Changeset 1079

Timestamp:

Jun 1, 2008 11:30:36 PM (5 years ago)

Author:

dkg

Message:

xdotool: committing local changes after upstream update to 20080601

Location:

trunk/xdotool

Files:

• CHANGELIST (modified) (1 diff)
• COPYRIGHT (copied) (copied from branches/upstream/xdotool/current/COPYRIGHT)
• Makefile (modified) (3 diffs)
• README (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• examples/ffsp.sh (modified) (1 diff)
• t/no_crashes_please.sh (modified) (1 diff)
• xdo.c (modified) (17 diffs)
• xdo.h (modified) (5 diffs)
• xdo_util.h (modified) (1 diff)
• xdotool.1 (copied) (copied from branches/upstream/xdotool/current/xdotool.1)
• xdotool.c (modified) (28 diffs)
• xdotool.pod (copied) (copied from branches/upstream/xdotool/current/xdotool.pod)

trunk/xdotool/CHANGELIST

@@ -1 @@
-20071230:
-  * Manpage contribution by Daniel Kahn Gillmor
-  * Add COPYRIGHT from svn to the distributed package.
+20080601:
+  * Add new commands:
+    - windowactivate: Activate a window. If the window is on another desktop, we
+        will switch to that desktop and then activate the window.
+    - set_num_desktops number: Changes the number of desktops or workspaces.
+    - get_num_desktops: Output the current number of desktops.
+    - set_desktop desktop_number: Change the current view to the specified
+        desktop.
+    - get_desktop: Output the current desktop in view.
+    - set_desktop_for_window window_id desktop_number: Move a window to a
+        different desktop.
+    - get_desktop_for_window window_id: Output the desktop currently containing
+        the given window.
+
+    windowactivate tested and confirmed working in: ion-3 and Gnome2 (metacity)
+    The rest of the new commands have only been tested in Gnome2. They do not
+    work in ion-3 due to lacking support for EWMH in ion.
+  * Rewrote the man page in perlpod format.
+
+20080521:
+  * Import patches from keynav's xdotool branch (From Lukas Mai) which make
+    xdotool compile happily when building with -Wall and -pedantic (and others)
+  * Finally convert to using Window type for (hopefully) everything instead of
+    incorrectly typecasting Window to int sometimes.
+  * Confirmed that the one (but mostly useless) test passes.
 
 20070903:

trunk/xdotool/Makefile

@@ -1 @@
-CFLAGS+=-Wall
+PREFIX=/usr/local
+INSTALLBIN=/usr/local/bin
+INSTALLMAN=/usr/local/man
+
+WARNFLAGS+=-pedantic -Wall -W -Wno-missing-field-initializers -Wundef \
+           -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast \
+           -Wcast-align -Wwrite-strings -Wstrict-prototypes \
+           -Wmissing-prototypes -Wnested-externs -Winline \
+           -Wdisabled-optimization
+
+CFLAGS=-pipe -std=c99 $(WARNFLAGS)
 
 DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst
@@ -10 +20 @@
 LDFLAGS+=$(LIBS)
 
-all: xdotool
+all: xdotool xdotool.1
+
+install: installprog installman
+
+installprog: xdotool
+        install -m 755 xdotool $(INSTALLBIN)/
+
+installman: xdotool.1
+        [ -d $(INSTALLMAN) ] || mkdir $(INSTALLMAN)
+        [ -d $(INSTALLMAN)/man1 ] || mkdir $(INSTALLMAN)/man1
+        install -m 644 xdotool.1 $(INSTALLMAN)/man1/
+
+deinstall: uninstall
+uninstall: 
+        rm -f $(INSTALLBIN)/xdotool
+        rm -f $(INSTALLMAN)/man1/xdotool.1
+
 
 clean:
@@ -27 +53 @@
         gcc $(CFLAGS) $(LDFLAGS) xdotool.o xdo.o -o $@
 
+xdotool.1: xdotool.pod
+        pod2man -c "" -r "" xdotool.pod > $@
+
 package: test-package-build create-package
 
-create-package:
+create-package: xdotool.1
         @NAME=xdotool-`date +%Y%m%d`; \
         echo "Creating package: $$NAME"; \
         mkdir $${NAME}; \
-        rsync --exclude .svn -a `ls -d *.c *.1 *.h examples t COPYRIGHT CHANGELIST README Makefile* 2> /dev/null` $${NAME}/; \
+        rsync --exclude .svn -a `ls -d *.1 *.pod COPYRIGHT *.c *.h examples t CHANGELIST README Makefile* 2> /dev/null` $${NAME}/; \
         tar -zcf $${NAME}.tar.gz $${NAME}/; \
         rm -rf $${NAME}/

trunk/xdotool/README

@@ -31 +31 @@
       See 'xwininfo' output for what each of these are/mean.
 
-$Id: README 1515 2007-08-12 23:22:01Z psionic $ 
+$Id: README 1520 2007-08-12 23:51:17Z psionic $ 

trunk/xdotool/debian/changelog

@@ +1 @@
+xdotool (20080601-1) UNRELEASED; urgency=low
+
+  * (NOT RELEASED YET) New upstream release
+
+ -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>  Sun, 01 Jun 2008 23:23:27 -0400
+
 xdotool (20071230-3) UNRELEASED; urgency=low
 

trunk/xdotool/examples/ffsp.sh

@@ -1 +1 @@
 #!/bin/sh
-# On my workstation, this switches to desktop 2, clears the search bar, pastes
-# into the search bar, and presses enter. Hence searching for whatever lies in
-# my X clipboard.
+# Activate firefox and paste the clipboard contents into the url bar.
 
-xdotool key "alt+2"
+wid=`xdotool search --title "Mozilla Firefox"`
+xdotool windowactivate $wid
+sleep 0.2
 xdotool key "ctrl+j"
 xdotool key "BackSpace"
-xdotool mousemove 600 35
-xdotool click 2
+xdotool key "ctrl+v"
 xdotool key "Return"

trunk/xdotool/t/no_crashes_please.sh

@@ -43 +43 @@
 try $xdotool key "ctrl+w"
 
+try $xdotool windowactivate $wid
+
+try $xdotool get_num_desktops $wid
+desktops=`$xdotool get_num_desktops $wid`
+try $xdotool set_num_desktops $desktops
+
+cur_desktop=`$xdotool get_desktop`
+try $xdotool set_desktop $cur_desktop
+
+desktop=`$xdotool get_desktop_for_window $wid`
+try $xdotool set_desktop_for_window $wid $desktop
+
 #pkill -f xdotool_test_window
 kill $xterm_pid

trunk/xdotool/xdo.c

@@ -1 +1 @@
 /* xdo library
  *
- * $Id: xdo.c 1538 2007-09-04 06:00:24Z psionic $
+ * $Id: xdo.c 1878 2008-06-01 00:31:53Z jordansissel $
  *
  * - getwindowfocus contributed by Lee Pumphret
@@ -8 +8 @@
  */
 
+#define _XOPEN_SOURCE 500
 #include <sys/select.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include <regex.h>
@@ -38 +40 @@
 static int _xdo_regex_match_window(xdo_t *xdo, Window window, int flags, regex_t *re);
 static int _xdo_is_window_visible(xdo_t *xdo, Window wid);
+static unsigned char * _xdo_getwinprop(xdo_t *xdo, Window window, Atom atom,
+                                       long *nitems, Atom *type, int *size);
+static int _xdo_ewmh_is_supported(xdo_t *xdo, const char *feature);
 
 static int _is_success(const char *funcname, int code);
@@ -55 +60 @@
 }
 
