X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_time.c;h=3a6c4cc0752757aa77170500baf4b9e6e1aa2b37;hb=52e9f6f63b74db2a6a1d67524851649b18794950;hp=ad1efddc982bf0ff2fcaa6e6cdeef4e07eb3545a;hpb=2ebe1f37269e9bec23a3f0c2e6be956884c7ab92;p=i3%2Fi3status

diff --git a/src/print_time.c b/src/print_time.c
index ad1efdd..3a6c4cc 100644
--- a/src/print_time.c
+++ b/src/print_time.c
@@ -1,45 +1,78 @@
-// 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"
 
-static int local_timezone_init = 0;
+static bool local_timezone_init = false;
 static const char *local_timezone = NULL;
 static const char *current_timezone = NULL;
 
-void set_timezone(const char *timezone) {
-        if (!local_timezone_init) {
-                /* First call, initialize. */
-                local_timezone = getenv("TZ");
-                local_timezone_init = 1;
-        }
-        if (timezone == NULL || timezone[0] == '\0') {
-                /* User wants localtime. */
-                timezone = local_timezone;
-        }
-        if (timezone != current_timezone) {
-                if (timezone) {
-                        setenv("TZ", timezone, 1);
-                } else {
-                        unsetenv("TZ");
-                }
-                tzset();
-                current_timezone = timezone;
+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 *format, const char *timezone, time_t t) {
-        char *outwalk = buffer;
-        struct tm tm;
+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, time_t t) {
+    const char *walk;
+    char *outwalk = buffer;
+    struct tm tm;
+    char timebuf[1024];
+
+    if (title != NULL)
+        INSTANCE(title);
+
+    set_timezone(tz);
+    localtime_r(&t, &tm);
+
+    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 (locale != NULL) {
+        setlocale(LC_ALL, "");
+    }
 
-        /* Convert time and format output. */
-        set_timezone(timezone);
-        localtime_r(&t, &tm);
-        outwalk += strftime(outwalk, 4095, format, &tm);
-        *outwalk = '\0';
-        OUTPUT_FULL_TEXT(buffer);
+    *outwalk = '\0';
+    OUTPUT_FULL_TEXT(buffer);
 }