fixed issue 97 and issue 95

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

diff --git a/src/clock/clock.c b/src/clock/clock.c
index eaaf69cb83e8a3c493f39151f4d5778c8be72899..7bb67a726a8c69f51109929920e601c6b86bed1b 100644 (file)
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -44,6 +44,16 @@ static char buf_time[40];
 static char buf_date[40];
 
 
+void init_precision()
+{
+       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;
+}
+
+
 void init_clock()
 {
    Panel *panel;
@@ -58,13 +68,7 @@ void init_clock()
                clock->area.panel = panel;
                clock->area._draw_foreground = draw_clock;
                clock->area._resize = resize_clock;
-
-               if (!clock->area.on_screen) continue;
-
-               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;
+               init_precision();
 
                // update clock to force update (-time_precision)
                struct timeval stv;
@@ -72,6 +76,8 @@ void init_clock()
                time_clock.tv_sec = stv.tv_sec - time_precision;
                time_clock.tv_sec -= time_clock.tv_sec % time_precision;
 
+               if (!clock->area.on_screen) continue;
+
                clock->area.posy = panel->area.pix.border.width + panel->area.paddingy;
                clock->area.height = panel->area.height - (2 * clock->area.posy);
                clock->area.resize = 1;
@@ -169,7 +175,6 @@ void resize_clock (void *obj)
    new_width += (2*clock->area.paddingxlr) + (2*clock->area.pix.border.width);
 
    if (new_width > clock->area.width || new_width < (clock->area.width-6)) {
-      int i;
       Panel *panel = ((Area*)obj)->panel;
 
       printf("clock_width %d, new_width %d\n", clock->area.width, new_width);
@@ -179,9 +184,8 @@ void resize_clock (void *obj)
       clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.pix.border.width;
 
       // resize other objects on panel
-               for (i=0 ; i < nb_panel ; i++) {
-                       panel1[i].area.resize = 1;
-               }
+               panel->area.resize = 1;
+               panel->battery.area.resize = 1;
                systray.area.resize = 1;
                panel_refresh = 1;
    }