-xdo_t* xdo_new_with_opened_display(Display *xdpy, const char *display, 
+xdo_t* xdo_new_with_opened_display(Display *xdpy, const char *display,
                                    int close_display_when_freed) {
   xdo_t *xdo = NULL;
@@ -120 +125 @@
 
   int ret, i;
+  int i;
 
   ret = regcomp(&re, regex, REG_EXTENDED | REG_ICASE);
@@ -133 +139 @@
     fprintf(stderr, "No text fields specified for regex search. \nDefaulting to"
             " window title, class, and name searching\n");
-    flags = SEARCH_TITLE | SEARCH_CLASS | SEARCH_NAME;
+    flags |= SEARCH_TITLE | SEARCH_CLASS | SEARCH_NAME;
   }
 
@@ -139 +145 @@
   *windowlist = malloc(matched_window_list_size * sizeof(Window));
 
-  _xdo_get_child_windows(xdo, XDefaultRootWindow(xdo->xdpy), 
+  _xdo_get_child_windows(xdo, RootWindow(xdo->xdpy, 0),
                          &total_window_list, &ntotal_windows,
                          &window_list_size);
@@ -146 +152 @@
     if (flags & SEARCH_VISIBLEONLY && !_xdo_is_window_visible(xdo, wid))
       continue;
-
     if (!_xdo_regex_match_window(xdo, wid, flags, &re))
       continue;
@@ -217 +222 @@
 }
 
+int xdo_window_activate(xdo_t *xdo, Window wid) {
+  int ret;
+  long desktop = 0;
+  XEvent xev;
+  XWindowAttributes wattr;
+
+  /* If this window is on another desktop, let's go to that desktop first */
+
+  if (_xdo_ewmh_is_supported(xdo, "_NET_WM_DESKTOP") == True
+      && _xdo_ewmh_is_supported(xdo, "_NET_CURRENT_DESKTOP") == True) {
+    xdo_get_desktop_for_window(xdo, wid, &desktop);
+    xdo_set_current_desktop(xdo, desktop);
+  }
+
+  memset(&xev, 0, sizeof(xev));
+  xev.type = ClientMessage;
+  xev.xclient.display = xdo->xdpy;
+  xev.xclient.window = wid;
+  xev.xclient.message_type = XInternAtom(xdo->xdpy, "_NET_ACTIVE_WINDOW", False);
+  xev.xclient.format = 32;
+  xev.xclient.data.l[0] = 2L; /* 2 == Message from a window pager */
+  xev.xclient.data.l[1] = CurrentTime;
+
+  XGetWindowAttributes(xdo->xdpy, wid, &wattr);
+  ret = XSendEvent(xdo->xdpy, wattr.screen->root, False,
+                   SubstructureNotifyMask | SubstructureRedirectMask,
+                   &xev);
+
+  /* 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);
+}
+
+int xdo_set_number_of_desktops(xdo_t *xdo, long ndesktops) {
+  /* XXX: This should support passing a screen number */
+  XEvent xev;
+  Window root;
+  int ret;
+
+  root = RootWindow(xdo->xdpy, 0);
+
+  memset(&xev, 0, sizeof(xev));
+  xev.type = ClientMessage;
+  xev.xclient.display = xdo->xdpy;
+  xev.xclient.window = root;
+  xev.xclient.message_type = XInternAtom(xdo->xdpy, "_NET_NUMBER_OF_DESKTOPS", 
+                                         False);
+  xev.xclient.format = 32;
+  xev.xclient.data.l[0] = ndesktops;
+
+  ret = XSendEvent(xdo->xdpy, root, False,
+                   SubstructureNotifyMask | SubstructureRedirectMask,
+                   &xev);
+
+  return _is_success("XSendEvent[EWMH:_NET_NUMBER_OF_DESKTOPS]", ret);
+}
+
+int xdo_get_number_of_desktops(xdo_t *xdo, long *ndesktops) {
+  Atom type;
+  int size;
+  long nitems;
+  unsigned char *data;
+  Window root;
+
+  Atom request;
+
+  request = XInternAtom(xdo->xdpy, "_NET_NUMBER_OF_DESKTOPS", False);
+  root = XDefaultRootWindow(xdo->xdpy);
+
+  data = _xdo_getwinprop(xdo, root, request, &nitems, &type, &size);
+
+  if (nitems > 0)
+    *ndesktops = *((long*)data);
+  else
+    *ndesktops = 0;
+
+  return _is_success("XGetWindowProperty[_NET_NUMBER_OF_DESKTOPS]",
+                     *ndesktops == 0);
+
+}
+
+int xdo_set_current_desktop(xdo_t *xdo, long desktop) {
+  /* XXX: This should support passing a screen number */
+  XEvent xev;
+  Window root;
+  int ret;
+
+  root = RootWindow(xdo->xdpy, 0);
+
+  memset(&xev, 0, sizeof(xev));
+  xev.type = ClientMessage;
+  xev.xclient.display = xdo->xdpy;
+  xev.xclient.window = root;
+  xev.xclient.message_type = XInternAtom(xdo->xdpy, "_NET_CURRENT_DESKTOP", 
+                                         False);
+  xev.xclient.format = 32;
+  xev.xclient.data.l[0] = desktop;
+  xev.xclient.data.l[1] = CurrentTime;
+
+  ret = XSendEvent(xdo->xdpy, root, False,
+                   SubstructureNotifyMask | SubstructureRedirectMask,
+                   &xev);
+
+  return _is_success("XSendEvent[EWMH:_NET_CURRENT_DESKTOP]", ret);
+}
+
+int xdo_get_current_desktop(xdo_t *xdo, long *desktop) {
+  Atom type;
+  int size;
+  long nitems;
+  unsigned char *data;
+  Window root;
+
+  Atom request;
+
+  request = XInternAtom(xdo->xdpy, "_NET_CURRENT_DESKTOP", False);
+  root = XDefaultRootWindow(xdo->xdpy);
+
+  data = _xdo_getwinprop(xdo, root, request, &nitems, &type, &size);
+
+  if (nitems > 0)
+    *desktop = *((long*)data);
+  else
+    *desktop = -1;
+
+  return _is_success("XGetWindowProperty[_NET_CURRENT_DESKTOP]",
+                     *desktop == -1);
+}
+
+int xdo_set_desktop_for_window(xdo_t *xdo, Window wid, long desktop) {
+  XEvent xev;
+  int ret;
+  XWindowAttributes wattr;
+  XGetWindowAttributes(xdo->xdpy, wid, &wattr);
+
+  memset(&xev, 0, sizeof(xev));
+  xev.type = ClientMessage;
+  xev.xclient.display = xdo->xdpy;
+  xev.xclient.window = wid;
+  xev.xclient.message_type = XInternAtom(xdo->xdpy, "_NET_WM_DESKTOP", 
+                                         False);
+  xev.xclient.format = 32;
+  xev.xclient.data.l[0] = desktop;
+  xev.xclient.data.l[1] = 2; /* indicate we are messaging from a pager */
+
+  ret = XSendEvent(xdo->xdpy, wattr.screen->root, False,
+                   SubstructureNotifyMask | SubstructureRedirectMask,
+                   &xev);
+
+  return _is_success("XSendEvent[EWMH:_NET_WM_DESKTOP]", ret);
+}
+
+int xdo_get_desktop_for_window(xdo_t *xdo, Window wid, long *desktop) {
+  Atom type;
+  int size;
+  long nitems;
+  unsigned char *data;
+
+  Atom request;
+
+  request = XInternAtom(xdo->xdpy, "_NET_WM_DESKTOP", False);
+
+  data = _xdo_getwinprop(xdo, wid, request, &nitems, &type, &size);
+
+  if (nitems > 0)
+    *desktop = *((long*)data);
+  else
+    *desktop = -1;
+
+  return _is_success("XGetWindowProperty[_NET_WM_DESKTOP]",
+                     *desktop == -1);
+}
+
 /* XRaiseWindow is ignored in ion3 and Gnome2. Is it even useful? */
 int xdo_window_raise(xdo_t *xdo, Window wid) {
@@ -295 +473 @@
   uint nkeys;
   uint i;
+  int i;
 
   if (_xdo_keysequence_to_keycode_list(xdo, keyseq, &keys, &nkeys) == False) {
@@ -325 +504 @@
 }
 
-
 /* Add by Lee Pumphret 2007-07-28
  * Modified slightly by Jordan Sissel */
@@ -334 +512 @@
   return _is_success("XGetInputFocus", ret);
 }
-
 
 /* Helper functions */
@@ -391 +568 @@
      * hence this little loop. */
     for (j = 0; j <= 1; j++) { 
-     int ix = (i - xdo->keycode_low) * 2 + j;
+     int idx = (i - xdo->keycode_low) * 2 + j;
      keybuf = XKeysymToString(XKeycodeToKeysym(xdo->xdpy, i, j));
 
-     xdo->charcodes[ix].key = _keysym_to_char(keybuf);
-     xdo->charcodes[ix].code = i;
-     xdo->charcodes[ix].shift = j ? shift_keycode : 0;
+     xdo->charcodes[idx].key = _keysym_to_char(keybuf);
+     xdo->charcodes[idx].code = i;
+     xdo->charcodes[idx].shift = j ? shift_keycode : 0;
     }
   }
