summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-20 14:34:48 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-20 14:34:48 +0000
commit457c145ea1446357a318c541cee692e934461d63 (patch)
treee6bd7e37450b725c68c4b6715afe714607b457f6
parentaa72f31b53942c14d8684338a2988b1d12f1cc45 (diff)
downloaddrakx-kbd-mouse-x11-457c145ea1446357a318c541cee692e934461d63.tar
drakx-kbd-mouse-x11-457c145ea1446357a318c541cee692e934461d63.tar.gz
drakx-kbd-mouse-x11-457c145ea1446357a318c541cee692e934461d63.tar.bz2
drakx-kbd-mouse-x11-457c145ea1446357a318c541cee692e934461d63.tar.xz
drakx-kbd-mouse-x11-457c145ea1446357a318c541cee692e934461d63.zip
(detect) configure input driver as 'vmmouse' if running in vmware (#29106)
(needs drakxtools >= 12.17)
-rw-r--r--NEWS1
-rw-r--r--lib/mouse.pm3
2 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index e65f082..f9860e7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- mousedrake:
+ o configure input driver as 'vmmouse' if running in vmware (#29106)
o test if the file is there before trying to install the packages, that saves
a rpm -q in harddrake service after adding/removing/changing a mouse
diff --git a/lib/mouse.pm b/lib/mouse.pm
index 1ff3068..cc530e9 100644
--- a/lib/mouse.pm
+++ b/lib/mouse.pm
@@ -86,6 +86,7 @@ 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") =>
@@ -345,6 +346,8 @@ 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} };