X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fclock%2Fclock.c;h=e90f83f1765b92bed017a0bb80e02e8c2c7e9d27;hb=cb9288bcb990b5ff5b550285f6d3ef752bd44d68;hp=fb5969b6c48e5837e5358e1f578f910ee5ae763e;hpb=8269d3d140bce7dafde5c8448a96d4a90bc557e7;p=chaz%2Ftint2

diff --git a/src/clock/clock.c b/src/clock/clock.c
index fb5969b..e90f83f 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -1,9 +1,9 @@
 /**************************************************************************
 *
 * Tint2 : clock
-* 
+*
 * Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
-* 
+*
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
 * as published by the Free Software Foundation.
@@ -30,41 +30,48 @@
 #include "panel.h"
 
 
+char *time1_format = 0;
+char *time2_format = 0;
+struct timeval time_clock;
+int  time_precision;
+
+
 void init_clock(Clock *clock, int panel_height)
 {
    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;
+   if (!time1_format) return;
+
+   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;      
-
-   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));
-   
+   clock->area.width = 0;  // force posx and width detection
+   clock->area.redraw = 1;
+
+   gettimeofday(&time_clock, 0);
+   time_clock.tv_sec -= time_clock.tv_sec % time_precision;
+
+   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));
    clock->time1_posy = (clock->area.height - time_height) / 2;
 
-   if (clock->time2_format) {      
+   if (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;
    }
 }
 
 
-int draw_foreground_clock (void *obj, cairo_t *c)
+void draw_foreground_clock (void *obj, cairo_t *c, int active)
 {
    Clock *clock = obj;
    PangoLayout *layout;
@@ -73,9 +80,9 @@ int draw_foreground_clock (void *obj, cairo_t *c)
    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:
@@ -86,7 +93,7 @@ redraw:
    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) {
+   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));
@@ -94,14 +101,14 @@ redraw:
    }
    if (time_width > date_width) new_width = time_width;
    else new_width = date_width;
-   new_width += (2*clock->area.paddingx) + (2*clock->area.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.border.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;
@@ -119,18 +126,17 @@ redraw:
    cairo_move_to (c, 0, clock->time1_posy);
    pango_cairo_show_layout (c, layout);
 
-   if (clock->time2_format) {
+   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);
    }
-   
+
    g_object_unref (layout);
-   return 0;
 }