From: Andreas Pokorny <andreas.pokorny@canonical.com>
Date: Mon, 1 Jun 2015 20:43:39 +0000 (+0200)
Subject: udev: input_id - use ABS_MT_SLOT{-1} to exclude non touch screen devices
X-Git-Tag: v221~207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=495968cf4e50b0380478833747c4279e19a33856;p=thirdparty%2Fsystemd.git

udev: input_id - use ABS_MT_SLOT{-1} to exclude non touch screen devices

Peek at the ABS_MT_SLOT-1 axis. Expect that touch screens only
have axes inside the MT range.
---

diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
index ab90787f6bf..e3fa4bc162c 100644
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -171,6 +171,10 @@ static bool test_pointers(struct udev_device *dev,
         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);
+
+        /* unset has_mt_coordinates if devices claims to have all abs axis */
+        if(has_mt_coordinates && test_bit(ABS_MT_SLOT, bitmask_abs) && test_bit(ABS_MT_SLOT - 1, bitmask_abs))
+                has_mt_coordinates = false;
         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.