X-Git-Url: https://diplodocus.org/git/xorg-xinput/blobdiff_plain/ff1b12265de1010aa22011c5db829274a8a3dab1..22fdd63f4521c89ae43bbfc6741e872b4a74d18f:/src/xinput.c

diff --git a/src/xinput.c b/src/xinput.c
index cff33d5..8340211 100644
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -25,6 +25,8 @@
 #include <ctype.h>
 #include <string.h>
 
+int xi_opcode;
+
 typedef int (*prog)(Display* display, int argc, char *argv[],
 		    char *prog_name, char *prog_desc);
 
@@ -83,11 +85,11 @@ static entry drivers[] =
     },
 #if HAVE_XI2
     { "create-master",
-      "<id> [sendCore (dflt:1)] [enable (dflt:1)]",
+      "<id> [<sendCore (dflt:1)>] [<enable (dflt:1)>]",
       create_master
     },
     { "remove-master",
-      "<id> [returnMode (dflt:Floating)] [returnPointer] [returnKeyboard]",
+      "<id> [Floating|AttachToMaster (dflt:Floating)] [<returnPointer>] [<returnKeyboard>]",
       remove_master
     },
     { "reattach",
@@ -222,7 +224,7 @@ xi2_find_device_info(Display *display, char *name)
 	id = atoi(name);
     }
 
-    info = XIQueryDevice(display, AllDevices, &ndevices);
+    info = XIQueryDevice(display, XIAllDevices, &ndevices);
     for(i = 0; i < ndevices; i++)
     {
         if ((is_id && info[i].deviceid == id) ||
@@ -257,6 +259,7 @@ main(int argc, char * argv[])
     Display	*display;
     entry	*driver = drivers;
     char        *func;
+    int event, error;
 
     if (argc < 2) {
 	usage();
@@ -270,6 +273,11 @@ main(int argc, char * argv[])
 	return EXIT_FAILURE;
     }
 
+    if (!XQueryExtension(display, "XInputExtension", &xi_opcode, &event, &error)) {
+        printf("X Input extension not available.\n");
+        return EXIT_FAILURE;
+    }
+
     func = argv[1];
     while((*func) == '-') func++;