diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2014-04-28 12:23:18 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-04-29 09:44:34 +1000 |
| commit | 34619347b73d3184929dd8e7aad44ea90c30a3aa (patch) | |
| tree | 70c03c9ffea844c8607cf5ea20980be1a0a5064e | |
| parent | 1a031657b96c60606f5b66e465054888f61b29d6 (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>
(cherry picked from commit 16c85cbeacb721ed365c6240aabaad921b811fe0)
Conflicts:
src/evdev.c
| -rw-r--r-- | src/evdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/evdev.c b/src/evdev.c index 16a0358..47c7cf0 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1553,7 +1553,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, -1.0, + SCROLL_TYPE_HORIZONTAL, 1.0, SCROLL_FLAG_NONE); } } @@ -1696,7 +1696,7 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) if (axis == REL_WHEEL) SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL, -1.0, SCROLL_FLAG_PREFERRED); else if (axis == REL_DIAL) - SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL, -1.0, SCROLL_FLAG_NONE); + SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, 1.0, SCROLL_FLAG_NONE); else if (axis == REL_HWHEEL) SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, 1.0, SCROLL_FLAG_NONE); #endif |