[PATCH libinput] evdev: INPUT_PROP_DIRECT devices can't be touchpads

Peter Hutterer peter.hutterer at who-t.net
Wed May 28 23:00:58 PDT 2014


Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/evdev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/evdev.c b/src/evdev.c
index 08a18fd..b7baab6 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -648,7 +648,8 @@ evdev_configure_device(struct evdev_device *device)
 		has_rel = 1;
 
 	if (libevdev_has_event_type(evdev, EV_KEY)) {
-		if (libevdev_has_event_code(evdev, EV_KEY, BTN_TOOL_FINGER) &&
+		if (!libevdev_has_property(evdev, INPUT_PROP_DIRECT) &&
+		    libevdev_has_event_code(evdev, EV_KEY, BTN_TOOL_FINGER) &&
 		    !libevdev_has_event_code(evdev, EV_KEY, BTN_TOOL_PEN) &&
 		    (has_abs || has_mt)) {
 			device->dispatch = evdev_mt_touchpad_create(device);
-- 
1.9.3



More information about the wayland-devel mailing list