Merge pull request #321 from eplanet/autodisplay-tz

[i3/i3status] / src / print_time.c

diff --git a/src/print_time.c b/src/print_time.c
index 3a6c4cc0752757aa77170500baf4b9e6e1aa2b37..864aeae71a214d13c9135feafa4a804af8473851 100644 (file)
--- a/src/print_time.c
+++ b/src/print_time.c
@@ -34,18 +34,28 @@ void set_timezone(const char *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, 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);
 
+    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);
     }
@@ -73,6 +83,7 @@ void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *
         setlocale(LC_ALL, "");
     }
 
+out:
     *outwalk = '\0';
     OUTPUT_FULL_TEXT(buffer);
 }