Changeset 1085

Timestamp:

Jun 3, 2008 9:59:00 AM (5 years ago)

Author:

dkg

Message:

[svn-upgrade] Integrating new upstream version, xdotool (20080603)

Location:

branches/upstream/xdotool/current

Files:

• CHANGELIST (modified) (3 diffs)
• Makefile (modified) (2 diffs)
• README (modified) (2 diffs)
• t/no_crashes_please.sh (modified) (2 diffs)
• xdo.c (modified) (30 diffs)
• xdo.h (modified) (2 diffs)
• xdotool.1 (deleted)
• xdotool.c (modified) (35 diffs)

branches/upstream/xdotool/current/CHANGELIST

@@ +1 @@
+20080603:
+  * Daniel Kahn Gillmor reported a problem with return codes from xdotool. All
+    commands return proper exit status now (0 == success, nonzero == error)
+  * I tested on 3 window managers: Gnome2 2.20.0, OpenBox 3.4, ion-3rc-20070608
+    - Gnome and OpenBox pass all tests.
+    - ion-3 fails on any desktop-related methods (ion-3 lacks the support).
+
 20080601:
   * Add new commands:
@@ -24 +31 @@
     incorrectly typecasting Window to int sometimes.
   * Confirmed that the one (but mostly useless) test passes.
+
+20071230:
+  * Manpage contribution by Daniel Kahn Gillmor
+  * Add COPYRIGHT from svn to the distributed package.
 
 20070903:
@@ -53 +64 @@
   (with menus enabled).
 
-
 20070712:
   Added new search options to 'xdotool search'

branches/upstream/xdotool/current/Makefile

@@ -37 +37 @@
         rm -f $(INSTALLMAN)/man1/xdotool.1
 
-
 clean:
-        rm -f *.o || true
+        rm -f *.o xdotool xdotool.1 || true
 
 xdo.o: xdo.c
@@ -58 +57 @@
 package: test-package-build create-package
 
-create-package: xdotool.1
+create-package: 
         @NAME=xdotool-`date +%Y%m%d`; \
         echo "Creating package: $$NAME"; \
         mkdir $${NAME}; \
-        rsync --exclude .svn -a `ls -d *.1 *.pod COPYRIGHT *.c *.h examples t CHANGELIST README Makefile* 2> /dev/null` $${NAME}/; \
+        rsync --exclude .svn -a `ls -d *.pod COPYRIGHT *.c *.h examples t CHANGELIST README Makefile* 2> /dev/null` $${NAME}/; \
         tar -zcf $${NAME}.tar.gz $${NAME}/; \
         rm -rf $${NAME}/

branches/upstream/xdotool/current/README

@@ -4 +4 @@
 ### See the website for more up-to-date documentation
 # http://www.semicomplete.com/projects/xdotool/
+#
+# Also see the manpage, which you can generate by running:
+# make xdotool.1
 
 Compile: make xdotool
@@ -31 +34 @@
       See 'xwininfo' output for what each of these are/mean.
 
-$Id: README 1520 2007-08-12 23:51:17Z psionic $ 
+$Id: README 1892 2008-06-03 09:04:59Z jordansissel $ 

branches/upstream/xdotool/current/t/no_crashes_please.sh

@@ -22 +22 @@
 xterm_pid="$!"
 
+sleep 1
+
 try $xdotool search xdotool_test_window
 try $xdotool getwindowfocus
@@ -44 +46 @@
 
 try $xdotool windowactivate $wid
+sleep 0.2
 
-try $xdotool get_num_desktops $wid
-desktops=`$xdotool get_num_desktops $wid`
+try $xdotool get_num_desktops
+desktops=`$xdotool get_num_desktops`
 try $xdotool set_num_desktops $desktops
 

branches/upstream/xdotool/current/xdo.c

