X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fclock%2Fclock.c;h=a3061cb206919800ae04c1d4b0eb38c8e24b66d7;hb=ef9c33a6a77e304bceaa00b146869bf3747aaa57;hp=eaaf69cb83e8a3c493f39151f4d5778c8be72899;hpb=5679142e44a103a6fe1e62365fe991d273e41049;p=chaz%2Ftint2 diff --git a/src/clock/clock.c b/src/clock/clock.c index eaaf69c..a3061cb 100644 --- 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;