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

diff --git a/src/config.c b/src/config.c
index fe3f9fe..60c14f3 100644
--- a/src/config.c
+++ b/src/config.c
@@ -58,21 +58,21 @@ char *snapshot_path = 0;
 // --------------------------------------------------
 // backward compatibility
 static int old_task_icon_size;
-static Area *area_task;
-static Area *area_task_active;
 // detect if it's an old config file
 // ==1
 static int old_config_file;
 
-// temporary list of background
-static GSList *list_back;
-
-
 
 void init_config()
 {
+	if (backgrounds)
+		g_array_free(backgrounds, 1);
+	backgrounds = g_array_new(0, 0, sizeof(Background));
+
 	// append full transparency background
-	list_back = g_slist_append(0, calloc(1, sizeof(Area)));
+	Background transparent_bg;
+	memset(&transparent_bg, 0, sizeof(Background));
+	g_array_append_val(backgrounds, transparent_bg);
 
 	// tint2 could reload config, so we cleanup objects
 	cleanup_systray();
@@ -87,8 +87,7 @@ void init_config()
 		pango_font_description_free(panel_config.g_task.font_desc);
 	}
 	memset(&panel_config, 0, sizeof(Panel));
-	panel_config.g_task.alpha = 100;
-	panel_config.g_task.alpha_active = 100;
+	systray.alpha = 100;
 	systray.sort = 3;
 	old_config_file = 1;
 
@@ -105,13 +104,6 @@ void init_config()
 
 void cleanup_config()
 {
-	// cleanup background list
-	GSList *l0;
-	for (l0 = list_back; l0 ; l0 = l0->next) {
-		free(l0->data);
-	}
-	g_slist_free(list_back);
-	list_back = NULL;
 }
 
 
@@ -181,6 +173,42 @@ void get_action (char *event, int *action)
 }
 
 
+int get_task_status(char* status)
+{
+	if (strcmp(status, "active") == 0)
+		return TASK_ACTIVE;
+	if (strcmp(status, "iconified") == 0)
+		return TASK_ICONIFIED;
+	if (strcmp(status, "urgent") == 0)
+		return TASK_URGENT;
+	return TASK_NORMAL;
+}
+
+
+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;
@@ -188,41 +216,31 @@ void add_entry (char *key, char *value)
 	/* Background and border */
 	if (strcmp (key, "rounded") == 0) {
 		// 'rounded' is the first parameter => alloc a new background
-		Area *a = calloc(1, sizeof(Area));
-		a->pix.border.rounded = atoi (value);
-		list_back = g_slist_append(list_back, a);
+		Background bg;
+		bg.border.rounded = atoi(value);
+		g_array_append_val(backgrounds, bg);
 	}
 	else if (strcmp (key, "border_width") == 0) {
-		Area *a = g_slist_last(list_back)->data;
-		a->pix.border.width = atoi (value);
+		g_array_index(backgrounds, Background, backgrounds->len-1).border.width = atoi(value);
 	}
 	else if (strcmp (key, "background_color") == 0) {
-		Area *a = g_slist_last(list_back)->data;
+		Background* bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
 		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, a->pix.back.color);
-		if (value2) a->pix.back.alpha = (atoi (value2) / 100.0);
-		else a->pix.back.alpha = 0.5;
+		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, "border_color") == 0) {
-		Area *a = g_slist_last(list_back)->data;
+		Background* bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
 		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, a->pix.border.color);
