summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-02-09 10:06:54 -0800
committerPeter Hutterer <peter.hutterer@who-t.net>2012-02-11 07:46:05 +1000
commite6032c34515a19ebac09090028f806d82ddfb62d (patch)
tree8dc68bc87f92e087f41b75a908a8ad411ea64bbf
parent796e0d43917de99757c08fd2998134cf6f5583c9 (diff)
Filter touch events if two-finger scrolling is enabled
Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-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 */