fixed config reload SIGUSR1. added systray = 1 parameter to enable systray

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

diff --git a/src/clock/clock.c b/src/clock/clock.c
index b7a3966c71f586d75612583425f8fbbe08493564..c1504bea8202272c553d243918ca2a374230b6f7 100644 (file)
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -26,22 +26,23 @@
 
 #include "window.h"
 #include "server.h"
-#include "taskbar.h"
-#include "panel.h"
 #include "area.h"
+#include "panel.h"
+#include "taskbar.h"
 #include "clock.h"
 
 
-char *time1_format;
-char *time2_format;
-char *clock_lclick_command;
-char *clock_rclick_command;
+char *time1_format=0;
+char *time2_format=0;
+char *clock_lclick_command=0;
+char *clock_rclick_command=0;
 struct timeval time_clock;
 int  time_precision;
-PangoFontDescription *time1_font_desc;
-PangoFontDescription *time2_font_desc;
+PangoFontDescription *time1_font_desc=0;
+PangoFontDescription *time2_font_desc=0;
 static char buf_time[40];
 static char buf_date[40];
+int clock_enabled;
 
 
 void init_precision()
@@ -56,62 +57,82 @@ void init_precision()
 
 void init_clock()
 {
-       Panel *panel;
-       Clock *clock;
-       int i, time_height, time_height_ink, date_height, date_height_ink;
-
        init_precision();
+
        // 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;
+}
 
-       for (i=0 ; i < nb_panel ; i++) {
-               panel = &panel1[i];
-               clock = &panel->clock;
-
-               if (!clock->area.on_screen) continue;
 
-               clock->area.parent = panel;
-               clock->area.panel = panel;
-               clock->area._draw_foreground = draw_clock;
-               clock->area._resize = resize_clock;
-               clock->area.resize = 1;
-               clock->area.redraw = 1;
+void init_clock_panel(void *p)
+{
+       Panel *panel =(Panel*)p;
+       Clock *clock = &panel->clock;
+       int time_height, time_height_ink, date_height, date_height_ink;
+
+       clock->area.parent = p;
+       clock->area.panel = p;
+       clock->area._draw_foreground = draw_clock;
+       clock->area._resize = resize_clock;
+       clock->area.resize = 1;
+       clock->area.redraw = 1;
+       clock->area.on_screen = 1;
 
-               strftime(buf_time, sizeof(buf_time), time1_format, localtime(&time_clock.tv_sec));
-               get_text_size(time1_font_desc, &time_height_ink, &time_height, panel->area.height, buf_time, strlen(buf_time));
-               if (time2_format) {
-                       strftime(buf_date, sizeof(buf_date), time2_format, localtime(&time_clock.tv_sec));
-                       get_text_size(time2_font_desc, &date_height_ink, &date_height, panel->area.height, buf_date, strlen(buf_date));
-               }
+       strftime(buf_time, sizeof(buf_time), time1_format, localtime(&time_clock.tv_sec));
+       get_text_size(time1_font_desc, &time_height_ink, &time_height, panel->area.height, buf_time, strlen(buf_time));
+       if (time2_format) {
+               strftime(buf_date, sizeof(buf_date), time2_format, localtime(&time_clock.tv_sec));
+               get_text_size(time2_font_desc, &date_height_ink, &date_height, panel->area.height, buf_date, strlen(buf_date));
+       }
 
-               if (panel_horizontal) {
-                       // panel horizonal => fixed height and posy
-                       clock->area.posy = panel->area.pix.border.width + panel->area.paddingy;
-                       clock->area.height = panel->area.height - (2 * clock->area.posy);
-               }
-               else {
-                       // panel vertical => fixed width, height, posy and posx
-                       clock->area.posy = panel->area.pix.border.width + panel->area.paddingxlr;
-                       clock->area.height = (2 * clock->area.paddingxlr) + (time_height + date_height);
-                       clock->area.posx = panel->area.pix.border.width + panel->area.paddingy;
-                       clock->area.width = panel->area.width - (2 * panel->area.pix.border.width) - (2 * panel->area.paddingy);
-               }
+       if (panel_horizontal) {
+               // panel horizonal => fixed height and posy
+               clock->area.posy = panel->area.pix.border.width + panel->area.paddingy;
+               clock->area.height = panel->area.height - (2 * clock->area.posy);
+       }
+       else {
+               // panel vertical => fixed width, height, posy and posx
+               clock->area.posy = panel->area.pix.border.width + panel->area.paddingxlr;
+               clock->area.height = (2 * clock->area.paddingxlr) + (time_height + date_height);
+               clock->area.posx = panel->area.pix.border.width + panel->area.paddingy;
+               clock->area.width = panel->area.width - (2 * panel->area.pix.border.width) - (2 * panel->area.paddingy);
+       }
 
-               clock->time1_posy = (clock->area.height - time_height) / 2;
-               if (time2_format) {
-                       strftime(buf_date, sizeof(buf_date), time2_format, localtime(&time_clock.tv_sec));
-                       get_text_size(time2_font_desc, &date_height_ink, &date_height, panel->area.height, buf_date, strlen(buf_date));
+       clock->time1_posy = (clock->area.height - time_height) / 2;
+       if (time2_format) {
+               strftime(buf_date, sizeof(buf_date), time2_format, localtime(&time_clock.tv_sec));
+               get_text_size(time2_font_desc, &date_height_ink, &date_height, panel->area.height, buf_date, strlen(buf_date));
 
-                       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;
-               }
+               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;
        }
 }
 
 
+void cleanup_clock()
+{
+       clock_enabled = 0;
+       if (time1_font_desc)
+               pango_font_description_free(time1_font_desc);
+       if (time2_font_desc)
+               pango_font_description_free(time2_font_desc);
+       if (time1_format)
+               g_free(time1_format);
+       if (time2_format)
+               g_free(time2_format);
+       if (clock_lclick_command)
+               g_free(clock_lclick_command);
+       if (clock_rclick_command)
+               g_free(clock_rclick_command);
+       time1_font_desc = time2_font_desc = 0;
+       time1_format = time2_format = 0;
+       clock_lclick_command = clock_rclick_command = 0;
+}
+
+
 void draw_clock (void *obj, cairo_t *c, int active)
 {
        Clock *clock = obj;