X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_time.c;h=5133c5108b9ffded80b7a1050d8038f8c5c1b18a;hb=478064800bf1fd7999f7bb0ee5ae3553760e2c45;hp=c70a09c7a830f68f2eb5371e650d12128ca9328c;hpb=bf223d9b61498a6b1e723bacb007545a696141fe;p=i3%2Fi3status

diff --git a/src/print_time.c b/src/print_time.c
index c70a09c..5133c51 100644
--- a/src/print_time.c
+++ b/src/print_time.c
@@ -1,8 +1,10 @@
 // vim:ts=4:sw=4:expandtab
+#include <config.h>
 #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>
 
@@ -28,22 +30,61 @@ void set_timezone(const char *tz) {
         } else {
             unsetenv("TZ");
         }
-        tzset();
         current_timezone = tz;
     }
+    tzset();
 }
 
-void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *format, const char *tz, time_t t) {
+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 tm;
+    struct tm local_tm, tm;
+    char timebuf[1024];
 
     if (title != NULL)
         INSTANCE(title);
 
-    /* Convert time and format output. */
+    set_timezone(NULL);
+    localtime_r(&t, &local_tm);
+
     set_timezone(tz);
     localtime_r(&t, &tm);
-    outwalk += strftime(outwalk, 4095, format, &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 (locale != NULL) {
+        setlocale(LC_ALL, "");
+    }
+
+out:
     *outwalk = '\0';
     OUTPUT_FULL_TEXT(buffer);
 }