X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fclock%2Fclock.c;h=64ac1ba0f7bb9476d8c9e49363a4d3403bdc1039;hb=0357305cec0f78ba4d4717467025ead6be25ce0c;hp=5fb6cb152ab4382d17efabb5f0c5d5ff504a5348;hpb=280d1d6e2e2cf7eed76e1def50a4b9547094d185;p=chaz%2Ftint2

diff --git a/src/clock/clock.c b/src/clock/clock.c
index 5fb6cb1..64ac1ba 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -25,38 +25,55 @@
 
 #include "window.h"
 #include "server.h"
+#include "taskbar.h"
+#include "panel.h"
 #include "area.h"
 #include "clock.h"
-#include "panel.h"
 
 
-void init_clock(Clock *clock, int panel_height)
+char *time1_format = 0;
+char *time2_format = 0;
+struct timeval time_clock;
+int  time_precision;
+PangoFontDescription *time1_font_desc;
+PangoFontDescription *time2_font_desc;
+
+
+void init_clock(Clock *clock, Area *parent)
 {
+   Panel *panel = (Panel *)parent;
    char buf_time[40];
    char buf_date[40];
    int time_height, time_height_ink, date_height, date_height_ink;
 
-   if (!clock->time1_format) return;
+	clock->area.parent = parent;
+	clock->area.panel = panel;
+   clock->area.draw_foreground = draw_foreground_clock;
+   if (!time1_format) return;
 
-   if (strchr(clock->time1_format, 'S') == NULL) clock->time_precision = 60;
-   else clock->time_precision = 1;
+   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.redraw = 1;
+   // 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;
 
-   gettimeofday(&clock->clock, 0);
-   clock->clock.tv_sec -= clock->clock.tv_sec % clock->time_precision;
+   clock->area.posy = parent->pix.border.width + parent->paddingy;
+   clock->area.height = parent->height - (2 * clock->area.posy);
+   clock->area.width = 0;  // force posx and width detection
+   clock->area.redraw = 1;
 
-   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));
+   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 (clock->time2_format) {
-      get_text_size(clock->time2_font_desc, &date_height_ink, &date_height, panel_height, buf_date, strlen(buf_date));
+   if (time2_format) {
+      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;
@@ -66,6 +83,7 @@ void init_clock(Clock *clock, int panel_height)
 
 void draw_foreground_clock (void *obj, cairo_t *c, int active)
 {
+   Area *parent = ((Area*)obj)->parent;
    Clock *clock = obj;
    PangoLayout *layout;
    char buf_time[40];
@@ -73,42 +91,42 @@ void draw_foreground_clock (void *obj, cairo_t *c, int active)
    int time_width, date_width, new_width;
 
    time_width = date_width = 0;
-   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));
+   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:
    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 (clock->time2_format) {
-      pango_layout_set_font_description (layout, clock->time2_font_desc);
+   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.paddingx) + (2*clock->area.pix.border.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)) {
       //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.paddingx - panel.area.pix.border.width;
+      clock->area.posx = parent->width - clock->area.width - parent->paddingxlr - parent->pix.border.width;
 
       g_object_unref (layout);
-      resize_taskbar();
+      resize_taskbar(parent);
       goto redraw;
    }
 
    // draw layout
-   pango_layout_set_font_description (layout, clock->time1_font_desc);
+   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));
@@ -119,8 +137,8 @@ redraw:
    cairo_move_to (c, 0, clock->time1_posy);
    pango_cairo_show_layout (c, layout);
 
-   if (clock->time2_format) {
-      pango_layout_set_font_description (layout, clock->time2_font_desc);
+   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);