@@ -427 +604 @@
                                    int *window_list_size) {
   Window dummy;
+<<<<<<< .working
   uint i;
+=======
+>>>>>>> .merge-right.r1078
   Window *children;
-  unsigned int nchildren;
+  unsigned int i, nchildren;
 
   if (*window_list_size == 0) {
@@ -566 +746 @@
     fprintf(stderr, "%s failed: got bad window\n", funcname);
     return False;
+  } else if (code != 1) {
+    fprintf(stderr, "%s failed (code=%d)\n", funcname, code);
+    return False;
   }
 
@@ -581 +764 @@
 }
 
-/* main test */
-#ifdef BUILDMAIN
-int main(int argc, char **argv) {
-  char *display_name;
-  xdo_t *xdo;
-
-  char *yay;
-
-  if ( (display_name = getenv("DISPLAY")) == (void *)NULL) {
-    fprintf(stderr, "Error: DISPLAY environment variable not set\n");
-    exit(1);
-  }
-
+/* Arbitrary window property retrieval
+ * slightly modified version from xprop.c from Xorg */
+unsigned char * _xdo_getwinprop(xdo_t *xdo, Window window, Atom atom,
+                                long *nitems, Atom *type, int *size) {
+  Atom actual_type;
+  int actual_format;
+  unsigned long _nitems;
+  unsigned long nbytes;
+  unsigned long bytes_after; /* unused */
+  unsigned char *prop;
+  int status;
+
+  status = XGetWindowProperty(xdo->xdpy, window, atom, 0, (~0L),
+                              False, AnyPropertyType, &actual_type,
+                              &actual_format, &_nitems, &bytes_after,
+                              &prop);
+  if (status == BadWindow) {
+    fprintf(stderr, "window id # 0x%lx does not exists!", window);
+    return NULL;
+  } if (status != Success) {
+    fprintf(stderr, "XGetWindowProperty failed!");
+    return NULL;
+  }
+
+<<<<<<< .working
   /* yay = strdup("ctrl+l"); */
-
+=======
+  if (actual_format == 32)
+    nbytes = sizeof(long);
+  else if (actual_format == 16)
+    nbytes = sizeof(short);
+  else if (actual_format == 8)
+    nbytes = 1;
+  else if (actual_format == 0)
+    nbytes = 0;
+>>>>>>> .merge-right.r1078
+
+<<<<<<< .working
   xdo = xdo_new(display_name);
 /*   xdo_mousemove(xdo, 100, 100); */
@@ -602 +808 @@
 /*   xdo_type(xdo, strdup("ls")); */
 /*   xdo_keysequence(xdo, strdup("Return")); */
-
+=======
+  *nitems = _nitems;
+  *type = actual_type;
+  *size = actual_format;
+  return prop;
+}
+>>>>>>> .merge-right.r1078
+
+int _xdo_ewmh_is_supported(xdo_t *xdo, const char *feature) {
+  Atom type = 0;
+  long nitems = 0L;
+  int size = 0;
+  Atom *results = NULL;
+  long i = 0;
+
+  Window root;
+  Atom request;
+  Atom feature_atom;
   
-  Window *list;
-  int nwindows;
-  char *query = "xterm";
-  int i;
-  if (argc > 1)
-    query = argv[1];
-
-  xdo_window_list_by_regex(xdo, query, &list, &nwindows);
-  for (i = 0; i < nwindows; i++) {
-    printf("%d\n", list[i]);
-  }
-  xdo_free(xdo);
-
-  return 0;
-}
-#endif
-
+  request = XInternAtom(xdo->xdpy, "_NET_SUPPORTED", False);
+  feature_atom = XInternAtom(xdo->xdpy, feature, False);
+  root = RootWindow(xdo->xdpy, 0);
+
+  results = (Atom *) _xdo_getwinprop(xdo, root, request, &nitems, &type, &size);
+  for (i = 0L; i < nitems; i++) {
+    if (results[i] == feature_atom)
+      return True;
+  }
+
+  return False;
+}

