summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-04-29 18:29:58 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-07-03 10:37:35 +1000
commitdcca28a59ce0a2f8a06c559eed493ca43afc20cb (patch)
treea4101e89842dcb416d47b88d8a2faec0555a5f8a
parentdb8b1ca5cffbc48f7d9c5c166489c714ac92ea86 (diff)
downloadxorg-driver-xf86-input-evdev-dcca28a59ce0a2f8a06c559eed493ca43afc20cb.tar.gz
Count REL_DIAL as a scrollwheel during EvdevProbe (#21457)
The Griffin Powermate only has a single axis (REL_DIAL). This axis is posted as horizontal scroll wheel, so we need to ensure the scroll wheel setup (including ensuring that enough buttons are available) is triggered accordingly. X.Org Bug 21457 <http://bugs.freedesktop.org/show_bug.cgi?id=21457> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/evdev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/evdev.c b/src/evdev.c
index ecca94a..0387a14 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1590,7 +1590,8 @@ EvdevProbe(InputInfoPtr pInfo)
}
if (TestBit(REL_WHEEL, pEvdev->rel_bitmask) ||
- TestBit(REL_HWHEEL, pEvdev->rel_bitmask)) {
+ TestBit(REL_HWHEEL, pEvdev->rel_bitmask) ||
+ TestBit(REL_DIAL, pEvdev->rel_bitmask)) {
xf86Msg(X_INFO, "%s: Found scroll wheel(s)\n", pInfo->name);
has_scroll = TRUE;
if (!num_buttons)