When a user id is specified, or --root, use the ID directly, don't try find a client...

[chaz/openbox] / tools / obxprop / obxprop.c

diff --git a/tools/obxprop/obxprop.c b/tools/obxprop/obxprop.c
index b28b77a7c13ce931bd7ce0dedad9620c03814240..44b33041a99e4e04858517e128989bb5a25398de 100644 (file)
--- a/tools/obxprop/obxprop.c
+++ b/tools/obxprop/obxprop.c
@@ -273,13 +273,13 @@ int main(int argc, char **argv)
 
     for (i = 1; i < argc; ++i) {
         if (!strcmp(argv[i], "--help")) {
-            return fail(0);
+            return fail(NULL);
         }
         else if (!strcmp(argv[i], "--root"))
             root = TRUE;
         else if (!strcmp(argv[i], "--id")) {
             if (++i == argc)
-                return fail(0);
+                return fail(NULL);
             if (argv[i][0] == '0' && argv[i][1] == 'x') {
                 /* hex */
                 userid = parse_hex(argv[i]+2);
@@ -288,11 +288,12 @@ int main(int argc, char **argv)
                 /* decimal */
                 userid = atoi(argv[i]);
             }
-            break;
+            if (!userid)
+                return fail("Unable to parse argument to --id.");
         }
         else if (!strcmp(argv[i], "--display")) {
             if (++i == argc)
-                return fail(0);
+                return fail(NULL);
             dname = argv[i];
         }
         else if (*argv[i] != '-')
@@ -333,9 +334,10 @@ int main(int argc, char **argv)
                 break;
             }
         }
+        id = find_client(d, userid);
     }
-
-    id = find_client(d, userid);
+    else
+        id = userid; /* they picked this one */
 
     if (id == None)
         return fail("Unable to find window with the requested ID");