trunk/xdotool/xdo.h

@@ -3 +3 @@
  * - include this if you have code that uses xdo
  *
- * $Id: xdo.h 1538 2007-09-04 06:00:24Z psionic $
+ * $Id: xdo.h 1876 2008-05-31 10:54:25Z jordansissel $
  */
 
@@ -13 +13 @@
 #define SEARCH_NAME (1L << 3)
 
+#define SEARCH_IGNORE_TRANSIENTS (1L << 4)
+#define SEARCH_IGNORE_WINDOW_INPUTONLY (1L << 5)
+
 #define SIZE_USEHINTS (1L << 0)
 
@@ -18 +21 @@
 typedef struct keysymcharmap {
   const char *keysym;
-  const char key;
+  char key;
 } keysymcharmap_t;
 
@@ -37 +40 @@
   int close_display_when_freed;
 } xdo_t;
-
 
 xdo_t* xdo_new(char *display);
@@ -61 +63 @@
 int xdo_window_raise(xdo_t *xdo, Window wid);
 int xdo_window_get_focus(xdo_t *xdo, Window *window_ret);
+int xdo_window_activate(xdo_t *xdo, Window wid);
 
 int xdo_window_map(xdo_t *xdo, Window wid);
 int xdo_window_unmap(xdo_t *xdo, Window wid);
 
