summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2014-09-28 12:51:09 +0200
committerHans de Goede <hdegoede@redhat.com>2014-11-06 11:18:29 +0100
commita78a25e62eaec24d625a48d9d0dcd524f874ad7f (patch)
tree947e6066d4eef3d1a58c7c13b052d9e012dc20cf
parentd2c44df7c337d506cc914eaf16931828547f2fd0 (diff)
touchpad: Make tap code follow state machine diagram part 3for-peter
We should only mark touches dead on a button click if we're dealing with a clickpad. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r--src/evdev-mt-touchpad-tap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c
index d15e9ea..a38edbe 100644
--- a/src/evdev-mt-touchpad-tap.c
+++ b/src/evdev-mt-touchpad-tap.c
@@ -562,7 +562,8 @@ tp_tap_handle_state(struct tp_dispatch *tp, uint64_t time)
if (!t->dirty || t->state == TOUCH_NONE)
continue;
- if (tp->queued & TOUCHPAD_EVENT_BUTTON_PRESS)
+ if (tp->buttons.is_clickpad &&
+ tp->queued & TOUCHPAD_EVENT_BUTTON_PRESS)
t->tap.state = TAP_TOUCH_STATE_DEAD;
if (t->state == TOUCH_BEGIN) {