xinput 1.5.0

[xorg-xinput] / src / list.c

diff --git a/src/list.c b/src/list.c
index 52ffba52677a50e79722e7eca7626cefb9fa003d..ecf1f4ba5499813d774e7e7740420d0d01d2749e 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -104,42 +104,15 @@ print_info(Display* dpy, XDeviceInfo      *info, Bool shortformat)
 }
 
 static int list_xi1(Display     *display,
 }
 
 static int list_xi1(Display     *display,

-                    int                argc,
-                    char        *argv[],
-                    char        *name,
-                    char        *desc)
+                    int                shortformat)

 {
     XDeviceInfo                *info;
     int                        loop;
 {
     XDeviceInfo                *info;
     int                        loop;

-    int                 shortformat = False;
-    int                 daemon = False;
+    int                 num_devices;

 
 

-    shortformat = (argc == 1 && strcmp(argv[0], "--short") == 0);
-    daemon = (argc == 1 && strcmp(argv[0], "--loop") == 0);
-
-    if (argc == 0 || shortformat || daemon) {
-       int             num_devices;
-
-        do {
-            info = XListInputDevices(display, &num_devices);
-            for(loop=0; loop<num_devices; loop++) {
-                print_info(display, info+loop, shortformat);
-            }
-        } while(daemon);
-    } else {
-       int     ret = EXIT_SUCCESS;
-
-       for(loop=0; loop<argc; loop++) {
-           info = find_device_info(display, argv[loop], False);
-
-           if (!info) {
-               fprintf(stderr, "unable to find device %s\n", argv[loop]);
-               ret = EXIT_FAILURE;
-           } else {
-               print_info(display, info, shortformat);
-           }
-       }
-       return ret;
+    info = XListInputDevices(display, &num_devices);
+    for(loop=0; loop<num_devices; loop++) {
+        print_info(display, info+loop, shortformat);

     }
     return EXIT_SUCCESS;
 }
     }
     return EXIT_SUCCESS;
 }


@@ -161,7 +134,16 @@ print_classes_xi2(Display* display, XIAnyClassInfo **classes,
             case XIButtonClass:
                 {
                     XIButtonClassInfo *b = (XIButtonClassInfo*)classes[i];
             case XIButtonClass:
                 {
                     XIButtonClassInfo *b = (XIButtonClassInfo*)classes[i];

+                    char *name;

                     printf("\t\tButtons supported: %d\n", b->num_buttons);
                     printf("\t\tButtons supported: %d\n", b->num_buttons);

+                    printf("\t\tButton labels:");
+                    for (j = 0; j < b->num_buttons; j++)
+                    {
+                        name = (b->labels[j]) ? XGetAtomName(display, b->labels[j]) : NULL;
+                        printf(" %s", (name) ? name : "None");
+                        XFree(name);
+                    }
+                    printf("\n");

                     printf("\t\tButton state:");
                     for (j = 0; j < b->state.mask_len * 8; j++)
                         if (XIMaskIsSet(b->state.mask, j))
                     printf("\t\tButton state:");
                     for (j = 0; j < b->state.mask_len * 8; j++)
                         if (XIMaskIsSet(b->state.mask, j))


@@ -179,12 +161,17 @@ print_classes_xi2(Display* display, XIAnyClassInfo **classes,
             case XIValuatorClass:
                 {
                     XIValuatorClassInfo *v = (XIValuatorClassInfo*)classes[i];
             case XIValuatorClass:
                 {
                     XIValuatorClassInfo *v = (XIValuatorClassInfo*)classes[i];

+                    char *name = v->label ?  XGetAtomName(display, v->label) : NULL;
+

                     printf("\t\tDetail for Valuator %d:\n", v->number);
                     printf("\t\tDetail for Valuator %d:\n", v->number);

-                    printf("\t\t  Name: %s\n", XGetAtomName(display, v->name));
+                    printf("\t\t  Label: %s\n",  (name) ? name : "None");

                     printf("\t\t  Range: %f - %f\n", v->min, v->max);
                     printf("\t\t  Resolution: %d units/m\n", v->resolution);
                     printf("\t\t  Mode: %s\n", v->mode == Absolute ? "absolute" :
                             "relative");
                     printf("\t\t  Range: %f - %f\n", v->min, v->max);
                     printf("\t\t  Resolution: %d units/m\n", v->resolution);
                     printf("\t\t  Mode: %s\n", v->mode == Absolute ? "absolute" :
                             "relative");

+                    if (v->mode == Absolute)
+                        printf("\t\t  Current value: %f\n", v->value);
+                    XFree(name);

                 }
                 break;
         }
                 }
                 break;
         }


@@ -226,21 +213,16 @@ print_info_xi2(Display* display, XIDeviceInfo *dev, Bool shortformat)
 }
 
 
 }
 
 

-int
-list_xi2(Display       *display,
-         int   argc,
-         char  *argv[],
-         char  *name,
-         char  *desc)
+static int
+list_xi2(Display *display,
+         int     shortformat)

 {
     int major = XI_2_Major,
         minor = XI_2_Minor;
     int ndevices;
 {
     int major = XI_2_Major,
         minor = XI_2_Minor;
     int ndevices;

-    int i, j, shortformat;
+    int i, j;

     XIDeviceInfo *info, *dev;
 
     XIDeviceInfo *info, *dev;
 

-    shortformat = (argc == 1 && strcmp(argv[0], "--short") == 0);
-

     if (XIQueryVersion(display, &major, &minor) != Success ||
         (major * 1000 + minor) < (XI_2_Major * 1000 + XI_2_Minor))
     {
     if (XIQueryVersion(display, &major, &minor) != Success ||
         (major * 1000 + minor) < (XI_2_Major * 1000 + XI_2_Minor))
     {


@@ -298,11 +280,44 @@ list(Display      *display,
      char      *name,
      char      *desc)
 {
      char      *name,
      char      *desc)
 {

+    int shortformat = (argc >= 1 && strcmp(argv[0], "--short") == 0);
+    int longformat = (argc >= 1 && strcmp(argv[0], "--long") == 0);
+    int arg_dev = shortformat || longformat;
+
+    if (argc > arg_dev)
+    {
+#ifdef HAVE_XI2
+        if (xinput_version(display) == XI_2_Major)
+        {
+            XIDeviceInfo *info = xi2_find_device_info(display, argv[arg_dev]);
+
+            if (!info) {
+                fprintf(stderr, "unable to find device %s\n", argv[arg_dev]);
+                return EXIT_FAILURE;
+            } else {
+                print_info_xi2(display, info, shortformat);
+                return EXIT_SUCCESS;
+            }
+        } else
+#endif
+        {
+            XDeviceInfo *info = find_device_info(display, argv[arg_dev], False);
+
+            if (!info) {
+                fprintf(stderr, "unable to find device %s\n", argv[arg_dev]);
+                return EXIT_FAILURE;
+            } else {
+                print_info(display, info, shortformat);
+                return EXIT_SUCCESS;
+            }
+        }
+    } else {

 #ifdef HAVE_XI2
 #ifdef HAVE_XI2

-    if (xinput_version(display) == XI_2_Major)
-        return list_xi2(display, argc, argv, name, desc);
+        if (xinput_version(display) == XI_2_Major)
+            return list_xi2(display, !longformat);

 #endif
 #endif

-    return list_xi1(display, argc, argv, name, desc);
+        return list_xi1(display, !longformat);
+    }

 }
 
 /* end of list.c */
 }
 
 /* end of list.c */