From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu, 20 Dec 2007 01:22:41 +0000 (+1030)
Subject: Add --short argument to list. Only prints name and ID.
X-Git-Url: https://diplodocus.org/git/xorg-xinput/commitdiff_plain/9b24e279439a800e72819ca63441a083a89643b6?ds=sidebyside;hp=--cc

Add --short argument to list. Only prints name and ID.
---

9b24e279439a800e72819ca63441a083a89643b6
diff --git a/src/list.c b/src/list.c
index 79c2aa4..a023610 100644
--- a/src/list.c
+++ b/src/list.c
@@ -24,7 +24,7 @@
 #include "xinput.h"
 
 static void
-print_info(XDeviceInfo	*info)
+print_info(XDeviceInfo	*info, Bool shortformat)
 {
     int			i,j;
     XAnyClassPtr	any;
@@ -57,6 +57,9 @@ print_info(XDeviceInfo	*info)
     }
     printf("]\n");
 
+    if (shortformat)
+        return;
+
     if (info->num_classes > 0) {
 	any = (XAnyClassPtr) (info->inputclassinfo);
 	for (i=0; i<info->num_classes; i++) {
@@ -105,6 +108,9 @@ list(Display	*display,
 {
     XDeviceInfo		*info;
     int			loop;
+    int                 shortformat = False;
+
+    shortformat = (argc == 1 && strcmp(argv[0], "--short") == 0);
 
     if (argc == 0) {
 	int		num_devices;
@@ -112,7 +118,7 @@ list(Display	*display,
 	info = XListInputDevices(display, &num_devices);
 	
 	for(loop=0; loop<num_devices; loop++) {
-	    print_info(info+loop);
+	    print_info(info+loop, shortformat);
 	}
     } else {
 	int	ret = EXIT_SUCCESS;
@@ -124,7 +130,7 @@ list(Display	*display,
 		fprintf(stderr, "unable to find device %s\n", argv[0]);
 		ret = EXIT_FAILURE;
 	    } else {
-		print_info(info);
+		print_info(info, shortformat);
 	    }
 	}
 	return ret;
diff --git a/src/xinput.c b/src/xinput.c
index 8275d18..6bafb2a 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",