X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclock%2Fclock.c;h=876536cbca6407c147908210f1f075ed5ea67f15;hb=8622308774bcb0569c8ffa1ea3f928b9d20f35b8;hp=2e54d10c0751cc7242af11f31f1c690ef3bcdd7a;hpb=bd9ade337cc85297242a10d5eb258aad2e71d021;p=chaz%2Ftint2

diff --git a/src/clock/clock.c b/src/clock/clock.c
index 2e54d10..876536c 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -23,179 +23,232 @@
 #include <cairo-xlib.h>
 #include <pango/pangocairo.h>
 #include <unistd.h>
+#include <signal.h>
 
 #include "window.h"
 #include "server.h"
-#include "taskbar.h"
-#include "panel.h"
 #include "area.h"
+#include "panel.h"
+#include "taskbar.h"
 #include "clock.h"
+#include "timer.h"
 
 
-char *time1_format;
-char *time2_format;
-char *clock_lclick_command;
-char *clock_rclick_command;
+char *time1_format=0;
+char *time2_format=0;
+char *time_tooltip_format=0;
+char *clock_lclick_command=0;
+char *clock_rclick_command=0;
 struct timeval time_clock;
-int  time_precision;
-PangoFontDescription *time1_font_desc;
-PangoFontDescription *time2_font_desc;
+PangoFontDescription *time1_font_desc=0;
+PangoFontDescription *time2_font_desc=0;
 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;
 
 
-void init_precision()
+void update_clocks()
 {
-	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;
+	gettimeofday(&time_clock, 0);
+	int i;
+	if (time1_format) {
+		for (i=0 ; i < nb_panel ; i++)
+			panel1[i].clock.area.resize = 1;
+	}
+	panel_refresh = 1;
 }
 
 
-void init_clock()
+const char* clock_get_tooltip(void* obj)
 {
-   Panel *panel;
-   Clock *clock;
-   int i, time_height, time_height_ink, date_height, date_height_ink;
+	strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, localtime(&time_clock.tv_sec));
+	return buf_tooltip;
+}
 
-	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;
+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);
+		else
+			clock_timeout = add_timeout(10, 60000, update_clocks);
+	}
+}
 
-		clock->area.parent = panel;
-		clock->area.panel = panel;
-		clock->area._draw_foreground = draw_clock;
-		clock->area._resize = resize_clock;
 
-		if (!clock->area.on_screen) continue;
+void init_clock_panel(void *p)
+{
+	Panel *panel =(Panel*)p;
+	Clock *clock = &panel->clock;
+	int time_height, time_height_ink, date_height, date_height_ink;
+
+	clock->area.parent = p;
+	clock->area.panel = p;
+	clock->area._draw_foreground = draw_clock;
+	clock->area._resize = resize_clock;
+	clock->area.resize = 1;
+	clock->area.redraw = 1;
+	clock->area.on_screen = 1;
+
+	strftime(buf_time, sizeof(buf_time), time1_format, localtime(&time_clock.tv_sec));
+	get_text_size(time1_font_desc, &time_height_ink, &time_height, panel->area.height, buf_time, strlen(buf_time));
+	if (time2_format) {
+		strftime(buf_date, sizeof(buf_date), time2_format, localtime(&time_clock.tv_sec));
+		get_text_size(time2_font_desc, &date_height_ink, &date_height, panel->area.height, buf_date, strlen(buf_date));
+	}
 
+	if (panel_horizontal) {
+		// panel horizonal => fixed height and posy
 		clock->area.posy = panel->area.pix.border.width + panel->area.paddingy;
 		clock->area.height = panel->area.height - (2 * clock->area.posy);
-		clock->area.resize = 1;
-		clock->area.redraw = 1;
-
-		strftime(buf_time, sizeof(buf_time), time1_format, localtime(&time_clock.tv_sec));
-		if (time2_format)
-			strftime(buf_date, sizeof(buf_date), time2_format, localtime(&time_clock.tv_sec));
+	}
+	else {
+		// panel vertical => fixed width, height, posy and posx
+		clock->area.posy = panel->area.pix.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);
+	}
 
