#include <cairo.h>
#include <cairo-xlib.h>
#include <pango/pangocairo.h>
-#include <unistd.h>
-#include <signal.h>
+#include <stdlib.h>
#include "window.h"
#include "server.h"
-#include "area.h"
#include "panel.h"
-#include "taskbar.h"
#include "clock.h"
#include "timer.h"
+#include "common.h"
-char *time1_format=0;
-char *time2_format=0;
-char *time_tooltip_format=0;
-char *clock_lclick_command=0;
-char *clock_rclick_command=0;
+char *time1_format;
+char *time1_timezone;
+char *time2_format;
+char *time2_timezone;
+char *time_tooltip_format;
+char *time_tooltip_timezone;
+char *clock_lclick_command;
+char *clock_rclick_command;
struct timeval time_clock;
-PangoFontDescription *time1_font_desc=0;
-PangoFontDescription *time2_font_desc=0;
+PangoFontDescription *time1_font_desc;
+PangoFontDescription *time2_font_desc;
static char buf_time[40];
static char buf_date[40];
static char buf_tooltip[40];
int clock_enabled;
+static timeout* clock_timeout;
-void update_clocks()
+void default_clock()
+{
+ clock_enabled = 0;
+ clock_timeout = 0;
+ time1_format = 0;
+ time1_timezone = 0;
+ time2_format = 0;
+ time2_timezone = 0;
+ time_tooltip_format = 0;
+ time_tooltip_timezone = 0;
+ clock_lclick_command = 0;
+ clock_rclick_command = 0;
+ time1_font_desc = 0;
+ time2_font_desc = 0;
+}
+
+void cleanup_clock()
+{
+ if (time1_font_desc) 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 (time1_timezone) g_free(time1_timezone);
+ if (time2_timezone) g_free(time2_timezone);
+ if (time_tooltip_timezone) g_free(time_tooltip_timezone);
+ if (clock_lclick_command) g_free(clock_lclick_command);
+ if (clock_rclick_command) g_free(clock_rclick_command);
+ if (clock_timeout) stop_timeout(clock_timeout);
+}
+
+
+void update_clocks_sec(void* arg)
{
gettimeofday(&time_clock, 0);
int i;
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);
}
}
{
Panel *panel =(Panel*)p;
Clock *clock = &panel->clock;
- int time_height, time_height_ink, date_height, date_height_ink;
clock->area.parent = p;
clock->area.panel = p;
clock->area._draw_foreground = draw_clock;
+ clock->area.size_mode = SIZE_BY_CONTENT;
clock->area._resize = resize_clock;
+ // check consistency
+ if (time1_format == 0)
+ return;
+
clock->area.resize = 1;
- clock->area.redraw = 1;
clock->area.on_screen = 1;
- strftime(buf_time, sizeof(buf_time), time1_format, localtime(&time_clock.tv_sec));
- 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));
- 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.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.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->time1_posy = (clock->area.height - time_height) / 2;
- if (time2_format) {
- strftime(buf_date, sizeof(buf_date), time2_format, localtime(&time_clock.tv_sec));
- 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, localtime(&time_clock.tv_sec));
+ strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
}
}
-void cleanup_clock()
-{
- clock_enabled = 0;
- if (time1_font_desc)
- 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);
- time1_font_desc = time2_font_desc = 0;
- time1_format = time2_format = 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;
}
-void resize_clock (void *obj)
+int resize_clock (void *obj)
{
Clock *clock = obj;
- PangoLayout *layout;
- int time_width, date_width, new_width;
+ Panel *panel = clock->area.panel;
+ int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width, ret = 0;
clock->area.redraw = 1;
- time_width = date_width = 0;
- strftime(buf_time, sizeof(buf_time), time1_format, localtime(&time_clock.tv_sec));
- if (time2_format)
- strftime(buf_date, sizeof(buf_date), time2_format, localtime(&time_clock.tv_sec));
-
- // vertical panel doen't adjust width
- if (!panel_horizontal) return;
-
- //printf(" resize_clock\n");
- cairo_surface_t *cs;
- cairo_t *c;
- Pixmap pmap;
- pmap = XCreatePixmap (server.dsp, server.root_win, clock->area.width, clock->area.height, server.depth);
-
- cs = cairo_xlib_surface_create (server.dsp, pmap, server.visual, clock->area.width, clock->area.height);
- c = cairo_create (cs);
- layout = pango_cairo_create_layout (c);
-
- // check width
- pango_layout_set_font_description (layout, time1_font_desc);
- pango_layout_set_indent(layout, 0);
- pango_layout_set_text (layout, buf_time, strlen(buf_time));
- pango_layout_get_pixel_size (layout, &time_width, NULL);
+
+ date_height = date_width = 0;
+ strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
+ get_text_size2(time1_font_desc, &time_height_ink, &time_height, &time_width, panel->area.height, panel->area.width, buf_time, strlen(buf_time));
if (time2_format) {
- pango_layout_set_font_description (layout, time2_font_desc);
- pango_layout_set_indent(layout, 0);
- pango_layout_set_text (layout, buf_date, strlen(buf_date));
- pango_layout_get_pixel_size (layout, &date_width, NULL);
+ strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
+ get_text_size2(time2_font_desc, &date_height_ink, &date_height, &date_width, panel->area.height, panel->area.width, buf_date, strlen(buf_date));
}
- 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);
-
- 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
- // printf("clock_width %d, new_width %d\n", clock->area.width, new_width);
- clock->area.width = new_width + 1;
-
- // resize other objects on panel
- panel->area.resize = 1;
-#ifdef ENABLE_BATTERY
- panel->battery.area.resize = 1;
-#endif
- systray.area.resize = 1;
- panel_refresh = 1;
+ if (panel_horizontal) {
+ int new_size = (time_width > date_width) ? time_width : date_width;
+ new_size += (2*clock->area.paddingxlr) + (2*clock->area.bg->border.width);
+ if (new_size > clock->area.width || new_size < (clock->area.width-6)) {
+ // we try to limit the number of resize
+ clock->area.width = new_size + 1;
+ clock->time1_posy = (clock->area.height - time_height) / 2;
+ if (time2_format) {
+ 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;
+ }
+ ret = 1;
+ }
+ }
+ else {
+ int new_size = time_height + date_height + (2 * (clock->area.paddingxlr + clock->area.bg->border.width));
+ if (new_size != clock->area.height) {
+ // we try to limit the number of resize
+ clock->area.height = new_size;
+ clock->time1_posy = (clock->area.height - time_height) / 2;
+ if (time2_format) {
+ 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;
+ }
+ ret = 1;
+ }
}
- g_object_unref (layout);
- cairo_destroy (c);
- cairo_surface_destroy (cs);
- XFreePixmap (server.dsp, pmap);
+ return ret;
}
command = clock_rclick_command;
break;
}
- if (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);
- }
- }
+ tint_exec(command);
}
projects / chaz / tint2 / blobdiff