Add --loop to "xinput list". Re-prints devices when hierarchy changes.

diff --git a/src/list.c b/src/list.c
index d1bc0866f58b33b1892fb240903546e41bd6dae7..85b766da7eac3c4fd3f43f461eb61b794c6c824c 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -115,17 +115,35 @@ list(Display      *display,
     XDeviceInfo                *info;
     int                        loop;
     int                 shortformat = False;
     XDeviceInfo                *info;
     int                        loop;
     int                 shortformat = False;

+    int                 daemon = False;

 
     shortformat = (argc == 1 && strcmp(argv[0], "--short") == 0);
 
     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;
        int             num_devices;

-
-       info = XListInputDevices(display, &num_devices);
-
-       for(loop=0; loop<num_devices; loop++) {
-           print_info(info+loop, shortformat);
-       }
+        XEvent  ev;
+        int     daemon = argc;
+
+        if (daemon)
+        {
+            XiSelectEvent(display, DefaultRootWindow(display),
+                          XI_DeviceHierarchyChangedMask);
+        }
+
+        do {
+            info = XListInputDevices(display, &num_devices);
+            for(loop=0; loop<num_devices; loop++) {
+                print_info(info+loop, shortformat);
+            }
+
+            /* just wait for the next generic event to come along */
+            while (daemon && !XNextEvent(display, &ev))
+            {
+                if (ev.type == GenericEvent)
+                    break;
+            }
+        } while(daemon);

     } else {
        int     ret = EXIT_SUCCESS;
 
     } else {
        int     ret = EXIT_SUCCESS;
 

diff --git a/src/xinput.c b/src/xinput.c
index 68f7f0b298c349d6b0ba3b1936bda72ee6e142c9..47603d292c5dd38a1e28ee55147ae79ca75990ce 100644 (file)
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -1,6 +1,6 @@
 /*
  * Copyright 1996 by Frederic Lepied, France. <Frederic.Lepied@sugix.frmug.org>
 /*
  * Copyright 1996 by Frederic Lepied, France. <Frederic.Lepied@sugix.frmug.org>

- *                                                                            
+ *

  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is  hereby granted without fee, provided that
  * the  above copyright   notice appear  in   all  copies and  that both  that
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is  hereby granted without fee, provided that
  * the  above copyright   notice appear  in   all  copies and  that both  that


@@ -9,8 +9,8 @@
  * advertising or publicity pertaining to distribution of the software without
  * specific,  written      prior  permission.     Frederic  Lepied   makes  no
  * representations about the suitability of this software for any purpose.  It
  * advertising or publicity pertaining to distribution of the software without
  * specific,  written      prior  permission.     Frederic  Lepied   makes  no
  * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.                   
- *                                                                            
+ * is provided "as is" without express or implied warranty.
+ *

  * FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
  * INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
  * EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
  * FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
  * INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
  * EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR


@@ -32,7 +32,7 @@ typedef int (*prog)(
 #endif
 );
 
 #endif
 );
 

-typedef struct 
+typedef struct

 {
     char       *func_name;
     char       *arg_desc;
 {
     char       *func_name;
     char       *arg_desc;


@@ -66,7 +66,7 @@ static entry drivers[] =
      set_mode
     },
     {"list",
      set_mode
     },
     {"list",

-     "[--short || <device name>...]",
+     "[--loop || --short || <device name>...]",

      list
     },
     {"query-state",
      list
     },
     {"query-state",


@@ -106,7 +106,7 @@ is_xinput_present(Display   *display)
 {
     XExtensionVersion  *version;
     Bool               present;
 {
     XExtensionVersion  *version;
     Bool               present;

-    
+

     version = XGetExtensionVersion(display, INAME);
 
     if (version && (version != (XExtensionVersion*) NoSuchExtension)) {
     version = XGetExtensionVersion(display, INAME);
 
     if (version && (version != (XExtensionVersion*) NoSuchExtension)) {