@@ -1 +1 @@
 /* xdo library
  *
- * $Id: xdo.c 1878 2008-06-01 00:31:53Z jordansissel $
+ * $Id: xdo.c 1891 2008-06-03 09:00:20Z jordansissel $
  *
  * - getwindowfocus contributed by Lee Pumphret
@@ -106 +106 @@
   ret = XMapWindow(xdo->xdpy, wid);
   XFlush(xdo->xdpy);
-  return _is_success("XMapWindow", ret);
+  return _is_success("XMapWindow", ret == 0);
 }
 
@@ -113 +113 @@
   ret = XUnmapWindow(xdo->xdpy, wid);
   XFlush(xdo->xdpy);
-  return _is_success("XMapWindow", ret);
-}
-
-void xdo_window_list_by_regex(xdo_t *xdo, char *regex, int flags,
+  return _is_success("XUnmapWindow", ret == 0);
+}
+
+int xdo_window_list_by_regex(xdo_t *xdo, char *regex, int flags,
                               Window **windowlist, int *nwindows) {
   regex_t re;
@@ -130 +130 @@
   if (ret != 0) {
     fprintf(stderr, "Failed to compile regex: '%s'\n", regex);
-    return;
+    return 1;
   }
 
@@ -166 +166 @@
 
   regfree(&re);
+  return 0;
 }
 
@@ -175 +176 @@
 
   ret = XConfigureWindow(xdo->xdpy, wid, CWX | CWY, &wc);
-  return _is_success("XConfigureWindow", ret);
+  return _is_success("XConfigureWindow", ret == 0);
 }
 
@@ -212 +213 @@
   ret = XConfigureWindow(xdo->xdpy, wid, cw_flags, &wc);
   XFlush(xdo->xdpy);
-  return _is_success("XConfigureWindow", ret);
+  return _is_success("XConfigureWindow", ret == 0);
 }
 
@@ -219 +220 @@
   ret = XSetInputFocus(xdo->xdpy, wid, RevertToParent, CurrentTime);
   XFlush(xdo->xdpy);
-  return _is_success("XSetInputFocus", ret);
+  return _is_success("XSetInputFocus", ret == 0);
 }
 
@@ -227 +228 @@
   XEvent xev;
   XWindowAttributes wattr;
+
+  if (_xdo_ewmh_is_supported(xdo, "_NET_ACTIVE_WINDOW") == False) {
+    fprintf(stderr,
+            "Your windowmanager claims not to support _NET_ACTIVE_WINDOW, "
+            "so the attempt to activate the window was aborted.\n");
+    return 1;
+  }
 
   /* If this window is on another desktop, let's go to that desktop first */
@@ -252 +260 @@
   /* XXX: XSendEvent returns 0 on conversion failure, nonzero otherwise.
    * Manpage says it will only generate BadWindow or BadValue errors */
-  return _is_success("XSendEvent[EWMH:_NET_ACTIVE_WINDOW]", ret);
+  printf("netact:%d\n", ret);
+  return _is_success("XSendEvent[EWMH:_NET_ACTIVE_WINDOW]", ret == 0);
 }
 
@@ -260 +269 @@
   Window root;
   int ret;
+
+  if (_xdo_ewmh_is_supported(xdo, "_NET_NUMBER_OF_DESKTOPS") == False) {
+    fprintf(stderr,
+            "Your windowmanager claims not to support _NET_NUMBER_OF_DESKTOPS, "
+            "so the attempt to change the number of desktops was aborted.\n");
+    return 1;
+  }
 
   root = RootWindow(xdo->xdpy, 0);
@@ -276 +292 @@
                    &xev);
 
-  return _is_success("XSendEvent[EWMH:_NET_NUMBER_OF_DESKTOPS]", ret);
+  return _is_success("XSendEvent[EWMH:_NET_NUMBER_OF_DESKTOPS]", ret == 0);
 }
 
@@ -285 +301 @@
   unsigned char *data;
   Window root;
-
   Atom request;
+
+  if (_xdo_ewmh_is_supported(xdo, "_NET_NUMBER_OF_DESKTOPS") == False) {
+    fprintf(stderr,
+            "Your windowmanager claims not to support _NET_NUMBER_OF_DESKTOPS, "
+            "so the attempt to query the number of desktops was aborted.\n");
+    return 1;
+  }
 
   request = XInternAtom(xdo->xdpy, "_NET_NUMBER_OF_DESKTOPS", False);
@@ -310 +332 @@
 
   root = RootWindow(xdo->xdpy, 0);
+
+  if (_xdo_ewmh_is_supported(xdo, "_NET_CURRENT_DESKTOP") == False) {
+    fprintf(stderr,
+            "Your windowmanager claims not to support _NET_CURRENT_DESKTOP, "
+            "so the attempt to change desktops was aborted.\n");
+    return 1;
+  }
 
   memset(&xev, 0, sizeof(xev));
@@ -325 +354 @@
                    &xev);
 
