X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fclock%2Fclock.c;h=a29eae545f465cd08c60b8a973b1d13b72c4ed75;hb=bdf5fa4daad88f6a65b6f4be3acae7b663906e86;hp=35fb595d29c62868791aea889d5ed0668dec6c7e;hpb=da65866b2388391052e3ce95818c1d5ebd2b26b5;p=chaz%2Ftint2

diff --git a/src/clock/clock.c b/src/clock/clock.c
index 35fb595..a29eae5 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -22,6 +22,7 @@
 #include <cairo.h>
 #include <cairo-xlib.h>
 #include <pango/pangocairo.h>
+#include <unistd.h>
 
 #include "window.h"
 #include "server.h"
@@ -31,8 +32,10 @@
 #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,56 +44,79 @@ 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;
-
-	// add clock to the panel
-	panel->area.list = g_slist_append(panel->area.list, clock);
-
-   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;
+	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;
+}
 
-   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;
+void init_clock()
+{
+   Panel *panel;
+   Clock *clock;
+   int i, time_height, time_height_ink, date_height, date_height_ink;
+
+	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;
+
+		if (!clock->area.on_screen) continue;
+
+		clock->area.parent = panel;
+		clock->area.panel = panel;
+		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 (time2_format) {
-      get_text_size(time2_font_desc, &date_height_ink, &date_height, parent->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 -= ((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 = (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;
+		}
+	}
 }
 
 
-void draw_foreground_clock (void *obj, cairo_t *c, int active)
+void draw_clock (void *obj, cairo_t *c, int active)
 {
    Clock *clock = obj;
    PangoLayout *layout;
 
-   //printf("  draw_foreground_clock : %s en (%d, %d)\n", buf_time, clock->area.posx, clock->area.width);
    layout = pango_cairo_create_layout (c);
 
    // draw layout
@@ -126,13 +152,15 @@ void resize_clock (void *obj)
    PangoLayout *layout;
    int time_width, date_width, new_width;
 
-   time_width = date_width = 0;
    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;
@@ -144,34 +172,36 @@ void resize_clock (void *obj)
    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)) {
-      int i;
+	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;
 
-      //printf("clock_width %d, new_width %d\n", clock->area.width, new_width);
       // resize clock
-      clock->area.width = new_width;
-      clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.pix.border.width;
+      // 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
-		for (i=0 ; i < nb_panel ; i++) {
-			panel1[i].area.resize = 1;
-		}
+		panel->area.resize = 1;
+#ifdef ENABLE_BATTERY
+		panel->battery.area.resize = 1;
+#endif
+		systray.area.resize = 1;
 		panel_refresh = 1;
    }
 
@@ -181,3 +211,25 @@ void resize_clock (void *obj)
    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);
+		}
+	}
+}
+