-		if (value2) a->pix.border.alpha = (atoi (value2) / 100.0);
-		else a->pix.border.alpha = 0.5;
+		get_color (value1, bg->border.color);
+		if (value2) bg->border.alpha = (atoi (value2) / 100.0);
+		else bg->border.alpha = 0.5;
 	}
 
 	/* 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);
@@ -283,9 +301,8 @@ void add_entry (char *key, char *value)
 		panel_config.g_task.font_shadow = atoi (value);
 	else if (strcmp (key, "panel_background_id") == 0) {
 		int id = atoi (value);
-		Area *a = g_slist_nth_data(list_back, id);
-		memcpy(&panel_config.area.pix.back, &a->pix.back, sizeof(Color));
-		memcpy(&panel_config.area.pix.border, &a->pix.border, sizeof(Border));
+		id = (id < backgrounds->len && id >= 0) ? id : 0;
+		panel_config.area.bg = &g_array_index(backgrounds, Background, id);
 	}
 	else if (strcmp (key, "wm_menu") == 0)
 		wm_menu = atoi (value);
@@ -293,6 +310,14 @@ 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, "panel_layer") == 0) {
+		if (strcmp(value, "bottom") == 0)
+			panel_layer = BOTTOM_LAYER;
+		else if (strcmp(value, "normal") == 0)
+			panel_layer = NORMAL_LAYER;
+		else if (strcmp(value, "top") == 0)
+			panel_layer = TOP_LAYER;
+	}
 
 	/* Battery */
 	else if (strcmp (key, "battery") == 0) {
@@ -346,9 +371,15 @@ void add_entry (char *key, char *value)
 	else if (strcmp (key, "battery_background_id") == 0) {
 #ifdef ENABLE_BATTERY
 		int id = atoi (value);
-		Area *a = g_slist_nth_data(list_back, id);
-		memcpy(&panel_config.battery.area.pix.back, &a->pix.back, sizeof(Color));
-		memcpy(&panel_config.battery.area.pix.border, &a->pix.border, sizeof(Border));
+		id = (id < backgrounds->len && id >= 0) ? id : 0;
+		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
 	}
 
@@ -366,6 +397,14 @@ void add_entry (char *key, char *value)
 	else if (strcmp (key, "time1_font") == 0) {
 		time1_font_desc = pango_font_description_from_string (value);
 	}
+	else if (strcmp(key, "time1_timezone") == 0) {
+		if (strlen(value) > 0)
+			time1_timezone = strdup(value);
+	}
+	else if (strcmp(key, "time2_timezone") == 0) {
+		if (strlen(value) > 0)
+			time2_timezone = strdup(value);
+	}
 	else if (strcmp (key, "time2_font") == 0) {
 		time2_font_desc = pango_font_description_from_string (value);
 	}
@@ -383,14 +422,17 @@ void add_entry (char *key, char *value)
 	}
 	else if (strcmp (key, "clock_background_id") == 0) {
 		int id = atoi (value);
-		Area *a = g_slist_nth_data(list_back, id);
-		memcpy(&panel_config.clock.area.pix.back, &a->pix.back, sizeof(Color));
-		memcpy(&panel_config.clock.area.pix.border, &a->pix.border, sizeof(Border));
+		id = (id < backgrounds->len && id >= 0) ? id : 0;
+		panel_config.clock.area.bg = &g_array_index(backgrounds, Background, id);
 	}
 	else if (strcmp(key, "clock_tooltip") == 0) {
 		if (strlen(value) > 0)
 			time_tooltip_format = strdup (value);
 	}
+	else if (strcmp(key, "clock_tooltip_timezone") == 0) {
+		if (strlen(value) > 0)
+			time_tooltip_timezone = strdup(value);
+	}
 	else if (strcmp(key, "clock_lclick_command") == 0) {
 		if (strlen(value) > 0)
 			clock_lclick_command = strdup(value);
@@ -407,21 +449,20 @@ void add_entry (char *key, char *value)
 	}
 	else if (strcmp (key, "taskbar_padding") == 0) {
 		extract_values(value, &value1, &value2, &value3);
-		panel_config.g_taskbar.paddingxlr = panel_config.g_taskbar.paddingx = atoi (value1);
-		if (value2) panel_config.g_taskbar.paddingy = atoi (value2);
-		if (value3) panel_config.g_taskbar.paddingx = atoi (value3);
+		panel_config.g_taskbar.area.paddingxlr = panel_config.g_taskbar.area.paddingx = atoi (value1);
+		if (value2) panel_config.g_taskbar.area.paddingy = atoi (value2);
+		if (value3) panel_config.g_taskbar.area.paddingx = atoi (value3);
 	}
 	else if (strcmp (key, "taskbar_background_id") == 0) {
 		int id = atoi (value);
-		Area *a = g_slist_nth_data(list_back, id);
-		memcpy(&panel_config.g_taskbar.pix.back, &a->pix.back, sizeof(Color));
-		memcpy(&panel_config.g_taskbar.pix.border, &a->pix.border, sizeof(Border));
+		id = (id < backgrounds->len && id >= 0) ? id : 0;
+		panel_config.g_taskbar.bg = &g_array_index(backgrounds, Background, id);
+		panel_config.g_taskbar.area.bg = panel_config.g_taskbar.bg;
 	}
 	else if (strcmp (key, "taskbar_active_background_id") == 0) {
 		int id = atoi (value);
-		Area *a = g_slist_nth_data(list_back, id);
-		memcpy(&panel_config.g_taskbar.pix_active.back, &a->pix.back, sizeof(Color));
-		memcpy(&panel_config.g_taskbar.pix_active.border, &a->pix.border, sizeof(Border));
+		id = (id < backgrounds->len && id >= 0) ? id : 0;
+		panel_config.g_taskbar.bg_active = &g_array_index(backgrounds, Background, id);
 		panel_config.g_taskbar.use_active = 1;
 	}
 
