summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-03-23 10:51:59 -0700
committerPeter Hutterer <peter.hutterer@who-t.net>2012-03-26 11:58:40 +1000
commit4c87455f3ecd1b82a3612a3050e463a0efb90f0c (patch)
tree5f4cb12f2fbecd301e70004703250eeb700d9d34
parentda461b91659d0c64aa6827e065aee2682116a57e (diff)
Do not perform a tap action when more than three touches
Though this looks like a behavior change, it really isn't since the maximum tap_max_fingers that was previously possible was already handled. The only real change is that if a tap is recognized but the tap_max_fingers is zero, a tap will no longer be emitted. This shouldn't happen in the real world. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/synaptics.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/synaptics.c b/src/synaptics.c
index f07fd13..99b5085 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -1798,7 +1798,6 @@ SelectTapButton(SynapticsPrivate *priv, edge_type edge)
switch (priv->tap_max_fingers) {
case 1:
- default:
switch (edge) {
case RIGHT_TOP_EDGE:
DBG(7, "right top edge\n");
@@ -1830,6 +1829,9 @@ SelectTapButton(SynapticsPrivate *priv, edge_type edge)
DBG(7, "three finger tap\n");
tap = F3_TAP;
break;
+ default:
+ priv->tap_button = 0;
+ return;
}
priv->tap_button = priv->synpara.tap_action[tap];