-  return _is_success("XSendEvent[EWMH:_NET_CURRENT_DESKTOP]", ret);
+  return _is_success("XSendEvent[EWMH:_NET_CURRENT_DESKTOP]", ret == 0);
 }
 
@@ -337 +366 @@
   Atom request;
 
+  if (_xdo_ewmh_is_supported(xdo, "_NET_CURRENT_DESKTOP") == False) {
+    fprintf(stderr,
+            "Your windowmanager claims not to support _NET_CURRENT_DESKTOP, "
+            "so the query for the current desktop was aborted.\n");
+    return 1;
+  }
+
   request = XInternAtom(xdo->xdpy, "_NET_CURRENT_DESKTOP", False);
   root = XDefaultRootWindow(xdo->xdpy);
@@ -356 +392 @@
   XWindowAttributes wattr;
   XGetWindowAttributes(xdo->xdpy, wid, &wattr);
+
+  if (_xdo_ewmh_is_supported(xdo, "_NET_WM_DESKTOP") == False) {
+    fprintf(stderr,
+            "Your windowmanager claims not to support _NET_WM_DESKTOP, "
+            "so the attempt to change a window's desktop location was "
+            "aborted.\n");
+    return 1;
+  }
 
   memset(&xev, 0, sizeof(xev));
@@ -371 +415 @@
                    &xev);
 
-  return _is_success("XSendEvent[EWMH:_NET_WM_DESKTOP]", ret);
+  return _is_success("XSendEvent[EWMH:_NET_WM_DESKTOP]", ret == 0);
 }
 
@@ -379 +423 @@
   long nitems;
   unsigned char *data;
-
   Atom request;
+
+  if (_xdo_ewmh_is_supported(xdo, "_NET_WM_DESKTOP") == False) {
+    fprintf(stderr,
+            "Your windowmanager claims not to support _NET_WM_DESKTOP, "
+            "so the attempt to query a window's desktop location was "
+            "aborted.\n");
+    return 1;
+  }
 
   request = XInternAtom(xdo->xdpy, "_NET_WM_DESKTOP", False);
@@ -408 +459 @@
   ret = XTestFakeMotionEvent(xdo->xdpy, -1, x, y, CurrentTime);
   XFlush(xdo->xdpy);
-  return _is_success("XTestFakeMotionEvent", ret);
+  return _is_success("XTestFakeMotionEvent", ret == 0);
 }
 
@@ -415 +466 @@
   ret = XTestFakeRelativeMotionEvent(xdo->xdpy, x, y, CurrentTime);
   XFlush(xdo->xdpy);
-  return _is_success("XTestFakeRelativeMotionEvent", ret);
+  return _is_success("XTestFakeRelativeMotionEvent", ret == 0);
 }
 
@@ -422 +473 @@
   ret = XTestFakeButtonEvent(xdo->xdpy, button, True, CurrentTime);
   XFlush(xdo->xdpy);
-  return _is_success("XTestFakeButtonEvent", ret);
+  return _is_success("XTestFakeButtonEvent(down)", ret == 0);
 }
 
@@ -429 +480 @@
   ret = XTestFakeButtonEvent(xdo->xdpy, button, False, CurrentTime);
   XFlush(xdo->xdpy);
-  return _is_success("XTestFakeKeyEvent", ret);
+  return _is_success("XTestFakeButtonEvent(up)", ret == 0);
 }
 
@@ -435 +486 @@
   int ret;
   ret = xdo_mousedown(xdo, button);
-  if (!ret)
+  if (ret)
     return ret;
   ret = xdo_mouseup(xdo, button);
   return ret;
-
-  /* no need to flush here */
 }
 
@@ -450 +499 @@
   int shiftcode = 0;
 
+  /* XXX: Add error handling */
   for (i = 0; string[i] != '\0'; i++) {
     key = string[i];
@@ -466 +516 @@
   }
 
-  return True;
+  return 0;
 }
 
 int _xdo_keysequence_do(xdo_t *xdo, char *keyseq, int pressed) {
+  int ret = 0;
   int *keys = NULL;
   int nkeys;
@@ -480 +531 @@
 
   for (i = 0; i < nkeys; i++) {
-    //fprintf(stderr, "Typing %d (%d)\n", keys[i], pressed);
-    XTestFakeKeyEvent(xdo->xdpy, keys[i], pressed, CurrentTime);
+    ret += !XTestFakeKeyEvent(xdo->xdpy, keys[i], pressed, CurrentTime);
   }
 
   free(keys);
   XFlush(xdo->xdpy);
-  return True;
+  return ret;
 }
   
