summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-20 18:40:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-20 18:40:49 +0000
commit53c7ef8c808990a52d014561adcc3784ed50f79b (patch)
tree27a72bf8e6bc568c6ce92aa0959d7ff1c71e9168
parentbb82abd56cebbbc2ab1e989d61efba9142634032 (diff)
downloaddrakx-kbd-mouse-x11-53c7ef8c808990a52d014561adcc3784ed50f79b.tar
drakx-kbd-mouse-x11-53c7ef8c808990a52d014561adcc3784ed50f79b.tar.gz
drakx-kbd-mouse-x11-53c7ef8c808990a52d014561adcc3784ed50f79b.tar.bz2
drakx-kbd-mouse-x11-53c7ef8c808990a52d014561adcc3784ed50f79b.tar.xz
drakx-kbd-mouse-x11-53c7ef8c808990a52d014561adcc3784ed50f79b.zip
- when using evdev for mice, ensure it doesn't match a keyboard
(eg: in case of a mouse+keyboard combo) (#32905)
-rw-r--r--NEWS2
-rw-r--r--lib/mouse.pm3
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 4b49e9d..63435d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- when using evdev for mice, ensure it doesn't match a keyboard
+ (eg: in case of a mouse+keyboard combo) (#32905)
- fix regression in 0.24: remove bogus duplicates in monitors tree (#33778)
Version 0.27 - 19 September 2007, by Pascal "Pixel" Rigaux
diff --git a/lib/mouse.pm b/lib/mouse.pm
index 0eef408..3afcca0 100644
--- a/lib/mouse.pm
+++ b/lib/mouse.pm
@@ -289,7 +289,8 @@ sub mice2evdev {
#- we always use HWheelRelativeAxisButtons for evdev, it tells mice with no horizontal wheel to skip those buttons
#- that way we ensure 6 & 7 is always horizontal wheel
#- (cf patch skip-HWheelRelativeAxisButtons-even-if-unused in x11-driver-input-evdev)
- { bustype => "0x$_->{bustype}", vendor => "0x$_->{vendor}", product => "0x$_->{id}", HWheelRelativeAxisButtons => "7 6" };
+ { bustype => "0x$_->{bustype}", vendor => "0x$_->{vendor}", product => "0x$_->{id}",
+ relBits => "+0+1+2", HWheelRelativeAxisButtons => "7 6" };
} @mice ]
}