Corrections according to PR review

[i3/i3status] / src / print_time.c

diff --git a/src/print_time.c b/src/print_time.c
index 3c48d3f8e5a1188ffeb20db90aca17c88d32a81a..864aeae71a214d13c9135feafa4a804af8473851 100644 (file)
--- a/src/print_time.c
+++ b/src/print_time.c
@@ -1,20 +1,89 @@
-// vim:ts=8:expandtab
+// vim:ts=4:sw=4:expandtab
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
+#include <locale.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");
+        }
+        current_timezone = tz;
+    }
+    tzset();
+}
+
+void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *format, const char *tz, const char *locale, const char *format_time, bool hide_if_equals_localtime, time_t t) {
+    const char *walk;
+    char *outwalk = buffer;
+    struct tm local_tm, tm;
+    char timebuf[1024];
+
+    if (title != NULL)
+        INSTANCE(title);
+
+    set_timezone(NULL);
+    localtime_r(&t, &local_tm);
+
+    set_timezone(tz);
+    localtime_r(&t, &tm);
+
+    // When hide_if_equals_localtime is true, compare local and target time to display only if different
+    time_t local_t = mktime(&local_tm);
+    double diff = difftime(local_t, t);
+    if (hide_if_equals_localtime && diff == 0.0) {
+        goto out;
+    }
+
+    if (locale != NULL) {
+        setlocale(LC_ALL, locale);
+    }
+
+    if (format_time == NULL) {
+        strftime(timebuf, sizeof(timebuf), format, &tm);
+        maybe_escape_markup(timebuf, &outwalk);
+    } else {
+        for (walk = format; *walk != '\0'; walk++) {
+            if (*walk != '%') {
+                *(outwalk++) = *walk;
+
+            } else if (BEGINS_WITH(walk + 1, "time")) {
+                strftime(timebuf, sizeof(timebuf), format_time, &tm);
+                maybe_escape_markup(timebuf, &outwalk);
+                walk += strlen("time");
+
+            } else {
+                *(outwalk++) = '%';
+            }
         }
-        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("\"}");
+    }
+
+    if (locale != NULL) {
+        setlocale(LC_ALL, "");
+    }
+
+out:
+    *outwalk = '\0';
+    OUTPUT_FULL_TEXT(buffer);
 }