@@ -498 +548 @@
 
 int xdo_keysequence(xdo_t *xdo, char *keyseq) {
-  _xdo_keysequence_do(xdo, keyseq, True);
-  _xdo_keysequence_do(xdo, keyseq, False);
-  return True;
+  int ret;
+  ret += _xdo_keysequence_do(xdo, keyseq, True);
+  ret += _xdo_keysequence_do(xdo, keyseq, False);
+  return ret;
 }
 
@@ -509 +560 @@
   int unused_revert_ret;
   ret = XGetInputFocus(xdo->xdpy, window_ret, &unused_revert_ret);
-  return _is_success("XGetInputFocus", ret);
+  return _is_success("XGetInputFocus", ret == 0);
 }
 
@@ -731 +782 @@
 
 int _is_success(const char *funcname, int code) {
-  if (code == BadMatch) {
-    fprintf(stderr, "%s failed: got bad match\n", funcname);
-    return False;
-  } else if (code == BadValue) {
-    fprintf(stderr, "%s failed: got bad value\n", funcname);
-    return False;
-  } else if (code == BadWindow) {
-    fprintf(stderr, "%s failed: got bad window\n", funcname);
-    return False;
-  } else if (code != 1) {
+  if (code != 0)
     fprintf(stderr, "%s failed (code=%d)\n", funcname, code);
-    return False;
-  }
-
-  return True;
+  return code;
 }
 

branches/upstream/xdotool/current/xdo.h

@@ -3 +3 @@
  * - include this if you have code that uses xdo
  *
- * $Id: xdo.h 1876 2008-05-31 10:54:25Z jordansissel $
+ * $Id: xdo.h 1891 2008-06-03 09:00:20Z jordansissel $
  */
 
@@ -77 +77 @@
 
 /* Returns: windowlist and nwindows */
-void xdo_window_list_by_regex(xdo_t *xdo, char *regex, int flags,
-                              Window **windowlist, int *nwindows);
+int xdo_window_list_by_regex(xdo_t *xdo, char *regex, int flags,
+                             Window **windowlist, int *nwindows);

branches/upstream/xdotool/current/xdotool.c

@@ -3 +3 @@
  * command line interface to the xdo library
  *
- * $Id: xdotool.c 1880 2008-06-01 07:23:14Z jordansissel $
+ * $Id: xdotool.c 1891 2008-06-03 09:00:20Z jordansissel $
  *
  * getwindowfocus contributed by Lee Pumphret
@@ -20 +20 @@
 #include "xdo.h"
 
-void cmd_click(int argc, char **args);
-void cmd_getwindowfocus(int argc, char **args);
-void cmd_help(int argc, char **args);
-void cmd_key(int argc, char **args);
-void cmd_mousedown(int argc, char **args);
-void cmd_mousemove(int argc, char **args);
-void cmd_mousemove_relative(int argc, char **args);
-void cmd_mouseup(int argc, char **args);
-void cmd_search(int argc, char **args);
-void cmd_type(int argc, char **args);
-void cmd_windowactivate(int argc, char **args);
-void cmd_windowfocus(int argc, char **args);
-void cmd_windowmap(int argc, char **args);
-void cmd_windowmove(int argc, char **args);
-void cmd_windowraise(int argc, char **args);
-void cmd_windowsize(int argc, char **args);
-void cmd_windowunmap(int argc, char **args);
+int cmd_click(int argc, char **args);
+int cmd_getwindowfocus(int argc, char **args);
+int cmd_help(int argc, char **args);
+int cmd_key(int argc, char **args);
+int cmd_mousedown(int argc, char **args);
+int cmd_mousemove(int argc, char **args);
+int cmd_mousemove_relative(int argc, char **args);
+int cmd_mouseup(int argc, char **args);
+int cmd_search(int argc, char **args);
+int cmd_type(int argc, char **args);
+int cmd_windowactivate(int argc, char **args);
+int cmd_windowfocus(int argc, char **args);
+int cmd_windowmap(int argc, char **args);
+int cmd_windowmove(int argc, char **args);
+int cmd_windowraise(int argc, char **args);
+int cmd_windowsize(int argc, char **args);
+int cmd_windowunmap(int argc, char **args);
 
 /* pager-like commands */
