summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Chandler Paul <thatslyude@gmail.com>2014-03-10 18:33:20 -0400
committerPeter Hutterer <peter.hutterer@who-t.net>2014-04-30 12:54:00 +1000
commited84731b72692c648b48d00b84bb680446e265b6 (patch)
treef48fed245b742edd00efb78430caa106559c65b7
parent8732f7b5c16aaba1df4b2429804d02c2742bdf59 (diff)
Don't allow any type of movement starting in the top softbutton area
Clicking in the top soft button area causes the trackpad to begin registering motion, even if the finger never leaves the top soft button area. We don't want this kind of behavior for the top soft button area, since it makes clicking and dragging items much more difficult when using a pointing stick. Signed-off-by: Stephen Chandler Paul <thatslyude@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit b40a5255fe73f7f95c8ff7145dd91605f3430119)
-rw-r--r--src/synaptics.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/synaptics.c b/src/synaptics.c
index 276a0fc..618de6b 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -3085,7 +3085,8 @@ 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 && (hw->left || hw->right || hw->middle)) {
+ if (para->clickpad && (priv->lastButtons & 7) &&
+ priv->last_button_area != TOP_BUTTON_AREA) {
hw->x = hw->cumulative_dx;
hw->y = hw->cumulative_dy;
using_cumulative_coords = TRUE;