X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=161d9023966182d6e0b934f9d17bd46986ae40b9;hb=28c230d74637bc2fc28ae8d15f3007aec0c49798;hp=84d5ab9d8d4dac0e2a8d22a24c7ccb2f8f2640dc;hpb=45704e9e1b7798307c0fb9a664b8e759a8524f38;p=chaz%2Ftint2

diff --git a/src/panel.c b/src/panel.c
index 84d5ab9..161d902 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -47,6 +47,8 @@ int panel_refresh;
 Task *task_active;
 Task *task_drag;
 Task *task_urgent;
+int  tick_urgent;
+int  max_tick_urgent;
 
 Panel *panel1 = 0;
 int  nb_panel;
@@ -73,12 +75,13 @@ void init_panel()
 		// add childs
 	   if (p->clock.area.on_screen)
 			p->area.list = g_slist_append(p->area.list, &p->clock);
+#ifdef ENABLE_BATTERY
 		if (p->battery.area.on_screen)
 			p->area.list = g_slist_append(p->area.list, &p->battery);
-	   if (systray.area.on_screen && i == 0) {
-	   	// systray only on first panel
+#endif
+   	// systray only on first panel
+	   if (systray.area.on_screen && i == 0)
 			p->area.list = g_slist_append(p->area.list, &systray);
-		}
 
 		// detect panel size
 		if (p->pourcentx)
@@ -115,6 +118,7 @@ void init_panel()
 		else {
 			p->posy = server.monitor[p->monitor].y + server.monitor[p->monitor].height - p->area.height - p->marginy;
 		}
+		//printf("posx %d, posy %d, width %d, height %d\n", p->posx, p->posy, p->area.width, p->area.height);
 
 		// Catch some events
 		XSetWindowAttributes att = { ParentRelative, 0L, 0, 0L, 0, 0, Always, 0L, 0L, False, ExposureMask|ButtonPressMask|ButtonReleaseMask, NoEventMask, False, 0, 0 };
@@ -178,8 +182,10 @@ void resize_panel(void *obj)
    taskbar_width = panel->area.width - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width);
    if (panel->clock.area.on_screen && panel->clock.area.width)
       taskbar_width -= (panel->clock.area.width + panel->area.paddingx);
+#ifdef ENABLE_BATTERY
 	if (panel->battery.area.on_screen && panel->battery.area.width)
 		taskbar_width -= (panel->battery.area.width + panel->area.paddingx);
+#endif
    // TODO : systray only on first panel. search better implementation !
    if (systray.area.on_screen && systray.area.width && panel == &panel1[0])
    	taskbar_width -= (systray.area.width + panel->area.paddingx);