-void cmd_set_num_desktops(int argc, char **args);
-void cmd_get_num_desktops(int argc, char **args);
-void cmd_set_desktop(int argc, char **args);
-void cmd_get_desktop(int argc, char **args);
-void cmd_set_desktop_for_window(int argc, char **args);
-void cmd_get_desktop_for_window(int argc, char **args);
+int cmd_set_num_desktops(int argc, char **args);
+int cmd_get_num_desktops(int argc, char **args);
+int cmd_set_desktop(int argc, char **args);
+int cmd_get_desktop(int argc, char **args);
+int cmd_set_desktop_for_window(int argc, char **args);
+int cmd_get_desktop_for_window(int argc, char **args);
 
 xdo_t *xdo;
@@ -51 +51 @@
 struct dispatch {
   const char *name;
-  void (*func)(int argc, char **args);
+  int (*func)(int argc, char **args);
 } dispatch[] = {
   /* Query functions */
@@ -90 +90 @@
 int main(int argc, char **argv) {
   char *cmd;
+  int ret = 0;
   int i;
 
@@ -109 +110 @@
   for (i = 0; dispatch[i].name != NULL; i++) {
     if (!strcasecmp(dispatch[i].name, cmd)) {
-      dispatch[i].func(argc, argv);
+      ret = dispatch[i].func(argc, argv);
       break;
     }
@@ -115 +116 @@
 
   xdo_free(xdo);
-  return 0;
+  return ret;
 }
 
@@ -123 +124 @@
 }
 
-void cmd_help(int argc, char **args) {
+int cmd_help(int argc, char **args) {
   int i;
   printf("Available commands:\n");
   for (i = 0; dispatch[i].name != NULL; i++)
     printf("  %s\n", dispatch[i].name);
-}
-
-void cmd_mousemove(int argc, char **args) {
+
+  return 0;
+}
+
+int cmd_mousemove(int argc, char **args) {
+  int ret = 0;
   int x, y;
   char *cmd = *args; argc--; args++;
@@ -137 +141 @@
     fprintf(stderr, "usage: %s <xcoord> <ycoord>\n", cmd);
     fprintf(stderr, "You specified the wrong number of args.\n");
-    return;
+    return 1;
   }
 
@@ -143 +147 @@
   y = atoi(args[1]);
 
-  if (!xdo_mousemove(xdo, x, y)) {
+  ret = xdo_mousemove(xdo, x, y);
+
+  if (ret)
     fprintf(stderr, "xdo_mousemove reported an error\n");
-  }
-}
-
-void cmd_mousemove_relative(int argc, char **args) {
+
+  return ret;
+}
+
+int cmd_mousemove_relative(int argc, char **args) {
   int x, y;
+  int ret = 0;
   char *cmd = *args; argc--; args++;
 
@@ -155 +163 @@
     fprintf(stderr, "usage: %s <xcoord> <ycoord>\n", cmd);
     fprintf(stderr, "You specified the wrong number of args.\n");
-    return;
+    return 1;
   }
 
@@ -161 +169 @@
   y = atoi(args[1]);
 
-  if (!xdo_mousemove_relative(xdo, x, y)) {
+  ret = xdo_mousemove_relative(xdo, x, y);
+
+  if (ret)
     fprintf(stderr, "xdo_mousemove_relative reported an error\n");
-  }
-}
-
-void cmd_mousedown(int argc, char **args) {
+
+  return ret;
+}
+
+int cmd_mousedown(int argc, char **args) {
+  int ret = 0;
   int button;
   char *cmd = *args; argc--; args++;
@@ -173 +185 @@
     fprintf(stderr, "usage: %s <button>\n", cmd);
     fprintf(stderr, "You specified the wrong number of args.\n");
-    return;
+    return 1;
   }
 
   button = atoi(args[0]);
 
-  if (!xdo_mousedown(xdo, button)) {
+  ret = xdo_mousedown(xdo, button);
+
+  if (ret)
     fprintf(stderr, "xdo_mousedown reported an error\n");
-  }
-}
-
-void cmd_mouseup(int argc, char **args) {
+
+  return ret;
+}
+
+int cmd_mouseup(int argc, char **args) {
+  int ret = 0;
   int button;
   char *cmd = *args; argc--; args++;
@@ -190 +206 @@
     fprintf(stderr, "usage: %s <button>\n", cmd);
     fprintf(stderr, "You specified the wrong number of args.\n");
-    return;
+    return 1;
   }
 
   button = atoi(args[0]);
 
