X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=8de01cd54eefc7f14fbe057de17afc7df5128adc;hb=b0ff4722b169b9bc26240a0fdecbc2d911f7afb8;hp=9fda951112b02a647c1fe72d387fc159d5d6e2e8;hpb=501a421b337b6e08b58904b1c008bd05dbbf954b;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index 9fda951..8de01cd 100644
--- a/src/config.c
+++ b/src/config.c
@@ -79,13 +79,16 @@ void init_config()
 	cleanup_panel();
 
 	// get monitor and desktop config
-	get_monitors_and_desktops();
+	get_monitors();
+	get_desktops();
 
 	// append full transparency background
 	list_back = g_slist_append(0, calloc(1, sizeof(Area)));
 
 	panel_config = calloc(1, sizeof(Panel));
-	systray.sort = 1;
+	panel_config->g_task.alpha = 100;
+	panel_config->g_task.alpha_active = 100;
+	systray.sort = 3;
 
 	// window manager's menu default value == false
 	wm_menu = 0;
@@ -530,15 +533,15 @@ void add_entry (char *key, char *value)
 		if (value2) panel_config->g_task.font_active.alpha = (atoi (value2) / 100.0);
 		else panel_config->g_task.font_active.alpha = 0.1;
 	}
-	else if (strcmp (key, "task_icon_hsb") == 0) {
+	else if (strcmp (key, "task_icon_asb") == 0) {
 		extract_values(value, &value1, &value2, &value3);
-		panel_config->g_task.hue = atoi(value1);
+		panel_config->g_task.alpha = atoi(value1);
 		panel_config->g_task.saturation = atoi(value2);
 		panel_config->g_task.brightness = atoi(value3);
 	}
-	else if (strcmp (key, "task_active_icon_hsb") == 0) {
+	else if (strcmp (key, "task_active_icon_asb") == 0) {
 		extract_values(value, &value1, &value2, &value3);
-		panel_config->g_task.hue_active = atoi(value1);
+		panel_config->g_task.alpha_active = atoi(value1);
 		panel_config->g_task.saturation_active = atoi(value2);
 		panel_config->g_task.brightness_active = atoi(value3);
 	}
@@ -570,10 +573,14 @@ void add_entry (char *key, char *value)
 		memcpy(&systray.area.pix.border, &a->pix.border, sizeof(Border));
 	}
 	else if (strcmp(key, "systray_sort") == 0) {
-		if (strcmp(value, "desc") == 0)
+		if (strcmp(value, "descending") == 0)
 			systray.sort = -1;
-		else
+		else if (strcmp(value, "ascending") == 0)
 			systray.sort = 1;
+		else if (strcmp(value, "left2right") == 0)
+			systray.sort = 2;
+		else  if (strcmp(value, "right2left") == 0)
+			systray.sort = 3;
 	}
 
 	/* Tooltip */
@@ -740,7 +747,7 @@ int parse_line (const char *line)
 void config_finish ()
 {
 	if (panel_config->monitor > (server.nb_monitor-1)) {
-		// server.nb_monitor minimum value is 1 (see get_monitors_and_desktops())
+		// server.nb_monitor minimum value is 1 (see get_monitors())
 		// and panel_config->monitor is higher
 		fprintf(stderr, "warning : monitor not found. tint2 default to monitor 1.\n");
 		panel_config->monitor = 0;