- char buf_time[40];
- char buf_date[40];
- int time_height, time_height_ink, date_height, date_height_ink;
-
- if (!clock->time1_format) return;
-
- if (strchr(clock->time1_format, 'S') == NULL) clock->time_precision = 60;
- else clock->time_precision = 1;
-
- clock->area.posy = panel.area.border.width + panel.area.paddingy;
- clock->area.height = panel.area.height - (2 * clock->area.posy);
- clock->area.redraw = 1;
-
- gettimeofday(&clock->clock, 0);
- clock->clock.tv_sec -= clock->clock.tv_sec % clock->time_precision;
-
- strftime(buf_time, sizeof(buf_time), clock->time1_format, localtime(&clock->clock.tv_sec));
- if (clock->time2_format)
- strftime(buf_date, sizeof(buf_date), clock->time2_format, localtime(&clock->clock.tv_sec));
-
- get_text_size(clock->time1_font_desc, &time_height_ink, &time_height, panel_height, buf_time, strlen(buf_time));
- clock->time1_posy = (clock->area.height - time_height) / 2;
-
- if (clock->time2_format) {
- get_text_size(clock->time2_font_desc, &date_height_ink, &date_height, panel_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(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);
+ }
+}
+
+
+void init_clock_panel(void *p)
+{
+ Panel *panel =(Panel*)p;
+ Clock *clock = &panel->clock;
+
+ 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.on_screen = 1;
+
+ 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));
+ }
+}
+
+
+void draw_clock (void *obj, cairo_t *c)
+{
+ Clock *clock = obj;
+ PangoLayout *layout;
+
+ layout = pango_cairo_create_layout (c);
+
+ // draw layout
+ pango_layout_set_font_description (layout, time1_font_desc);
+ pango_layout_set_width (layout, clock->area.width * PANGO_SCALE);
+ pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
+ pango_layout_set_text (layout, buf_time, strlen(buf_time));
+
+ cairo_set_source_rgba (c, clock->font.color[0], clock->font.color[1], clock->font.color[2], clock->font.alpha);
+
+ pango_cairo_update_layout (c, layout);
+ cairo_move_to (c, 0, clock->time1_posy);
+ pango_cairo_show_layout (c, layout);
+
+ 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_set_width (layout, clock->area.width * PANGO_SCALE);
+
+ pango_cairo_update_layout (c, layout);
+ cairo_move_to (c, 0, clock->time2_posy);
+ pango_cairo_show_layout (c, layout);
+ }
+
+ g_object_unref (layout);
+}
+
+
+int resize_clock (void *obj)
+{
+ Clock *clock = obj;
+ 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;
+
+ 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) {
+ 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 (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;
+ }
+ }
+
+ return ret;