-  if (!xdo_mouseup(xdo, button)) {
+  ret = xdo_mouseup(xdo, button);
+  if (ret)
     fprintf(stderr, "xdo_mouseup reported an error\n");
-  }
-}
-
-void cmd_click(int argc, char **args) {
-  cmd_mousedown(argc, args);
-  cmd_mouseup(argc, args);
-}
-
-void cmd_type(int argc, char **args) {
+  
+  return ret;
+}
+
+int cmd_click(int argc, char **args) {
+  int button;
+  char *cmd = *args; argc--; args++;
+
+  if (argc != 1) {
+    fprintf(stderr, "usage: %s <button>\n", cmd);
+    fprintf(stderr, "You specified the wrong number of args.\n");
+    return 1;
+  }
+
+  button = atoi(args[0]);
+  return xdo_click(xdo, button);
+}
+
+int cmd_type(int argc, char **args) {
+  int ret = 0;
   int i;
   char *cmd = *args; argc--; args++;
@@ -212 +240 @@
     fprintf(stderr, "usage: %s <things to type>\n", cmd);
     fprintf(stderr, "You specified the wrong number of args.\n");
-    return;
+    return 1;
   }
 
   for (i = 0; i < argc; i++) {
-    if (!xdo_type(xdo, args[i])) {
+    int tmp = xdo_type(xdo, args[i]);
+
+    if (tmp) {
       fprintf(stderr, "xdo_type reported an error\n");
     }
-  }
-}
-
-void cmd_key(int argc, char **args) {
+
+    ret += tmp;
+  }
+
+  return ret > 0;
+}
+
+int cmd_key(int argc, char **args) {
+  int ret = 0;
   int i;
   char *cmd = *args; argc--; args++;
@@ -229 +264 @@
     fprintf(stderr, "usage: %s <keyseq1> [keyseq2 ... keyseqN]\n", cmd);
     fprintf(stderr, "You specified the wrong number of args.\n");
-    return;
+    return 1;
   }
 
@@ -242 +277 @@
   } else {
     fprintf(stderr, "Unknown command '%s'\n", cmd);
-    return;
+    return 1;
   }
 
   for (i = 0; i < argc; i++) {
-    if (!func(xdo, args[i]))
+    int tmp = func(xdo, args[i]);
+    if (tmp != 0)
       fprintf(stderr, "xdo_keysequence reported an error for string '%s'\n", args[i]);
-  }
-}
-
-void cmd_windowmove(int argc, char **args) {
+    ret += tmp;
+  }
+
+  return ret;
+}
+
+int cmd_windowmove(int argc, char **args) {
+  int ret = 0;
   int x, y;
   Window wid;
@@ -258 +298 @@
   if (argc != 3) {
     printf("usage: %s wid x y\n", cmd);
-    return;
+    return 1;
   }
 
@@ -265 +305 @@
   y = (int)strtol(args[2], NULL, 0);
 
-  if (!xdo_window_move(xdo, wid, x, y)) {
-    fprintf(stderr, "xdo_window_mvoe reported an error\n");
-  }
-}
-
-void cmd_windowactivate(int argc, char **args) {
+  ret = xdo_window_move(xdo, wid, x, y);
+  if (ret)
+    fprintf(stderr, "xdo_window_move reported an error\n");
+  
+  return ret;
+}
+
+int cmd_windowactivate(int argc, char **args) {
+  int ret = 0;
   Window wid;
   char *cmd = *args; argc--; args++;
@@ -276 +319 @@
   if (argc != 1) {
     printf("usage: %s wid\n", cmd);
-    return;
+    return 1;
   }
 
   wid = (Window)strtol(args[0], NULL, 0);
-  if (!xdo_window_activate(xdo, wid)) {
+  ret = xdo_window_activate(xdo, wid);
+
+  if (ret)
     fprintf(stderr, "xdo_window_activate reported an error\n");
-    return;
-  }
-
-}
-
-void cmd_windowfocus(int argc, char **args) {
+
+  return ret;
+}
+
+int cmd_windowfocus(int argc, char **args) {
+  int ret = 0;
   Window wid;
   char *cmd = *args; argc--; args++;
@@ -293 +338 @@
   if (argc != 1) {
     printf("usage: %s wid\n", cmd);
-    return;
+    return 1;
   }
 
   wid = (Window)strtol(args[0], NULL, 0);
-  if (!xdo_window_focus(xdo, wid)) {
+  ret = xdo_window_focus(xdo, wid);
+  if (ret)
     fprintf(stderr, "xdo_window_focus reported an error\n");
-  }
-}
-
-void cmd_windowraise(int argc, char **args) {
+  
+  return ret;
+}
+
+int cmd_windowraise(int argc, char **args) {
+  int ret = 0;
   Window wid;
   char *cmd = *args; argc--; args++;
@@ -308 +356 @@
   if (argc != 1) {
     printf("usage: %s wid\n", cmd);
-    return;
-  }
+    return 1;
+   }
 
   wid = (Window)strtol(args[0], NULL, 0);