@@ -453,50 +494,46 @@ void add_entry (char *key, char *value)
 	else if (strcmp (key, "task_font") == 0) {
 		panel_config.g_task.font_desc = pango_font_description_from_string (value);
 	}
-	else if (strcmp (key, "task_font_color") == 0) {
+	else if (g_regex_match_simple("task.*_font_color", key, 0, 0)) {
+		gchar** split = g_regex_split_simple("_", key, 0, 0);
+		int status = get_task_status(split[1]);
+		g_strfreev(split);
 		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, panel_config.g_task.font.color);
-		if (value2) panel_config.g_task.font.alpha = (atoi (value2) / 100.0);
-		else panel_config.g_task.font.alpha = 0.1;
-	}
-	else if (strcmp (key, "task_active_font_color") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, panel_config.g_task.font_active.color);
-		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_asb") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		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_asb") == 0) {
+		float alpha = 1;
+		if (value2) alpha = (atoi (value2) / 100.0);
+		get_color (value1, panel_config.g_task.font[status].color);
+		panel_config.g_task.font[status].alpha = alpha;
+		panel_config.g_task.config_font_mask |= (1<<status);
+	}
+	else if (g_regex_match_simple("task.*_icon_asb", key, 0, 0)) {
+		gchar** split = g_regex_split_simple("_", key, 0, 0);
+		int status = get_task_status(split[1]);
+		g_strfreev(split);
 		extract_values(value, &value1, &value2, &value3);
-		panel_config.g_task.alpha_active = atoi(value1);
-		panel_config.g_task.saturation_active = atoi(value2);
-		panel_config.g_task.brightness_active = atoi(value3);
-	}
-	else if (strcmp (key, "task_background_id") == 0) {
-		int id = atoi (value);
-		Area *a = g_slist_nth_data(list_back, id);
-		memcpy(&panel_config.g_task.area.pix.back, &a->pix.back, sizeof(Color));
-		memcpy(&panel_config.g_task.area.pix.border, &a->pix.border, sizeof(Border));
-	}
-	else if (strcmp (key, "task_active_background_id") == 0) {
+		panel_config.g_task.alpha[status] = atoi(value1);
+		panel_config.g_task.saturation[status] = atoi(value2);
+		panel_config.g_task.brightness[status] = atoi(value3);
+		panel_config.g_task.config_asb_mask |= (1<<status);
+	}
+	else if (g_regex_match_simple("task.*_background_id", key, 0, 0)) {
+		gchar** split = g_regex_split_simple("_", key, 0, 0);
+		int status = get_task_status(split[1]);
+		g_strfreev(split);
 		int id = atoi (value);
-		Area *a = g_slist_nth_data(list_back, id);
-		memcpy(&panel_config.g_task.area.pix_active.back, &a->pix.back, sizeof(Color));
-		memcpy(&panel_config.g_task.area.pix_active.border, &a->pix.border, sizeof(Border));
+		id = (id < backgrounds->len && id >= 0) ? id : 0;
+		panel_config.g_task.background[status] = &g_array_index(backgrounds, Background, id);
+		panel_config.g_task.config_background_mask |= (1<<status);
+		if (status == TASK_NORMAL) panel_config.g_task.area.bg = panel_config.g_task.background[TASK_NORMAL];
 	}
 
 	/* 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);
@@ -506,9 +543,8 @@ void add_entry (char *key, char *value)
 	}
 	else if (strcmp (key, "systray_background_id") == 0) {
 		int id = atoi (value);
-		Area *a = g_slist_nth_data(list_back, id);
-		memcpy(&systray.area.pix.back, &a->pix.back, sizeof(Color));
-		memcpy(&systray.area.pix.border, &a->pix.border, sizeof(Border));
+		id = (id < backgrounds->len && id >= 0) ? id : 0;
+		systray.area.bg = &g_array_index(backgrounds, Background, id);
 	}
 	else if (strcmp(key, "systray_sort") == 0) {
 		if (strcmp(value, "descending") == 0)
@@ -520,6 +556,15 @@ void add_entry (char *key, char *value)
 		else  if (strcmp(value, "right2left") == 0)
 			systray.sort = 3;
 	}
+	else if (strcmp(key, "systray_icon_size") == 0) {
+		systray_max_icon_size = atoi(value);
+	}
+	else if (strcmp(key, "systray_icon_asb") == 0) {
+		extract_values(value, &value1, &value2, &value3);
+		systray.alpha = atoi(value1);
+		systray.saturation = atoi(value2);
+		systray.brightness = atoi(value3);
+	}
 
 	/* Tooltip */
 	else if (strcmp (key, "tooltip") == 0)
