From 3e7508ac087028f8f8e116f5279dad1ebcdc58e6 Mon Sep 17 00:00:00 2001 From: Gabriele Mazzotta Date: Thu, 14 Aug 2014 20:03:42 +0200 Subject: Use cumulative relative touch movements while scrolling Signed-off-by: Gabriele Mazzotta Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer (cherry picked from commit ec0901e5f81d9cad6cc8bbdcb5ea075009c13de5) --- src/eventcomm.c | 8 +++++--- src/synaptics.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) 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; -- cgit v1.2.3