|
 |
e94010 |
From 5a2ed1e91a488b8009ce6cb870cea3205d73bdaf Mon Sep 17 00:00:00 2001
|
|
|
e94010 |
From: Stephen Chandler Paul <thatslyude@gmail.com>
|
|
|
e94010 |
Date: Mon, 10 Mar 2014 18:33:20 -0400
|
|
|
e94010 |
Subject: [PATCH synaptics 12/14] Don't allow any type of movement starting in
|
|
|
e94010 |
the top softbutton area
|
|
|
e94010 |
|
|
|
e94010 |
Clicking in the top soft button area causes the trackpad to begin
|
|
|
e94010 |
registering motion, even if the finger never leaves the top soft button
|
|
|
e94010 |
area. We don't want this kind of behavior for the top soft button area,
|
|
|
e94010 |
since it makes clicking and dragging items much more difficult when
|
|
|
e94010 |
using a pointing stick.
|
|
|
e94010 |
|
|
|
e94010 |
Signed-off-by: Stephen Chandler Paul <thatslyude@gmail.com>
|
|
|
e94010 |
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
e94010 |
(cherry picked from commit b40a5255fe73f7f95c8ff7145dd91605f3430119)
|
|
|
e94010 |
(cherry picked from commit ed84731b72692c648b48d00b84bb680446e265b6)
|
|
|
e94010 |
---
|
|
|
e94010 |
src/synaptics.c | 3 ++-
|
|
|
e94010 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
e94010 |
|
|
|
e94010 |
diff --git a/src/synaptics.c b/src/synaptics.c
|
|
|
e94010 |
index c3bda7b..512ca8d 100644
|
|
|
e94010 |
--- a/src/synaptics.c
|
|
|
e94010 |
+++ b/src/synaptics.c
|
|
|
e94010 |
@@ -2904,7 +2904,8 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw, CARD32 now,
|
|
|
e94010 |
|
|
|
e94010 |
/* If a physical button is pressed on a clickpad, use cumulative relative
|
|
|
e94010 |
* touch movements for motion */
|
|
|
e94010 |
- if (para->clickpad && (hw->left || hw->right || hw->middle)) {
|
|
|
e94010 |
+ if (para->clickpad && (priv->lastButtons & 7) &&
|
|
|
e94010 |
+ priv->last_button_area != TOP_BUTTON_AREA) {
|
|
|
e94010 |
hw->x = hw->cumulative_dx;
|
|
|
e94010 |
hw->y = hw->cumulative_dy;
|
|
|
e94010 |
using_cumulative_coords = TRUE;
|
|
|
e94010 |
--
|
|
|
e94010 |
1.9.3
|
|
|
e94010 |
|