summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2015-03-24 15:41:39 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2015-03-27 11:23:53 +1000
commit15caf2b53407379f8e677d48a022f4b46b97d83a (patch)
tree8617bff75399022ee02ddf4aec22648f4d8a5442
parentef8daaf696584f7c1d3e9f192de18b5b9f923bdc (diff)
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 <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com> (cherry picked from commit fc9f490a2c87e6f87b0f483cd6bf5f526dddbb8d)
-rw-r--r--src/eventcomm.c9
1 files changed, 9 insertions, 0 deletions
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: