[PATCH xf86-input-synaptics v4 06/10] Disable scrolling when beginning a clickpad press

[Chase Douglas]

There really isn't a point to scrolling while a clickpad is pressed. In
particular, the clickpad button areas and the horizontal edge scrolling
areas overlap, so horizontal edge scrolling must be disabled. Also,
performing two finger scrolling while a third finger presses the button
would require us to inhibit touch events until four touches are present.
That is enough reason to disable two finger scrolling as well.

Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
---
 src/synaptics.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/synaptics.c b/src/synaptics.c
index cdc45c7..35adbed 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -1855,6 +1855,12 @@ HandleTapProcessing(SynapticsPrivate *priv, struct SynapticsHwState *hw,
 	}
 	break;
     case TS_CLICKPAD_MOVE:
+	/* Disable scrolling once a button is pressed on a clickpad */
+	priv->vert_scroll_edge_on = FALSE;
+	priv->horiz_scroll_edge_on = FALSE;
+	priv->vert_scroll_twofinger_on = FALSE;
+	priv->horiz_scroll_twofinger_on = FALSE;
+
         /* Assume one touch is only for holding the clickpad button down */
 	if (hw->numFingers > 1)
 	    hw->numFingers--;
-- 
1.7.9