travis: re-add libpulse-dev

[i3/i3status] / src / print_time.c

diff --git a/src/print_time.c b/src/print_time.c
index 3c48d3f8e5a1188ffeb20db90aca17c88d32a81a..c70a09c7a830f68f2eb5371e650d12128ca9328c 100644 (file)
--- a/src/print_time.c
+++ b/src/print_time.c
@@ -1,20 +1,49 @@
-// vim:ts=8:expandtab
+// vim:ts=4:sw=4:expandtab
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
 
 #include "i3status.h"
 
-void print_time(const char *format, struct tm *current_tm) {
-        static char part[512];
-        /* Get date & time */
-        if (current_tm == NULL) {
-                return;
+static bool local_timezone_init = false;
+static const char *local_timezone = NULL;
+static const char *current_timezone = NULL;
+
+void set_timezone(const char *tz) {
+    if (!local_timezone_init) {
+        /* First call, initialize. */
+        local_timezone = getenv("TZ");
+        local_timezone_init = true;
+    }
+    if (tz == NULL || tz[0] == '\0') {
+        /* User wants localtime. */
+        tz = local_timezone;
+    }
+    if (tz != current_timezone) {
+        if (tz) {
+            setenv("TZ", tz, 1);
+        } else {
+            unsetenv("TZ");
         }
-        if (output_format == O_I3BAR)
-                printf("{\"name\":\"time\", \"full_text\":\"");
-        (void)strftime(part, sizeof(part), format, current_tm);
-        printf("%s", part);
-        if (output_format == O_I3BAR)
-                printf("\"}");
+        tzset();
+        current_timezone = tz;
+    }
+}
+
+void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *format, const char *tz, time_t t) {
+    char *outwalk = buffer;
+    struct tm tm;
+
+    if (title != NULL)
+        INSTANCE(title);
+
+    /* Convert time and format output. */
+    set_timezone(tz);
+    localtime_r(&t, &tm);
+    outwalk += strftime(outwalk, 4095, format, &tm);
+    *outwalk = '\0';
+    OUTPUT_FULL_TEXT(buffer);
 }