diff options
| author | Andreas Pokorny <andreas.pokorny@canonical.com> | 2015-05-29 14:54:53 +0200 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2015-06-03 08:31:02 +1000 |
| commit | fa5a113d11453f46fc175d3b48c260bc09ff5ec4 (patch) | |
| tree | 0ad6819cf6c4a9cfb4f3b5832450cd0b5cc70b78 /src | |
| parent | 15264e5aeeadacffc5afd10dc790e02cb7c73801 (diff) | |
udev: input_id - use direct property and mt axis for touch screen detection
A lot of touch screens use INPUT_PROP_DIRECT to indicate that touch input
maps directly to the underlying screen, while the BTN_TOUCH bit might not be
set.
Diffstat (limited to 'src')
| -rw-r--r-- | src/udev/udev-builtin-input_id.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c index 91a6141e26..ab90787f6b 100644 --- a/src/udev/udev-builtin-input_id.c +++ b/src/udev/udev-builtin-input_id.c @@ -135,7 +135,9 @@ static bool test_pointers(struct udev_device *dev, bool test) { bool has_abs_coordinates = false; bool has_rel_coordinates = false; + bool has_mt_coordinates = false; bool has_joystick_axes_or_buttons = false; + bool is_direct = false; bool has_touch = false; bool has_3d_coordinates = false; bool has_keys = false; @@ -168,6 +170,8 @@ static bool test_pointers(struct udev_device *dev, finger_but_no_pen = test_bit(BTN_TOOL_FINGER, bitmask_key) && !test_bit(BTN_TOOL_PEN, bitmask_key); has_mouse_button = test_bit(BTN_LEFT, bitmask_key); has_rel_coordinates = test_bit(EV_REL, bitmask_ev) && test_bit(REL_X, bitmask_rel) && test_bit(REL_Y, bitmask_rel); + has_mt_coordinates = test_bit(ABS_MT_POSITION_X, bitmask_abs) && test_bit(ABS_MT_POSITION_Y, bitmask_abs); + is_direct = test_bit(INPUT_PROP_DIRECT, bitmask_props); has_touch = test_bit(BTN_TOUCH, bitmask_key); /* joysticks don't necessarily have buttons; e. g. * rudders/pedals are joystick-like, but buttonless; they have @@ -187,7 +191,7 @@ static bool test_pointers(struct udev_device *dev, if (has_abs_coordinates) { if (stylus_or_pen) is_tablet = true; - else if (finger_but_no_pen) + else if (finger_but_no_pen && !is_direct) is_touchpad = true; else if (has_mouse_button) /* This path is taken by VMware's USB mouse, which has @@ -198,6 +202,8 @@ static bool test_pointers(struct udev_device *dev, else if (has_joystick_axes_or_buttons) is_joystick = true; } + if (has_mt_coordinates && is_direct) + is_touchscreen = true; if (has_rel_coordinates && has_mouse_button) is_mouse = true; |