We really don't need to deal with devices that have x but not y or vice versa.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
---
src/evdev.c | 23 +++++++++++++
test/device.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 126 insertions(+)
diff --git a/src/evdev.c b/src/evdev.c
index ea63356..3481b45 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1416,6 +1416,22 @@ evdev_fix_android_mt(struct evdev_device *device)
}
static int
+evdev_reject_device(struct evdev_device *device)
+{
+ struct libevdev *evdev = device->evdev;
+
+ if (libevdev_has_event_code(evdev, EV_ABS, ABS_X) ^
+ libevdev_has_event_code(evdev, EV_ABS, ABS_Y))
+ return -1;
+
+ if (libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_X) ^
+ libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_Y))
+ return -1;
+
+ return 0;
+}
+
+static int
evdev_configure_device(struct evdev_device *device)
{
struct libinput *libinput = device->base.seat->libinput;
@@ -1467,6 +1483,13 @@ evdev_configure_device(struct evdev_device *device)
return -1;
}
+ if (evdev_reject_device(device) == -1) {
+ log_info(libinput,
+ "input device '%s', %s was rejected.\n",
+ device->devname, devnode);
+ return -1;
+ }
+
if (libevdev_has_event_type(evdev, EV_ABS)) {
evdev_fix_android_mt(device);
diff --git a/test/device.c b/test/device.c
index 0420533..a18ec82 100644
--- a/test/device.c
+++ b/test/device.c
@@ -716,6 +716,104 @@ START_TEST(device_group_ref)
}
END_TEST
+START_TEST(abs_device_no_absx)
+{
+ struct libevdev_uinput *uinput;
+ struct libinput *li;
+ struct libinput_device *device;
+
+ uinput = litest_create_uinput_device("test device", NULL,
+ EV_KEY, BTN_LEFT,
+ EV_KEY, BTN_RIGHT,
+ EV_ABS, ABS_Y,
+ -1);
+ li = litest_create_context();
+ litest_disable_log_handler(li);
+ device = libinput_path_add_device(li,
+ libevdev_uinput_get_devnode(uinput));
+ litest_restore_log_handler(li);
+ ck_assert(device == NULL);
+ libinput_unref(li);
+
+ libevdev_uinput_destroy(uinput);
+}
+END_TEST
+
+START_TEST(abs_device_no_absy)
+{
+ struct libevdev_uinput *uinput;
+ struct libinput *li;
+ struct libinput_device *device;
+
+ uinput = litest_create_uinput_device("test device", NULL,
+ EV_KEY, BTN_LEFT,
+ EV_KEY, BTN_RIGHT,
+ EV_ABS, ABS_X,
+ -1);
+ li = litest_create_context();
+ litest_disable_log_handler(li);
+ device = libinput_path_add_device(li,
+ libevdev_uinput_get_devnode(uinput));
+ litest_restore_log_handler(li);
+ ck_assert(device == NULL);
+ libinput_unref(li);
+
+ libevdev_uinput_destroy(uinput);
+}
+END_TEST
+
+START_TEST(abs_mt_device_no_absy)
+{
+ struct libevdev_uinput *uinput;
+ struct libinput *li;
+ struct libinput_device *device;
+
+ uinput = litest_create_uinput_device("test device", NULL,
+ EV_KEY, BTN_LEFT,
+ EV_KEY, BTN_RIGHT,
+ EV_ABS, ABS_X,
+ EV_ABS, ABS_Y,
+ EV_ABS, ABS_MT_SLOT,
+ EV_ABS, ABS_MT_POSITION_X,
+ -1);
+ li = litest_create_context();
+ litest_disable_log_handler(li);
+ device = libinput_path_add_device(li,
+ libevdev_uinput_get_devnode(uinput));
+ litest_restore_log_handler(li);
+ ck_assert(device == NULL);
+ libinput_unref(li);
+
+ libevdev_uinput_destroy(uinput);
+}
+END_TEST
+
+START_TEST(abs_mt_device_no_absx)
+{
+ struct libevdev_uinput *uinput;
+ struct libinput *li;
+ struct libinput_device *device;
+
+ uinput = litest_create_uinput_device("test device", NULL,
+ EV_KEY, BTN_LEFT,
+ EV_KEY, BTN_RIGHT,
+ EV_ABS, ABS_X,
+ EV_ABS, ABS_Y,
+ EV_ABS, ABS_MT_SLOT,
+ EV_ABS, ABS_MT_POSITION_Y,
+ -1);
+ li = litest_create_context();
+ litest_disable_log_handler(li);
+ device = libinput_path_add_device(li,
+ libevdev_uinput_get_devnode(uinput));
+ litest_restore_log_handler(li);
+ ck_assert(device == NULL);
+ libinput_unref(li);
+
+ libevdev_uinput_destroy(uinput);
+}
+END_TEST
+
int main (int argc, char **argv)
{
litest_add("device:sendevents", device_sendevents_config, LITEST_ANY,
LITEST_TOUCHPAD);
@@ -744,5 +842,10 @@ int main (int argc, char **argv)
litest_add("device:group", device_group_get, LITEST_ANY, LITEST_ANY);
litest_add_no_device("device:group", device_group_ref);
+ litest_add_no_device("device:invalid devices", abs_device_no_absx);
+ litest_add_no_device("device:invalid devices", abs_device_no_absy);
+ litest_add_no_device("device:invalid devices", abs_mt_device_no_absx);
+ litest_add_no_device("device:invalid devices", abs_mt_device_no_absy);
+
return litest_run(argc, argv);
}
--
2.3.2
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
