xinput: include device type in device list

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/src/list.c b/src/list.c
index de8aca7981f41a68e49eb105d08e70de3cc0c893..bd71a5cccc70aa77c39ceea4866779a600154fce 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -26,7 +26,7 @@
 #include <X11/extensions/XIproto.h> /* for XI_Device***ChangedNotify */
 
 static void
 #include <X11/extensions/XIproto.h> /* for XI_Device***ChangedNotify */
 
 static void

-print_info(XDeviceInfo *info, Bool shortformat)
+print_info(Display* dpy, XDeviceInfo   *info, Bool shortformat)

 {
     int                        i,j;
     XAnyClassPtr       any;
 {
     int                        i,j;
     XAnyClassPtr       any;


@@ -65,6 +65,9 @@ print_info(XDeviceInfo        *info, Bool shortformat)
     if (shortformat)
         return;
 
     if (shortformat)
         return;
 

+    if(info->type != None)
+       printf("\tType is %s\n", XGetAtomName(dpy, info->type));
+

     if (info->num_classes > 0) {
        any = (XAnyClassPtr) (info->inputclassinfo);
        for (i=0; i<info->num_classes; i++) {
     if (info->num_classes > 0) {
        any = (XAnyClassPtr) (info->inputclassinfo);
        for (i=0; i<info->num_classes; i++) {


@@ -140,7 +143,7 @@ list(Display        *display,
         do {
             info = XListInputDevices(display, &num_devices);
             for(loop=0; loop<num_devices; loop++) {
         do {
             info = XListInputDevices(display, &num_devices);
             for(loop=0; loop<num_devices; loop++) {

-                print_info(info+loop, shortformat);
+                print_info(display, info+loop, shortformat);

             }
 
 #if HAVE_XI2
             }
 
 #if HAVE_XI2


@@ -175,7 +178,7 @@ list(Display        *display,
                fprintf(stderr, "unable to find device %s\n", argv[loop]);
                ret = EXIT_FAILURE;
            } else {
                fprintf(stderr, "unable to find device %s\n", argv[loop]);
                ret = EXIT_FAILURE;
            } else {

-               print_info(info, shortformat);
+               print_info(display, info, shortformat);

            }
        }
        return ret;
            }
        }
        return ret;