Require inputproto 1.9.99.4

[xorg-xinput] / src / xinput.c

diff --git a/src/xinput.c b/src/xinput.c
index 68f7f0b298c349d6b0ba3b1936bda72ee6e142c9..ac9c65f99bc988fa3f7fec8fa45190062c0f12ff 100644 (file)
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -1,19 +1,19 @@
 /*
  * 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
  * copyright  notice   and   this  permission   notice  appear  in  supporting
- * documentation, and that   the  name of  Frederic   Lepied not  be  used  in
+ * documentation, and that   the  name of  the authors  not  be  used  in
  * advertising or publicity pertaining to distribution of the software without
- * specific,  written      prior  permission.     Frederic  Lepied   makes  no
+ * specific,  written      prior  permission.     The authors  make  no
  * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.                   
- *                                                                            
- * FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
+ * is provided "as is" without express or implied warranty.
+ *
+ * THE AUTHORS DISCLAIM 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
+ * EVENT  SHALL THE AUTHORS  BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
  * DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER
  * TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR
@@ -32,7 +32,7 @@ typedef int (*prog)(
 #endif
 );
 
-typedef struct 
+typedef struct
 {
     char       *func_name;
     char       *arg_desc;
@@ -66,7 +66,7 @@ static entry drivers[] =
      set_mode
     },
     {"list",
-     "[--short || <device name>...]",
+     "[--loop || --short || <device name>...]",
      list
     },
     {"query-state",
@@ -81,6 +81,7 @@ static entry drivers[] =
      "",
      version
     },
+#if HAVE_XI2
     { "create-master",
       "<id> [sendCore (dflt:1)] [enable (dflt:1)]",
       create_master
@@ -97,6 +98,23 @@ static entry drivers[] =
       "<id>",
       float_device
     },
+    { "set-cp",
+      "<window> <device>",
+      set_clientpointer
+    },
+    { "list-props",
+      "<device> [<device> ...]",
+      list_props
+    },
+    { "set-int-prop",
+      "<device> <property> <format (8, 16, 32)> <val> [<val> ...]",
+      set_int_prop
+    },
+    { "watch-props",
+      "<device>",
+      watch_props
+    },
+#endif
     {0, 0, 0
     }
 };
@@ -106,8 +124,12 @@ is_xinput_present(Display  *display)
 {
     XExtensionVersion  *version;
     Bool               present;
-    
+
+#if HAVE_XI2
+    version = XQueryInputVersion(display, XI_2_Major, XI_2_Minor);
+#else
     version = XGetExtensionVersion(display, INAME);
+#endif
 
     if (version && (version != (XExtensionVersion*) NoSuchExtension)) {
        present = version->present;
@@ -124,6 +146,7 @@ find_device_info(Display    *display,
                 Bool           only_extended)
 {
     XDeviceInfo        *devices;
+    XDeviceInfo *found = NULL;
     int                loop;
     int                num_devices;
     int                len = strlen(name);
@@ -147,14 +170,21 @@ find_device_info(Display  *display,
        if ((!only_extended || (devices[loop].use >= IsXExtensionDevice)) &&
            ((!is_id && strcmp(devices[loop].name, name) == 0) ||
             (is_id && devices[loop].id == id))) {
-           return &devices[loop];
+           if (found) {
+               fprintf(stderr,
+                       "Warning: There are multiple devices named \"%s\".\n"
+                       "To ensure the correct one is selected, please use "
+                       "the device ID instead.\n\n", name);
+           } else {
+               found = &devices[loop];
+           }
        }
     }
-    return NULL;
+    return found;
 }
 
 static void
-usage()
+usage(void)
 {
     entry      *pdriver = drivers;