[PATCH libinput 18/20] touchpad: Remove clickpad clicked test from 2 finger scrolling handling

Hans de Goede hdegoede at redhat.com
Tue Apr 15 05:28:15 PDT 2014


This is no longer needed now that we take the button area and pinned fingers
into account.

Signed-off-by: Hans de Goede <hdegoede at redhat.com>
Acked-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/evdev-mt-touchpad.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 7333ec9..e7ef357 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -498,11 +498,6 @@ tp_post_scroll_events(struct tp_dispatch *tp, uint32_t time)
 	struct tp_touch *t;
 	int nfingers_down = 0;
 
-	/* don't scroll if a clickpad is held down */
-	if (tp->buttons.is_buttonpad &&
-	    (tp->buttons.state || tp->buttons.old_state))
-		return 0;
-
 	/* Only count active touches for 2 finger scrolling */
 	tp_for_each_touch(tp, t) {
 		if (tp_touch_active(tp, t))
-- 
1.9.0



More information about the wayland-devel mailing list