X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclock%2Fclock.c;h=e29c138a687cf82825a38d24c2321ce669aebe83;hb=3fe84f48719226f0b23390df15c62eafbf7ed15c;hp=b5c3e41920bc271a36e7a857718c84dd289c0c31;hpb=0a43eba2b74224ce55ff7ea3cfaaf25758f2e582;p=chaz%2Ftint2 diff --git a/src/clock/clock.c b/src/clock/clock.c index b5c3e41..e29c138 100644 --- a/src/clock/clock.c +++ b/src/clock/clock.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "window.h" #include "server.h" @@ -35,8 +36,11 @@ char *time1_format=0; +char *time1_timezone=0; char *time2_format=0; +char *time2_timezone=0; char *time_tooltip_format=0; +char *time_tooltip_timezone=0; char *clock_lclick_command=0; char *clock_rclick_command=0; struct timeval time_clock; @@ -46,9 +50,10 @@ static char buf_time[40]; static char buf_date[40]; static char buf_tooltip[40]; int clock_enabled; +static timeout* clock_timeout=0; -void update_clocks() +void update_clocks_sec(void* arg) { gettimeofday(&time_clock, 0); int i; @@ -59,20 +64,48 @@ void update_clocks() panel_refresh = 1; } +void update_clocks_min(void* arg) +{ + // remember old_sec because after suspend/hibernate the clock should be updated directly, and not + // on next minute change + time_t old_sec = time_clock.tv_sec; + gettimeofday(&time_clock, 0); + if (time_clock.tv_sec % 60 == 0 || time_clock.tv_sec - old_sec > 60) { + int i; + if (time1_format) { + for (i=0 ; i < nb_panel ; i++) + panel1[i].clock.area.resize = 1; + } + panel_refresh = 1; + } +} + +struct tm* clock_gettime_for_tz(const char* timezone) { + if (timezone) { + const char* old_tz = getenv("TZ"); + setenv("TZ", timezone, 1); + struct tm* result = localtime(&time_clock.tv_sec); + if (old_tz) setenv("TZ", old_tz, 1); + else unsetenv("TZ"); + return result; + } + else return localtime(&time_clock.tv_sec); +} const char* clock_get_tooltip(void* obj) { - strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, localtime(&time_clock.tv_sec)); + strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone)); return buf_tooltip; } void init_clock() { - if(time1_format) { + if(time1_format && clock_timeout==0) { if (strchr(time1_format, 'S') || strchr(time1_format, 'T') || strchr(time1_format, 'r')) - install_timer(0, 1000000, 1, 0, update_clocks); - else install_timer(0, 1000000, 60, 0, update_clocks); + clock_timeout = add_timeout(10, 1000, update_clocks_sec, 0); + else + clock_timeout = add_timeout(10, 1000, update_clocks_min, 0); } } @@ -91,29 +124,29 @@ void init_clock_panel(void *p) clock->area.redraw = 1; clock->area.on_screen = 1; - strftime(buf_time, sizeof(buf_time), time1_format, localtime(&time_clock.tv_sec)); + strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone)); 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)); + strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone)); 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.posy = panel->area.bg->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.posy = panel->area.bg->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->area.posx = panel->area.bg->border.width + panel->area.paddingy; + clock->area.width = panel->area.width - (2 * panel->area.bg->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)); + strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone)); 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); @@ -122,7 +155,7 @@ void init_clock_panel(void *p) 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)); + strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone)); } } @@ -134,23 +167,22 @@ void cleanup_clock() 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 (time_tooltip_format) - g_free(time_tooltip_format); - if (clock_lclick_command) - g_free(clock_lclick_command); - if (clock_rclick_command) - g_free(clock_rclick_command); + g_free(time1_format); + g_free(time2_format); + g_free(time_tooltip_format); + g_free(time1_timezone); + g_free(time2_timezone); + g_free(time_tooltip_timezone); + g_free(clock_lclick_command); + g_free(clock_rclick_command); time1_font_desc = time2_font_desc = 0; - time1_format = time2_format = 0; + time1_format = time2_format = time_tooltip_format = 0; + time1_timezone = time2_timezone = time_tooltip_timezone = 0; clock_lclick_command = clock_rclick_command = 0; } -void draw_clock (void *obj, cairo_t *c, int active) +void draw_clock (void *obj, cairo_t *c) { Clock *clock = obj; PangoLayout *layout; @@ -192,9 +224,9 @@ void resize_clock (void *obj) clock->area.redraw = 1; time_width = date_width = 0; - strftime(buf_time, sizeof(buf_time), time1_format, localtime(&time_clock.tv_sec)); + strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone)); if (time2_format) - strftime(buf_date, sizeof(buf_date), time2_format, localtime(&time_clock.tv_sec)); + strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone)); // vertical panel doen't adjust width if (!panel_horizontal) return; @@ -223,11 +255,9 @@ void resize_clock (void *obj) if (time_width > date_width) new_width = time_width; else new_width = date_width; - new_width += (2*clock->area.paddingxlr) + (2*clock->area.pix.border.width); + new_width += (2*clock->area.paddingxlr) + (2*clock->area.bg->border.width); Panel *panel = ((Area*)obj)->panel; - clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.pix.border.width; - if (new_width > clock->area.width || new_width < (clock->area.width-6)) { // resize clock // we try to limit the number of resize @@ -242,6 +272,8 @@ void resize_clock (void *obj) systray.area.resize = 1; panel_refresh = 1; } + clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.bg->border.width; + g_object_unref (layout); cairo_destroy (c); @@ -263,12 +295,12 @@ void clock_action(int button) } if (command) { pid_t pid; - sigset_t sigset; - sigprocmask(SIG_SETMASK, &sigset, 0); - sigprocmask(SIG_UNBLOCK, &sigset, 0); pid = fork(); - sigprocmask(SIG_BLOCK, &sigset, 0); 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); }