Changeset 1080

Timestamp:

Jun 1, 2008 11:42:03 PM (5 years ago)

Author:

dkg

Message:

xdotool: reverting to upstream sources -- changes do not appear needed

Location:

trunk/xdotool

Files:

• xdo.c (modified) (20 diffs)
• xdo.h (modified) (2 diffs)
• xdotool.c (modified) (4 diffs)

trunk/xdotool/xdo.c

@@ -28 +28 @@
 static int _xdo_has_xtest(xdo_t *xdo);
 
-static KeyCode _xdo_keycode_from_char(xdo_t *xdo, char key);
+static int _xdo_keycode_from_char(xdo_t *xdo, char key);
 static int _xdo_get_shiftcode_if_needed(xdo_t *xdo, char key);
 
@@ -36 +36 @@
                                    int *window_list_size);
 
-static int _xdo_keysequence_to_keycode_list(xdo_t *xdo, char *keyseq, uint **keys, uint *nkeys);
+static int _xdo_keysequence_to_keycode_list(xdo_t *xdo, char *keyseq, int **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);
@@ -124 +124 @@
   int matched_window_list_size = 100;
 
-  int ret, i;
+  int ret;
   int i;
 
@@ -181 +181 @@
   XWindowChanges wc;
   int ret;
-  uint cw_flags = 0;
+  int cw_flags = 0;
 
   wc.width = width;
@@ -418 +418 @@
 }
 
-int xdo_mousedown(xdo_t *xdo, uint button) {
+int xdo_mousedown(xdo_t *xdo, int button) {
   int ret;
   ret = XTestFakeButtonEvent(xdo->xdpy, button, True, CurrentTime);
@@ -425 +425 @@
 }
 
-int xdo_mouseup(xdo_t *xdo, uint button) {
+int xdo_mouseup(xdo_t *xdo, int button) {
   int ret;
   ret = XTestFakeButtonEvent(xdo->xdpy, button, False, CurrentTime);
@@ -432 +432 @@
 }
 
-int xdo_click(xdo_t *xdo, uint button) {
+int xdo_click(xdo_t *xdo, int button) {
   int ret;
   ret = xdo_mousedown(xdo, button);
@@ -447 +447 @@
   int i = 0;
   char key = '0';
-  KeyCode keycode = 0;
-  uint shiftcode = 0;
+  int keycode = 0;
+  int shiftcode = 0;
 
   for (i = 0; string[i] != '\0'; i++) {
@@ -470 +470 @@
 
 int _xdo_keysequence_do(xdo_t *xdo, char *keyseq, int pressed) {
-  uint *keys = NULL;
-  uint nkeys;
-  uint i;
+  int *keys = NULL;
+  int nkeys;
   int i;
 
@@ -481 +480 @@
 
   for (i = 0; i < nkeys; i++) {
-    /* fprintf(stderr, "Typing %d (%d)\n", keys[i], pressed); */
+    //fprintf(stderr, "Typing %d (%d)\n", keys[i], pressed);
     XTestFakeKeyEvent(xdo->xdpy, keys[i], pressed, CurrentTime);
   }
@@ -514 +513 @@
 
 /* Helper functions */
-static KeyCode _xdo_keycode_from_char(xdo_t *xdo, char key) {
+static int _xdo_keycode_from_char(xdo_t *xdo, char key) {
   int i = 0;
   int len = xdo->keycode_high - xdo->keycode_low;
@@ -522 +521 @@
       return xdo->charcodes[i].code;
 
-  return (KeyCode)-1;
+  return -1;
 }
 
@@ -545 +544 @@
   int keycodes_length = 0;
   int shift_keycode = 0;
-  KeyCode i;
-  int j;
+  int i, j;
 
   XDisplayKeycodes(xdo->xdpy, &(xdo->keycode_low), &(xdo->keycode_high));
@@ -604 +602 @@
                                    int *window_list_size) {
   Window dummy;
-<<<<<<< .working
-  uint i;
-=======
->>>>>>> .merge-right.r1078
   Window *children;
   unsigned int i, nchildren;
@@ -637 +631 @@
 }
 
-int _xdo_keysequence_to_keycode_list(xdo_t *xdo, char *keyseq, uint **keys, uint *nkeys) {
+int _xdo_keysequence_to_keycode_list(xdo_t *xdo, char *keyseq, int **keys, int *nkeys) {
   char *tokctx = NULL;
   const char *tok = NULL;
@@ -644 +638 @@
   
   /* Array of keys to press, in order given by keyseq */
-  uint keys_size = 10;
+  int keys_size = 10;
   *nkeys = 0;
 
@@ -655 +649 @@
   strptr = strdup(keyseq);
   while ((tok = strtok_r(strptr, "+", &tokctx)) != NULL) {
-    KeySym keysym;
+    int keysym;
     if (strptr != NULL)
       strptr = NULL;
@@ -788 +782 @@
   }
 
-<<<<<<< .working
-  /* yay = strdup("ctrl+l"); */
-=======
   if (actual_format == 32)
     nbytes = sizeof(long);
@@ -799 +790 @@
   else if (actual_format == 0)
     nbytes = 0;
->>>>>>> .merge-right.r1078
-
-<<<<<<< .working
-  xdo = xdo_new(display_name);
-/*   xdo_mousemove(xdo, 100, 100); */
-/*   usleep(100 * 1000); */
-/*   xdo_keysequence(xdo, strdup("ctrl+l")); */
-/*   xdo_type(xdo, strdup("ls")); */
-/*   xdo_keysequence(xdo, strdup("Return")); */
-=======
+
   *nitems = _nitems;
   *type = actual_type;
@@ -814 +796 @@
   return prop;
 }
->>>>>>> .merge-right.r1078
 
 int _xdo_ewmh_is_supported(xdo_t *xdo, const char *feature) {

trunk/xdotool/xdo.h

@@ -27 +27 @@
 typedef struct charcodemap {
   char key;
-  KeyCode code;
+  int code;
   int shift;
 } charcodemap_t;
@@ -48 +48 @@
 int xdo_mousemove(xdo_t *xdo, int x, int y);
 int xdo_mousemove_relative(xdo_t *xdo, int x, int y);
-int xdo_mousedown(xdo_t *xdo, uint button);
-int xdo_mouseup(xdo_t *xdo, uint button);
+int xdo_mousedown(xdo_t *xdo, int button);
+int xdo_mouseup(xdo_t *xdo, int button);
 
-int xdo_click(xdo_t *xdo, uint button);
+int xdo_click(xdo_t *xdo, int button);
 
 int xdo_type(xdo_t *xdo, char *string);

trunk/xdotool/xdotool.c

@@ -125 +125 @@
 void cmd_help(int argc, char **args) {
   int i;
-
-  /* touch to clean up warnings (we want the parameters to stick
-     around because of the use of function pointers) */
-  argc = 0;
-  args = NULL;
-  
   printf("Available commands:\n");
   for (i = 0; dispatch[i].name != NULL; i++)
@@ -173 +167 @@
 
 void cmd_mousedown(int argc, char **args) {
-  uint button;
+  int button;
   char *cmd = *args; argc--; args++;
 
@@ -190 +184 @@
 
 void cmd_mouseup(int argc, char **args) {
-  uint button;
+  int button;
   char *cmd = *args; argc--; args++;
 
@@ -237 +231 @@
     return;
   }
+
+  int (*func)(xdo_t *, char *) = NULL;
 
   if (!strcmp(cmd, "key")) {