summaryrefslogtreecommitdiff
path: root/src/synaptics.c
diff options
context:
space:
mode:
authorGabriele Mazzotta <gabriele.mzt@gmail.com>2014-08-14 20:03:42 +0200
committerPeter Hutterer <peter.hutterer@who-t.net>2014-09-05 13:36:19 +1000
commitec0901e5f81d9cad6cc8bbdcb5ea075009c13de5 (patch)
treeacffd66307942ee85c880d0b5471b663bb19e4e7 /src/synaptics.c
parent90d19302306f49722e210227b2fb5161e6f51880 (diff)
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>
Diffstat (limited to 'src/synaptics.c')
-rw-r--r--src/synaptics.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/synaptics.c b/src/synaptics.c
index b49957c..e8a08d2 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -3098,9 +3098,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;