- 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;
- }
+ 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);
+ 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 = 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)
+{
+ 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);
+}
+
+
+void resize_clock (void *obj)
+{
+ Clock *clock = obj;
+ PangoLayout *layout;
+ int time_width, date_width, new_width;
+
+ clock->area.redraw = 1;
+ time_width = date_width = 0;
+ 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, clock_gettime_for_tz(time2_timezone));
+
+ // 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);
+ 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);
+ }
+
+ if (time_width > date_width) new_width = time_width;
+ else new_width = date_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.bg->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;
+ }
+
+ g_object_unref (layout);
+ cairo_destroy (c);
+ cairo_surface_destroy (cs);
+ XFreePixmap (server.dsp, pmap);