X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Finput_id%2Finput_id.c;h=602c90d0c470c8396f72b01048553e41e6133aeb;hp=fededa3f7d0ab1f83141d0d9ec4b29315492918a;hb=9fa68615bb0315501625c6cde3f3077257c740e7;hpb=22f9cb51c39a6fef1109bfd24e97d2fdda327a9e

diff --git a/extras/input_id/input_id.c b/extras/input_id/input_id.c
index fededa3f7..602c90d0c 100644
--- a/extras/input_id/input_id.c
+++ b/extras/input_id/input_id.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <linux/limits.h>
 #include <linux/input.h>
 
 #include "libudev.h"
@@ -64,12 +65,19 @@ static void get_cap_mask (struct udev_device *dev, const char* attr,
 }
 
 /* pointer devices */
-static void test_pointers (const unsigned long* bitmask_abs, const unsigned long* bitmask_key, const unsigned long* bitmask_rel)
+static void test_pointers (const unsigned long* bitmask_ev,
+                           const unsigned long* bitmask_abs, 
+                           const unsigned long* bitmask_key, 
+                           const unsigned long* bitmask_rel)
 {
 	int is_mouse = 0;
 	int is_touchpad = 0;
 
-	if (test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) {
+	if (!test_bit (EV_KEY, bitmask_ev))
+		return;
+
+	if (test_bit (EV_ABS, bitmask_ev) &&
+            test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) {
 		if (test_bit (BTN_STYLUS, bitmask_key) || test_bit (BTN_TOOL_PEN, bitmask_key))
 			puts("ID_INPUT_TABLET=1");
 		else if (test_bit (BTN_TOOL_FINGER, bitmask_key) && !test_bit (BTN_TOOL_PEN, bitmask_key))
@@ -82,9 +90,13 @@ static void test_pointers (const unsigned long* bitmask_abs, const unsigned long
 			/* This path is taken by VMware's USB mouse, which has
 			 * absolute axes, but no touch/pressure button. */
 			is_mouse = 1;
+		else if (test_bit (BTN_TOUCH, bitmask_key))
+			puts("ID_INPUT_TOUCHSCREEN=1");
 	}
 
-	if (test_bit (REL_X, bitmask_rel) && test_bit (REL_Y, bitmask_rel))
+	if (test_bit (EV_REL, bitmask_ev) && 
+	    test_bit (REL_X, bitmask_rel) && test_bit (REL_Y, bitmask_rel) &&
+	    test_bit (BTN_MOUSE, bitmask_key))
 		is_mouse = 1;
 
 	if (is_mouse)
@@ -94,13 +106,17 @@ static void test_pointers (const unsigned long* bitmask_abs, const unsigned long
 }
 
 /* key like devices */
-static void test_key (const unsigned long* bitmask_key)
+static void test_key (const unsigned long* bitmask_ev, 
+                      const unsigned long* bitmask_key)
 {
 	unsigned i;
 	unsigned long acc;
 	unsigned long mask;
 
 	/* do we have any KEY_* capability? */
+        if (!test_bit (EV_KEY, bitmask_ev))
+                return;
+
 	acc = 0;
 	for (i = 0; i < BTN_MISC/BITS_PER_LONG; ++i)
 	    acc |= bitmask_key[i];
@@ -120,6 +136,7 @@ int main (int argc, char** argv)
 	struct udev_device *dev;
 
 	char devpath[PATH_MAX];
+	unsigned long bitmask_ev[NBITS(EV_MAX)];
 	unsigned long bitmask_abs[NBITS(ABS_MAX)];
 	unsigned long bitmask_key[NBITS(KEY_MAX)];
         unsigned long bitmask_rel[NBITS(REL_MAX)];
@@ -143,20 +160,25 @@ int main (int argc, char** argv)
 
 	/* walk up the parental chain until we find the real input device; the
 	 * argument is very likely a subdevice of this, like eventN */
-	while (dev != NULL && udev_device_get_sysattr_value(dev, "capabilities/key") == NULL)
-		dev = udev_device_get_parent(dev);
+	while (dev != NULL && udev_device_get_sysattr_value(dev, "capabilities/ev") == NULL)
+		dev = udev_device_get_parent_with_subsystem_devtype(dev, "input", NULL);
+
+	/* not an "input" class device */
+	if (dev == NULL)
+		return 0;
 
 	/* Use this as a flag that input devices were detected, so that this
 	 * program doesn't need to be called more than once per device */
 	puts("ID_INPUT=1");
 
+	get_cap_mask (dev, "capabilities/ev", bitmask_ev, sizeof (bitmask_ev));
 	get_cap_mask (dev, "capabilities/abs", bitmask_abs, sizeof (bitmask_abs));
 	get_cap_mask (dev, "capabilities/rel", bitmask_rel, sizeof (bitmask_rel));
 	get_cap_mask (dev, "capabilities/key", bitmask_key, sizeof (bitmask_key));
 
-	test_pointers(bitmask_abs, bitmask_key, bitmask_rel);
+	test_pointers(bitmask_ev, bitmask_abs, bitmask_key, bitmask_rel);
 
-	test_key(bitmask_key);
+	test_key(bitmask_ev, bitmask_key);
 
 	return 0;
 }