- Refactor most 'printf' invocations to use xdotool_output which has will

  fflush after every write.
- Add xdotool_debug for debug output when 'DEBUG' is present in env.


git-svn-id: https://semicomplete.googlecode.com/svn/xdotool@3185 66067f73-fe4c-0410-82e9-b9c6d0c95a22

Author: jordansissel

CHANGELIST

@@ -9,6 +9,8 @@
     Should fix http://code.google.com/p/semicomplete/issues/detail?id=37
     Reported by ryandesign.com
   - Add support for typing UTF-8 characters. Patch from Joseph Krahn.
+  - Make all output call fflush to send data immediately (for pipes). Reported
+    by Andreas Wagner on the mailing list.
   @ TODO: Add search --desktop
   @ TODO: Search shortcutting (break after N matches) (Requested by Anthony Thyssen)
   @ TODO: Get window position and size (Requested by Anthony Thyssen via mailing list)

cmd_behave.c

@@ -143,7 +143,7 @@ int cmd_behave(context_t *context) {
     }
 
     if (ret != XDO_SUCCESS) {
-      printf("Command failed.\n");
+      xdotool_output(context, "Command failed.");
     }
   }
   return ret;

cmd_get_desktop.c

@@ -30,7 +30,7 @@ int cmd_get_desktop(context_t *context) {
   consume_args(context, optind);
 
   ret = xdo_get_current_desktop(context->xdo, &desktop);
-  printf("%ld\n", desktop);
+  xdotool_output(context, "%ld", desktop);
 
   return ret;
 }

cmd_get_desktop_for_window.c

@@ -39,7 +39,7 @@ int cmd_get_desktop_for_window(context_t *context) {
 
   window_each(context, window_arg, {
     ret = xdo_get_desktop_for_window(context->xdo, window, &desktop);
-    printf("%ld\n", desktop);
+    xdotool_output(context, "%ld", desktop);
   }); /* window_each(...) */
   return ret;
 }

cmd_get_desktop_viewport.c

@@ -36,10 +36,10 @@ int cmd_get_desktop_viewport(context_t *context) {
   ret = xdo_get_desktop_viewport(context->xdo, &x, &y);
 
   if (shell_output) {
-    printf("X=%d\n", x);
-    printf("Y=%d\n", y);
+    xdotool_output(context, "X=%d", x);
+    xdotool_output(context, "Y=%d", y);
   } else {
-    printf("%d,%d\n", x, y);
+    xdotool_output(context, "%d,%d", x, y);
   }
 
   return ret;

cmd_get_num_desktops.c

@@ -36,6 +36,6 @@ int cmd_get_num_desktops(context_t *context) {
 
   ret = xdo_get_number_of_desktops(context->xdo, &ndesktops);
 
-  printf("%ld\n", ndesktops);
+  xdotool_output(context, "%ld", ndesktops);
   return ret;
 }

cmd_getmouselocation.c

@@ -40,12 +40,12 @@ int cmd_getmouselocation(context_t *context) {
   ret = xdo_mouselocation2(context->xdo, &x, &y, &screen_num, &window);
 
   if (output_shell) {
-    printf("X=%d\n", x);
-    printf("Y=%d\n", y);
-    printf("SCREEN=%d\n", screen_num);
-    printf("WINDOW=%d\n", window);
+    xdotool_output(context, "X=%d", x);
+    xdotool_output(context, "Y=%d", y);
+    xdotool_output(context, "SCREEN=%d", screen_num);
+    xdotool_output(context, "WINDOW=%d", window);
   } else {
-    printf("x:%d y:%d screen:%d window:%ld\n", x, y, screen_num, window);
+    xdotool_output(context, "x:%d y:%d screen:%d window:%ld", x, y, screen_num, window);
   }
   return ret;
 }

cmd_getwindowname.c

@@ -41,7 +41,7 @@ int cmd_getwindowname(context_t *context) {
 
   window_each(context, window_arg, {
     xdo_get_window_name(context->xdo, window, &name, &name_len, &name_type);
-    printf("%.*s\n", name_len, name);
+    xdotool_output(context, "%.*s", name_len, name);
     XFree(name);
   }); /* window_each(...) */
   return EXIT_SUCCESS;

cmd_getwindowpid.c

@@ -44,7 +44,7 @@ int cmd_getwindowpid(context_t *context) {
       fprintf(stderr, "window %ld has no pid associated with it.\n", window);
       return EXIT_FAILURE;
     } else {
-      printf("%d\n", pid);
+      xdotool_output(context, "%d", pid);
     }
   }); /* window_each(...) */
   return EXIT_SUCCESS;

xdo.c

@@ -1210,7 +1210,7 @@ int xdo_window_find_client(const xdo_t *xdo, Window window, Window *window_ret,
         done = True; /* recursion should end us */
         for (i = 0; i < nchildren && !done; i++) {
           ret = xdo_window_find_client(xdo, children[i], &window, direction);
-          printf("findclient: %ld\n", window);
+          fprintf(stderr, "findclient: %ld\n", window);
           if (ret == XDO_SUCCESS) {
             *window_ret = window;
             break;

xdo_cmd.h

@@ -31,4 +31,6 @@ extern int window_is_valid(context_t *context, const char *window_arg);
 extern int window_get_arg(context_t *context, int min_arg, int window_arg_pos,
                           const char **window_arg);
 
+extern void xdotool_debug(context_t *context, const char *format, ...);
+
 #endif /* _XDO_CMD_H_ */

xdotool.c

@@ -23,6 +23,7 @@
 #include <strings.h>
 #include <errno.h>
 #include <ctype.h>
+#include <stdarg.h>
 
 #include "xdo.h"
 #include "xdotool.h"
@@ -39,6 +40,8 @@ int window_get_arg(context_t *context, int min_arg, int window_arg_pos,
                    const char **window_arg);
 int window_is_valid(context_t *context, const char *window_arg);
 int is_command(char* cmd);
+void xdotool_debug(context_t *context, const char *format, ...);
+void xdotool_output(context_t *context, const char *format, ...);
 
 void consume_args(context_t *context, int argc) {
   if (argc > context->argc) {
@@ -514,6 +517,9 @@ int context_execute(context_t *context) {
       if (!strcasecmp(dispatch[i].name, cmd)) {
         cmd_found = 1;
         optind = 0;
+        if (context->debug) {
+          fprintf(stderr, "command: %s\n", cmd);
+        }
         ret = dispatch[i].func(context);
       }
     }
@@ -543,10 +549,29 @@ int cmd_help(context_t *context) {
 }
 
 int cmd_version(context_t *context) {
-  printf("xdotool version %s\n", xdo_version());
+  xdotool_output(context, "xdotool version %s", xdo_version());
   if (context != NULL) {
     consume_args(context, 1);
   }
 
   return 0;
 }
+
+void xdotool_debug(context_t *context, const char *format, ...) {
+  va_list args;
+
+  va_start(args, format);
+  if (context->debug) {
+    vfprintf(stderr, format, args);
+    fprintf(stderr, "\n");
+  }
+} /* xdotool_debug */
+
+void xdotool_output(context_t *context, const char *format, ...) {
+  va_list args;
+
+  va_start(args, format);
+  vfprintf(stdout, format, args);
+  fprintf(stdout, "\n");
+  fflush(stdout);
+} /* xdotool_output */