diff --git a/0001-Map-REL_DIAL-to-horizontal-scrolling-73105.patch b/0001-Map-REL_DIAL-to-horizontal-scrolling-73105.patch new file mode 100644 index 0000000..4435455 --- /dev/null +++ b/0001-Map-REL_DIAL-to-horizontal-scrolling-73105.patch @@ -0,0 +1,44 @@ +From e677c4ccc28e28e10c5fb0e9fa2b3a6fbff6cc51 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 28 Apr 2014 12:25:56 +1000 +Subject: [PATCH xf86-input-evdev] Map REL_DIAL to horizontal scrolling + (#73105) + +This was the original behaviour 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. + +X.Org Bug 73105 + +Signed-off-by: Peter Hutterer +--- + src/evdev.c | 4 ++-- + 1 file 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); + } +-- +1.9.0 + diff --git a/xorg-x11-drv-evdev.spec b/xorg-x11-drv-evdev.spec index 32cef1e..4ccb6b8 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.8.99 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -21,6 +21,8 @@ Source2: commitid Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 %endif +Patch0: 0001-Map-REL_DIAL-to-horizontal-scrolling-73105.patch + ExcludeArch: s390 s390x BuildRequires: autoconf automake libtool @@ -41,6 +43,7 @@ X.Org X11 evdev input driver. %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%patch0 -p1 %build autoreconf --force -v --install || exit 1 @@ -76,6 +79,10 @@ X.Org X11 evdev input driver development files. %changelog +* Mon Apr 28 2014 Hans de Goede - 2.8.99-3.20140417gitae67f64 +- xserver 1.15.99-20140428 git snapshot ABI rebuild +- Map REL_DIAL to horizontal scrolling (bfdo#73105, rhbz#869065) + * Tue Apr 22 2014 Peter Hutterer 2.8.99-2.20140417gitae67f64 - Bump the xorg-x11-drv-keyboard obsoletes, I missed a few rebuilds there