fixed issue 98

[chaz/tint2] / src / clock / clock.c

diff --git a/src/clock/clock.c b/src/clock/clock.c
index 19aaf4ac4a82e8fc907d8798f5fb4b96c7f64b48..01b1991e247d090e85015c720403ef4b9cedd086 100644 (file)
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -22,6 +22,7 @@
 #include <cairo.h>
 #include <cairo-xlib.h>
 #include <pango/pangocairo.h>
+#include <unistd.h>
 
 #include "window.h"
 #include "server.h"
@@ -31,8 +32,10 @@
 #include "clock.h"
 
 
-char *time1_format = 0;
-char *time2_format = 0;
+char *time1_format;
+char *time2_format;
+char *clock_lclick_command;
+char *clock_rclick_command;
 struct timeval time_clock;
 int  time_precision;
 PangoFontDescription *time1_font_desc;
@@ -41,31 +44,39 @@ static char buf_time[40];
 static char buf_date[40];
 
 
+void init_precision()
+{
+       if (!time1_format) time_precision = 60;
+       else if (strchr(time1_format, 'S')) time_precision = 1;
+       else if (strchr(time1_format, 'T')) time_precision = 1;
+       else if (strchr(time1_format, 'r')) time_precision = 1;
+       else time_precision = 60;
+}
+
+
 void init_clock()
 {
    Panel *panel;
    Clock *clock;
    int i, time_height, time_height_ink, date_height, date_height_ink;
 
+       init_precision();
+       // 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;
+
        for (i=0 ; i < nb_panel ; i++) {
           panel = &panel1[i];
           clock = &panel->clock;
 
                clock->area.parent = panel;
                clock->area.panel = panel;
-               if (!clock->area.visible) return;
-
-               clock->area._draw_foreground = draw_foreground_clock;
+               clock->area._draw_foreground = draw_clock;
                clock->area._resize = resize_clock;
 
-               if (strchr(time1_format, 'S') == NULL) time_precision = 60;
-               else time_precision = 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;
+               if (!clock->area.on_screen) continue;
 
                clock->area.posy = panel->area.pix.border.width + panel->area.paddingy;
                clock->area.height = panel->area.height - (2 * clock->area.posy);
@@ -89,12 +100,12 @@ void init_clock()
 }
 
 
-void draw_foreground_clock (void *obj, cairo_t *c, int active)
+void draw_clock (void *obj, cairo_t *c, int active)
 {
    Clock *clock = obj;
    PangoLayout *layout;
 
-   //printf("  draw_foreground_clock : %s en (%d, %d)\n", buf_time, clock->area.posx, clock->area.width);
+   //printf("  draw_clock : %s en (%d, %d)\n", buf_time, clock->area.posx, clock->area.width);
    layout = pango_cairo_create_layout (c);
 
    // draw layout
@@ -163,19 +174,19 @@ void resize_clock (void *obj)
    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-3)) {
-      int i;
+   if (new_width > clock->area.width || new_width < (clock->area.width-6)) {
       Panel *panel = ((Area*)obj)->panel;
 
-      //printf("clock_width %d, new_width %d\n", clock->area.width, new_width);
+      printf("clock_width %d, new_width %d\n", clock->area.width, new_width);
       // resize clock
-      clock->area.width = new_width;
+      // we try to limit the number of resize
+      clock->area.width = new_width + 1;
       clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.pix.border.width;
 
       // resize other objects on panel
-               for (i=0 ; i < nb_panel ; i++) {
-                       panel1[i].area.resize = 1;
-               }
+               panel->area.resize = 1;
+               panel->battery.area.resize = 1;
+               systray.area.resize = 1;
                panel_refresh = 1;
    }
 
@@ -185,3 +196,25 @@ void resize_clock (void *obj)
    XFreePixmap (server.dsp, pmap);
 }
 
+
+void clock_action(int button)
+{
+       char *command = 0;
+       switch (button) {
+               case 1:
+               command = clock_lclick_command;
+               break;
+               case 3:
+               command = clock_rclick_command;
+               break;
+       }
+       if (command) {
+               pid_t pid;
+               pid = fork();
+               if (pid == 0) {
+                       execl("/bin/sh", "/bin/sh", "-c", command, NULL);
+                       _exit(0);
+               }
+       }
+}
+