X-Git-Url: https://diplodocus.org/git/xorg-xinput/blobdiff_plain/26c8ad96bed67087f89439ec595e928e7f5c8a9c..cef07c0c8280d7e7b82c3bcc62a1dfbe8cc43ff8:/src/xinput.c?ds=inline

diff --git a/src/xinput.c b/src/xinput.c
index 6989ef3..7b27ffe 100644
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -68,7 +68,7 @@ static entry drivers[] =
      set_mode
     },
     {"list",
-     "[--short || --long] [<device name>...]",
+     "[--short || --long || --name-only || --id-only] [<device name>...]",
      list
     },
     {"query-state",
@@ -101,9 +101,13 @@ static entry drivers[] =
       set_clientpointer
     },
     { "test-xi2",
-      "<device>",
+      "[--root] <device>",
       test_xi2,
     },
+    { "map-to-output",
+      "<device> <output name>",
+      map_to_output,
+    },
 #endif
     { "list-props",
       "<device> [<device> ...]",
@@ -133,14 +137,24 @@ static entry drivers[] =
       "<device> [--type=atom|float|int] [--format=8|16|32] <property> <val> [<val> ...]",
       set_prop
     },
+    {
+      "disable",
+      "<device>",
+      disable,
+    },
+    {
+      "enable",
+      "<device>",
+      enable,
+    },
     {NULL, NULL, NULL
     }
 };
 
 static const char version_id[] = VERSION;
 
-int
-print_version()
+static int
+print_version(void)
 {
     XExtensionVersion	*version;
     Display *display;
@@ -184,6 +198,34 @@ xinput_version(Display	*display)
 	XFree(version);
     }
 
+#if HAVE_XI2
+    /* Announce our supported version so the server treats us correctly. */
+    if (vers >= XI_2_Major)
+    {
+        const char *forced_version;
+        int maj = 2,
+            min = 0;
+
+#if HAVE_XI22
+        min = 2;
+#elif HAVE_XI21
+        min = 1;
+#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
+
     return vers;
 }
 
@@ -219,7 +261,7 @@ find_device_info(Display	*display,
 	     (is_id && devices[loop].id == id))) {
 	    if (found) {
 	        fprintf(stderr,
-	                "Warning: There are multiple devices named \"%s\".\n"
+	                "Warning: There are multiple devices named '%s'.\n"
 	                "To ensure the correct one is selected, please use "
 	                "the device ID instead.\n\n", name);
 		return NULL;
@@ -231,7 +273,38 @@ find_device_info(Display	*display,
     return found;
 }
 
-#ifdef HAVE_XI2
+#if HAVE_XI2
+Bool is_pointer(int use)
+{
+    return use == XIMasterPointer || use == XISlavePointer;
+}
+
+Bool is_keyboard(int use)
+{
+    return use == XIMasterKeyboard || use == XISlaveKeyboard;
+}
+
+Bool device_matches(XIDeviceInfo *info, char *name)
+{
+    if (strcmp(info->name, name) == 0) {
+        return True;
+    }
+
+    if (strncmp(name, "pointer:", strlen("pointer:")) == 0 &&
+        strcmp(info->name, name + strlen("pointer:")) == 0 &&
+        is_pointer(info->use)) {
+        return True;
+    }
+
+    if (strncmp(name, "keyboard:", strlen("keyboard:")) == 0 &&
+        strcmp(info->name, name + strlen("keyboard:")) == 0 &&
+        is_keyboard(info->use)) {
+        return True;
+    }
+
+    return False;
+}
+
 XIDeviceInfo*
 xi2_find_device_info(Display *display, char *name)
 {
@@ -255,14 +328,13 @@ xi2_find_device_info(Display *display, char *name)
     info = XIQueryDevice(display, XIAllDevices, &ndevices);
     for(i = 0; i < ndevices; i++)
     {
-        if ((is_id && info[i].deviceid == id) ||
-                (!is_id && strcmp(info[i].name, name) == 0))
-        {
+        if (is_id ? info[i].deviceid == id : device_matches (&info[i], name)) {
             if (found) {
                 fprintf(stderr,
-                        "Warning: There are multiple devices named '%s'.\n"
+                        "Warning: There are multiple devices matching '%s'.\n"
                         "To ensure the correct one is selected, please use "
-                        "the device ID instead.\n\n", name);
+                        "the device ID, or prefix the\ndevice name with "
+                        "'pointer:' or 'keyboard:' as appropriate.\n\n", name);
                 XIFreeDeviceInfo(info);
                 return NULL;
             } else {
@@ -289,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[])
 {
@@ -297,35 +389,42 @@ main(int argc, char * argv[])
     char        *func;
     int event, error;
 
-    if (argc < 2) {
-	usage();
-	return EXIT_FAILURE;
+    if (argc > 1) {
+	func = argv[1];
+	while(func[0] == '-') func++;
+    } else {
+	func = "list";
     }
 
-    func = argv[1];
-    while((*func) == '-') func++;
-
     if (strcmp("version", func) == 0) {
-        return print_version(argv[0]);
+        return print_version();
+    }
+
+    if (strcmp("help", func) == 0) {
+        usage();
+        return 0;
     }
 
     display = XOpenDisplay(NULL);
 
     if (display == NULL) {
 	fprintf(stderr, "Unable to connect to X server\n");
-	return EXIT_FAILURE;
+	goto out;
     }
 
     if (!XQueryExtension(display, "XInputExtension", &xi_opcode, &event, &error)) {
         printf("X Input extension not available.\n");
-        return EXIT_FAILURE;
+        goto out;
     }
 
     if (!xinput_version(display)) {
 	fprintf(stderr, "%s extension not available\n", INAME);
-	return EXIT_FAILURE;
+	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,
@@ -339,6 +438,9 @@ main(int argc, char * argv[])
 
     usage();
 
+out:
+    if (display)
+        XCloseDisplay(display);
     return EXIT_FAILURE;
 }