+/* pager-like behaviors */
+int xdo_set_number_of_desktops(xdo_t *xdo, long ndesktops);
+int xdo_get_number_of_desktops(xdo_t *xdo, long *ndesktops);
+int xdo_set_current_desktop(xdo_t *xdo, long desktop);
+int xdo_get_current_desktop(xdo_t *xdo, long *desktop);
+int xdo_set_desktop_for_window(xdo_t *xdo, Window wid, long desktop);
+int xdo_get_desktop_for_window(xdo_t *xdo, Window wid, long *desktop);
+
 /* Returns: windowlist and nwindows */
 void xdo_window_list_by_regex(xdo_t *xdo, char *regex, int flags,

trunk/xdotool/xdo_util.h

@@ -1 +1 @@
 /* xdo utility pieces 
  *
- * $Id: xdo_util.h 1487 2007-07-22 08:37:07Z psionic $
+ * $Id: xdo_util.h 1854 2008-05-21 07:23:29Z jordansissel $
  */
 

trunk/xdotool/xdotool.c

@@ -3 +3 @@
  * command line interface to the xdo library
  *
- * $Id: xdotool.c 1538 2007-09-04 06:00:24Z psionic $
+ * $Id: xdotool.c 1880 2008-06-01 07:23:14Z jordansissel $
  *
  * getwindowfocus contributed by Lee Pumphret
@@ -15 +15 @@
 #include <getopt.h>
 #include <string.h>
+#include <strings.h>
+
 
 #include "xdo.h"
@@ -28 +30 @@
 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_windowmap(int argc, char **args);
 void cmd_windowmove(int argc, char **args);
@@ -35 +37 @@
 void cmd_windowsize(int argc, char **args);
 void cmd_windowunmap(int argc, char **args);
-void 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);
 
 xdo_t *xdo;
