X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclock%2Fclock.c;h=35fb595d29c62868791aea889d5ed0668dec6c7e;hb=da65866b2388391052e3ce95818c1d5ebd2b26b5;hp=e90f83f1765b92bed017a0bb80e02e8c2c7e9d27;hpb=cb9288bcb990b5ff5b550285f6d3ef752bd44d68;p=chaz%2Ftint2

diff --git a/src/clock/clock.c b/src/clock/clock.c
index e90f83f..35fb595 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -25,45 +25,59 @@
 
 #include "window.h"
 #include "server.h"
+#include "taskbar.h"
+#include "panel.h"
 #include "area.h"
 #include "clock.h"
-#include "panel.h"
 
 
 char *time1_format = 0;
 char *time2_format = 0;
 struct timeval time_clock;
 int  time_precision;
+PangoFontDescription *time1_font_desc;
+PangoFontDescription *time2_font_desc;
+static char buf_time[40];
+static char buf_date[40];
 
 
-void init_clock(Clock *clock, int panel_height)
+void init_clock(Clock *clock, Area *parent)
 {
-   char buf_time[40];
-   char buf_date[40];
+   Panel *panel = (Panel *)parent;
    int time_height, time_height_ink, date_height, date_height_ink;
 
+	clock->area.parent = parent;
+	clock->area.panel = panel;
+   clock->area._draw_foreground = draw_foreground_clock;
+   clock->area._resize = resize_clock;
    if (!time1_format) return;
 
+	// add clock to the panel
+	panel->area.list = g_slist_append(panel->area.list, clock);
+
    if (strchr(time1_format, 'S') == NULL) time_precision = 60;
    else time_precision = 1;
 
-   clock->area.posy = panel.area.pix.border.width + panel.area.paddingy;
-   clock->area.height = panel.area.height - (2 * clock->area.posy);
-   clock->area.width = 0;  // force posx and width detection
-   clock->area.redraw = 1;
-
-   gettimeofday(&time_clock, 0);
+   // 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;
 
+   clock->area.posy = parent->pix.border.width + parent->paddingy;
+   clock->area.height = parent->height - (2 * clock->area.posy);
+   clock->area.resize = 1;
+   clock->area.redraw = 1;
+
    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));
 
-   get_text_size(clock->time1_font_desc, &time_height_ink, &time_height, panel_height, buf_time, strlen(buf_time));
+   get_text_size(time1_font_desc, &time_height_ink, &time_height, parent->height, buf_time, strlen(buf_time));
    clock->time1_posy = (clock->area.height - time_height) / 2;
 
    if (time2_format) {
-      get_text_size(clock->time2_font_desc, &date_height_ink, &date_height, panel_height, buf_date, strlen(buf_date));
+      get_text_size(time2_font_desc, &date_height_ink, &date_height, parent->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;
@@ -75,68 +89,95 @@ void draw_foreground_clock (void *obj, cairo_t *c, int active)
 {
    Clock *clock = obj;
    PangoLayout *layout;
-   char buf_time[40];
-   char buf_date[40];
+
+   //printf("  draw_foreground_clock : %s en (%d, %d)\n", buf_time, clock->area.posx, clock->area.width);
+   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;
 
    time_width = date_width = 0;
+   clock->area.redraw = 1;
+
    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));
 
-   //printf("  draw_foreground_clock : %s\n", buf_time);
-redraw:
+   //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, clock->time1_font_desc);
+   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, clock->time2_font_desc);
+      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.pix.border.width);
 
-   if (new_width > clock->area.width || (new_width != clock->area.width && date_width > time_width)) {
+   if (new_width > clock->area.width || new_width < (clock->area.width-3)) {
+      int i;
+      Panel *panel = ((Area*)obj)->panel;
+
       //printf("clock_width %d, new_width %d\n", clock->area.width, new_width);
       // resize clock
       clock->area.width = new_width;
-      panel.clock.area.posx = panel.area.width - panel.clock.area.width - panel.area.paddingxlr - panel.area.pix.border.width;
-
-      g_object_unref (layout);
-      resize_taskbar();
-      goto redraw;
-   }
-
-   // draw layout
-   pango_layout_set_font_description (layout, clock->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);
+      clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.pix.border.width;
 
-   if (time2_format) {
-      pango_layout_set_font_description (layout, clock->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);
+      // resize other objects on panel
+		for (i=0 ; i < nb_panel ; i++) {
+			panel1[i].area.resize = 1;
+		}
+		panel_refresh = 1;
    }
 
    g_object_unref (layout);
+   cairo_destroy (c);
+   cairo_surface_destroy (cs);
+   XFreePixmap (server.dsp, pmap);
 }