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

diff --git a/src/panel.c b/src/panel.c
index 21a3001..161d902 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -40,11 +40,15 @@ int mouse_scroll_up;
 int mouse_scroll_down;
 
 int panel_mode;
+int wm_menu;
 int panel_position;
 int panel_refresh;
 
-Task *task_active = 0;
-Task *task_drag = 0;
+Task *task_active;
+Task *task_drag;
+Task *task_urgent;
+int  tick_urgent;
+int  max_tick_urgent;
 
 Panel *panel1 = 0;
 int  nb_panel;
@@ -71,10 +75,13 @@ void init_panel()
 		// add childs
 	   if (p->clock.area.on_screen)
 			p->area.list = g_slist_append(p->area.list, &p->clock);
-	   if (systray.area.on_screen && i == 0) {
-	   	// systray only on first panel
+#ifdef ENABLE_BATTERY
+		if (p->battery.area.on_screen)
+			p->area.list = g_slist_append(p->area.list, &p->battery);
+#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)
@@ -111,14 +118,11 @@ 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 };
-
-		// XCreateWindow(display, parent, x, y, w, h, border, depth, class, visual, mask, attrib)
-		// main_win doesn't include panel.area.paddingx, so we have WM capabilities on left and right.
 		if (p->main_win) XDestroyWindow(server.dsp, p->main_win);
-		//win = XCreateWindow (server.dsp, server.root_win, p->posx+p->area.paddingxlr, p->posy, p->area.width-(2*p->area.paddingxlr), p->area.height, 0, server.depth, InputOutput, CopyFromParent, CWEventMask, &att);
 		p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, CopyFromParent, CWEventMask, &att);
 
 		set_panel_properties(p);
@@ -134,6 +138,10 @@ void cleanup_panel()
 {
 	if (!panel1) return;
 
+	task_active = 0;
+	task_drag = 0;
+	task_urgent = 0;
+	cleanup_systray();
    cleanup_taskbar();
 
 	// font allocated once
@@ -171,41 +179,42 @@ void resize_panel(void *obj)
    Panel *panel = (Panel*)obj;
    int taskbar_width, modulo_width, taskbar_on_screen;
 
-//printf("resize_panel :  : posx et width des barres de taches\n");
-
-   if (panel_mode == MULTI_DESKTOP) taskbar_on_screen = panel->nb_desktop;
-   else taskbar_on_screen = 1;
-
    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);
 
-   taskbar_width = (taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx)) / taskbar_on_screen;
-
-   if (taskbar_on_screen > 1)
-      modulo_width = (taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx)) % taskbar_on_screen;
-   else
+   if (panel_mode == MULTI_DESKTOP) {
+		taskbar_on_screen = panel->nb_desktop;
+		int width = taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx);
+	   taskbar_width = width / taskbar_on_screen;
+      modulo_width = width % taskbar_on_screen;
+	}
+   else {
+		taskbar_on_screen = 1;
       modulo_width = 0;
+	}
 
 	// change posx and width for all taskbar
-   int i, modulo=0, posx=0;
+   int i, posx;
+	posx = panel->area.pix.border.width + panel->area.paddingxlr;
    for (i=0 ; i < panel->nb_desktop ; i++) {
-      if ((i % taskbar_on_screen) == 0) {
-         posx = panel->area.pix.border.width + panel->area.paddingxlr;
-         modulo = modulo_width;
-      }
-      else posx += taskbar_width + panel->area.paddingx;
-
       panel->taskbar[i].area.posx = posx;
       panel->taskbar[i].area.width = taskbar_width;
       panel->taskbar[i].area.resize = 1;
-      if (modulo) {
+      if (modulo_width) {
          panel->taskbar[i].area.width++;
-         modulo--;
+         modulo_width--;
       }
+		//printf("taskbar %d : posx %d, width, %d, posy %d\n", i, posx, panel->taskbar[i].area.width, posx + panel->taskbar[i].area.width);
+      if (panel_mode == MULTI_DESKTOP)
+      	posx += panel->taskbar[i].area.width + panel->area.paddingx;
    }
 }
 
@@ -222,7 +231,7 @@ void visible_object()
 		for (j=0 ; j < panel->nb_desktop ; j++) {
 			taskbar = &panel->taskbar[j];
 			if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
-				// (SINGLE_DESKTOP or SINGLE_MONITOR) and not current desktop
+				// SINGLE_DESKTOP and not current desktop
 				taskbar->area.on_screen = 0;
 			}
 			else {