diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-01-04 08:36:41 +0100 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-01-04 08:36:41 +0100 |
| commit | 993898a2af5bc34e600b81aafec055cc93be0b02 (patch) | |
| tree | c8974377048895fdd5bac79513175168101b8386 | |
| parent | 05442a9cdc3feaecfe27ed537b36de81818ae522 (diff) | |
| parent | 1a3439ef68d02e8ca4da02a7c1816d596e70de8b (diff) | |
Merge pull request #2248 from APokorny/detect-touchscreens-with-btn-touch
udev: Fix touch screen detection
| -rw-r--r-- | src/udev/udev-builtin-input_id.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c index 1d31829a08..a7aac78def 100644 --- a/src/udev/udev-builtin-input_id.c +++ b/src/udev/udev-builtin-input_id.c @@ -205,12 +205,12 @@ static bool test_pointers(struct udev_device *dev, /* This path is taken by VMware's USB mouse, which has * absolute axes, but no touch/pressure button. */ is_mouse = true; - else if (has_touch) + else if (has_touch || is_direct) is_touchscreen = true; else if (has_joystick_axes_or_buttons) is_joystick = true; } - if (has_mt_coordinates && is_direct) + if (has_mt_coordinates && (is_direct || has_touch)) is_touchscreen = true; if (has_rel_coordinates && has_mouse_button) |