Changeset 1250

Timestamp:

Mar 31, 2009, 12:37:37 AM (9 years ago)

Author:

Daniel Kahn Gillmor

Message:

xdotool: merging new upstream version 20090126.

Location:

trunk/xdotool

Files:

• CHANGELIST (modified) (1 diff)
• Makefile (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• xdo.c (modified) (13 diffs)
• xdo.h (modified) (2 diffs)
• xdotool.c (modified) (17 diffs)
• xdotool.pod (modified) (1 diff)

trunk/xdotool/CHANGELIST

@@ +1 @@
+20090126:
+  * Change the default behavior of 'getwindowfocus' to get the first
+    ancestor-or-self window that has WM_CLASS set. WM_CLASS will be set on
+    (all?) top-level windows and it's possible that the currently focused window
+    according to X is not a top-level window. To use the previous behavior, use
+    'getwindowfocus -f'
+  * Make 'xdotool key at' work correctly. 'at' is usually Shift+2, for example.
+    Now all shifted characters should work, but I've only tested on a US
+    keyboard.
+  * Minor Makefile fixes for package maintainers.
+
 20080720:
   * Add 'getmouselocation' which ouputs the coordinate of the mouse cursor and

trunk/xdotool/Makefile

@@ -1 +1 @@
 PREFIX?=/usr/local
-INSTALLBIN=$(PREFIX)/bin
-INSTALLMAN=$(PREFIX)/man
+INSTALLBIN?=$(PREFIX)/bin
+INSTALLMAN?=$(PREFIX)/man
 
 WARNFLAGS+=-pedantic -Wall -W -Wundef \

trunk/xdotool/debian/changelog

@@ -1 @@
-xdotool (20080720-2~pre1) UNRELEASED; urgency=low
+xdotool (20090126-1~pre1) UNRELEASED; urgency=low
 
+  * (NOT RELEASED YET) New upstream release
   * updated my e-mail address
 
- -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Tue, 06 Jan 2009 11:23:33 -0500
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Tue, 31 Mar 2009 00:35:06 -0400
 
 xdotool (20080720-1) unstable; urgency=low

trunk/xdotool/xdo.c

@@ -1 +1 @@
 /* xdo library
  *
- * $Id: xdo.c 1954 2008-07-16 23:21:28Z jordansissel $
+ * $Id: xdo.c 2158 2009-01-26 11:05:03Z jordansissel $
  *
  * - getwindowfocus contributed by Lee Pumphret
@@ -36 +36 @@
                                    int *window_list_size);
 
-static int _xdo_keysequence_to_keycode_list(xdo_t *xdo, char *keyseq, int **keys, int *nkeys);
+static int _xdo_keysequence_to_keycode_list(xdo_t *xdo, char *keyseq,
+                                            charcodemap_t **keys, int *nkeys);
 static int _xdo_keysequence_do(xdo_t *xdo, char *keyseq, int pressed);
 static int _xdo_regex_match_window(xdo_t *xdo, Window window, int flags, regex_t *re);
@@ -47 +48 @@
 
 /* context-free functions */
-char _keysym_to_char(char *keysym);
+static char _keysym_to_char(const char *keysym);
 
 xdo_t* xdo_new(char *display_name) {
@@ -562 +563 @@
     shiftcode = _xdo_get_shiftcode_if_needed(xdo, key);
 
-    if (shiftcode)
+    if (shiftcode > 0)
       XTestFakeKeyEvent(xdo->xdpy, shiftcode, True, CurrentTime);
     XTestFakeKeyEvent(xdo->xdpy, keycode, True, CurrentTime);
     XTestFakeKeyEvent(xdo->xdpy, keycode, False, CurrentTime);
-    if (shiftcode)
+    if (shiftcode > 0)
       XTestFakeKeyEvent(xdo->xdpy, shiftcode, False, CurrentTime);
 
@@ -578 +579 @@
 int _xdo_keysequence_do(xdo_t *xdo, char *keyseq, int pressed) {
   int ret = 0;
-  int *keys = NULL;
-  int nkeys;
+  charcodemap_t *keys = NULL;
+  int nkeys = 0;
   int i;
+  KeyCode shiftcode;
 
   if (_xdo_keysequence_to_keycode_list(xdo, keyseq, &keys, &nkeys) == False) {
@@ -587 +589 @@
   }
 
+  /* If shiftcode is necessary, send shift before the key if pressed is true,
+   * otherwise release the shift key after the key is released */
   for (i = 0; i < nkeys; i++) {
-    ret += !XTestFakeKeyEvent(xdo->xdpy, keys[i], pressed, CurrentTime);
+    shiftcode = keys[i].shift;
+
+    if (pressed > 0 && shiftcode)
+      ret += !XTestFakeKeyEvent(xdo->xdpy, shiftcode, pressed, CurrentTime);
+
+    ret += !XTestFakeKeyEvent(xdo->xdpy, keys[i].code, pressed, CurrentTime);
+
+    if (pressed == 0 && shiftcode)
+      ret += !XTestFakeKeyEvent(xdo->xdpy, shiftcode, pressed, CurrentTime);
   }
 
@@ -616 +628 @@
   int ret = 0;
   int unused_revert_ret;
+
   ret = XGetInputFocus(xdo->xdpy, window_ret, &unused_revert_ret);
   return _is_success("XGetInputFocus", ret == 0);
+}
+
+/* Like xdo_window_get_focus, but return the first ancestor-or-self window
+ * having a property of WM_CLASS. This allows you to get the "real" or
+ * top-level-ish window having focus rather than something you may
+ * not expect to be the window having focused. */
+int xdo_window_sane_get_focus(xdo_t *xdo, Window *window_ret) {
+  int done = 0;
+  Window w;
+  XClassHint classhint;
+
+  /* for XQueryTree */
+  Window dummy, parent, *children = NULL;
+  unsigned int nchildren;
+
+  xdo_window_get_focus(xdo, &w);
+
+  while (!done) {
+    Status s;
+    s = XGetClassHint(xdo->xdpy, w, &classhint);
+    //fprintf(stderr, "%d\n", s);
+
+    if (s == 0) {
+      /* Error. This window doesn't have a class hint */
+      //fprintf(stderr, "no class on: %d\n", w);
+      XQueryTree(xdo->xdpy, w, &dummy, &parent, &children, &nchildren);
+
+      /* Don't care about the children, but we still need to free them */
+      if (children != NULL)
+        XFree(children);
+      //fprintf(stderr, "parent: %d\n", parent);
+      w = parent;
+    } else {
+      /* Must XFree the class and name items. */
+      XFree(classhint.res_class);
+      XFree(classhint.res_name);
+
+      done = 1;
+    }
+  }
+
+  *window_ret = w;
+  return _is_success("xdo_window_sane_get_focus", w == 0);
 }
 
@@ -685 +741 @@
 
 /* context-free functions */
-char _keysym_to_char(char *keysym) {
+char _keysym_to_char(const char *keysym) {
   int i;
 
@@ -719 +775 @@
   }
 
-  /* foo */
   if (!XQueryTree(xdo->xdpy, window, &dummy, &dummy, &children, &nchildren))
     return;
@@ -739 +794 @@
 }
 
-int _xdo_keysequence_to_keycode_list(xdo_t *xdo, char *keyseq, int **keys, int *nkeys) {
+int _xdo_keysequence_to_keycode_list(xdo_t *xdo, char *keyseq,
+                                     charcodemap_t **keys, int *nkeys) {
   char *tokctx = NULL;
   const char *tok = NULL;
   char *strptr = NULL;
   int i;
+  KeyCode shift_keycode;
   
   /* Array of keys to press, in order given by keyseq */
@@ -754 +811 @@
   }
 
-  *keys = malloc(keys_size * sizeof(int));
+  shift_keycode = XKeysymToKeycode(xdo->xdpy, XStringToKeysym("Shift_L"));
+
+  *keys = malloc(keys_size * sizeof(KeyCode));
   strptr = strdup(keyseq);
   while ((tok = strtok_r(strptr, "+", &tokctx)) != NULL) {
-    int keysym;
+    KeySym sym;
+    KeyCode key;
+
     if (strptr != NULL)
       strptr = NULL;
@@ -767 +828 @@
         tok = symbol_map[i + 1];
 
-    keysym = XStringToKeysym(tok);
-    if (keysym == NoSymbol) {
+    sym = XStringToKeysym(tok);
+    if (sym == NoSymbol) {
       fprintf(stderr, "(symbol) No such key name '%s'. Ignoring it.\n", tok);
       continue;
     }
 
-    (*keys)[*nkeys] = XKeysymToKeycode(xdo->xdpy, keysym);
-
-    if ((*keys)[*nkeys] == 0) {
+    key = XKeysymToKeycode(xdo->xdpy, sym);
+    (*keys)[*nkeys].code = key;
+    if (XKeycodeToKeysym(xdo->xdpy, key, 0) == sym) {
+      (*keys)[*nkeys].shift = 0;
+    } else  {
+      (*keys)[*nkeys].shift = shift_keycode;
+    }
+
+    if ((*keys)[*nkeys].code == 0) {
       fprintf(stderr, "No such key '%s'. Ignoring it.\n", tok);
       continue;
@@ -783 +850 @@
     if (*nkeys == keys_size) {
       keys_size *= 2;
-      *keys = realloc(*keys, keys_size);
+      *keys = realloc(*keys, keys_size * sizeof(KeyCode));
     }
   }

trunk/xdotool/xdo.h

@@ -3 +3 @@
  * - include this if you have code that uses xdo
  *
- * $Id: xdo.h 1947 2008-06-16 03:41:25Z jordansissel $
+ * $Id: xdo.h 2158 2009-01-26 11:05:03Z jordansissel $
  */
 
@@ -64 +64 @@
 int xdo_window_raise(xdo_t *xdo, Window wid);
 int xdo_window_get_focus(xdo_t *xdo, Window *window_ret);
+int xdo_window_sane_get_focus(xdo_t *xdo, Window *window_ret);
 int xdo_window_activate(xdo_t *xdo, Window wid);
 

trunk/xdotool/xdotool.c

@@ -3 +3 @@
  * command line interface to the xdo library
  *
- * $Id: xdotool.c 1956 2008-07-20 20:40:17Z jordansissel $
+ * $Id: xdotool.c 2158 2009-01-26 11:05:03Z jordansissel $
  *
  * getwindowfocus contributed by Lee Pumphret
@@ -137 +137 @@
 }
 
-int cmd_help(int argc, char **args) {
+int cmd_help(int unused_argc, char **unused_args) {
   int i;
   printf("Available commands:\n");
@@ -325 +325 @@
 
   if (argc != 3) {
-    printf("usage: %s wid x y\n", cmd);
+    fprintf(stderr, "usage: %s wid x y\n", cmd);
     return 1;
   }
@@ -346 +346 @@
 
   if (argc != 1) {
-    printf("usage: %s wid\n", cmd);
+    fprintf(stderr, "usage: %s wid\n", cmd);
     return 1;
   }
@@ -365 +365 @@
 
   if (argc != 1) {
-    printf("usage: %s wid\n", cmd);
+    fprintf(stderr, "usage: %s wid\n", cmd);
     return 1;
   }
@@ -383 +383 @@
 
   if (argc != 1) {
-    printf("usage: %s wid\n", cmd);
+    fprintf(stderr, "usage: %s wid\n", cmd);
     return 1;
    }
@@ -426 +426 @@
 
   if (argc != 3) {
-    printf("usage: %s wid width height\n", cmd);
+    fprintf(stderr, "usage: %s wid width height\n", cmd);
     return 1;
   }
@@ -515 +515 @@
   char *cmd = *args; argc--; args++;
 
-  if (argc != 0) {
-    printf("usage: %s\n", cmd);
-    return 1;
-  }
-
-  ret = xdo_window_get_focus(xdo, &wid);
+  if (argc > 1) {
+    fprintf(stderr, "usage: %s -f\n", cmd);
+    return 1;
+  }
+
+  if (argc == 1) {
+    if (!strcmp(args[0], "-f")) { /* -f was given */
+      ret = xdo_window_get_focus(xdo, &wid);
+    } else {
+      fprintf(stderr, "usage: %s -f\n", cmd);
+    }
+  } else {
+    /* No '-f' flag given, assume sane mode */
+    ret = xdo_window_sane_get_focus(xdo, &wid);
+  }
 
   if (ret) {
@@ -537 +546 @@
 
   if (argc != 0) {
-    printf("usage: %s\n", cmd);
+    fprintf(stderr, "usage: %s\n", cmd);
     return 1;
   }
@@ -548 +557 @@
     window_print(wid);
   }
+
+  return ret;
 }
 
@@ -574 +585 @@
 
   if (argc != 1) {
-    printf("usage: %s wid\n", cmd);
+    fprintf(stderr, "usage: %s wid\n", cmd);
     return 1;
   }
@@ -591 +602 @@
 
   if (argc != 1) {
-    printf("usage: %s num_desktops\n", cmd);
+    fprintf(stderr, "usage: %s num_desktops\n", cmd);
     return 1;
   }
@@ -606 +617 @@
 
   if (argc != 0) {
-    printf("usage: %s\n", cmd);
+    fprintf(stderr, "usage: %s\n", cmd);
     return 1;
   }
@@ -621 +632 @@
 
   if (argc != 1) {
-    printf("usage: %s desktop\n", cmd);
+    fprintf(stderr, "usage: %s desktop\n", cmd);
     return 1;
   }
@@ -636 +647 @@
 
   if (argc != 0) {
-    printf("usage: %s\n", cmd);
+    fprintf(stderr, "usage: %s\n", cmd);
     return 1;
   }
@@ -651 +662 @@
 
   if (argc != 2) {
-    printf("usage: %s <window> <desktop>\n", cmd);
+    fprintf(stderr, "usage: %s <window> <desktop>\n", cmd);
     return 1;
   }
@@ -668 +679 @@
 
   if (argc != 1) {
-    printf("usage: %s <window>\n", cmd);
+    fprintf(stderr, "usage: %s <window>\n", cmd);
     return 1;
   }

trunk/xdotool/xdotool.pod

@@ -103 +103 @@
 The default options are C<--title --name --class>
 
-=item B<getwindowfocus>
-
-Prints the window id of the currently focused window
+=item B<getwindowfocus> [-f]
+
+Prints the window id of the currently focused window. 
+
+If the current window has no WM_CLASS property, we assume it is not a normal
+top-level window and traverse up the parents until we find a window with a
+WM_CLASS set and return that window id.
+
+If you really want the window currently having focus and don't care if it has a
+WM_CLASS setting, then use 'getwindowfocus -f'
 
 =item B<windowsize> [options] windowid width height