[PATCH libinput 7/7] touchpad: Make tap code follow state machine diagram part 3

Hans de Goede hdegoede at redhat.com
Sun Sep 28 04:22:23 PDT 2014


We should only mark touches dead on a button click if we're dealing with a
clickpad.

Signed-off-by: Hans de Goede <hdegoede at redhat.com>
---
 src/evdev-mt-touchpad-tap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c
index e9dc147..ce88ff4 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) {
-- 
2.1.0



More information about the wayland-devel mailing list