X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=60c14f31716e7c3d3f786f82bcb9f5fada61ced7;hb=a9e5183d2195a08988cd03fd10320b31e92fe0a2;hp=7ccb08396467e6a7f35576f4d7b96d59f093c61e;hpb=bab0811f845cedb817a3c3a29dd91ade07d5a886;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index 7ccb083..60c14f3 100644
--- a/src/config.c
+++ b/src/config.c
@@ -58,8 +58,6 @@ char *snapshot_path = 0;
 // --------------------------------------------------
 // backward compatibility
 static int old_task_icon_size;
-static int bg_task;
-static int bg_task_active;
 // detect if it's an old config file
 // ==1
 static int old_config_file;
@@ -89,9 +87,6 @@ void init_config()
 		pango_font_description_free(panel_config.g_task.font_desc);
 	}
 	memset(&panel_config, 0, sizeof(Panel));
-	int i;
-	for (i=0; i<TASK_STATE_COUNT; ++i)
-		panel_config.g_task.alpha[i] = 100;
 	systray.alpha = 100;
 	systray.sort = 3;
 	old_config_file = 1;
@@ -190,6 +185,30 @@ int get_task_status(char* status)
 }
 
 
+int config_get_monitor(char* monitor)
+{
+	if (strcmp(monitor, "all") == 0)
+		return -1;
+	else {
+		char* endptr;
+		int ret_int = strtol(monitor, &endptr, 10);
+		if (*endptr == 0)
+			return ret_int-1;
+		else {
+			// monitor specified by name, not by index
+			int i, j;
+			for (i=0; i<server.nb_monitor; ++i) {
+				j = 0;
+				while (server.monitor[i].names[j] != 0) {
+					if (strcmp(monitor, server.monitor[i].names[j++]) == 0)
+						return i;
+				}
+			}
+		}
+	}
+	return -1;
+}
+
 void add_entry (char *key, char *value)
 {
 	char *value1=0, *value2=0, *value3=0;
@@ -221,16 +240,7 @@ void add_entry (char *key, char *value)
 
 	/* Panel */
 	else if (strcmp (key, "panel_monitor") == 0) {
-		if (strcmp (value, "all") == 0) panel_config.monitor = -1;
-		else {
-			panel_config.monitor = atoi (value);
-			if (panel_config.monitor > 0) panel_config.monitor -= 1;
-		}
-		if (panel_config.monitor > (server.nb_monitor-1)) {
-			// server.nb_monitor minimum value is 1 (see get_monitors())
-			fprintf(stderr, "warning : monitor not found. tint2 default to all monitors.\n");
-			panel_config.monitor = 0;
-		}
+		panel_config.monitor = config_get_monitor(value);
 	}
 	else if (strcmp (key, "panel_size") == 0) {
 		extract_values(value, &value1, &value2, &value3);
@@ -300,8 +310,6 @@ void add_entry (char *key, char *value)
 		panel_dock = atoi (value);
 	else if (strcmp (key, "urgent_nb_of_blink") == 0)
 		max_tick_urgent = (atoi (value) * 2) + 1;
-	else if (strcmp (key, "real_transparency") == 0)
-		real_transparency = atoi(value);
 	else if (strcmp (key, "panel_layer") == 0) {
 		if (strcmp(value, "bottom") == 0)
 			panel_layer = BOTTOM_LAYER;
@@ -367,6 +375,13 @@ void add_entry (char *key, char *value)
 		panel_config.battery.area.bg = &g_array_index(backgrounds, Background, id);
 #endif
 	}
+	else if (strcmp (key, "battery_hide") == 0) {
+#ifdef ENABLE_BATTERY
+		percentage_hide = atoi (value);
+		if (percentage_hide == 0)
+			percentage_hide = 101;
+#endif
+	}
 
 	/* Clock */
 	else if (strcmp (key, "time1_format") == 0) {
@@ -512,12 +527,13 @@ void add_entry (char *key, char *value)
 	}
 
 	/* Systray */
-	else if (strcmp (key, "systray") == 0) {
+	// systray disabled in snapshot mode
+	else if (strcmp (key, "systray") == 0 && snapshot_path == 0) {
 		systray_enabled = atoi(value);
 		// systray is latest option added. files without 'systray' are old.
 		old_config_file = 0;
 	}
-	else if (strcmp (key, "systray_padding") == 0) {
+	else if (strcmp (key, "systray_padding") == 0 && snapshot_path == 0) {
 		if (old_config_file)
 			systray_enabled = 1;
 		extract_values(value, &value1, &value2, &value3);
@@ -601,94 +617,16 @@ void add_entry (char *key, char *value)
 	else if (strcmp(key, "strut_policy") == 0) {
 		if (strcmp(value, "follow_size") == 0)
 			panel_strut_policy = STRUT_FOLLOW_SIZE;
+		else if (strcmp(value, "none") == 0)
+			panel_strut_policy = STRUT_NONE;
 		else
 			panel_strut_policy = STRUT_MINIMUM;
 	}
 	else if (strcmp(key, "autohide_height") == 0)
 		panel_autohide_height = atoi(value);
 
-
-	// QUESTION: Do we still need backwards compatibility???
-	/* Read tint-0.6 config for backward compatibility */
-	else if (strcmp (key, "panel_mode") == 0) {
-		if (strcmp (value, "single_desktop") == 0) panel_mode = SINGLE_DESKTOP;
-		else panel_mode = MULTI_DESKTOP;
-	}
-	else if (strcmp (key, "panel_rounded") == 0) {
-		Background bg;
-		bg.border.rounded = atoi(value);
-		g_array_append_val(backgrounds, bg);
-	}
-	else if (strcmp (key, "panel_border_width") == 0) {
-		g_array_index(backgrounds, Background, backgrounds->len-1).border.width = atoi(value);
-	}
-	else if (strcmp (key, "panel_background_color") == 0) {
-		Background* bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, bg->back.color);
-		if (value2) bg->back.alpha = (atoi (value2) / 100.0);
-		else bg->back.alpha = 0.5;
-	}
-	else if (strcmp (key, "panel_border_color") == 0) {
-		Background* bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, bg->border.color);
-		if (value2) bg->border.alpha = (atoi (value2) / 100.0);
-		else bg->border.alpha = 0.5;
-	}
-	else if (strcmp (key, "task_text_centered") == 0)
-		panel_config.g_task.centered = atoi (value);
-	else if (strcmp (key, "task_margin") == 0) {
-		panel_config.g_taskbar.area.paddingxlr = 0;
-		panel_config.g_taskbar.area.paddingx = atoi (value);
-	}
-	else if (strcmp (key, "task_icon_size") == 0)
-		old_task_icon_size = atoi (value);
-	else if (strcmp (key, "task_rounded") == 0) {
-		Background bg;
-		bg.border.rounded = atoi(value);
-		g_array_append_val(backgrounds, bg);
-		g_array_append_val(backgrounds, bg);
-		bg_task = backgrounds->len-2;
-		bg_task_active = backgrounds->len-1;
-	}
-	else if (strcmp (key, "task_background_color") == 0) {
-		Background* bg = &g_array_index(backgrounds, Background, bg_task);
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, bg->back.color);
-		if (value2) bg->back.alpha = (atoi (value2) / 100.0);
-		else bg->back.alpha = 0.5;
-	}
-	else if (strcmp (key, "task_active_background_color") == 0) {
-		Background* bg = &g_array_index(backgrounds, Background, bg_task_active);
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, bg->back.color);
-		if (value2) bg->back.alpha = (atoi (value2) / 100.0);
-		else bg->back.alpha = 0.5;
-	}
-	else if (strcmp (key, "task_border_width") == 0) {
-		Background* bg = &g_array_index(backgrounds, Background, bg_task);
-		bg->border.width = atoi (value);
-		bg = &g_array_index(backgrounds, Background, bg_task_active);
-		bg->border.width = atoi (value);
-	}
-	else if (strcmp (key, "task_border_color") == 0) {
-		Background* bg = &g_array_index(backgrounds, Background, bg_task);
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, bg->border.color);
-		if (value2) bg->border.alpha = (atoi (value2) / 100.0);
-		else bg->border.alpha = 0.5;
-	}
-	else if (strcmp (key, "task_active_border_color") == 0) {
-		Background* bg = &g_array_index(backgrounds, Background, bg_task_active);
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, bg->border.color);
-		if (value2) bg->border.alpha = (atoi (value2) / 100.0);
-		else bg->border.alpha = 0.5;
-	}
-
 	else
-		fprintf(stderr, "tint2 : invalid option \"%s\", correct your config file\n", key);
+		fprintf(stderr, "tint2 : invalid option \"%s\",\n  upgrade tint2 or correct your config file\n", key);
 
 	if (value1) free (value1);
 	if (value2) free (value2);