X-Git-Url: https://diplodocus.org/git/xorg-xinput/blobdiff_plain/6ebdca422d12e3326f9ab59767e05eefd24ff85f..82d338548e22ae271f50592e759794dd7536a207:/src/xinput.c

diff --git a/src/xinput.c b/src/xinput.c
index ac9c65f..007fe2c 100644
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -25,12 +25,8 @@
 #include <ctype.h>
 #include <string.h>
 
-typedef int (*prog)(
-#if NeedFunctionPrototypes
-		    Display* display, int argc, char *argv[],
-		    char *prog_name, char *prog_desc
-#endif
-);
+typedef int (*prog)(Display* display, int argc, char *argv[],
+		    char *prog_name, char *prog_desc);
 
 typedef struct
 {
@@ -53,6 +49,10 @@ static entry drivers[] =
      "<device name> <feedback id> <value>",
      set_integer_feedback
     },
+    {"get-button-map",
+     "<device name>",
+     get_button_map
+    },
     {"set-button-map",
      "<device name> <map button 1> [<map button 2> [...]]",
      set_button_map
@@ -102,6 +102,11 @@ static entry drivers[] =
       "<window> <device>",
       set_clientpointer
     },
+    { "test-xi2",
+      "<device>",
+      test_xi2,
+    },
+#endif
     { "list-props",
       "<device> [<device> ...]",
       list_props
@@ -110,34 +115,47 @@ static entry drivers[] =
       "<device> <property> <format (8, 16, 32)> <val> [<val> ...]",
       set_int_prop
     },
+    { "set-float-prop",
+      "<device> <property> <val> [<val> ...]",
+      set_float_prop
+    },
+    { "set-atom-prop",
+      "<device> <property> <val> [<val> ...]",
+      set_atom_prop
+    },
     { "watch-props",
       "<device>",
       watch_props
     },
-#endif
-    {0, 0, 0
+    { "delete-prop",
+      "<device> <property>",
+      delete_prop
+    },
+    { "set-prop",
+      "<device> <property> <val> [<val> ...]",
+      set_prop
+    },
+    {NULL, NULL, NULL
     }
 };
 
-static Bool
-is_xinput_present(Display	*display)
+int
+xinput_version(Display	*display)
 {
     XExtensionVersion	*version;
-    Bool		present;
+    static int vers = -1;
+
+    if (vers != -1)
+        return vers;
 
-#if HAVE_XI2
-    version = XQueryInputVersion(display, XI_2_Major, XI_2_Minor);
-#else
     version = XGetExtensionVersion(display, INAME);
-#endif
 
     if (version && (version != (XExtensionVersion*) NoSuchExtension)) {
-	present = version->present;
+	vers = version->major_version;
 	XFree(version);
-	return present;
-    } else {
-	return False;
     }
+
+    return vers;
 }
 
 XDeviceInfo*
@@ -151,7 +169,7 @@ find_device_info(Display	*display,
     int		num_devices;
     int		len = strlen(name);
     Bool	is_id = True;
-    XID		id;
+    XID		id = (XID)-1;
 
     for(loop=0; loop<len; loop++) {
 	if (!isdigit(name[loop])) {
@@ -175,6 +193,7 @@ find_device_info(Display	*display,
 	                "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;
 	    } else {
 		found = &devices[loop];
 	    }
@@ -183,6 +202,41 @@ find_device_info(Display	*display,
     return found;
 }
 
+#ifdef HAVE_XI2
+XIDeviceInfo*
+xi2_find_device_info(Display *display, char *name)
+{
+    XIDeviceInfo *info;
+    int ndevices;
+    Bool is_id = True;
+    int i, id = -1;
+
+    for(i = 0; i < strlen(name); i++) {
+	if (!isdigit(name[i])) {
+	    is_id = False;
+	    break;
+	}
+    }
+
+    if (is_id) {
+	id = atoi(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))
+        {
+            return &info[i];
+        }
+    }
+
+    XIFreeDeviceInfo(info);
+    return NULL;
+}
+#endif
+
 static void
 usage(void)
 {
@@ -219,7 +273,7 @@ main(int argc, char * argv[])
     func = argv[1];
     while((*func) == '-') func++;
 
-    if (!is_xinput_present(display)) {
+    if (!xinput_version(display)) {
 	fprintf(stderr, "%s extension not available\n", INAME);
 	return EXIT_FAILURE;
     }
@@ -228,7 +282,8 @@ main(int argc, char * argv[])
 	if (strcmp(driver->func_name, func) == 0) {
 	    int	r = (*driver->func)(display, argc-2, argv+2,
 				    driver->func_name, driver->arg_desc);
-	    XFlush(display);
+	    XSync(display, False);
+	    XCloseDisplay(display);
 	    return r;
 	}
 	driver++;