X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclock%2Fclock.c;h=cfd9aed5d22ad90ed63ff4b1a0bf20e621a55b84;hb=699103e6e9de1b060c80c63326f1782b45dd8f73;hp=273fb818e17991089c391a52a85d1b9dc5ea9924;hpb=f8bebb561d52fa25b320904bb0c6a08347d05611;p=chaz%2Ftint2

diff --git a/src/clock/clock.c b/src/clock/clock.c
index 273fb81..cfd9aed 100644
--- 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;
@@ -150,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) {
@@ -168,11 +169,10 @@ void init_clock_panel(void *p)
 		clock->area.height = panel->area.height - (2 * clock->area.posy);
 	}
 	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);
+		// panel vertical => fixed width, posx, 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);
+		clock->area.height = time_height + date_height + (2 * clock->area.paddingxlr) + (2*clock->area.bg->border.width);
 	}
 
 	clock->time1_posy = (clock->area.height - time_height) / 2;
@@ -225,11 +225,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, ret = 0;
 
 	clock->area.redraw = 1;
 	time_width = date_width = 0;
@@ -238,8 +238,8 @@ 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;
 	cairo_t *c;
@@ -250,7 +250,7 @@ void resize_clock (void *obj)
 	c = cairo_create (cs);
 	layout = pango_cairo_create_layout (c);
 
-	// check width
+	// check width/height
 	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));
@@ -262,32 +262,20 @@ void resize_clock (void *obj)
 		pango_layout_get_pixel_size (layout, &date_width, NULL);
 	}
 
-	if (time_width > date_width) new_width = time_width;
-	else new_width = date_width;
+	int new_width = (time_width > date_width) ? time_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
-		// printf("clock_width %d, new_width %d\n", clock->area.width, new_width);
 		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;
 }
 
 
@@ -302,17 +290,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);
 }