panel_items : fixed some segfault.

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

diff --git a/src/clock/clock.c b/src/clock/clock.c
index e29c138a687cf82825a38d24c2321ce669aebe83..70babb66ab75e9315d36965de06d14e6480088e9 100644 (file)
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -22,35 +22,63 @@
 #include <cairo.h>
 #include <cairo-xlib.h>
 #include <pango/pangocairo.h>
-#include <unistd.h>
-#include <signal.h>
 #include <stdlib.h>
 
 #include "window.h"
 #include "server.h"
-#include "area.h"
 #include "panel.h"
-#include "taskbar.h"
 #include "clock.h"
 #include "timer.h"
+#include "common.h"
 
 
-char *time1_format=0;
-char *time1_timezone=0;
-char *time2_format=0;
-char *time2_timezone=0;
-char *time_tooltip_format=0;
-char *time_tooltip_timezone=0;
-char *clock_lclick_command=0;
-char *clock_rclick_command=0;
+char *time1_format;
+char *time1_timezone;
+char *time2_format;
+char *time2_timezone;
+char *time_tooltip_format;
+char *time_tooltip_timezone;
+char *clock_lclick_command;
+char *clock_rclick_command;
 struct timeval time_clock;
-PangoFontDescription *time1_font_desc=0;
-PangoFontDescription *time2_font_desc=0;
+PangoFontDescription *time1_font_desc;
+PangoFontDescription *time2_font_desc;
 static char buf_time[40];
 static char buf_date[40];
 static char buf_tooltip[40];
 int clock_enabled;
-static timeout* clock_timeout=0;
+static timeout* clock_timeout;
+
+
+void default_clock()
+{
+       clock_enabled = 0;
+       clock_timeout = 0;
+       time1_format = 0;
+       time1_timezone = 0;
+       time2_format = 0;
+       time2_timezone = 0;
+       time_tooltip_format = 0;
+       time_tooltip_timezone = 0;
+       clock_lclick_command = 0;
+       clock_rclick_command = 0;
+       time1_font_desc = 0;
+       time2_font_desc = 0;
+}
+
+void cleanup_clock()
+{
+       if (time1_font_desc) pango_font_description_free(time1_font_desc);
+       if (time2_font_desc) pango_font_description_free(time2_font_desc);
+       if (time1_format) g_free(time1_format);
+       if (time2_format) g_free(time2_format);
+       if (time_tooltip_format) g_free(time_tooltip_format);
+       if (time1_timezone) g_free(time1_timezone);
+       if (time2_timezone) g_free(time2_timezone);
+       if (time_tooltip_timezone) g_free(time_tooltip_timezone);
+       if (clock_lclick_command) g_free(clock_lclick_command);
+       if (clock_rclick_command) g_free(clock_rclick_command);
+}
 
 
 void update_clocks_sec(void* arg)
@@ -119,11 +147,15 @@ void init_clock_panel(void *p)
        clock->area.parent = p;
        clock->area.panel = p;
        clock->area._draw_foreground = draw_clock;
+       clock->area.size_mode = SIZE_BY_CONTENT;
        clock->area._resize = resize_clock;
        clock->area.resize = 1;
        clock->area.redraw = 1;
-       clock->area.on_screen = 1;
+       // check consistency
+       if (time1_format == 0)
+               return;
 
+       clock->area.on_screen = 1;
        strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
        get_text_size(time1_font_desc, &time_height_ink, &time_height, panel->area.height, buf_time, strlen(buf_time));
        if (time2_format) {
@@ -138,8 +170,6 @@ void init_clock_panel(void *p)
        }
        else {
                // panel vertical => fixed width, height, posy and posx
-               clock->area.posy = panel->area.bg->border.width + panel->area.paddingxlr;
-               clock->area.height = (2 * clock->area.paddingxlr) + (time_height + date_height);
                clock->area.posx = panel->area.bg->border.width + panel->area.paddingy;
                clock->area.width = panel->area.width - (2 * panel->area.bg->border.width) - (2 * panel->area.paddingy);
        }
@@ -160,28 +190,6 @@ void init_clock_panel(void *p)
 }
 
 
-void cleanup_clock()
-{
-       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;
@@ -216,11 +224,11 @@ void draw_clock (void *obj, cairo_t *c)
 }
 
 
-void resize_clock (void *obj)
+int resize_clock (void *obj)
 {
        Clock *clock = obj;
        PangoLayout *layout;
-       int time_width, date_width, new_width;
+       int time_width, date_width, new_width, ret = 0;
 
        clock->area.redraw = 1;
        time_width = date_width = 0;
@@ -229,7 +237,11 @@ void resize_clock (void *obj)
                strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
 
        // vertical panel doen't adjust width
-       if (!panel_horizontal) return;
+       if (!panel_horizontal) {
+//             clock->area.posy = panel->area.bg->border.width + panel->area.paddingxlr;
+//             clock->area.height = (2 * clock->area.paddingxlr) + (time_height + date_height);
+               return ret;
+       }
 
        //printf("  resize_clock\n");
        cairo_surface_t *cs;
@@ -257,7 +269,6 @@ void resize_clock (void *obj)
        else new_width = date_width;
        new_width += (2*clock->area.paddingxlr) + (2*clock->area.bg->border.width);
 
-       Panel *panel = ((Area*)obj)->panel;
        if (new_width > clock->area.width || new_width < (clock->area.width-6)) {
                // resize clock
                // we try to limit the number of resize
@@ -265,20 +276,15 @@ void resize_clock (void *obj)
                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;
+               ret = 1;
                panel_refresh = 1;
        }
-       clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.bg->border.width;
-
 
        g_object_unref (layout);
        cairo_destroy (c);
        cairo_surface_destroy (cs);
        XFreePixmap (server.dsp, pmap);
+       return ret;
 }
 
 
@@ -293,17 +299,6 @@ void clock_action(int button)
                command = clock_rclick_command;
                break;
        }
-       if (command) {
-               pid_t pid;
-               pid = fork();
-               if (pid == 0) {
-                       // change for the fork the signal mask
-//                     sigset_t sigset;
-//                     sigprocmask(SIG_SETMASK, &sigset, 0);
-//                     sigprocmask(SIG_UNBLOCK, &sigset, 0);
-                       execl("/bin/sh", "/bin/sh", "-c", command, NULL);
-                       _exit(0);
-               }
-       }
+       tint_exec(command);
 }