Require inputproto 1.9.99.4

[xorg-xinput] / src / xinput.c

diff --git a/src/xinput.c b/src/xinput.c
index b16295034f77a0b0116a422b57f7fc47e9632bb2..ac9c65f99bc988fa3f7fec8fa45190062c0f12ff 100644 (file)
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -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,40 @@ static entry drivers[] =
      "",
      version
     },
+#if HAVE_XI2
+    { "create-master",
+      "<id> [sendCore (dflt:1)] [enable (dflt:1)]",
+      create_master
+    },
+    { "remove-master",
+      "<id> [returnMode (dflt:Floating)] [returnPointer] [returnKeyboard]",
+      remove_master
+    },
+    { "reattach",
+      "<id> <master>",
+      change_attachment
+    },
+    { "float",
+      "<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
     }
 };
@@ -90,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;
@@ -146,7 +184,7 @@ find_device_info(Display    *display,
 }
 
 static void
-usage()
+usage(void)
 {
     entry      *pdriver = drivers;