input_id: Consistently use tabs for indentation

[elogind.git] / extras / input_id / input_id.c

diff --git a/extras/input_id/input_id.c b/extras/input_id/input_id.c
index 95f78795c06eb75bd5d6afdc02970463e4e7c466..85664ab4792909537930ac48f2b82df432c74ac3 100644 (file)
--- 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"
@@ -42,32 +43,32 @@
  * @param bitmask: Output array; must have max_size elements
  */
 static void get_cap_mask (struct udev_device *dev, const char* attr,
-                         unsigned long *bitmask, size_t max_size)
+                         unsigned long *bitmask, size_t max_size)
 {
        char text[4096];
-        int i;
+       int i;
        char* word;
        unsigned long val;
 
        snprintf(text, sizeof(text), "%s", udev_device_get_sysattr_value(dev, attr));
 
-        memset (bitmask, 0, max_size);
+       memset (bitmask, 0, max_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);
+               bitmask[i] = val;
                *word = '\0';
                ++i;
-        }
+       }
        val = strtoul (text, NULL, 16);
        bitmask[i] = val;
 }
 
 /* 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;
@@ -76,7 +77,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))
@@ -89,6 +90,8 @@ static void test_pointers (const unsigned long* bitmask_ev,
                        /* 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 (EV_REL, bitmask_ev) && 
@@ -104,15 +107,15 @@ 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 mask;
 
        /* do we have any KEY_* capability? */
-        if (!test_bit (EV_KEY, bitmask_ev))
-                return;
+       if (!test_bit (EV_KEY, bitmask_ev))
+               return;
 
        acc = 0;
        for (i = 0; i < BTN_MISC/BITS_PER_LONG; ++i)
@@ -136,7 +139,7 @@ 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]);