X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftint2;a=blobdiff_plain;f=src%2Fpanel.c;h=6a98a26191aaf43ad2efc13daa1b5f3d4b8c019a;hp=61b4b2025a01a36be364a4abf90b257d79653b7c;hb=63bbffa4af17926ba2d52728883988eae402b07a;hpb=a72ae04bf96477f11d8bf24baea54596f6d3356b

diff --git a/src/panel.c b/src/panel.c
index 61b4b20..6a98a26 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -58,6 +58,7 @@ int panel_autohide_show_timeout;
 int panel_autohide_hide_timeout;
 int panel_autohide_height;
 int panel_strut_policy;
+char *panel_items_order;
 
 int  max_tick_urgent;
 
@@ -79,6 +80,7 @@ void default_panel()
 	task_dragged = 0;
 	panel_horizontal = 1;
 	panel_position = CENTER;
+	panel_items_order = 0;
 	panel_autohide = 0;
 	panel_autohide_show_timeout = 0;
 	panel_autohide_hide_timeout = 0;
@@ -115,6 +117,7 @@ void cleanup_panel()
 		if (p->main_win) XDestroyWindow(server.dsp, p->main_win);
 	}
 
+	if (panel_items_order) g_free(panel_items_order);
 	if (panel1) free(panel1);
 	if (backgrounds)
 		g_array_free(backgrounds, 1);
@@ -123,7 +126,7 @@ void cleanup_panel()
 
 void init_panel()
 {
-	int i;
+	int i, k;
 	Panel *p;
 
 	if (panel_config.monitor > (server.nb_monitor-1)) {
@@ -139,6 +142,7 @@ void init_panel()
 #ifdef ENABLE_BATTERY
 	init_battery();
 #endif
+	init_taskbar();
 
 	// number of panels (one monitor or 'all' monitors)
 	if (panel_config.monitor >= 0)
@@ -164,32 +168,30 @@ void init_panel()
 		p->area.on_screen = 1;
 		p->area.resize = 1;
 		p->area.size_mode = SIZE_BY_LAYOUT;
-		p->area._resize = resize_panel;
+		p->area._resize = resize_by_layout;
 		p->g_taskbar.area.parent = p;
 		p->g_taskbar.area.panel = p;
 		p->g_task.area.panel = p;
 		init_panel_size_and_position(p);
-		// add childs
-		if (clock_enabled) {
-			init_clock_panel(p);
-			p->area.list = g_slist_append(p->area.list, &p->clock);
-		}
+		// add childs according to panel_items
+		for (k=0 ; k < strlen(panel_items_order) ; k++) {
+			if (panel_items_order[k] == 'L') 
+				init_launcher_panel(p);
+			if (panel_items_order[k] == 'T')
+				init_taskbar_panel(p);
 #ifdef ENABLE_BATTERY
-		if (battery_enabled) {
-			init_battery_panel(p);
-			p->area.list = g_slist_append(p->area.list, &p->battery);
-		}
+			if (panel_items_order[k] == 'B')
+				init_battery_panel(p);
 #endif
-		if (launcher_enabled) {
-			init_launcher_panel(p);
-			p->area.list = g_slist_append(p->area.list, &p->launcher);
-		}
-		// systray only on first panel
-		if (systray.area.on_screen && i == 0) {
-			init_systray_panel(p);
-			p->area.list = g_slist_append(p->area.list, &systray);
-			refresh_systray = 1;
+			if (panel_items_order[k] == 'S') {
+				// TODO : check systray is only on 1 panel
+				init_systray_panel(p);
+				refresh_systray = 1;
+			}
+			if (panel_items_order[k] == 'C')
+				init_clock_panel(p);
 		}
+		set_panel_items_order(p);
 
 		// catch some events
 		XSetWindowAttributes att = { .colormap=server.colormap, .background_pixel=0, .border_pixel=0 };
@@ -217,11 +219,10 @@ void init_panel()
 
 		if (panel_autohide)
 			add_timeout(panel_autohide_hide_timeout, 0, autohide_hide, p);
+		
+		visible_taskbar(p);
 	}
 
-	panel_refresh = 1;
-	init_taskbar();
-	visible_object();
 	task_refresh_tasklist();
 	active_task();
 }
@@ -301,116 +302,6 @@ void init_panel_size_and_position(Panel *panel)
 }
 
 
