[xorg-x11-drv-evdev] Fix inverted horizontal scroll
Peter Hutterer
whot at fedoraproject.org
Tue Mar 27 02:49:50 UTC 2012
commit 79ac3fd769ac9deec2173fae81086ac1f5e8c96e
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue Mar 27 12:49:08 2012 +1000
Fix inverted horizontal scroll
- Fix broken scroll wheels on QEMU tablets (#805902)
...tive-scroll-valuators-on-absolute-devices.patch | 187 ++++++++++++++++++++
0001-Fix-inverted-horizontal-scroll-46205.patch | 31 ++++
xorg-x11-drv-evdev.spec | 12 ++-
3 files changed, 229 insertions(+), 1 deletions(-)
---
diff --git a/0001-Allow-relative-scroll-valuators-on-absolute-devices.patch b/0001-Allow-relative-scroll-valuators-on-absolute-devices.patch
new file mode 100644
index 0000000..d5c1d58
--- /dev/null
+++ b/0001-Allow-relative-scroll-valuators-on-absolute-devices.patch
@@ -0,0 +1,187 @@
+From 2a21c2e35299c0438cea9d24e6754287e03aa0b6 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Tue, 27 Mar 2012 12:18:46 +1000
+Subject: [PATCH] Allow relative scroll valuators on absolute devices
+
+Special-case RHEL_WHEEL, RHEL_HWHEEL and REL_DIAL to add scroll valuators
+for those axes on top of the absolute axes.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=805902
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ src/evdev.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
+ src/evdev.h | 3 +-
+ 2 files changed, 86 insertions(+), 6 deletions(-)
+
+diff --git a/src/evdev.c b/src/evdev.c
+index 8cf630c..90bd455 100644
+--- a/src/evdev.c
++++ b/src/evdev.c
+@@ -702,7 +702,9 @@ EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, struct input_event *ev)
+ #endif
+ default:
+ /* Ignore EV_REL events if we never set up for them. */
+- if (!(pEvdev->flags & EVDEV_RELATIVE_EVENTS))
++ if (!(pEvdev->flags & EVDEV_RELATIVE_EVENTS) &&
++ ev->code != REL_WHEEL && ev->code != REL_DIAL &&
++ ev->code != REL_HWHEEL)
+ return;
+
+ /* Handle mouse wheel emulation */
+@@ -711,7 +713,7 @@ EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, struct input_event *ev)
+
+ pEvdev->rel_queued = 1;
+ pEvdev->delta[ev->code] += value;
+- map = pEvdev->axis_map[ev->code];
++ map = pEvdev->axis_map[ev->code + pEvdev->rel_offset];
+ valuator_mask_set(pEvdev->vals, map, value);
+ break;
+ }
+@@ -1234,7 +1236,7 @@ is_blacklisted_axis(int axis)
+
+
+ static int
+-EvdevAddAbsValuatorClass(DeviceIntPtr device)
++EvdevAddAbsValuatorClass(DeviceIntPtr device, int want_scroll_axes)
+ {
+ InputInfoPtr pInfo;
+ EvdevPtr pEvdev;
+@@ -1282,6 +1284,20 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
+ }
+ }
+ #endif
++
++#ifdef HAVE_SMOOTH_SCROLLING
++ if (want_scroll_axes && EvdevBitIsSet(pEvdev->bitmask, EV_REL))
++ {
++ pEvdev->rel_offset = num_axes;
++ if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_WHEEL))
++ num_axes++;
++ if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_HWHEEL))
++ num_axes++;
++ if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_DIAL))
++ num_axes++;
++ }
++#endif
++
+ if (num_axes + num_mt_axes > MAX_VALUATORS) {
+ xf86IDrvMsg(pInfo, X_WARNING, "found %d axes, limiting to %d.\n", num_axes, MAX_VALUATORS);
+ num_axes = MAX_VALUATORS;
+@@ -1368,6 +1384,20 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
+ i++;
+ }
+
++#ifdef HAVE_SMOOTH_SCROLLING
++ if (want_scroll_axes)
++ {
++ int mapping = pEvdev->rel_offset;
++
++ if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_HWHEEL))
++ pEvdev->axis_map[pEvdev->rel_offset + REL_HWHEEL] = mapping++;
++ if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_DIAL))
++ pEvdev->axis_map[pEvdev->rel_offset + REL_DIAL] = mapping++;
++ if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_WHEEL))
++ pEvdev->axis_map[pEvdev->rel_offset + REL_WHEEL] = mapping++;
++ }
++#endif
++
+ EvdevInitAxesLabels(pEvdev, Absolute, pEvdev->num_vals + num_mt_axes, atoms);
+
+ if (!InitValuatorClassDeviceStruct(device, num_axes + num_mt_axes, atoms,
+@@ -1461,6 +1491,51 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
+ }
+ #endif
+
++#ifdef HAVE_SMOOTH_SCROLLING
++ if (want_scroll_axes)
++ {
++ int axidx;
++ if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_WHEEL))
++ {
++ axidx = pEvdev->rel_offset + REL_WHEEL;
++ xf86InitValuatorAxisStruct(device,
++ pEvdev->axis_map[axidx],
++ atoms[pEvdev->axis_map[axidx]],
++ NO_AXIS_LIMITS, NO_AXIS_LIMITS,
++ 0, 0, 0, Relative);
++ SetScrollValuator(device, pEvdev->axis_map[axidx],
++ SCROLL_TYPE_VERTICAL, -1.0,
++ SCROLL_FLAG_PREFERRED);
++ }
++
++ if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_HWHEEL))
++ {
++ axidx = pEvdev->rel_offset + REL_HWHEEL;
++ xf86InitValuatorAxisStruct(device,
++ pEvdev->axis_map[axidx],
++ atoms[pEvdev->axis_map[axidx]],
++ NO_AXIS_LIMITS, NO_AXIS_LIMITS,
++ 0, 0, 0, Relative);
++ SetScrollValuator(device, pEvdev->axis_map[axidx],
++ SCROLL_TYPE_HORIZONTAL, 1.0,
++ SCROLL_FLAG_NONE);
++ }
++
++ if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_DIAL))
++ {
++ axidx = pEvdev->rel_offset + REL_DIAL;
++ xf86InitValuatorAxisStruct(device,
++ pEvdev->axis_map[axidx],
++ atoms[pEvdev->axis_map[axidx]],
++ NO_AXIS_LIMITS, NO_AXIS_LIMITS,
++ 0, 0, 0, Relative);
++ SetScrollValuator(device, pEvdev->axis_map[axidx],
++ SCROLL_TYPE_HORIZONTAL, 1.0,
++ SCROLL_FLAG_NONE);
++ }
++ }
++#endif
++
+ free(atoms);
+
+ for (i = 0; i < ArrayLength(proximity_bits); i++)
+@@ -1690,12 +1765,16 @@ static void
+ EvdevInitAnyValuators(DeviceIntPtr device, EvdevPtr pEvdev)
+ {
+ InputInfoPtr pInfo = device->public.devicePrivate;
++ int rel_success = FALSE;
+
+ if (pEvdev->flags & EVDEV_RELATIVE_EVENTS &&
+ EvdevAddRelValuatorClass(device) == Success)
++ {
++ rel_success = TRUE;
+ xf86IDrvMsg(pInfo, X_INFO, "initialized for relative axes.\n");
++ }
+ if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS &&
+- EvdevAddAbsValuatorClass(device) == Success)
++ EvdevAddAbsValuatorClass(device, !rel_success) == Success)
+ xf86IDrvMsg(pInfo, X_INFO, "initialized for absolute axes.\n");
+ }
+
+@@ -1704,7 +1783,7 @@ EvdevInitAbsValuators(DeviceIntPtr device, EvdevPtr pEvdev)
+ {
+ InputInfoPtr pInfo = device->public.devicePrivate;
+
+- if (EvdevAddAbsValuatorClass(device) == Success) {
++ if (EvdevAddAbsValuatorClass(device, TRUE) == Success) {
+ xf86IDrvMsg(pInfo, X_INFO,"initialized for absolute axes.\n");
+ } else {
+ xf86IDrvMsg(pInfo, X_ERROR,"failed to initialize for absolute axes.\n");
+diff --git a/src/evdev.h b/src/evdev.h
+index 309b215..cca5cbe 100644
+--- a/src/evdev.h
++++ b/src/evdev.h
+@@ -153,7 +153,8 @@ typedef struct {
+ int grabDevice; /* grab the event device? */
+
+ int num_vals; /* number of valuators */
+- int axis_map[max(ABS_CNT, REL_CNT)]; /* Map evdev <axis> to index */
++ int axis_map[ABS_CNT + REL_CNT]; /* Map evdev <axis> to index */
++ int rel_offset; /* offset for relative axes in absolute device */
+ ValuatorMask *vals; /* new values coming in */
+ ValuatorMask *old_vals; /* old values for calculating relative motion */
+ ValuatorMask *prox; /* last values set while not in proximity */
+--
+1.7.7.6
+
diff --git a/0001-Fix-inverted-horizontal-scroll-46205.patch b/0001-Fix-inverted-horizontal-scroll-46205.patch
new file mode 100644
index 0000000..670eb54
--- /dev/null
+++ b/0001-Fix-inverted-horizontal-scroll-46205.patch
@@ -0,0 +1,31 @@
+From 99340147b9092a5aaec997eca407282a51e1f063 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Thu, 15 Mar 2012 15:46:32 +1000
+Subject: [PATCH] Fix inverted horizontal scroll (#46205)
+
+REL_HWHEEL has a positive increment, not a negative one like REL_WHEEL.
+
+X.Org Bug 46205 <http://bugs.freedesktop.org/show_bug.cgi?id=46205>
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+Reviewed-by: Chase Douglas <chase.douglas at canonical.com>
+---
+ src/evdev.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/evdev.c b/src/evdev.c
+index d540b87..8cf630c 100644
+--- a/src/evdev.c
++++ b/src/evdev.c
+@@ -1600,7 +1600,7 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
+ else if (axis == REL_DIAL)
+ SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL, -1.0, SCROLL_FLAG_NONE);
+ else if (axis == REL_HWHEEL)
+- SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, -1.0, SCROLL_FLAG_NONE);
++ SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, 1.0, SCROLL_FLAG_NONE);
+ #endif
+ }
+
+--
+1.7.7.6
+
diff --git a/xorg-x11-drv-evdev.spec b/xorg-x11-drv-evdev.spec
index c6d08bf..9d7ac99 100644
--- a/xorg-x11-drv-evdev.spec
+++ b/xorg-x11-drv-evdev.spec
@@ -8,7 +8,7 @@
Summary: Xorg X11 evdev input driver
Name: xorg-x11-drv-evdev
Version: 2.7.0
-Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
+Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -21,6 +21,10 @@ Source2: commitid
Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
%endif
+Patch01: 0001-Fix-inverted-horizontal-scroll-46205.patch
+# Bug 805902 - Scrollwheels on tablets are broken
+Patch02: 0001-Allow-relative-scroll-valuators-on-absolute-devices.patch
+
ExcludeArch: s390 s390x
BuildRequires: autoconf automake libtool
@@ -38,6 +42,8 @@ X.Org X11 evdev input driver.
%prep
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+%patch01 -p1
+%patch02 -p1
%build
autoreconf -v --install || exit 1
@@ -79,6 +85,10 @@ X.Org X11 evdev input driver development files.
%changelog
+* Tue Mar 27 2012 Peter Hutterer <peter.hutterer at redhat.com> 2.7.0-2
+- Fix inverted horizontal scroll
+- Fix broken scroll wheels on QEMU tablets (#805902)
+
* Wed Mar 07 2012 Peter Hutterer <peter.hutterer at redhat.com> 2.7.0-1
- evdev 2.7.0
More information about the scm-commits
mailing list