#include <cairo-xlib.h>
#include <pango/pangocairo.h>
#include <unistd.h>
+#include <signal.h>
#include "window.h"
#include "server.h"
char *time1_format=0;
char *time2_format=0;
+char *time_tooltip_format=0;
char *clock_lclick_command=0;
char *clock_rclick_command=0;
struct timeval time_clock;
PangoFontDescription *time2_font_desc=0;
static char buf_time[40];
static char buf_date[40];
+static char buf_tooltip[40];
int clock_enabled;
+static const struct timeout* clock_timeout=0;
void update_clocks()
}
+const char* clock_get_tooltip(void* obj)
+{
+ strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, localtime(&time_clock.tv_sec));
+ 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);
+ else
+ clock_timeout = add_timeout(10, 60000, update_clocks);
}
}
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, localtime(&time_clock.tv_sec));
+ }
}
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)
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);
}