X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fclock%2Fclock.c;h=82964a663c5eb307364b6d0f948132100bf0ca55;hb=d3ffd17946b172b64b2abc646176510a0773bc5f;hp=115ba9fe1bf5a4794984f1db33e0863147249142;hpb=9becd8bd3b513a0bbfe778b2ef88f6d598fdf03a;p=chaz%2Ftint2

diff --git a/src/clock/clock.c b/src/clock/clock.c
index 115ba9f..82964a6 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -50,10 +50,10 @@ static char buf_time[40];
 static char buf_date[40];
 static char buf_tooltip[40];
 int clock_enabled;
-static const struct timeout* clock_timeout=0;
+static timeout* clock_timeout=0;
 
 
-void update_clocks()
+void update_clocks(void* arg)
 {
 	gettimeofday(&time_clock, 0);
 	int i;
@@ -87,9 +87,9 @@ void init_clock()
 {
 	if(time1_format && clock_timeout==0) {
 		if (strchr(time1_format, 'S') || strchr(time1_format, 'T') || strchr(time1_format, 'r'))
-			clock_timeout = add_timeout(10, 1000, update_clocks);
+			clock_timeout = add_timeout(10, 1000, update_clocks, 0);
 		else
-			clock_timeout = add_timeout(10, 60000, update_clocks);
+			clock_timeout = add_timeout(10, 60000, update_clocks, 0);
 	}
 }
 
@@ -117,15 +117,15 @@ void init_clock_panel(void *p)
 
 	if (panel_horizontal) {
 		// panel horizonal => fixed height and posy
-		clock->area.posy = panel->area.pix.border.width + panel->area.paddingy;
+		clock->area.posy = panel->area.bg->border.width + panel->area.paddingy;
 		clock->area.height = panel->area.height - (2 * clock->area.posy);
 	}
 	else {
 		// panel vertical => fixed width, height, posy and posx
-		clock->area.posy = panel->area.pix.border.width + panel->area.paddingxlr;
+		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.pix.border.width + panel->area.paddingy;
-		clock->area.width = panel->area.width - (2 * panel->area.pix.border.width) - (2 * panel->area.paddingy);
+		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->time1_posy = (clock->area.height - time_height) / 2;
@@ -166,7 +166,7 @@ void cleanup_clock()
 }
 
 
-void draw_clock (void *obj, cairo_t *c, int active)
+void draw_clock (void *obj, cairo_t *c)
 {
 	Clock *clock = obj;
 	PangoLayout *layout;
@@ -239,10 +239,10 @@ void resize_clock (void *obj)
 
 	if (time_width > date_width) new_width = time_width;
 	else new_width = date_width;
-	new_width += (2*clock->area.paddingxlr) + (2*clock->area.pix.border.width);
+	new_width += (2*clock->area.paddingxlr) + (2*clock->area.bg->border.width);
 
 	Panel *panel = ((Area*)obj)->panel;
-	clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.pix.border.width;
+	clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.bg->border.width;
 
 	if (new_width > clock->area.width || new_width < (clock->area.width-6)) {
 		// resize clock
@@ -282,9 +282,9 @@ void clock_action(int button)
 		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);
+//			sigset_t sigset;
+//			sigprocmask(SIG_SETMASK, &sigset, 0);
+//			sigprocmask(SIG_UNBLOCK, &sigset, 0);
 			execl("/bin/sh", "/bin/sh", "-c", command, NULL);
 			_exit(0);
 		}