-void resize_panel(void *obj)
-{
-	Panel *panel = (Panel*)obj;
-//printf("resize_panel : taskbar\n");
-
-	if (panel_horizontal) {
-		int taskbar_width, modulo_width = 0;
-
-		taskbar_width = panel->area.width - (2 * panel->area.paddingxlr) - (2 * panel->area.bg->border.width);
-		if (panel->clock.area.on_screen && panel->clock.area.width)
-			taskbar_width -= (panel->clock.area.width + panel->area.paddingx);
-		if (panel->launcher.area.on_screen && panel->launcher.area.width)
-			taskbar_width -= (panel->launcher.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;
-		}
-
-		// change posx and width for all taskbar
-		int i, posx;
-		posx = panel->area.bg->border.width + panel->area.paddingxlr;
-		if (panel->launcher.area.on_screen && panel->launcher.area.width)
-			posx += (panel->launcher.area.width + panel->area.paddingx);
-		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.bg->border.width);
-		if (panel->clock.area.on_screen && panel->clock.area.height)
-			taskbar_height -= (panel->clock.area.height + panel->area.paddingx);
-		if (panel->launcher.area.on_screen && panel->launcher.area.height)
-			taskbar_height -= (panel->launcher.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.bg->border.width - panel->area.paddingxlr - taskbar_height;
-		if (panel->launcher.area.on_screen && panel->launcher.area.height)
-			posy -= (panel->launcher.area.height + panel->area.paddingx);
-		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;
-		}
-
-		// 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;
-		}
-	}
-}
-
-
-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;
-}
-
 void update_strut(Panel* p)
 {
 	if (panel_strut_policy == STRUT_NONE) {
@@ -466,6 +357,37 @@ void update_strut(Panel* p)
 }
 
 
+void set_panel_items_order(Panel *p)
+{
+	int k, j;
+	
+	if (p->area.list) {
+		g_slist_free(p->area.list);
+		p->area.list = 0;
+	}
+
+	for (k=0 ; k < strlen(panel_items_order) ; k++) {
+		if (panel_items_order[k] == 'L') 
+			p->area.list = g_slist_append(p->area.list, &p->launcher);
+		if (panel_items_order[k] == 'T') {
+			for (j=0 ; j < p->nb_desktop ; j++)
+				p->area.list = g_slist_append(p->area.list, &p->taskbar[j]);
+		}
+#ifdef ENABLE_BATTERY
+		if (panel_items_order[k] == 'B') 
+			p->area.list = g_slist_append(p->area.list, &p->battery);
+#endif
+		if (panel_items_order[k] == 'S') {
+			// TODO : check systray is only on 1 panel
+			p->area.list = g_slist_append(p->area.list, &systray);
+		}
+		if (panel_items_order[k] == 'C')
+			p->area.list = g_slist_append(p->area.list, &p->clock);
+	}
+	init_rendering(&p->area, 0);
+}
+
+
 void set_panel_properties(Panel *p)
 {
 	XStoreName (server.dsp, p->main_win, "tint2");
@@ -580,12 +502,14 @@ void set_panel_background(Panel *p)
 	}
 
 	// redraw panel's object
+	//p->area.redraw = 1;
 	GSList *l0;
 	Area *a;
 	for (l0 = p->area.list; l0 ; l0 = l0->next) {
 		a = l0->data;
 		set_redraw(a);
 	}
+	
 	// reset task 'state_pix'
 	int i;
 	Taskbar *tskbar;