summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-02-09 10:01:49 -0800
committerPeter Hutterer <peter.hutterer@who-t.net>2012-02-11 07:46:05 +1000
commit796e0d43917de99757c08fd2998134cf6f5583c9 (patch)
tree31a85b74591e955b2833b736cb9aad018a7106e4
parent061e4a259644408899e03ba5abdd979691a02b1a (diff)
Filter touch events if tap actions are 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/synaptics.c b/src/synaptics.c
index 56caf35..dfeb0c4 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -2607,9 +2607,9 @@ HandleTouches(InputInfoPtr pInfo, struct SynapticsHwState *hw)
Bool restart_touches = FALSE;
int i;
- if (para->click_action[F3_CLICK1])
+ if (para->click_action[F3_CLICK1] || para.tap_action[F3_TAP])
min_touches = 4;
- else if (para->click_action[F2_CLICK1])
+ else if (para->click_action[F2_CLICK1] || para.tap_action[F2_TAP])
min_touches = 3;
/* Count new number of active touches */