-		get_text_size(time1_font_desc, &time_height_ink, &time_height, panel->area.height, buf_time, strlen(buf_time));
-		clock->time1_posy = (clock->area.height - time_height) / 2;
+	clock->time1_posy = (clock->area.height - time_height) / 2;
+	if (time2_format) {
+		strftime(buf_date, sizeof(buf_date), time2_format, localtime(&time_clock.tv_sec));
+		get_text_size(time2_font_desc, &date_height_ink, &date_height, panel->area.height, buf_date, strlen(buf_date));
 
-		if (time2_format) {
-			get_text_size(time2_font_desc, &date_height_ink, &date_height, panel->area.height, buf_date, strlen(buf_date));
+		clock->time1_posy -= ((date_height_ink + 2) / 2);
+		clock->time2_posy = clock->time1_posy + time_height + 2 - (time_height - time_height_ink)/2 - (date_height - date_height_ink)/2;
+	}
 
-			clock->time1_posy -= ((date_height_ink + 2) / 2);
-			clock->time2_posy = clock->time1_posy + time_height + 2 - (time_height - time_height_ink)/2 - (date_height - date_height_ink)/2;
-		}
+	if (time_tooltip_format) {
+		clock->area._get_tooltip_text = clock_get_tooltip;
+		strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, localtime(&time_clock.tv_sec));
 	}
 }
 
 
+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);
+	if (time1_format)
+		g_free(time1_format);
+	if (time2_format)
+		g_free(time2_format);
+	if (time_tooltip_format)
+		g_free(time_tooltip_format);
+	if (clock_lclick_command)
+		g_free(clock_lclick_command);
+	if (clock_rclick_command)
+		g_free(clock_rclick_command);
+	time1_font_desc = time2_font_desc = 0;
+	time1_format = time2_format = 0;
+	clock_lclick_command = clock_rclick_command = 0;
+}
+
+
 void draw_clock (void *obj, cairo_t *c, int active)
 {
-   Clock *clock = obj;
-   PangoLayout *layout;
+	Clock *clock = obj;
+	PangoLayout *layout;
 
-   //printf("  draw_clock : %s en (%d, %d)\n", buf_time, clock->area.posx, clock->area.width);
-   layout = pango_cairo_create_layout (c);
+	layout = pango_cairo_create_layout (c);
 
-   // draw layout
-   pango_layout_set_font_description (layout, time1_font_desc);
-   pango_layout_set_width (layout, clock->area.width * PANGO_SCALE);
-   pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
-   pango_layout_set_text (layout, buf_time, strlen(buf_time));
+	// draw layout
+	pango_layout_set_font_description (layout, time1_font_desc);
+	pango_layout_set_width (layout, clock->area.width * PANGO_SCALE);
+	pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
+	pango_layout_set_text (layout, buf_time, strlen(buf_time));
 
-   cairo_set_source_rgba (c, clock->font.color[0], clock->font.color[1], clock->font.color[2], clock->font.alpha);
+	cairo_set_source_rgba (c, clock->font.color[0], clock->font.color[1], clock->font.color[2], clock->font.alpha);
 
-   pango_cairo_update_layout (c, layout);
-   cairo_move_to (c, 0, clock->time1_posy);
-   pango_cairo_show_layout (c, layout);
+	pango_cairo_update_layout (c, layout);
+	cairo_move_to (c, 0, clock->time1_posy);
+	pango_cairo_show_layout (c, layout);
 
-   if (time2_format) {
-      pango_layout_set_font_description (layout, time2_font_desc);
-      pango_layout_set_indent(layout, 0);
-      pango_layout_set_text (layout, buf_date, strlen(buf_date));
-      pango_layout_set_width (layout, clock->area.width * PANGO_SCALE);
+	if (time2_format) {
+		pango_layout_set_font_description (layout, time2_font_desc);
+		pango_layout_set_indent(layout, 0);
+		pango_layout_set_text (layout, buf_date, strlen(buf_date));
+		pango_layout_set_width (layout, clock->area.width * PANGO_SCALE);
 
-      pango_cairo_update_layout (c, layout);
-      cairo_move_to (c, 0, clock->time2_posy);
-      pango_cairo_show_layout (c, layout);
-   }
+		pango_cairo_update_layout (c, layout);
+		cairo_move_to (c, 0, clock->time2_posy);
+		pango_cairo_show_layout (c, layout);
+	}
 
-   g_object_unref (layout);
+	g_object_unref (layout);
 }
 
 
 void resize_clock (void *obj)
 {
-   Clock *clock = obj;
-   PangoLayout *layout;
-   int time_width, date_width, new_width;
+	Clock *clock = obj;
+	PangoLayout *layout;
+	int time_width, date_width, new_width;
+
+	clock->area.redraw = 1;
+	time_width = date_width = 0;
+	strftime(buf_time, sizeof(buf_time), time1_format, localtime(&time_clock.tv_sec));
+	if (time2_format)
+		strftime(buf_date, sizeof(buf_date), time2_format, localtime(&time_clock.tv_sec));
+
+	// vertical panel doen't adjust width
+	if (!panel_horizontal) return;
+
+	//printf("  resize_clock\n");
+	cairo_surface_t *cs;
+	cairo_t *c;
+	Pixmap pmap;
+	pmap = XCreatePixmap (server.dsp, server.root_win, clock->area.width, clock->area.height, server.depth);
 
-   time_width = date_width = 0;
-   clock->area.redraw = 1;
+	cs = cairo_xlib_surface_create (server.dsp, pmap, server.visual, clock->area.width, clock->area.height);
+	c = cairo_create (cs);
+	layout = pango_cairo_create_layout (c);
+
+	// check width
+	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));
+	pango_layout_get_pixel_size (layout, &time_width, NULL);
+	if (time2_format) {
+		pango_layout_set_font_description (layout, time2_font_desc);
+		pango_layout_set_indent(layout, 0);
+		pango_layout_set_text (layout, buf_date, strlen(buf_date));
+		pango_layout_get_pixel_size (layout, &date_width, NULL);
+	}
 
