test_xi2: Print the key repeat flag if it is set.

[xorg-xinput] / src / xinput.c

diff --git a/src/xinput.c b/src/xinput.c
index cff33d5100fd507730c1ca55ab74058231c3de5c..8340211a785e120182fe0a853aaad9dfe9b10ef4 100644 (file)
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -25,6 +25,8 @@
 #include <ctype.h>
 #include <string.h>
 
 #include <ctype.h>
 #include <string.h>
 

+int xi_opcode;
+

 typedef int (*prog)(Display* display, int argc, char *argv[],
                    char *prog_name, char *prog_desc);
 
 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",
     },
 #if HAVE_XI2
     { "create-master",

-      "<id> [sendCore (dflt:1)] [enable (dflt:1)]",
+      "<id> [<sendCore (dflt:1)>] [<enable (dflt:1)>]",

       create_master
     },
     { "remove-master",
       create_master
     },
     { "remove-master",

-      "<id> [returnMode (dflt:Floating)] [returnPointer] [returnKeyboard]",
+      "<id> [Floating|AttachToMaster (dflt:Floating)] [<returnPointer>] [<returnKeyboard>]",

       remove_master
     },
     { "reattach",
       remove_master
     },
     { "reattach",


@@ -222,7 +224,7 @@ xi2_find_device_info(Display *display, char *name)
        id = atoi(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) ||
     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;
     Display    *display;
     entry      *driver = drivers;
     char        *func;

+    int event, error;

 
     if (argc < 2) {
        usage();
 
     if (argc < 2) {
        usage();


@@ -270,6 +273,11 @@ main(int argc, char * argv[])
        return EXIT_FAILURE;
     }
 
        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++;
 
     func = argv[1];
     while((*func) == '-') func++;