X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclock%2Fclock.c;h=2745a80bd920afe183c8bbcd036d92378fc37dfe;hb=01e90494fc953a58283ab49aca5562f9f456a6b8;hp=e7bb32f66699544ca09c60c1a94194bc113343b2;hpb=bf2fd3cf8c96d2a747ba4ea3bd8bd9b0a0d7e0e7;p=chaz%2Ftint2

diff --git a/src/clock/clock.c b/src/clock/clock.c
index e7bb32f..2745a80 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -22,17 +22,20 @@
 #include <cairo.h>
 #include <cairo-xlib.h>
 #include <pango/pangocairo.h>
+#include <unistd.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"
 
 
-char *time1_format = 0;
-char *time2_format = 0;
+char *time1_format;
+char *time2_format;
+char *clock_lclick_command;
+char *clock_rclick_command;
 struct timeval time_clock;
 int  time_precision;
 PangoFontDescription *time1_font_desc;
@@ -41,131 +44,190 @@ static char buf_time[40];
 static char buf_date[40];
 
 
-void init_clock(Clock *clock, Area *parent)
+void init_precision()
 {
-   Panel *panel = (Panel *)parent;
-   int time_height, time_height_ink, date_height, date_height_ink;
-
-	clock->area.parent = parent;
-	clock->area.panel = panel;
-   clock->area._draw_foreground = draw_foreground_clock;
-   clock->area._resize = resize_clock;
-   if (!time1_format) return;
-
-   if (strchr(time1_format, 'S') == NULL) time_precision = 60;
-   else time_precision = 1;
-
-   // 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;
-
-   clock->area.posy = parent->pix.border.width + parent->paddingy;
-   clock->area.height = parent->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));
-
-   get_text_size(time1_font_desc, &time_height_ink, &time_height, parent->height, buf_time, strlen(buf_time));
-   clock->time1_posy = (clock->area.height - time_height) / 2;
-
-   if (time2_format) {
-      get_text_size(time2_font_desc, &date_height_ink, &date_height, parent->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;
-   }
+	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;
 }
 
 
-void draw_foreground_clock (void *obj, cairo_t *c, int active)
+void init_clock()
 {
-   Clock *clock = obj;
-   PangoLayout *layout;
+	init_precision();
 
-   //printf("  draw_foreground_clock : %s en (%d, %d)\n", buf_time, clock->area.posx, clock->area.width);
-   layout = pango_cairo_create_layout (c);
+	// 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;
+}
 
-   // 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);
+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;
+
+	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);
+	}
+	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);
+	}
+
+	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));
+
+		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;
+	}
+}
 
-   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);
+void draw_clock (void *obj, cairo_t *c, int active)
+{
+	Clock *clock = obj;
+	PangoLayout *layout;
+
+	layout = pango_cairo_create_layout (c);
 
-      pango_cairo_update_layout (c, layout);
-      cairo_move_to (c, 0, clock->time2_posy);
-      pango_cairo_show_layout (c, layout);
-   }
+	// 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));
 
-   g_object_unref (layout);
+	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);
+
+	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);
+	}
+
+	g_object_unref (layout);
 }
 
 
 void resize_clock (void *obj)
 {
-   Area *parent = ((Area*)obj)->parent;
-   Clock *clock = obj;
-   PangoLayout *layout;
-   int time_width, date_width, new_width;
-
-   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));
-
-   //printf("  resize_clock\n");
-   cairo_surface_t *cs;
-   cairo_t *c;
+	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);
 
-   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-3)) {
-      // resize clock
-      //printf("clock_width %d, new_width %d\n", clock->area.width, new_width);
-      clock->area.width = new_width;
-      clock->area.posx = parent->width - clock->area.width - parent->paddingxlr - parent->pix.border.width;
-      set_resize(parent);
-   }
-
-   g_object_unref (layout);
-   cairo_destroy (c);
-   cairo_surface_destroy (cs);
-   XFreePixmap (server.dsp, pmap);
+	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);
+
+	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;
+
+		// 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);
+}
+
+
+void clock_action(int button)
+{
+	char *command = 0;
+	switch (button) {
+		case 1:
+		command = clock_lclick_command;
+		break;
+		case 3:
+		command = clock_rclick_command;
+		break;
+	}
+	if (command) {
+		pid_t pid;
+		pid = fork();
+		if (pid == 0) {
+			execl("/bin/sh", "/bin/sh", "-c", command, NULL);
+			_exit(0);
+		}
+	}
 }