@@ -539,9 +584,8 @@ void add_entry (char *key, char *value)
 	}
 	else if (strcmp (key, "tooltip_background_id") == 0) {
 		int id = atoi (value);
-		Area *a = g_slist_nth_data(list_back, id);
-		memcpy(&g_tooltip.background_color, &a->pix.back, sizeof(Color));
-		memcpy(&g_tooltip.border, &a->pix.border, sizeof(Border));
+		id = (id < backgrounds->len && id >= 0) ? id : 0;
+		g_tooltip.bg = &g_array_index(backgrounds, Background, id);
 	}
 	else if (strcmp (key, "tooltip_font_color") == 0) {
 		extract_values(value, &value1, &value2, &value3);
@@ -563,83 +607,26 @@ void add_entry (char *key, char *value)
 	else if (strcmp (key, "mouse_scroll_down") == 0)
 		get_action (value, &mouse_scroll_down);
 
-
-	/* 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) {
-		Area *a = calloc(1, sizeof(Area));
-		a->pix.border.rounded = atoi (value);
-		list_back = g_slist_append(list_back, a);
-	}
-	else if (strcmp (key, "panel_border_width") == 0) {
-		Area *a = g_slist_last(list_back)->data;
-		a->pix.border.width = atoi (value);
-	}
-	else if (strcmp (key, "panel_background_color") == 0) {
-		Area *a = g_slist_last(list_back)->data;
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, a->pix.back.color);
-		if (value2) a->pix.back.alpha = (atoi (value2) / 100.0);
-		else a->pix.back.alpha = 0.5;
-	}
-	else if (strcmp (key, "panel_border_color") == 0) {
-		Area *a = g_slist_last(list_back)->data;
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, a->pix.border.color);
-		if (value2) a->pix.border.alpha = (atoi (value2) / 100.0);
-		else a->pix.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.paddingxlr = 0;
-		panel_config.g_taskbar.paddingx = atoi (value);
-	}
-	else if (strcmp (key, "task_icon_size") == 0)
-		old_task_icon_size = atoi (value);
-	else if (strcmp (key, "task_rounded") == 0) {
-		area_task = calloc(1, sizeof(Area));
-		area_task->pix.border.rounded = atoi (value);
-		list_back = g_slist_append(list_back, area_task);
-
-		area_task_active = calloc(1, sizeof(Area));
-		area_task_active->pix.border.rounded = atoi (value);
-		list_back = g_slist_append(list_back, area_task_active);
-	}
-	else if (strcmp (key, "task_background_color") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, area_task->pix.back.color);
-		if (value2) area_task->pix.back.alpha = (atoi (value2) / 100.0);
-		else area_task->pix.back.alpha = 0.5;
-	}
-	else if (strcmp (key, "task_active_background_color") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, area_task_active->pix.back.color);
-		if (value2) area_task_active->pix.back.alpha = (atoi (value2) / 100.0);
-		else area_task_active->pix.back.alpha = 0.5;
-	}
-	else if (strcmp (key, "task_border_width") == 0) {
-		area_task->pix.border.width = atoi (value);
-		area_task_active->pix.border.width = atoi (value);
-	}
-	else if (strcmp (key, "task_border_color") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, area_task->pix.border.color);
-		if (value2) area_task->pix.border.alpha = (atoi (value2) / 100.0);
-		else area_task->pix.border.alpha = 0.5;
-	}
-	else if (strcmp (key, "task_active_border_color") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, area_task_active->pix.border.color);
-		if (value2) area_task_active->pix.border.alpha = (atoi (value2) / 100.0);
-		else area_task_active->pix.border.alpha = 0.5;
-	}
+	/* autohide options */
+	else if (strcmp(key, "autohide") == 0)
+		panel_autohide = atoi(value);
+	else if (strcmp(key, "autohide_show_timeout") == 0)
+		panel_autohide_show_timeout = 1000*atof(value);
+	else if (strcmp(key, "autohide_hide_timeout") == 0)
+		panel_autohide_hide_timeout = 1000*atof(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);
 
 	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);