order of panel items : position of each object is update by layering engine (area)

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

diff --git a/src/clock/clock.c b/src/clock/clock.c
index c7ac910468c4242b0e7f561edae711c3e676bab7..783f7e9ff4031f5d269623804d4218b05bdd73dd 100644 (file)
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -22,17 +22,14 @@
 #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;
@@ -71,7 +68,6 @@ void default_clock()
 
 void cleanup_clock()
 {
-printf("*** cleanup_clock()\n");
        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);
@@ -151,6 +147,7 @@ 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;
@@ -170,8 +167,8 @@ 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.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);
        }
@@ -226,11 +223,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;
@@ -239,7 +236,7 @@ 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) return ret;
 
        //printf("  resize_clock\n");
        cairo_surface_t *cs;
@@ -267,7 +264,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
@@ -275,20 +271,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;
 }
 
 
@@ -303,17 +294,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);
 }