X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=3bc5aa541c6ca1aba14bc293f532d6e5dbb852fa;hb=3795f38c6c834700ac5eed530b86adbc6399488d;hp=3e2d76e12461ab092b2287c041d34a7d50f1a138;hpb=0357305cec0f78ba4d4717467025ead6be25ce0c;p=chaz%2Ftint2

diff --git a/src/panel.c b/src/panel.c
index 3e2d76e..3bc5aa5 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -40,11 +40,16 @@ int mouse_scroll_up;
 int mouse_scroll_down;
 
 int panel_mode;
+int wm_menu;
 int panel_position;
+int panel_horizontal;
 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;
@@ -55,30 +60,61 @@ void init_panel()
 {
 	int i;
 	Panel *p;
+
 	for (i=0 ; i < nb_panel ; i++) {
 		p = &panel1[i];
 
-		p->area.parent = 0;
+		p->area.parent = p;
 		p->area.panel = p;
+		p->area.on_screen = 1;
+	   p->area.resize = 1;
+		p->area._resize = resize_panel;
 		p->g_taskbar.parent = p;
 		p->g_taskbar.panel = p;
 		p->g_task.area.panel = p;
 
-		if (p->pourcentx)
-			p->area.width = (float)server.monitor[p->monitor].width * p->initial_width / 100;
-		else
-			p->area.width = p->initial_width;
-		if (p->pourcenty)
-			p->area.height = (float)server.monitor[p->monitor].height * p->initial_height / 100;
-		else
-			p->area.height = p->initial_height;
+		// 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);
+#endif
+   	// systray only on first panel
+	   if (systray.area.on_screen && i == 0)
+			p->area.list = g_slist_append(p->area.list, &systray);
 
 		// full width mode
-		if (!p->area.width)
-			p->area.width = server.monitor[p->monitor].width;
+		if (!p->initial_width) {
+			p->initial_width = 100;
+			p->pourcentx = 1;
+		}
 
-		if (p->area.pix.border.rounded > p->area.height/2)
-			p->area.pix.border.rounded = p->area.height/2;
+		// detect panel size
+		if (panel_horizontal) {
+			if (p->pourcentx)
+				p->area.width = (float)server.monitor[p->monitor].width * p->initial_width / 100;
+			else
+				p->area.width = p->initial_width;
+			if (p->pourcenty)
+				p->area.height = (float)server.monitor[p->monitor].height * p->initial_height / 100;
+			else
+				p->area.height = p->initial_height;
+			if (p->area.pix.border.rounded > p->area.height/2)
+				p->area.pix.border.rounded = p->area.height/2;
+		}
+		else {
+			if (p->pourcentx)
+				p->area.height = (float)server.monitor[p->monitor].height * p->initial_width / 100;
+			else
+				p->area.height = p->initial_width;
+			if (p->pourcenty)
+				p->area.width = (float)server.monitor[p->monitor].width * p->initial_height / 100;
+			else
+				p->area.width = p->initial_height;
+			if (p->area.pix.border.rounded > p->area.width/2)
+				p->area.pix.border.rounded = p->area.width/2;
+		}
 
 		/* panel position determined here */
 		if (panel_position & LEFT) {
@@ -89,32 +125,36 @@ void init_panel()
 				p->posx = server.monitor[p->monitor].x + server.monitor[p->monitor].width - p->area.width - p->marginx;
 			}
 			else {
-				p->posx = server.monitor[p->monitor].x + ((server.monitor[p->monitor].width - p->area.width) / 2);
+				if (panel_horizontal)
+					p->posx = server.monitor[p->monitor].x + ((server.monitor[p->monitor].width - p->area.width) / 2);
+				else
+					p->posx = server.monitor[p->monitor].x + p->marginx;
 			}
 		}
 		if (panel_position & TOP) {
 			p->posy = server.monitor[p->monitor].y + p->marginy;
 		}
 		else {
-			p->posy = server.monitor[p->monitor].y + server.monitor[p->monitor].height - p->area.height - p->marginy;
+			if (panel_position & BOTTOM) {
+				p->posy = server.monitor[p->monitor].y + server.monitor[p->monitor].height - p->area.height - p->marginy;
+			}
+			else {
+				p->posy = server.monitor[p->monitor].y + ((server.monitor[p->monitor].height - p->area.height) / 2);
+			}
 		}
+		// printf("panel : 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);
 		set_panel_background(p);
 
 		XMapWindow (server.dsp, p->main_win);
-
-		init_clock(&p->clock, &p->area);
 	}
+	panel_refresh = 1;
 }
 
 
