From 15caf2b53407379f8e677d48a022f4b46b97d83a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 24 Mar 2015 15:41:39 +1000 Subject: eventcomm: ignore fake and broken MT devices An MT device without X/Y is not a touchpad. And neither are fake MT devices. Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede (cherry picked from commit fc9f490a2c87e6f87b0f483cd6bf5f526dddbb8d) --- src/eventcomm.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/eventcomm.c b/src/eventcomm.c index a08a3b3..589a6de 100644 --- a/src/eventcomm.c +++ b/src/eventcomm.c @@ -320,6 +320,15 @@ event_query_is_touchpad(struct libevdev *evdev, BOOL test_grab) libevdev_has_event_code(evdev, EV_ABS, BTN_TOOL_PEN)) /* Don't match wacom tablets */ goto unwind; + if (libevdev_has_event_code(evdev, EV_ABS, ABS_MT_SLOT)) { + if (libevdev_get_num_slots(evdev) == -1) + goto unwind; /* Ignore fake MT devices */ + + if (!libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_X) || + !libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_Y)) + goto unwind; + } + ret = TRUE; unwind: -- cgit v1.2.3