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-03-12 14:09:59 +1000
commitb40a5255fe73f7f95c8ff7145dd91605f3430119 (patch)
treefef5254a97bddd49805c4c5540af3fd9d96c0f5b
parent9a419ba01c53a38b4b601f4415801fca29a2b4e2 (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>
-rw-r--r--src/synaptics.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/synaptics.c b/src/synaptics.c
index 23175b1..640fa6f 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -3107,7 +3107,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;