diff options
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/gtk.pm | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 923721a94..b156bd260 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - fix final banner - handle partition starting after 1To +- set mouse driver as 'vmmouse' for vmware (#49654) - update XFCE preview Version 12.30 - 21 April 2009 diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index 6aa6a8c95..73222f673 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -8,6 +8,7 @@ use mygtk2; use common; use lang; use devices; +use detect_devices; #-##################################################################################### #-INTERN CONSTANT @@ -263,7 +264,8 @@ sub createXconf { symlink("/tmp/stage2/etc/X11", "/etc/X11"); if ($Driver) { - output($file, sprintf(<<'END', $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"')); + my ($mouse_driver, $mouse_protocol) = detect_devices::is_vmware() ? qw(vmmouse auto) : ('mouse', $mouse_type); + output($file, sprintf(<<'END', $mouse_driver, $mouse_protocol, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"')); Section "ServerFlags" Option "AutoAddDevices" "False" EndSection @@ -281,7 +283,7 @@ EndSection Section "InputDevice" Identifier "Mouse" - Driver "mouse" + Driver "%s" Option "Protocol" "%s" Option "Device" "/dev/mouse" Option "ZAxisMapping" "4 5" |