X-Git-Url: https://diplodocus.org/git/xorg-xinput/blobdiff_plain/a01e5475d17c584bfa3b2d67570d675aebf4e6fd..7f046c957d4529249bcb69b35f6513411f6efcf5:/src/list.c?ds=sidebyside

diff --git a/src/list.c b/src/list.c
index 1bdffed..de8aca7 100644
--- a/src/list.c
+++ b/src/list.c
@@ -23,6 +23,7 @@
 
 #include "xinput.h"
 #include <string.h>
+#include <X11/extensions/XIproto.h> /* for XI_Device***ChangedNotify */
 
 static void
 print_info(XDeviceInfo	*info, Bool shortformat)
@@ -33,6 +34,9 @@ print_info(XDeviceInfo	*info, Bool shortformat)
     XButtonInfoPtr	b;
     XValuatorInfoPtr	v;
     XAxisInfoPtr	a;
+#if HAVE_XI2
+    XAttachInfoPtr      att;
+#endif
 
     printf("\"%s\"\tid=%ld\t[", info->name, info->id);
 
@@ -91,7 +95,12 @@ print_info(XDeviceInfo	*info, Bool shortformat)
 		    printf ("\t\tResolution is %d\n", a->resolution);
 		}
 		break;
-
+#if HAVE_XI2
+            case AttachClass:
+                att = (XAttachInfoPtr)any;
+                printf("\tAttached to %d\n", att->attached);
+                break;
+#endif
 	    default:
 		printf ("unknown class\n");
 	    }
@@ -110,25 +119,60 @@ list(Display	*display,
     XDeviceInfo		*info;
     int			loop;
     int                 shortformat = False;
+    int                 daemon = False;
 
     shortformat = (argc == 1 && strcmp(argv[0], "--short") == 0);
+    daemon = (argc == 1 && strcmp(argv[0], "--loop") == 0);
 
-    if (argc == 0 || shortformat) {
+    if (argc == 0 || shortformat || daemon) {
 	int		num_devices;
-
-	info = XListInputDevices(display, &num_devices);
-
-	for(loop=0; loop<num_devices; loop++) {
-	    print_info(info+loop, shortformat);
-	}
+        XEvent  ev;
+
+#if HAVE_XI2
+        if (daemon)
+        {
+            XiSelectEvent(display, DefaultRootWindow(display), NULL,
+                          XI_DeviceHierarchyChangedMask |
+                          XI_DeviceClassesChangedMask);
+        }
+#endif
+
+        do {
+            info = XListInputDevices(display, &num_devices);
+            for(loop=0; loop<num_devices; loop++) {
+                print_info(info+loop, shortformat);
+            }
+
+#if HAVE_XI2
+            /* just wait for the next generic event to come along */
+            while (daemon && !XNextEvent(display, &ev))
+            {
+                if (ev.type == GenericEvent)
+                {
+                    XGenericEvent* gev = (XGenericEvent*)&ev;
+                    /* we just assume that extension is IReqCode, pretty save
+                       since we don't register for other events. */
+                    if (gev->evtype == XI_DeviceHierarchyChangedNotify)
+                    {
+                        printf("Hierarchy change.\n");
+                    } else if (gev->evtype == XI_DeviceClassesChangedNotify)
+                    {
+                        printf("Device classes changed.\n");
+                        free(((XDeviceClassesChangedEvent*)&ev)->inputclassinfo);
+                    }
+                    break;
+                }
+            }
+#endif
+        } while(daemon);
     } else {
 	int	ret = EXIT_SUCCESS;
 
 	for(loop=0; loop<argc; loop++) {
-	    info = find_device_info(display, argv[0], False);
+	    info = find_device_info(display, argv[loop], False);
 
 	    if (!info) {
-		fprintf(stderr, "unable to find device %s\n", argv[0]);
+		fprintf(stderr, "unable to find device %s\n", argv[loop]);
 		ret = EXIT_FAILURE;
 	    } else {
 		print_info(info, shortformat);