diff options
| author | root <root@rshg054.dnsready.net> | 2012-03-18 00:02:54 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-03-18 00:02:54 +0000 |
| commit | d14a25fc4f65ae3d6e62f4668e9cb88d74834255 (patch) | |
| tree | 7c4f618283e9b502f0d9cfb5059ce38daa7738be /extra/xf86-input-synaptics | |
| parent | 9a940818cc3edb82afac4d73a6474e6e3374f987 (diff) | |
Sun Mar 18 00:02:53 UTC 2012
Diffstat (limited to 'extra/xf86-input-synaptics')
| -rw-r--r-- | extra/xf86-input-synaptics/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch | 40 |
2 files changed, 47 insertions, 4 deletions
diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD index 28e169f2c..2e1710d8c 100644 --- a/extra/xf86-input-synaptics/PKGBUILD +++ b/extra/xf86-input-synaptics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153467 2012-03-14 18:01:52Z andyrtr $ +# $Id: PKGBUILD 153621 2012-03-16 17:56:02Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> @@ -6,7 +6,7 @@ pkgname=xf86-input-synaptics pkgver=1.5.99.901 -pkgrel=1 +pkgrel=2 pkgdesc="Synaptics driver for notebook touchpads" arch=('i686' 'x86_64') license=('custom') @@ -21,12 +21,15 @@ groups=('xorg-drivers' 'xorg') options=(!libtool) backup=('etc/X11/xorg.conf.d/10-synaptics.conf') source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - 10-synaptics.conf) + 10-synaptics.conf + synaptics-Fix-inverted-circular-scrolling-direction.patch) sha1sums=('8836b1c2bf443b2c11f38457e203c5309698d9d0' - '68e1f4ef5e1038231d210eb422fa4d18c5922f0f') + '68e1f4ef5e1038231d210eb422fa4d18c5922f0f' + '2e35cde5db6c435f612a5c6802f33aca8ba1b6bb') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/synaptics-Fix-inverted-circular-scrolling-direction.patch ./configure --prefix=/usr make } diff --git a/extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch b/extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch new file mode 100644 index 000000000..fee383855 --- /dev/null +++ b/extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch @@ -0,0 +1,40 @@ +From patchwork Wed Mar 14 03:27:29 2012 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: [synaptics] Fix inverted circular scrolling direction +Date: Wed, 14 Mar 2012 03:27:29 -0000 +From: Peter Hutterer <peter.hutterer@who-t.net> +X-Patchwork-Id: 9512 +Message-Id: <20120314032729.GA16614@yabbi.bne.redhat.com> +To: "X.Org Devel List" <xorg-devel@lists.freedesktop.org> +Cc: Thomas =?iso-8859-1?Q?B=E4chler?= <thomas@archlinux.org> + +Introduced in 26831a6eeac6762ad4d99532f62ebbab0827de10. +In said commit, the old-style button events were changed to delta +accumulation. Alas, for circular scrolling, a positive delta is up whereas +for everything else a positive delta is down. + +Reported-by: Thomas Bächler <thomas@archlinux.org> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +--- +src/synaptics.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/synaptics.c b/src/synaptics.c +index fa46f0d..c9609cd 100644 +--- a/src/synaptics.c ++++ b/src/synaptics.c +@@ -2554,9 +2554,9 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw, + double diff = diffa(priv->scroll.last_a, angle(priv, hw->x, hw->y)); + if (delta >= 0.005 && diff != 0.0) { + if (priv->circ_scroll_vert) +- priv->scroll.delta_y += diff / delta * para->scroll_dist_vert; ++ priv->scroll.delta_y -= diff / delta * para->scroll_dist_vert; + else +- priv->scroll.delta_x += diff / delta * para->scroll_dist_horiz;; ++ priv->scroll.delta_x -= diff / delta * para->scroll_dist_horiz;; + priv->scroll.last_a = angle(priv, hw->x, hw->y); + DBG(priv, 10, "circ scoll delta: %.2f diff %.2f angle %.2f\n", delta, diff, priv->scroll.last_a); + } |