xinput 1.6.3

[xorg-xinput] / src / xinput.c

diff --git a/src/xinput.c b/src/xinput.c
index e6e468cd392e9bc343ec0293aadf21508bc49b6a..7b27ffeb42d466d7b33411060215bf6b18af1d0b 100644 (file)
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -206,10 +206,10 @@ xinput_version(Display    *display)
         int maj = 2,
             min = 0;
 
-#if HAVE_XI21
-        min = 1;
-#elif HAVE_XI22
+#if HAVE_XI22
         min = 2;
+#elif HAVE_XI21
+        min = 1;
 #endif
 
         forced_version = getenv("XINPUT_XI2_VERSION");
@@ -273,7 +273,7 @@ find_device_info(Display    *display,
     return found;
 }
 
-#ifdef HAVE_XI2
+#if HAVE_XI2
 Bool is_pointer(int use)
 {
     return use == XIMasterPointer || use == XISlavePointer;
@@ -361,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[])
 {
@@ -402,6 +422,9 @@ main(int argc, char * argv[])
        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,