X-Git-Url: https://diplodocus.org/git/xorg-xinput/blobdiff_plain/c0178d2afef586f58f42508a9b8bd78e4e6e0cb8..49d37729f1d7212aad8afbd91b49a37c4e93a796:/src/xinput.c

diff --git a/src/xinput.c b/src/xinput.c
index 5010923..68d4136 100644
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -66,7 +66,7 @@ static entry drivers[] =
      set_mode
     },
     {"list",
-     "[<device name>...]",
+     "[--short || <device name>...]",
      list
     },
     {"query-state",
@@ -108,12 +108,13 @@ find_device_info(Display	*display,
 		 Bool		only_extended)
 {
     XDeviceInfo	*devices;
+    XDeviceInfo *found = NULL;
     int		loop;
     int		num_devices;
     int		len = strlen(name);
     Bool	is_id = True;
     XID		id;
-    
+
     for(loop=0; loop<len; loop++) {
 	if (!isdigit(name[loop])) {
 	    is_id = False;
@@ -124,26 +125,33 @@ find_device_info(Display	*display,
     if (is_id) {
 	id = atoi(name);
     }
-    
+
     devices = XListInputDevices(display, &num_devices);
 
     for(loop=0; loop<num_devices; loop++) {
 	if ((!only_extended || (devices[loop].use >= IsXExtensionDevice)) &&
 	    ((!is_id && strcmp(devices[loop].name, name) == 0) ||
 	     (is_id && devices[loop].id == id))) {
-	    return &devices[loop];
+	    if (found) {
+	        fprintf(stderr,
+	                "Warning: There are multiple devices named \"%s\".\n"
+	                "To ensure the correct one is selected, please use "
+	                "the device ID instead.\n\n", name);
+	    } else {
+		found = &devices[loop];
+	    }
 	}
     }
-    return NULL;
+    return found;
 }
 
 static void
-usage() 
+usage()
 {
     entry	*pdriver = drivers;
-    
+
     fprintf(stderr, "usage :\n");
-    
+
     while(pdriver->func_name) {
 	fprintf(stderr, "\txinput %s %s\n", pdriver->func_name,
 		pdriver->arg_desc);
@@ -156,26 +164,30 @@ main(int argc, char * argv[])
 {
     Display	*display;
     entry	*driver = drivers;
-    
+    char        *func;
+
     if (argc < 2) {
 	usage();
 	return EXIT_FAILURE;
     }
-    
+
     display = XOpenDisplay(NULL);
-    
+
     if (display == NULL) {
 	fprintf(stderr, "Unable to connect to X server\n");
 	return EXIT_FAILURE;
     }
 
+    func = argv[1];
+    while((*func) == '-') func++;
+
     if (!is_xinput_present(display)) {
 	fprintf(stderr, "%s extension not available\n", INAME);
 	return EXIT_FAILURE;
     }
-    
+
     while(driver->func_name) {
-	if (strcmp(driver->func_name, argv[1]) == 0) {
+	if (strcmp(driver->func_name, func) == 0) {
 	    int	r = (*driver->func)(display, argc-2, argv+2,
 				    driver->func_name, driver->arg_desc);
 	    XFlush(display);
@@ -183,9 +195,9 @@ main(int argc, char * argv[])
 	}
 	driver++;
     }
-    
+
     usage();
-    
+
     return EXIT_FAILURE;
 }