add panel_items = LTBSC config. LauncherTaskbarBatterySystrayClock define order and enable/disable of each object.

git-svn-id: http://tint2.googlecode.com/svn/trunk@548 121b4492-b84c-0410-8b4c-0d4edfb3f3cc

src/config.c

@@ -235,6 +235,30 @@ void add_entry (char *key, char *value)
 			panel_config.area.height = atoi(value2);
 		}
 	}
+	else if (strcmp (key, "panel_items") == 0) {
+		if (panel_items_order) g_free(panel_items_order);
+		panel_items_order = strdup(value);
+		int j;
+		for (j=0 ; j < strlen(panel_items_order) ; j++) {
+			if (panel_items_order[j] == 'L')
+				launcher_enabled = 1;
+			//if (panel_items_order[j] == 'T')
+			if (panel_items_order[j] == 'B') {
+#ifdef ENABLE_BATTERY
+				battery_enabled = 1;
+#else
+				fprintf(stderr, "tint2 is build without battery support\n");
+#endif
+			}
+			if (panel_items_order[j] == 'S') {
+				// systray disabled in snapshot mode
+				if (snapshot_path == 0)
+					systray_enabled = 1;
+			}
+			if (panel_items_order[j] == 'C')			
+				clock_enabled = 1;
+		}
+	}
 	else if (strcmp (key, "panel_margin") == 0) {
 		extract_values(value, &value1, &value2, &value3);
 		panel_config.marginx = atoi (value1);
@@ -291,15 +315,6 @@ void add_entry (char *key, char *value)
 	}
 
 	/* Battery */
-	else if (strcmp (key, "battery") == 0) {
-#ifdef ENABLE_BATTERY
-		if(atoi(value) == 1)
-			battery_enabled = 1;
-#else
-		if(atoi(value) == 1)
-			fprintf(stderr, "tint2 is build without battery support\n");
-#endif
-	}
 	else if (strcmp (key, "battery_low_status") == 0) {
 #ifdef ENABLE_BATTERY
 		battery_low_status = atoi(value);
@@ -498,16 +513,7 @@ void add_entry (char *key, char *value)
 	}
 
 	/* Systray */
-	// systray disabled in snapshot mode
-	else if (strcmp (key, "systray") == 0 && snapshot_path == 0) {
-		systray_enabled = atoi(value);
-		old_config_file = 0;
-	}
-	else if (strcmp (key, "systray_padding") == 0 && snapshot_path == 0) {
-		if (old_config_file) {
-			// if tint2rc is an old config file, systray_padding enabled the systray bar.
-			systray_enabled = 1;
-		}
+	else if (strcmp (key, "systray_padding") == 0) {
 		extract_values(value, &value1, &value2, &value3);
 		systray.area.paddingxlr = systray.area.paddingx = atoi (value1);
 		if (value2) systray.area.paddingy = atoi (value2);
@@ -539,9 +545,6 @@ void add_entry (char *key, char *value)
 	}
 
 	/* Launcher */
-	else if (strcmp (key, "launcher") == 0) {
-		launcher_enabled = atoi(value);
-	}
 	else if (strcmp (key, "launcher_padding") == 0) {
 		extract_values(value, &value1, &value2, &value3);
 		panel_config.launcher.area.paddingxlr = panel_config.launcher.area.paddingx = atoi (value1);

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 = strdup("LTBSC");  // Default order : Launcher, Taskbar, Battery, Systray, Clock
 	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);
@@ -169,33 +172,38 @@ void init_panel()
 		p->g_taskbar.area.panel = p;
 		p->g_task.area.panel = p;
 		init_panel_size_and_position(p);
-		// add childs
-		// TODO : should respect the order of 'panel_items' config parameter
-		if (launcher_enabled) {
+		// add childs occording to panel_items_order
+		int k;
+		for (k=0 ; k < strlen(panel_items_order) ; k++) {
+			if (panel_items_order[k] == 'L') {
 				init_launcher_panel(p);
 				p->area.list = g_slist_append(p->area.list, &p->launcher);
 			}
+			if (panel_items_order[k] == 'T') {
 				p->nb_desktop = server.nb_desktop;
 				p->taskbar = calloc(p->nb_desktop, sizeof(Taskbar));
 				for (j=0 ; j < p->nb_desktop ; j++) {
 					p->area.list = g_slist_append(p->area.list, &p->taskbar[j]);
 				}
+				//printf("init taskbar\n");
+			}
 #ifdef ENABLE_BATTERY
-		if (battery_enabled) {
+			if (panel_items_order[k] == 'B') {
 				init_battery_panel(p);
 				p->area.list = g_slist_append(p->area.list, &p->battery);
 			}
 #endif
-		// systray only on first panel
-		if (systray.area.on_screen && i == 0) {
+			if (panel_items_order[k] == 'S') {
+				// TODO : check systray is only on 1 panel
 				init_systray_panel(p);
 				p->area.list = g_slist_append(p->area.list, &systray);
 				refresh_systray = 1;
 			}
-		if (clock_enabled) {
+			if (panel_items_order[k] == 'C') {
 				init_clock_panel(p);
 				p->area.list = g_slist_append(p->area.list, &p->clock);
 			}
+		}
 
 		// catch some events
 		XSetWindowAttributes att = { .colormap=server.colormap, .background_pixel=0, .border_pixel=0 };

src/panel.h

@@ -59,6 +59,7 @@ extern int panel_autohide_show_timeout;
 extern int panel_autohide_hide_timeout;
 extern int panel_autohide_height;  // for vertical panels this is of course the width
 extern int panel_strut_policy;
+extern char *panel_items_order;
 
 extern int  max_tick_urgent;