diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-08-13 09:40:03 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-08-13 11:02:25 +1000 |
| commit | 88b62031b376204cd3a96fdfc6a032fa422508ac (patch) | |
| tree | 8a74442cd0467178e82302d32501e4c99599803f | |
| parent | 834a6d1df158ee072501915b3b9610e6a4a6d8b7 (diff) | |
| download | libinput-88b62031b376204cd3a96fdfc6a032fa422508ac.tar.gz | |
Revert "evdev: fix the check for tablet vs joystick"
There are a number of devices that have the ID_INPUT_JOYSTICK tag set by udev,
usually because of seemingly random event codes set. We cannot rely on
ID_INPUT_JOYSTICK to be accurate enough.
Fixes #517
This reverts commit eededbeb7faa2b6182c02a84884f54c1cb1d8a2a.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/evdev.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/evdev.c b/src/evdev.c index 0d8e8766..124b07a0 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1810,8 +1810,11 @@ evdev_configure_device(struct evdev_device *device) evdev_disable_accelerometer_axes(device); } - if (udev_tags & EVDEV_UDEV_TAG_JOYSTICK) { - evdev_log_info(device, "device is a joystick, ignoring\n"); + /* libwacom *adds* TABLET, TOUCHPAD but leaves JOYSTICK in place, so + make sure we only ignore real joystick devices */ + if (udev_tags == (EVDEV_UDEV_TAG_INPUT|EVDEV_UDEV_TAG_JOYSTICK)) { + evdev_log_info(device, + "device is a joystick, ignoring\n"); return NULL; } |