summaryrefslogtreecommitdiff
path: root/src/udev/udev-builtin-input_id.c
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2017-06-12 14:09:55 +0200
committerMichal Suchanek <msuchanek@suse.de>2017-06-27 13:28:11 +0200
commit0c21944e246ea598d0368547a172101d22a3d69d (patch)
tree05e752a301326058d8072f28c15f0e89cf6aabb7 /src/udev/udev-builtin-input_id.c
parent38887d1bd5eb037a532279b2b75d6a87ce381419 (diff)
downloadsystemd-0c21944e246ea598d0368547a172101d22a3d69d.tar.gz
input_id: fix detection of devices with mouse buttons
Assign ID_INPUT_MOUSE property to devices with mouse buttons and no axis. Libinput tries to use libwacom on devices with tablet-pad capability which are detected by ID_INPUT_TABLET_PAD=1 property so assign pointer class by setting ID_INPUT_MOUSE=1 to devices with mouse buttons and let libwacom override the class for Wacom pads.
Diffstat (limited to 'src/udev/udev-builtin-input_id.c')
-rw-r--r--src/udev/udev-builtin-input_id.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
index 47f41a6607..80c8ba589b 100644
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -244,7 +244,9 @@ static bool test_pointers(struct udev_device *dev,
is_touchscreen = true;
}
- if (has_rel_coordinates && has_mouse_button)
+ if (has_mouse_button &&
+ (has_rel_coordinates ||
+ !has_abs_coordinates)) /* mouse buttons and no axis */
is_mouse = true;
if (is_pointing_stick)