diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | lib/mouse.pm | 6 |
2 files changed, 3 insertions, 6 deletions
@@ -1,4 +1,5 @@ - +- stop installing x11-driver-input-vmmouse + (uneeded since kernel-4.1) - add US Macintosh keyboard (mga#7519) - translation updates diff --git a/lib/mouse.pm b/lib/mouse.pm index 374f14b..7827e53 100644 --- a/lib/mouse.pm +++ b/lib/mouse.pm @@ -87,7 +87,6 @@ sub _all_mice() { [ 7, 'ps/2', 'ExplorerPS/2', N_("Force evdev") ], #- evdev is magically handled in mouse::select() if_(detect_devices::is_xbox(), [ 5, 'ps/2', 'IMPS/2', N_("Microsoft Xbox Controller S") ]), if_(detect_devices::is_virtualbox(), [ 7, 'ps/2', 'vboxmouse', N_("VirtualBox mouse") ]), - if_(detect_devices::is_vmware(), [ 7, 'ps/2', 'vmmouse', N_("VMware mouse") ]), ] ], N_("none") => @@ -298,8 +297,6 @@ sub detect { $modules_conf->get_probeall("usb-interface") and eval { modules::load('usbhid') }; if (detect_devices::is_virtualbox()) { fullname2mouse("Universal|VirtualBox mouse"); - } elsif (detect_devices::is_vmware()) { - fullname2mouse("Universal|VMware mouse"); } elsif (my @mice = grep { $_->{Handlers}{mouse} } detect_devices::getInputDevices_and_usb()) { my @synaptics = map { { ALPS => $_->{ALPS} }; @@ -354,7 +351,7 @@ sub set_xfree_conf { my @mice = map { { - (member($_->{Protocol}, qw(vboxmouse vmmouse)) ? "Driver" : "Protocol") => $_->{Protocol}, + ($_->{Protocol} eq 'vboxmouse' ? "Driver" : "Protocol") => $_->{Protocol}, Device => devices::make($_->{device}), if_($_->{Emulate3Buttons} || $_->{EmulateWheel}, Emulate3Buttons => undef, Emulate3Timeout => 50), if_($_->{EmulateWheel}, EmulateWheel => undef, EmulateWheelButton => 2), @@ -398,7 +395,6 @@ sub various_xfree_conf { if_($mouse->{evdev_mice}, ['x11-driver-input-evdev', "$inputdrvpath/evdev_drv.so"]), if_($mouse->{Protocol} eq 'vboxmouse', ['x11-driver-input-vboxmouse', "$inputdrvpath/vboxmouse_drv.so"]), if_(@{$mouse->{wacom}}, ['x11-driver-input-wacom', "$inputdrvpath/wacom_drv.so"]), - if_($mouse->{name} =~ /VMware/i, ['x11-driver-input-vmmouse', "$inputdrvpath/vmmouse_drv.so"]), ]; $do_pkgs->ensure_files_are_installed($pkgs, 1); |