*fix* use another timer implementation, coz *BSD does not support timerfd :(

[chaz/tint2] / src / clock / clock.c

diff --git a/src/clock/clock.c b/src/clock/clock.c
index c1504bea8202272c553d243918ca2a374230b6f7..876536cbca6407c147908210f1f075ed5ea67f15 100644 (file)
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -23,6 +23,7 @@
 #include <cairo-xlib.h>
 #include <pango/pangocairo.h>
 #include <unistd.h>
+#include <signal.h>
 
 #include "window.h"
 #include "server.h"
@@ -30,40 +31,51 @@
 #include "panel.h"
 #include "taskbar.h"
 #include "clock.h"
+#include "timer.h"
 
 
 char *time1_format=0;
 char *time2_format=0;
+char *time_tooltip_format=0;
 char *clock_lclick_command=0;
 char *clock_rclick_command=0;
 struct timeval time_clock;
-int  time_precision;
 PangoFontDescription *time1_font_desc=0;
 PangoFontDescription *time2_font_desc=0;
 static char buf_time[40];
 static char buf_date[40];
+static char buf_tooltip[40];
 int clock_enabled;
+static const struct timeout* clock_timeout=0;
 
 
-void init_precision()
+void update_clocks()
 {
-       if (!time1_format) time_precision = 60;
-       else if (strchr(time1_format, 'S')) time_precision = 1;
-       else if (strchr(time1_format, 'T')) time_precision = 1;
-       else if (strchr(time1_format, 'r')) time_precision = 1;
-       else time_precision = 60;
+       gettimeofday(&time_clock, 0);
+       int i;
+       if (time1_format) {
+               for (i=0 ; i < nb_panel ; i++)
+                       panel1[i].clock.area.resize = 1;
+       }
+       panel_refresh = 1;
 }
 
 
-void init_clock()
+const char* clock_get_tooltip(void* obj)
 {
-       init_precision();
+       strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, localtime(&time_clock.tv_sec));
+       return buf_tooltip;
+}
 
-       // update clock to force update (-time_precision)
-       struct timeval stv;
-       gettimeofday(&stv, 0);
-       time_clock.tv_sec = stv.tv_sec - time_precision;
-       time_clock.tv_sec -= time_clock.tv_sec % time_precision;
+
+void init_clock()
+{
+       if(time1_format && clock_timeout==0) {
+               if (strchr(time1_format, 'S') || strchr(time1_format, 'T') || strchr(time1_format, 'r'))
+                       clock_timeout = add_timeout(10, 1000, update_clocks);
+               else
+                       clock_timeout = add_timeout(10, 60000, update_clocks);
+       }
 }
 
 
@@ -109,6 +121,11 @@ void init_clock_panel(void *p)
                clock->time1_posy -= ((date_height_ink + 2) / 2);
                clock->time2_posy = clock->time1_posy + time_height + 2 - (time_height - time_height_ink)/2 - (date_height - date_height_ink)/2;
        }
+
+       if (time_tooltip_format) {
+               clock->area._get_tooltip_text = clock_get_tooltip;
+               strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, localtime(&time_clock.tv_sec));
+       }
 }
 
 
@@ -123,6 +140,8 @@ void cleanup_clock()
                g_free(time1_format);
        if (time2_format)
                g_free(time2_format);
+       if (time_tooltip_format)
+               g_free(time_tooltip_format);
        if (clock_lclick_command)
                g_free(clock_lclick_command);
        if (clock_rclick_command)
@@ -248,6 +267,10 @@ void clock_action(int button)
                pid_t pid;
                pid = fork();
                if (pid == 0) {
+                       // change for the fork the signal mask
+                       sigset_t sigset;
+                       sigprocmask(SIG_SETMASK, &sigset, 0);
+                       sigprocmask(SIG_UNBLOCK, &sigset, 0);
                        execl("/bin/sh", "/bin/sh", "-c", command, NULL);
                        _exit(0);
                }