Merge pull request #2248 from APokorny/detect-touchscreens-with-btn-touch

udev: Fix touch screen detection
2016-01-04 08:36:41 +01:00
parent 05442a9cdc 1a3439ef68
commit 993898a2af
1 changed files with 2 additions and 2 deletions
@@ -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)