X-Git-Url: https://diplodocus.org/git/xorg-xinput/blobdiff_plain/8806f3db5417f1c5946b6589cf2f043e9e7c68d3..865c7bd8013f9882163234cce6cdd4168525815c:/src/xinput.c

diff --git a/src/xinput.c b/src/xinput.c
index c25a4de..b162950 100644
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -1,19 +1,19 @@
 /*
  * Copyright 1996 by Frederic Lepied, France. <Frederic.Lepied@sugix.frmug.org>
- *                                                                            
+ *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is  hereby granted without fee, provided that
  * the  above copyright   notice appear  in   all  copies and  that both  that
  * copyright  notice   and   this  permission   notice  appear  in  supporting
- * documentation, and that   the  name of  Frederic   Lepied not  be  used  in
+ * documentation, and that   the  name of  the authors  not  be  used  in
  * advertising or publicity pertaining to distribution of the software without
- * specific,  written      prior  permission.     Frederic  Lepied   makes  no
+ * specific,  written      prior  permission.     The authors  make  no
  * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.                   
- *                                                                            
- * FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
+ * is provided "as is" without express or implied warranty.
+ *
+ * THE AUTHORS DISCLAIM ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
  * INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
- * EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
+ * EVENT  SHALL THE AUTHORS  BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
  * DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER
  * TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR
@@ -23,8 +23,7 @@
 
 #include "xinput.h"
 #include <ctype.h>
-
-static const char rcs_id[] = "$Id: xinput.c,v 1.5 1997/06/09 16:06:31 fred Exp $";
+#include <string.h>
 
 typedef int (*prog)(
 #if NeedFunctionPrototypes
@@ -67,7 +66,7 @@ static entry drivers[] =
      set_mode
     },
     {"list",
-     "[<device name>...]",
+     "[--short || <device name>...]",
      list
     },
     {"query-state",
@@ -109,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;
@@ -125,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)) &&
+	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);
@@ -157,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);
@@ -184,11 +195,10 @@ main(int argc, char * argv[])
 	}
 	driver++;
     }
-    
+
     usage();
-    
+
     return EXIT_FAILURE;
 }
 
-/* end of xinput.c
- */
+/* end of xinput.c */