Clean up the detection of XI2

[xorg-xinput] / src / xinput.c

diff --git a/src/xinput.c b/src/xinput.c
index b16295034f77a0b0116a422b57f7fc47e9632bb2..6dd2b25aa5e96cd05170247f68d571d8a555bcfc 100644 (file)
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -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",


@@ -81,6 +81,28 @@ static entry drivers[] =
      "",
      version
     },
      "",
      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
+    },
+#endif

     {0, 0, 0
     }
 };
     {0, 0, 0
     }
 };


@@ -90,8 +112,12 @@ is_xinput_present(Display   *display)
 {
     XExtensionVersion  *version;
     Bool               present;
 {
     XExtensionVersion  *version;
     Bool               present;

-    
+
+#if HAVE_XI2
+    version = XQueryInputVersion(display, XI_2_Major, XI_2_Minor);
+#else

     version = XGetExtensionVersion(display, INAME);
     version = XGetExtensionVersion(display, INAME);

+#endif

 
     if (version && (version != (XExtensionVersion*) NoSuchExtension)) {
        present = version->present;
 
     if (version && (version != (XExtensionVersion*) NoSuchExtension)) {
        present = version->present;


@@ -146,7 +172,7 @@ find_device_info(Display    *display,
 }
 
 static void
 }
 
 static void

-usage()
+usage(void)

 {
     entry      *pdriver = drivers;
 
 {
     entry      *pdriver = drivers;