X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_run_watch.c;h=b108f8fef85b728ac2d388b6055744c6c13bd400;hb=3e1213123fb0d49339b11eafa8b283f87b237d6f;hp=455130e91bab049ce1c024e42f75f1b061e5a355;hpb=38337511e9b5896006f276c111265c985b2af70d;p=i3%2Fi3status diff --git a/src/print_run_watch.c b/src/print_run_watch.c index 455130e..b108f8f 100644 --- a/src/print_run_watch.c +++ b/src/print_run_watch.c @@ -1,27 +1,40 @@ +// vim:ts=4:sw=4:expandtab #include #include +#include +#include #include "i3status.h" -void print_run_watch(const char *title, const char *pidfile, const char *format) { - bool running = process_runs(pidfile); - const char *walk; +void print_run_watch(yajl_gen json_gen, char *buffer, const char *title, const char *pidfile, const char *format, const char *format_down) { + bool running = process_runs(pidfile); + const char *walk; + char *outwalk = buffer; - printf("%s", (running ? color("color_good") : color("color_bad"))); + if (running || format_down == NULL) { + walk = format; + } else { + walk = format_down; + } - for (walk = format; *walk != '\0'; walk++) { - if (*walk != '%') { - putchar(*walk); - continue; - } + INSTANCE(pidfile); - if (strncmp(walk+1, "title", strlen("title")) == 0) { - printf("%s", title); - walk += strlen("title"); - } else if (strncmp(walk+1, "status", strlen("status")) == 0) { - printf("%s", (running ? "yes" : "no")); - walk += strlen("status"); - } + START_COLOR((running ? "color_good" : "color_bad")); + + for (; *walk != '\0'; walk++) { + if (*walk != '%') { + *(outwalk++) = *walk; + continue; + } + + if (BEGINS_WITH(walk + 1, "title")) { + outwalk += sprintf(outwalk, "%s", title); + walk += strlen("title"); + } else if (BEGINS_WITH(walk + 1, "status")) { + outwalk += sprintf(outwalk, "%s", (running ? "yes" : "no")); + walk += strlen("status"); } + } - printf("%s", endcolor()); + END_COLOR; + OUTPUT_FULL_TEXT(buffer); }