summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-02-09 10:06:54 -0800
committerChase Douglas <chase.douglas@canonical.com>2012-02-10 13:20:49 -0800
commit8add953ea645a1353f0c268963015dae2cd9353e (patch)
tree8dc68bc87f92e087f41b75a908a8ad411ea64bbf
parent7454d285efcf322bc6138034d3e5a30aa8110a6e (diff)
Filter touch events if two-finger scrolling is enabledmultitouch-synaptics
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r--src/synaptics.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/synaptics.c b/src/synaptics.c
index dfeb0c4..7b3f680 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -2607,9 +2607,10 @@ HandleTouches(InputInfoPtr pInfo, struct SynapticsHwState *hw)
Bool restart_touches = FALSE;
int i;
- if (para->click_action[F3_CLICK1] || para.tap_action[F3_TAP])
+ if (para->click_action[F3_CLICK1] || para->tap_action[F3_TAP])
min_touches = 4;
- else if (para->click_action[F2_CLICK1] || para.tap_action[F2_TAP])
+ else if (para->click_action[F2_CLICK1] || para->tap_action[F2_TAP] ||
+ para->scroll_twofinger_vert || para->scroll_twofinger_horiz)
min_touches = 3;
/* Count new number of active touches */