#include <cairo-xlib.h>
#include <pango/pangocairo.h>
#include <unistd.h>
+#include <signal.h>
+#include <stdlib.h>
#include "window.h"
#include "server.h"
#include "panel.h"
#include "taskbar.h"
#include "clock.h"
+#include "timer.h"
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;
-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 timeout* clock_timeout=0;
-void init_precision()
+void update_clocks_sec(void* arg)
{
- 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 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);
+}
-void init_clock()
+const char* clock_get_tooltip(void* obj)
{
- init_precision();
+ strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
+ 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_sec, 0);
+ else
+ clock_timeout = add_timeout(10, 1000, update_clocks_min, 0);
+ }
}
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);
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, clock_gettime_for_tz(time_tooltip_timezone));
+ }
}
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);
+ 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;
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;
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
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);
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);
}
projects / chaz / tint2 / blobdiff