+void window_print(Window wid);
 
 struct dispatch {
@@ -47 +57 @@
   { "search", cmd_search, },
 
+  /* Help me! */
   { "help", cmd_help, },
   { "-h", cmd_help, },
@@ -60 +71 @@
   { "mouseup", cmd_mouseup, },
   { "type", cmd_type, },
+  { "windowactivate", cmd_windowactivate, },
   { "windowfocus", cmd_windowfocus, },
   { "windowmap", cmd_windowmap, },
@@ -66 +78 @@
   { "windowsize", cmd_windowsize, },
   { "windowunmap", cmd_windowunmap, },
+
+  { "set_num_desktops", cmd_set_num_desktops, },
+  { "get_num_desktops", cmd_get_num_desktops, },
+  { "set_desktop", cmd_set_desktop, },
+  { "get_desktop", cmd_get_desktop, },
+  { "set_desktop_for_window", cmd_set_desktop_for_window, },
+  { "get_desktop_for_window", cmd_get_desktop_for_window, },
   { NULL, NULL, },
 };
@@ -97 +116 @@
   xdo_free(xdo);
   return 0;
+}
+
+void window_print(Window wid) {
+  /* Window is XID is 'unsigned long' or CARD32 */
+  printf("%ld\n", wid);
 }
 