-  if (!xdo_window_raise(xdo, wid)) {
+  ret = xdo_window_raise(xdo, wid);
+  if (ret)
     fprintf(stderr, "xdo_window_raise reported an error\n");
-  }
-}
-
-void cmd_windowsize(int argc, char **args) {
+  
+  return ret;
+}
+
+int cmd_windowsize(int argc, char **args) {
+  int ret = 0;
   int width, height;
   Window wid;
@@ -348 +399 @@
   if (argc != 3) {
     printf("usage: %s wid width height\n", cmd);
-    return;
+    return 1;
   }
 
@@ -355 +406 @@
   height = (int)strtol(args[2], NULL, 0);
 
-  if (!xdo_window_setsize(xdo, wid, width, height, size_flags)) {
+  ret = xdo_window_setsize(xdo, wid, width, height, size_flags);
+  if (ret)
     fprintf(stderr, "xdo_window_setsize reported an error\n");
-  }
-}
-
-void cmd_search(int argc, char **args) {
+  return ret;
+}
+
+int cmd_search(int argc, char **args) {
   Window *list;
   int nwindows;
@@ -405 +457 @@
   if (argc != 1) {
     printf(
-    "Usage: xdotool %s "
-    "[--onlyvisible] [--title --class --name] regexp_pattern\n"
-    " --onlyvisible   matches only windows currently visible\n"
-    " --title         check regexp_pattern agains the window title\n"
-    " --class         check regexp_pattern agains the window class\n"
-    " --name          check regexp_pattern agains the window name\n"
-    "\n"
-    "* If none of --title, --class, and --name are specified,\n"
-    "the defaults are to match any of them.\n", 
-    cmd);
-    return;
+      "Usage: xdotool %s "
+      "[--onlyvisible] [--title --class --name] regexp_pattern\n"
+      " --onlyvisible   matches only windows currently visible\n"
+      " --title         check regexp_pattern agains the window title\n"
+      " --class         check regexp_pattern agains the window class\n"
+      " --name          check regexp_pattern agains the window name\n"
+      "\n"
+      "* If none of --title, --class, and --name are specified,\n"
+      "the defaults are to match any of them.\n", 
+      cmd);
+    return 1;
   }
 
@@ -424 +476 @@
   /* Free list as it's malloc'd by xdo_window_list_by_regex */
   free(list);
+
+  /* error if number of windows found is zero (behave like grep) */
+  return !nwindows;
 }
 
 /* Added 2007-07-28 - Lee Pumphret */
