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

diff --git a/src/panel.c b/src/panel.c
index 3e2d76e..7d0fa90 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -55,15 +55,30 @@ 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;
 
+		// add childs
+	   if (p->clock.area.on_screen)
+			p->area.list = g_slist_append(p->area.list, &p->clock);
+		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
+			p->area.list = g_slist_append(p->area.list, &systray);
+		}
+
+		// detect panel size
 		if (p->pourcentx)
 			p->area.width = (float)server.monitor[p->monitor].width * p->initial_width / 100;
 		else
@@ -112,9 +127,8 @@ void init_panel()
 		set_panel_background(p);
 
 		XMapWindow (server.dsp, p->main_win);
-
-		init_clock(&p->clock, &p->area);
 	}
+	panel_refresh = 1;
 }
 
 
@@ -122,46 +136,103 @@ void cleanup_panel()
 {
 	if (!panel1) return;
 
+	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;
+   int taskbar_width, modulo_width, taskbar_on_screen;
+
+   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);
+	if (panel->battery.area.on_screen && panel->battery.area.width)
+		taskbar_width -= (panel->battery.area.width + panel->area.paddingx);
+   // 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) {
+		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, 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;
+   }
+}
 
-   XCopyArea (server.dsp, p->area.pix.pmap, p->root_pmap, server.gc, 0, 0, p->area.width, p->area.height, 0, 0);
 
-   // draw child object
-   GSList *l = p->area.list;
-   for (; l ; l = l->next)
-      refresh (l->data);
+void visible_object()
+{
+   Panel *panel;
+   int i, j;
 
-   XCopyArea(server.dsp, p->root_pmap, p->main_win, server.gc, 0, 0, p->area.width, p->area.height, 0, 0);
+	for (i=0 ; i < nb_panel ; i++) {
+		panel = &panel1[i];
 
-   // 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);
+		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
+				taskbar->area.on_screen = 0;
+			}
+			else {
+				taskbar->area.on_screen = 1;
+			}
+		}
+	}
+	panel_refresh = 1;
 }
 
 
@@ -226,40 +297,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 +304,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 +322,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);
+   }
 }