@@ -122,46 +162,141 @@ void cleanup_panel()
 {
 	if (!panel1) return;
 
+	task_active = 0;
+	task_drag = 0;
+	task_urgent = 0;
+	cleanup_systray();
    cleanup_taskbar();
 
+	// font allocated once
+   if (panel1[0].g_task.font_desc) {
+   	pango_font_description_free(panel1[0].g_task.font_desc);
+   	panel1[0].g_task.font_desc = 0;
+	}
+
 	int i;
 	Panel *p;
 	for (i=0 ; i < nb_panel ; i++) {
 		p = &panel1[i];
 
-	   free_area(&p->area);
+		free_area(&p->area);
 	   free_area(&p->g_task.area);
 	   free_area(&p->g_taskbar);
-   	free_area(&p->clock.area);
-		if (p->root_pmap) XFreePixmap(server.dsp, p->root_pmap);
-		if (p->main_win) XDestroyWindow(server.dsp, p->main_win);
-	}
 
-	// font allocated once
-   if (panel1[0].g_task.font_desc) pango_font_description_free(panel1[0].g_task.font_desc);
+		if (p->temp_pmap) {
+			XFreePixmap(server.dsp, p->temp_pmap);
+			p->temp_pmap = 0;
+		}
+		if (p->main_win) {
+			XDestroyWindow(server.dsp, p->main_win);
+			p->main_win = 0;
+		}
+	}
 
    if (panel1) free(panel1);
    panel1 = 0;
 }
 
 
-void visual_refresh (Panel *p)
+void resize_panel(void *obj)
 {
-   if (p->root_pmap) XFreePixmap(server.dsp, p->root_pmap);
-   p->root_pmap = XCreatePixmap(server.dsp, server.root_win, p->area.width, p->area.height, server.depth);
+   Panel *panel = (Panel*)obj;
+
+	if (panel_horizontal) {
+	   int taskbar_width, modulo_width = 0;
+
+		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);
+
+		if (panel_mode == MULTI_DESKTOP) {
+			int width = taskbar_width - ((panel->nb_desktop-1) * panel->area.paddingx);
+			taskbar_width = width / panel->nb_desktop;
+			modulo_width = width % panel->nb_desktop;
+		}
 
-   XCopyArea (server.dsp, p->area.pix.pmap, p->root_pmap, server.gc, 0, 0, p->area.width, p->area.height, 0, 0);
+		// change posx and width for all taskbar
+		int i, posx;
+		posx = panel->area.pix.border.width + panel->area.paddingxlr;
+		for (i=0 ; i < panel->nb_desktop ; i++) {
+			panel->taskbar[i].area.posx = posx;
+			panel->taskbar[i].area.width = taskbar_width;
+			panel->taskbar[i].area.resize = 1;
+			if (modulo_width) {
+				panel->taskbar[i].area.width++;
+				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;
+		}
+	}
+	else {
+	   int taskbar_height, modulo_height = 0;
+		int i, posy;
+
+		taskbar_height = panel->area.height - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width);
+		if (panel->clock.area.on_screen && panel->clock.area.height)
+			taskbar_height -= (panel->clock.area.height + panel->area.paddingx);
+	#ifdef ENABLE_BATTERY
+		if (panel->battery.area.on_screen && panel->battery.area.height)
+			taskbar_height -= (panel->battery.area.height + panel->area.paddingx);
+	#endif
+		// TODO : systray only on first panel. search better implementation !
+		if (systray.area.on_screen && systray.area.height && panel == &panel1[0])
+			taskbar_height -= (systray.area.height + panel->area.paddingx);
+
+		posy = panel->area.height - panel->area.pix.border.width - panel->area.paddingxlr - taskbar_height;
+		if (panel_mode == MULTI_DESKTOP) {
+			int height = taskbar_height - ((panel->nb_desktop-1) * panel->area.paddingx);
+			taskbar_height = height / panel->nb_desktop;
+			modulo_height = height % panel->nb_desktop;
+		}
 
-   // draw child object
-   GSList *l = p->area.list;
-   for (; l ; l = l->next)
-      refresh (l->data);
+		// change posy and height for all taskbar
+		for (i=0 ; i < panel->nb_desktop ; i++) {
+			panel->taskbar[i].area.posy = posy;
+			panel->taskbar[i].area.height = taskbar_height;
+			panel->taskbar[i].area.resize = 1;
+			if (modulo_height) {
+				panel->taskbar[i].area.height++;
+				modulo_height--;
+			}
+			if (panel_mode == MULTI_DESKTOP)
+				posy += panel->taskbar[i].area.height + panel->area.paddingx;
+		}
+	}
+}
 
-   XCopyArea(server.dsp, p->root_pmap, p->main_win, server.gc, 0, 0, p->area.width, p->area.height, 0, 0);
 