-   strftime(buf_time, sizeof(buf_time), time1_format, localtime(&time_clock.tv_sec));
-   if (time2_format)
-      strftime(buf_date, sizeof(buf_date), time2_format, localtime(&time_clock.tv_sec));
+	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);
 
-   //printf("  resize_clock\n");
-   cairo_surface_t *cs;
-   cairo_t *c;
-	Pixmap pmap;
-	pmap = XCreatePixmap (server.dsp, server.root_win, clock->area.width, clock->area.height, server.depth);
+	Panel *panel = ((Area*)obj)->panel;
+	clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.pix.border.width;
+
+	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;
 
-   cs = cairo_xlib_surface_create (server.dsp, pmap, server.visual, clock->area.width, clock->area.height);
-   c = cairo_create (cs);
-   layout = pango_cairo_create_layout (c);
-
-   // check width
-   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));
-   pango_layout_get_pixel_size (layout, &time_width, NULL);
-   if (time2_format) {
-      pango_layout_set_font_description (layout, time2_font_desc);
-      pango_layout_set_indent(layout, 0);
-      pango_layout_set_text (layout, buf_date, strlen(buf_date));
-      pango_layout_get_pixel_size (layout, &date_width, NULL);
-   }
-
-   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);
-
-   if (new_width > clock->area.width || new_width < (clock->area.width-6)) {
-      Panel *panel = ((Area*)obj)->panel;
-
-      // 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;
-      clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.pix.border.width;
-
-      // resize other objects on panel
+		// resize other objects on panel
 		panel->area.resize = 1;
 #ifdef ENABLE_BATTERY
 		panel->battery.area.resize = 1;
 #endif
 		systray.area.resize = 1;
 		panel_refresh = 1;
-   }
+	}
 
-   g_object_unref (layout);
-   cairo_destroy (c);
-   cairo_surface_destroy (cs);
-   XFreePixmap (server.dsp, pmap);
+	g_object_unref (layout);
+	cairo_destroy (c);
+	cairo_surface_destroy (cs);
+	XFreePixmap (server.dsp, pmap);
 }
 
 
@@ -214,6 +267,10 @@ void clock_action(int button)
 		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);
 		}