[PATCH] xinput: Assume 'list' by default if no args given.

Bryce Harrington bryce at canonical.com
Tue Nov 29 17:33:23 PST 2011


xrandr lists all outputs by default when run with no args.  So, make
xinput list all inputs by default when run the same way, so the tools
are consistent.

Signed-off-by: Bryce Harrington <bryce at canonical.com>
Reviewed-by: Chase Douglas <chase.douglas at canonical.com>
---
 src/xinput.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/xinput.c b/src/xinput.c
index 9ca3832..7ab2121 100644
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -327,14 +327,13 @@ 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]);
     }
-- 
1.7.4.1



More information about the xorg-devel mailing list