-   // main_win doesn't include panel.area.paddingx, so we have WM capabilities on left and right.
-   // this feature is disabled !
-   //XCopyArea (server.dsp, server.pmap, p->main_win, server.gc, p->area.paddingxlr, 0, p->area.width-(2*p->area.paddingxlr), p->area.height, 0, 0);
+void visible_object()
+{
+   Panel *panel;
+   int i, j;
+
+	for (i=0 ; i < nb_panel ; i++) {
+		panel = &panel1[i];
+
+		Taskbar *taskbar;
+		for (j=0 ; j < panel->nb_desktop ; j++) {
+			taskbar = &panel->taskbar[j];
+			if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
+				// SINGLE_DESKTOP and not current desktop
+				taskbar->area.on_screen = 0;
+			}
+			else {
+				taskbar->area.on_screen = 1;
+			}
+		}
+	}
+	panel_refresh = 1;
 }
 
 
@@ -183,18 +318,34 @@ void set_panel_properties(Panel *p)
 
    // Reserved space
    long   struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-   if (panel_position & TOP) {
-      struts[2] = p->area.height + p->marginy;
-      struts[8] = p->posx;
-      // p->area.width - 1 allowed full screen on monitor 2
-      struts[9] = p->posx + p->area.width - 1;
-   }
-   else {
-      struts[3] = p->area.height + p->marginy;
-      struts[10] = p->posx;
-      // p->area.width - 1 allowed full screen on monitor 2
-      struts[11] = p->posx + p->area.width - 1;
-   }
+	if (panel_horizontal) {
+		if (panel_position & TOP) {
+			struts[2] = p->area.height + p->marginy;
+			struts[8] = p->posx;
+			// p->area.width - 1 allowed full screen on monitor 2
+			struts[9] = p->posx + p->area.width - 1;
+		}
+		else {
+			struts[3] = p->area.height + p->marginy;
+			struts[10] = p->posx;
+			// p->area.width - 1 allowed full screen on monitor 2
+			struts[11] = p->posx + p->area.width - 1;
+		}
+	}
+	else {
+		if (panel_position & LEFT) {
+			struts[0] = p->area.width + p->marginx;
+			struts[4] = p->posy;
+			// p->area.width - 1 allowed full screen on monitor 2
+			struts[5] = p->posy + p->area.height - 1;
+		}
+		else {
+			struts[1] = p->area.width + p->marginx;
+			struts[6] = p->posy;
+			// p->area.width - 1 allowed full screen on monitor 2
+			struts[7] = p->posy + p->area.height - 1;
+		}
+	}
    // Old specification : fluxbox need _NET_WM_STRUT.
    XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STRUT, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 4);
    XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STRUT_PARTIAL, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 12);
@@ -226,40 +377,6 @@ void set_panel_properties(Panel *p)
 }
 
 
-void visible_object()
-{
-   Panel *panel;
-   int i, j;
-
-	for (i=0 ; i < nb_panel ; i++) {
-		panel = &panel1[i];
-
-		if (panel->area.list) {
-			g_slist_free(panel->area.list);
-			panel->area.list = 0;
-		}
-
-		// list of visible objects
-		// start with clock because draw(clock) can resize others object
-		if (time1_format)
-			panel->area.list = g_slist_append(panel->area.list, &panel->clock);
-
-		Taskbar *taskbar;
-		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
-				continue;
-			}
-
-			panel->area.list = g_slist_append(panel->area.list, taskbar);
-		}
-		set_redraw(&panel->area);
-	}
-	panel_refresh = 1;
-}
-
-
 void set_panel_background(Panel *p)
 {
    get_root_pixmap();
@@ -267,7 +384,7 @@ void set_panel_background(Panel *p)
    if (p->area.pix.pmap) XFreePixmap (server.dsp, p->area.pix.pmap);
    p->area.pix.pmap = XCreatePixmap (server.dsp, server.root_win, p->area.width, p->area.height, server.depth);
 
-   // copy background (server.root_pmap) in panel
+   // copy background (server.root_pmap) in panel.area.pix.pmap
    Window dummy;
    int  x, y;
    XTranslateCoordinates(server.dsp, p->main_win, server.root_win, 0, 0, &x, &y, &dummy);
@@ -285,11 +402,13 @@ void set_panel_background(Panel *p)
    cairo_destroy (c);
    cairo_surface_destroy (cs);
 
-	// redraw panel
-   set_redraw (&p->area);
-
-   // copy background panel on desktop window
-   //XCopyArea (server.dsp, p->area.pix.pmap, server.root_win, server.gc_root, 0, 0, p->area.width, p->area.height, p->posx, p->posy);
+	// redraw panel's object
+   GSList *l0;
+   Area *a;
+	for (l0 = p->area.list; l0 ; l0 = l0->next) {
+      a = l0->data;
+      set_redraw(a);
+   }
 }