X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Finput_id%2Finput_id.c;h=b2d4a6770af5be860de1ce0f1c5b87a97a08e1ce;hb=88149f668ea7ac23c61f6d1982db4f4517da763c;hp=602c90d0c470c8396f72b01048553e41e6133aeb;hpb=7ca9a05dca97f7ef3d7a3ffa1afba844aa23adbc;p=elogind.git

diff --git a/extras/input_id/input_id.c b/extras/input_id/input_id.c
index 602c90d0c..b2d4a6770 100644
--- a/extras/input_id/input_id.c
+++ b/extras/input_id/input_id.c
@@ -36,39 +36,62 @@
 #define LONG(x) ((x)/BITS_PER_LONG)
 #define test_bit(bit, array)    ((array[LONG(bit)] >> OFF(bit)) & 1)
 
+static int debug = 0;
+#define DBG(format, args...) { if (debug) fprintf(stderr, format, ##args); }
+
 /* 
  * Read a capability attribute and return bitmask.
  * @param dev udev_device
  * @param attr sysfs attribute name (e. g. "capabilities/key")
- * @param bitmask: Output array; must have max_size elements
+ * @param bitmask: Output array which has a sizeof of bitmask_size
  */
 static void get_cap_mask (struct udev_device *dev, const char* attr,
-	                  unsigned long *bitmask, size_t max_size)
+			  unsigned long *bitmask, size_t bitmask_size)
 {
 	char text[4096];
-        int i;
+	unsigned i;
 	char* word;
 	unsigned long val;
 
 	snprintf(text, sizeof(text), "%s", udev_device_get_sysattr_value(dev, attr));
 
-        memset (bitmask, 0, max_size);
+	DBG("%s raw kernel attribute: %s\n", attr, text);
+
+	memset (bitmask, 0, bitmask_size);
 	i = 0;
-        while ((word = strrchr(text, ' ')) != NULL) {
-                val = strtoul (word+1, NULL, 16);
-                bitmask[i] = val;
+	while ((word = strrchr(text, ' ')) != NULL) {
+		val = strtoul (word+1, NULL, 16);
+		if (i < bitmask_size/sizeof(unsigned long))
+			bitmask[i] = val;
+		else
+			DBG("Ignoring %s block %lX which is larger than maximum size\n", attr, val);
 		*word = '\0';
 		++i;
-        }
+	}
 	val = strtoul (text, NULL, 16);
-	bitmask[i] = val;
+	if (i < bitmask_size/sizeof(unsigned long))
+		bitmask[i] = val;
+	else
+		DBG("Ignoring %s block %lX which is larger than maximum size\n", attr, val);
+
+	if (debug) {
+		/* printf pattern with the right unsigned long number of hex chars */
+		snprintf(text, sizeof(text), "  bit %%4u: %%0%zilX\n", 2*sizeof(unsigned long));
+		DBG("%s decoded bit map:\n", attr);
+		val = bitmask_size/sizeof (unsigned long);
+		/* skip over leading zeros */
+		while (bitmask[val-1] == 0 && val > 0)
+		    --val;
+		for (i = 0; i < val; ++i)
+			DBG(text, i * BITS_PER_LONG, bitmask[i]);
+	}
 }
 
 /* pointer devices */
 static void test_pointers (const unsigned long* bitmask_ev,
-                           const unsigned long* bitmask_abs, 
-                           const unsigned long* bitmask_key, 
-                           const unsigned long* bitmask_rel)
+			   const unsigned long* bitmask_abs, 
+			   const unsigned long* bitmask_key, 
+			   const unsigned long* bitmask_rel)
 {
 	int is_mouse = 0;
 	int is_touchpad = 0;
@@ -77,7 +100,7 @@ static void test_pointers (const unsigned long* bitmask_ev,
 		return;
 
 	if (test_bit (EV_ABS, bitmask_ev) &&
-            test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) {
+	    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))
@@ -107,20 +130,25 @@ static void test_pointers (const unsigned long* bitmask_ev,
 
 /* key like devices */
 static void test_key (const unsigned long* bitmask_ev, 
-                      const unsigned long* bitmask_key)
+		      const unsigned long* bitmask_key)
 {
 	unsigned i;
-	unsigned long acc;
+	unsigned long found;
 	unsigned long mask;
 
 	/* do we have any KEY_* capability? */
-        if (!test_bit (EV_KEY, bitmask_ev))
-                return;
+	if (!test_bit (EV_KEY, bitmask_ev)) {
+		DBG("test_key: no EV_KEY capability\n");
+		return;
+	}
 
-	acc = 0;
-	for (i = 0; i < BTN_MISC/BITS_PER_LONG; ++i)
-	    acc |= bitmask_key[i];
-	if (acc > 0)
+	/* only consider KEY_* here, not BTN_* */
+	found = 0;
+	for (i = 0; i < BTN_MISC/BITS_PER_LONG; ++i) {
+		found |= bitmask_key[i];
+		DBG("test_key: checking bit block %lu for any keys; found=%i\n", i*BITS_PER_LONG, found > 0);
+	}
+	if (found > 0)
 		puts("ID_INPUT_KEY=1");
 
 	/* the first 32 bits are ESC, numbers, and Q to D; if we have all of
@@ -139,13 +167,16 @@ int main (int argc, char** argv)
 	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)];
+	unsigned long bitmask_rel[NBITS(REL_MAX)];
 
 	if (argc != 2) {
 		fprintf(stderr, "Usage: %s <device path (without /sys)>\n", argv[0]);
 		exit(1);
 	}
 
+	if (getenv ("DEBUG"))
+		debug = 1;
+
 	/* get the device */
 	udev = udev_new();
 	if (udev == NULL)