[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-input-synaptics: Changes to 'debian-unstable'



 ChangeLog        |   19 +++++++++++++++++++
 configure.ac     |    2 +-
 debian/changelog |    6 ++++++
 src/eventcomm.c  |    8 +++++---
 src/synaptics.c  |    8 +++++---
 5 files changed, 36 insertions(+), 7 deletions(-)

New commits:
commit cdd2131794c282ae443010ed887424e219975451
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Jan 24 14:32:03 2016 +0100

    Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 82bd5a9..c5b4136 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-synaptics (1.8.3-1) UNRELEASED; urgency=medium
+xserver-xorg-input-synaptics (1.8.3-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Julien Cristau <jcristau@debian.org>  Sun, 24 Jan 2016 14:24:37 +0100
+ -- Julien Cristau <jcristau@debian.org>  Sun, 24 Jan 2016 14:31:57 +0100
 
 xserver-xorg-input-synaptics (1.8.2-1) unstable; urgency=medium
 

commit 9250a7b727feac3dc06e4eece4aa8eedef56430d
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Jan 24 14:25:08 2016 +0100

    Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 6d53ac4..7903df4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+commit af7d8a15278a968d919bf539628281bf713f747b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Oct 29 12:10:09 2015 +1000
+
+    synaptics 1.8.3
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 3e7508ac087028f8f8e116f5279dad1ebcdc58e6
+Author: Gabriele Mazzotta <gabriele.mzt@gmail.com>
+Date:   Thu Aug 14 20:03:42 2014 +0200
+
+    Use cumulative relative touch movements while scrolling
+    
+    Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit ec0901e5f81d9cad6cc8bbdcb5ea075009c13de5)
+
 commit 6f8d4bac14ac8f3fd2714f0a8a9e37c5136a4013
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Mar 27 11:26:55 2015 +1000
diff --git a/debian/changelog b/debian/changelog
index 8f08984..82bd5a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.8.3-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 24 Jan 2016 14:24:37 +0100
+
 xserver-xorg-input-synaptics (1.8.2-1) unstable; urgency=medium
 
   * Let uscan verify tarball signatures.

commit af7d8a15278a968d919bf539628281bf713f747b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Thu Oct 29 12:10:09 2015 +1000

    synaptics 1.8.3
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/configure.ac b/configure.ac
index b90e5b2..0b706a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-synaptics],
-        [1.8.2],
+        [1.8.3],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-input-synaptics])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 3e7508ac087028f8f8e116f5279dad1ebcdc58e6
Author: Gabriele Mazzotta <gabriele.mzt@gmail.com>
Date:   Thu Aug 14 20:03:42 2014 +0200

    Use cumulative relative touch movements while scrolling
    
    Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit ec0901e5f81d9cad6cc8bbdcb5ea075009c13de5)

diff --git a/src/eventcomm.c b/src/eventcomm.c
index 589a6de..635ec2c 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -697,9 +697,11 @@ EventReadHwState(InputInfoPtr pInfo,
 
     SynapticsResetTouchHwState(hw, FALSE);
 
-    /* Reset cumulative values if buttons were not previously pressed,
-     * or no finger was previously present. */
-    if ((!hw->left && !hw->right && !hw->middle) || hw->z < para->finger_low) {
+    /* Reset cumulative values if buttons were not previously pressed and no
+     * two-finger scrolling is ongoing, or no finger was previously present. */
+    if (((!hw->left && !hw->right && !hw->middle) &&
+        !(priv->vert_scroll_twofinger_on || priv->vert_scroll_twofinger_on)) ||
+        hw->z < para->finger_low) {
         hw->cumulative_dx = hw->x;
         hw->cumulative_dy = hw->y;
         sync_cumulative = TRUE;
diff --git a/src/synaptics.c b/src/synaptics.c
index 2d49a12..6f8889b 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -3111,9 +3111,11 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw, CARD32 now,
         }
     }
 
-    /* If a physical button is pressed on a clickpad, use cumulative relative
-     * touch movements for motion */
-    if (para->clickpad && (priv->lastButtons & 7) &&
+    /* If a physical button is pressed on a clickpad or a two-finger scrolling
+     * is ongoing, use cumulative relative touch movements for motion */
+    if (para->clickpad &&
+        ((priv->lastButtons & 7) ||
+        (priv->vert_scroll_twofinger_on || priv->horiz_scroll_twofinger_on)) &&
         priv->last_button_area != TOP_BUTTON_AREA) {
         hw->x = hw->cumulative_dx;
         hw->y = hw->cumulative_dy;


Reply to: