diff options
| -rw-r--r-- | perl-install/install/NEWS | 6 | ||||
| -rw-r--r-- | perl-install/install/gtk.pm | 22 |
2 files changed, 7 insertions, 21 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index d5645e689..2abf03695 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,9 @@ +- xorg config: + o rely on evdev/udev for input devices + o Wacom tablets should work better + (we now load the wacom driver again) + o Synaptics touchpads should now work during install (mga#11524) + Version 16.30 - 4 June 2014 - adapt to perl-5.20 diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index 41d43d42d..42a331084 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -249,7 +249,6 @@ sub special_shortcuts { sub createXconf { my ($file, $mouse_type, $mouse_dev, $_wacom_dev, $Driver) = @_; - $mouse_type = 'IMPS/2' if $mouse_type eq 'vboxmouse'; symlinkf(devices::make($mouse_dev), "/dev/mouse") if $mouse_dev ne 'none'; #- remove "error opening security policy file" warning @@ -257,11 +256,9 @@ sub createXconf { return if !$Driver; - my ($mouse_driver, $mouse_protocol) = detect_devices::is_vmware() ? qw(vmmouse auto) : ('mouse', $mouse_type); my $resolution = $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"'; - output($file, sprintf(<<'END', $mouse_driver, $mouse_protocol, $Driver, $resolution)); + output($file, sprintf(<<'END', $Driver, $resolution)); Section "ServerFlags" - Option "AutoAddDevices" "False" EndSection Section "Module" @@ -272,21 +269,6 @@ Section "Files" FontPath "/usr/share/fonts:unscaled" EndSection -Section "InputDevice" - Identifier "Keyboard" - Driver "keyboard" - Option "XkbModel" "pc105" - Option "XkbLayout" "us" -EndSection - -Section "InputDevice" - Identifier "Mouse" - Driver "%s" - Option "Protocol" "%s" - Option "Device" "/dev/mouse" - Option "ZAxisMapping" "4 5" -EndSection - Section "Monitor" Identifier "monitor" HorizSync 31.5-35.5 @@ -316,8 +298,6 @@ Section "ServerLayout" Option "OffTime" "0" Identifier "layout" Screen "screen" - InputDevice "Mouse" "CorePointer" - InputDevice "Keyboard" "CoreKeyboard" EndSection END |