Implement %essid and %signal for wireless on OpenBSD.

[i3/i3status] / src / print_run_watch.c

diff --git a/src/print_run_watch.c b/src/print_run_watch.c
index 391467ea2a423233865196fb87f862ff58cd325a..893e2cd80f36d8b76cc7da679ab4ef6b65c85c3f 100644 (file)
--- a/src/print_run_watch.c
+++ b/src/print_run_watch.c
@@ -1,10 +1,33 @@
 #include <stdio.h>
+#include <string.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
 #include "i3status.h"
 
-void print_run_watch(const char *title, const char *pidfile, const char *format) {
+void print_run_watch(yajl_gen json_gen, char *buffer, const char *title, const char *pidfile, const char *format) {
        bool running = process_runs(pidfile);
-       printf("%s%s: %s%s",
-               (running ? color("#00FF00") : color("#FF0000")),
-               title,
-               (running ? "yes" : "no"), endcolor());
+       const char *walk;
+       char *outwalk = buffer;
+
+       INSTANCE(pidfile);
+
+       START_COLOR((running ? "color_good" : "color_bad"));
+
+        for (walk = format; *walk != '\0'; walk++) {
+                if (*walk != '%') {
+                       *(outwalk++) = *walk;
+                        continue;
+                }
+
+                if (strncmp(walk+1, "title", strlen("title")) == 0) {
+                       outwalk += sprintf(outwalk, "%s", title);
+                        walk += strlen("title");
+                } else if (strncmp(walk+1, "status", strlen("status")) == 0) {
+                       outwalk += sprintf(outwalk, "%s", (running ? "yes" : "no"));
+                        walk += strlen("status");
+                }
+        }
+
+       END_COLOR;
+       OUTPUT_FULL_TEXT(buffer);
 }