summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2014-04-28 12:23:18 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2014-04-29 09:39:12 +1000
commit16c85cbeacb721ed365c6240aabaad921b811fe0 (patch)
treee814bdc156d4b598046b5ec5c862692ca39461a3
parentae67f64f02434171e1828b00fbf4277c8166966e (diff)
Map REL_DIAL to horizontal scrolling (#73105)
This was the original behavior introduced in f77410e1f97d394e98c854fd174f712666b0544c and stayed that way until smooth scrolling erroneously added it as vertical axis in b450efdf95999cad08de23ce069f04a66bdae24b. Revert to horizontal scrolling to restore the previous behaviour - which unbreaks scrolling on Microsoft mice. This effectively reverts 54a3120e339e55fc4721543abb15692c3e9ede09 too. X.Org Bug 73105 <http://bugs.freedesktop.org/show_bug.cgi?id=73105> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r--src/evdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/evdev.c b/src/evdev.c
index ed84f0f..6d02bdd 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1574,7 +1574,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device, int want_scroll_axes)
NO_AXIS_LIMITS, NO_AXIS_LIMITS,
0, 0, 0, Relative);
SetScrollValuator(device, pEvdev->rel_axis_map[idx],
- SCROLL_TYPE_VERTICAL,
+ SCROLL_TYPE_HORIZONTAL,
-pEvdev->smoothScroll.dial_delta,
SCROLL_FLAG_NONE);
}
@@ -1652,7 +1652,7 @@ EvdevSetScrollValuators(DeviceIntPtr device)
axnum = pEvdev->rel_axis_map[REL_DIAL];
if (axnum != -1) {
- SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL,
+ SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL,
-pEvdev->smoothScroll.dial_delta,
SCROLL_FLAG_NONE);
}