xinput 1.6.3

[xorg-xinput] / src / xinput.c

diff --git a/src/xinput.c b/src/xinput.c
index 0f86720229667030c14d77134196a757d4905482..7b27ffeb42d466d7b33411060215bf6b18af1d0b 100644 (file)
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -101,7 +101,7 @@ static entry drivers[] =
       set_clientpointer
     },
     { "test-xi2",
       set_clientpointer
     },
     { "test-xi2",

-      "<device>",
+      "[--root] <device>",

       test_xi2,
     },
     { "map-to-output",
       test_xi2,
     },
     { "map-to-output",


@@ -202,15 +202,26 @@ xinput_version(Display    *display)
     /* Announce our supported version so the server treats us correctly. */
     if (vers >= XI_2_Major)
     {
     /* Announce our supported version so the server treats us correctly. */
     if (vers >= XI_2_Major)
     {

+        const char *forced_version;

         int maj = 2,
             min = 0;
 
         int maj = 2,
             min = 0;
 

-#if HAVE_XI21
-        min = 1;
-#elif HAVE_XI22
+#if HAVE_XI22

         min = 2;
         min = 2;

+#elif HAVE_XI21
+        min = 1;

 #endif
 
 #endif
 

+        forced_version = getenv("XINPUT_XI2_VERSION");
+        if (forced_version) {
+            if (sscanf(forced_version, "%d.%d", &maj, &min) != 2) {
+                fprintf(stderr, "Invalid format of XINPUT_XI2_VERSION "
+                                "environment variable. Need major.minor\n");
+                exit(1);
+            }
+            printf("Overriding XI2 version to: %d.%d\n", maj, min);
+        }
+

         XIQueryVersion(display, &maj, &min);
     }
 #endif
         XIQueryVersion(display, &maj, &min);
     }
 #endif


@@ -262,7 +273,7 @@ find_device_info(Display    *display,
     return found;
 }
 
     return found;
 }
 

-#ifdef HAVE_XI2
+#if HAVE_XI2

 Bool is_pointer(int use)
 {
     return use == XIMasterPointer || use == XISlavePointer;
 Bool is_pointer(int use)
 {
     return use == XIMasterPointer || use == XISlavePointer;


@@ -350,6 +361,26 @@ usage(void)
     }
 }
 
     }
 }
 

+static Bool
+is_xwayland(Display *dpy)
+{
+    XDeviceInfo *devices;
+    int n;
+    Bool is_xwayland = False;
+
+    devices = XListInputDevices(dpy, &n);
+    while (n-- > 0) {
+        if (strncmp(devices[n].name, "xwayland-", 9) == 0) {
+            is_xwayland = True;
+            break;
+        }
+    }
+
+    XFreeDeviceList(devices);
+
+    return is_xwayland;
+}
+

 int
 main(int argc, char * argv[])
 {
 int
 main(int argc, char * argv[])
 {


@@ -391,6 +422,9 @@ main(int argc, char * argv[])
        goto out;
     }
 
        goto out;
     }
 

+    if (is_xwayland(display))
+        fprintf(stderr, "WARNING: running xinput against an Xwayland server. See the xinput man page for details.\n");
+

     while(driver->func_name) {
        if (strcmp(driver->func_name, func) == 0) {
            int r = (*driver->func)(display, argc-2, argv+2,
     while(driver->func_name) {
        if (strcmp(driver->func_name, func) == 0) {
            int r = (*driver->func)(display, argc-2, argv+2,