@@ -114 +138 @@
 void cmd_mousemove(int argc, char **args) {
   int x, y;
-  char *cmd = *args;
-  argc -= 1;
-  args++;
+  char *cmd = *args; argc--; args++;
 
   if (argc != 2) {
@@ -134 +156 @@
 void cmd_mousemove_relative(int argc, char **args) {
   int x, y;
-  char *cmd = *args;
-  argc -= 1;
-  args++;
+  char *cmd = *args; argc--; args++;
 
   if (argc != 2) {
@@ -154 +174 @@
 void cmd_mousedown(int argc, char **args) {
   uint button;
-  char *cmd = *args;
-  argc -= 1;
-  args++;
+  char *cmd = *args; argc--; args++;
 
   if (argc != 1) {
@@ -173 +191 @@
 void cmd_mouseup(int argc, char **args) {
   uint button;
-  char *cmd = *args;
-  argc -= 1;
-  args++;
+  char *cmd = *args; argc--; args++;
 
   if (argc != 1) {
@@ -197 +213 @@
 void cmd_type(int argc, char **args) {
   int i;
-  char *cmd = *args;
-  argc -= 1;
-  args++;
+  char *cmd = *args; argc--; args++;
 
   if (argc == 0) {
@@ -216 +230 @@
 void cmd_key(int argc, char **args) {
   int i;
-  char *cmd = *args;
-  int (*func)(xdo_t *, char *) = NULL;
-
-  argc -= 1;
-  args++;
+  char *cmd = *args; argc--; args++;
 
   if (argc == 0) {
@@ -248 +258 @@
   int x, y;
   Window wid;
-  char *cmd = *args;
-  argc -= 1;
-  args++;
+  char *cmd = *args; argc--; args++;
 
   if (argc != 3) {
@@ -257 +265 @@
   }
 
-  wid = (int)strtol(args[0], NULL, 0);
+  wid = (Window)strtol(args[0], NULL, 0);
   x = (int)strtol(args[1], NULL, 0);
   y = (int)strtol(args[2], NULL, 0);
@@ -266 +274 @@
 }
 
+void cmd_windowactivate(int argc, char **args) {
+  Window wid;
+  char *cmd = *args; argc--; args++;
+
+  if (argc != 1) {
+    printf("usage: %s wid\n", cmd);
+    return;
+  }
+
+  wid = (Window)strtol(args[0], NULL, 0);
+  if (!xdo_window_activate(xdo, wid)) {
+    fprintf(stderr, "xdo_window_activate reported an error\n");
+    return;
+  }
+
+}
+
 void cmd_windowfocus(int argc, char **args) {
   Window wid;
-  char *cmd = *args;
-  argc -= 1;
-  args++;
+  char *cmd = *args; argc--; args++;
 
   if (argc != 1) {
@@ -277 +300 @@
   }
 
-  wid = (int)strtol(args[0], NULL, 0);
+  wid = (Window)strtol(args[0], NULL, 0);
   if (!xdo_window_focus(xdo, wid)) {
     fprintf(stderr, "xdo_window_focus reported an error\n");
@@ -285 +308 @@
 void cmd_windowraise(int argc, char **args) {
   Window wid;
-  char *cmd = *args;
-  argc -= 1;
-  args++;
+  char *cmd = *args; argc--; args++;
 
   if (argc != 1) {
@@ -294 +315 @@
   }
 
-  wid = (int)strtol(args[0], NULL, 0);
+  wid = (Window)strtol(args[0], NULL, 0);
   if (!xdo_window_raise(xdo, wid)) {
     fprintf(stderr, "xdo_window_raise reported an error\n");
@@ -334 +355 @@
   }
 
-  wid = (int)strtol(args[0], NULL, 0);
+  wid = (Window)strtol(args[0], NULL, 0);
   width = (int)strtol(args[1], NULL, 0);
   height = (int)strtol(args[2], NULL, 0);
@@ -402 +423 @@
 
   xdo_window_list_by_regex(xdo, *args, search_flags, &list, &nwindows);
-  /* XXX: We shouldn't assume 'Window' == 'int' here... */
   for (i = 0; i < nwindows; i++)
-    printf("%d\n", (int)list[i]);
+    window_print(list[i]);
 
   /* Free list as it's malloc'd by xdo_window_list_by_regex */
@@ -412 +432 @@
 /* Added 2007-07-28 - Lee Pumphret */
 void cmd_getwindowfocus(int argc, char **args) {
-  Window window = (Window)(-1);
-  char *cmd = *args;
-  argc -= 1;
-  args++;
+  Window wid = 0;
+  char *cmd = *args; argc--; args++;
 
   if (argc != 0) {
@@ -422 +440 @@
   }
 
-  if (!xdo_window_get_focus(xdo, &window)) {
+  if (!xdo_window_get_focus(xdo, &wid)) {
     fprintf(stderr, "xdo_window_focus reported an error\n");
   } else {
-    printf("%d\n", (int)window);
+    window_print(wid);
   }
 }
@@ -431 +449 @@
 void cmd_windowmap(int argc, char **args) {
   Window wid;
-  char *cmd = *args;
-  argc -= 1;
-  args++;
+  char *cmd = *args; argc--; args++;
 
   if (argc != 1) {
@@ -440 +456 @@
   }
 
-  wid = (int)strtol(args[0], NULL, 0);
+  wid = (Window)strtol(args[0], NULL, 0);
   if (!xdo_window_map(xdo, wid)) {
     fprintf(stderr, "xdo_window_map reported an error\n");
@@ -448 +464 @@
 void cmd_windowunmap(int argc, char **args) {
   Window wid;
-  char *cmd = *args;
-  argc -= 1;
-  args++;
+  char *cmd = *args; argc--; args++;
 
   if (argc != 1) {
@@ -457 +471 @@
   }
 
-  wid = (int)strtol(args[0], NULL, 0);
+  wid = (Window)strtol(args[0], NULL, 0);
   if (!xdo_window_unmap(xdo, wid)) {
     fprintf(stderr, "xdo_window_unmap reported an error\n");
   }
 }
+
+void cmd_set_num_desktops(int argc, char **args) {
+  char *cmd = *args; argc--; args++;
+  long ndesktops;
+
+  if (argc != 1) {
+    printf("usage: %s num_desktops\n", cmd);
+    return;
+  }
+
+  ndesktops = strtol(args[0], NULL, 0);
+
+  xdo_set_number_of_desktops(xdo, ndesktops);
+}
+
+void cmd_get_num_desktops(int argc, char **args) {
+  char *cmd = *args; argc--; args++;
+  long ndesktops = 0;
+
+  if (argc != 0) {
+    printf("usage: %s\n", cmd);
+    return;
+  }
+
+  xdo_get_number_of_desktops(xdo, &ndesktops);
+
+  printf("%ld\n", ndesktops);
+}
+
+void cmd_set_desktop(int argc, char **args) {
+  char *cmd = *args; argc--; args++;
+  long desktop;
+
+  if (argc != 1) {
+    printf("usage: %s desktop\n", cmd);
+    return;
+  }
+
+  desktop = strtol(args[0], NULL, 0);
+
+  xdo_set_current_desktop(xdo, desktop);
+}
+
+void cmd_get_desktop(int argc, char **args) {
+  char *cmd = *args; argc--; args++;
+  long desktop = 0;
+
+  if (argc != 0) {
+    printf("usage: %s\n", cmd);
+    return;
+  }
+
+  xdo_get_current_desktop(xdo, &desktop);
+
+  printf("%ld\n", desktop);
+}
+
+void cmd_set_desktop_for_window(int argc, char **args) {
+  char *cmd = *args; argc--; args++;
+  long desktop = 0;
+  Window window = 0;
+
+  if (argc != 2) {
+    printf("usage: %s <window> <desktop>\n", cmd);
+    return;
+  }
+
+  window = (Window)strtol(args[0], NULL, 0);
+  desktop = strtol(args[1], NULL, 0);
+
+  xdo_set_desktop_for_window(xdo, window, desktop);
+}
+
+void cmd_get_desktop_for_window(int argc, char **args) {
+  char *cmd = *args; argc--; args++;
+  long desktop = 0;
+  Window window = 0;
+
+  if (argc != 1) {
+    printf("usage: %s <window>\n", cmd);
+    return;
+  }
+
+  window = (Window)strtol(args[0], NULL, 0);
+
+  xdo_get_desktop_for_window(xdo, window, &desktop);
+  printf("%ld\n", desktop);
+}