-void cmd_getwindowfocus(int argc, char **args) {
+int cmd_getwindowfocus(int argc, char **args) {
+  int ret = 0;
   Window wid = 0;
   char *cmd = *args; argc--; args++;
@@ -433 +489 @@
   if (argc != 0) {
     printf("usage: %s\n", cmd);
-    return;
-  }
-
-  if (!xdo_window_get_focus(xdo, &wid)) {
+    return 1;
+  }
+
+  ret = xdo_window_get_focus(xdo, &wid);
+
+  if (ret) {
     fprintf(stderr, "xdo_window_focus reported an error\n");
-  } else {
+  } else { 
     window_print(wid);
   }
-}
-
-void cmd_windowmap(int argc, char **args) {
+
+  return ret;
+}
+
+int cmd_windowmap(int argc, char **args) {
+  int ret = 0;
   Window wid;
   char *cmd = *args; argc--; args++;
@@ -449 +510 @@
   if (argc != 1) {
     printf("usage: %s wid\n", cmd);
-    return;
+    return 1;
   }
 
   wid = (Window)strtol(args[0], NULL, 0);
-  if (!xdo_window_map(xdo, wid)) {
+  ret = xdo_window_map(xdo, wid);
+  if (ret)
     fprintf(stderr, "xdo_window_map reported an error\n");
-  }
-}
-
-void cmd_windowunmap(int argc, char **args) {
+  
+  return ret;
+}
+
+int cmd_windowunmap(int argc, char **args) {
+  int ret = 0;
   Window wid;
   char *cmd = *args; argc--; args++;
@@ -464 +528 @@
   if (argc != 1) {
     printf("usage: %s wid\n", cmd);
-    return;
+    return 1;
   }
 
   wid = (Window)strtol(args[0], NULL, 0);
-  if (!xdo_window_unmap(xdo, wid)) {
+  ret = xdo_window_unmap(xdo, wid);
+  if (ret)
     fprintf(stderr, "xdo_window_unmap reported an error\n");
-  }
-}
-
-void cmd_set_num_desktops(int argc, char **args) {
+  
+  return ret;
+}
+
+int cmd_set_num_desktops(int argc, char **args) {
   char *cmd = *args; argc--; args++;
   long ndesktops;
@@ -479 +545 @@
   if (argc != 1) {
     printf("usage: %s num_desktops\n", cmd);
-    return;
+    return 1;
   }
 
   ndesktops = strtol(args[0], NULL, 0);
 
-  xdo_set_number_of_desktops(xdo, ndesktops);
-}
-
-void cmd_get_num_desktops(int argc, char **args) {
+  return xdo_set_number_of_desktops(xdo, ndesktops);
+}
+
+int cmd_get_num_desktops(int argc, char **args) {
+  int ret = 0;
   char *cmd = *args; argc--; args++;
   long ndesktops = 0;
@@ -493 +560 @@
   if (argc != 0) {
     printf("usage: %s\n", cmd);
-    return;
-  }
-
-  xdo_get_number_of_desktops(xdo, &ndesktops);
+    return 1;
+  }
+
+  ret = xdo_get_number_of_desktops(xdo, &ndesktops);
 
   printf("%ld\n", ndesktops);
-}
-
-void cmd_set_desktop(int argc, char **args) {
+  return ret;
+}
+
+int cmd_set_desktop(int argc, char **args) {
   char *cmd = *args; argc--; args++;
   long desktop;
@@ -507 +575 @@
   if (argc != 1) {
     printf("usage: %s desktop\n", cmd);
-    return;
+    return 1;
   }
 
   desktop = strtol(args[0], NULL, 0);
 
-  xdo_set_current_desktop(xdo, desktop);
-}
-
-void cmd_get_desktop(int argc, char **args) {
+  return xdo_set_current_desktop(xdo, desktop);
+}
+
+int cmd_get_desktop(int argc, char **args) {
+  int ret = 0;
   char *cmd = *args; argc--; args++;
   long desktop = 0;
@@ -521 +590 @@
   if (argc != 0) {
     printf("usage: %s\n", cmd);
-    return;
-  }
-
-  xdo_get_current_desktop(xdo, &desktop);
-
+    return 1;
+  }
+
+  ret = xdo_get_current_desktop(xdo, &desktop);
   printf("%ld\n", desktop);
-}
-
-void cmd_set_desktop_for_window(int argc, char **args) {
+  return ret;
+}
+
+int cmd_set_desktop_for_window(int argc, char **args) {
   char *cmd = *args; argc--; args++;
   long desktop = 0;
@@ -536 +605 @@
   if (argc != 2) {
     printf("usage: %s <window> <desktop>\n", cmd);
-    return;
+    return 1;
   }
 
@@ -542 +611 @@
   desktop = strtol(args[1], NULL, 0);
 
-  xdo_set_desktop_for_window(xdo, window, desktop);
-}
-
-void cmd_get_desktop_for_window(int argc, char **args) {
+  return xdo_set_desktop_for_window(xdo, window, desktop);
+}
+
+int cmd_get_desktop_for_window(int argc, char **args) {
+  int ret = 0;
   char *cmd = *args; argc--; args++;
   long desktop = 0;
@@ -552 +622 @@
   if (argc != 1) {
     printf("usage: %s <window>\n", cmd);
-    return;
+    return 1;
   }
 
   window = (Window)strtol(args[0], NULL, 0);
 
-  xdo_get_desktop_for_window(xdo, window, &desktop);
+  ret = xdo_get_desktop_for_window(xdo, window, &desktop);
   printf("%ld\n", desktop);
-}
+  return ret;
+}