X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=90cb31e41cd124b935aae91f7d0908814eba8796;hb=0bcb780ab356a8ac3a9b23c054c6f702c8718b5b;hp=e281b8a006f6f0d5713a71d59041b896cd28f9f8;hpb=3083e8006371cfb4a454b8bce92a682e4bb87e50;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index e281b8a..90cb31e 100644
--- a/src/config.c
+++ b/src/config.c
@@ -74,10 +74,6 @@ static GSList *list_back;
 
 void init_config()
 {
-	// get monitor and desktop config
-	get_monitors();
-	get_desktops();
-
 	// append full transparency background
 	list_back = g_slist_append(0, calloc(1, sizeof(Area)));
 
@@ -104,25 +100,6 @@ void cleanup_config()
 }
 
 
-void copy_file(const char *pathSrc, const char *pathDest)
-{
-	FILE *fileSrc, *fileDest;
-	char line[100];
-	int  nb;
-
-	fileSrc = fopen(pathSrc, "rb");
-	if (fileSrc == NULL) return;
-
-	fileDest = fopen(pathDest, "wb");
-	if (fileDest == NULL) return;
-
-	while ((nb = fread(line, 1, 100, fileSrc)) > 0) fwrite(line, 1, nb, fileDest);
-
-	fclose (fileDest);
-	fclose (fileSrc);
-}
-
-
 void extract_values (const char *value, char **value1, char **value2, char **value3)
 {
 	char *b=0, *c=0;
@@ -162,58 +139,6 @@ void extract_values (const char *value, char **value1, char **value2, char **val
 }
 
 
-int hex_char_to_int (char c)
-{
-	int r;
-
-	if (c >= '0' && c <= '9')  r = c - '0';
-	else if (c >= 'a' && c <= 'f')  r = c - 'a' + 10;
-	else if (c >= 'A' && c <= 'F')  r = c - 'A' + 10;
-	else  r = 0;
-
-	return r;
-}
-
-
-int hex_to_rgb (char *hex, int *r, int *g, int *b)
-{
-	int len;
-
-	if (hex == NULL || hex[0] != '#') return (0);
-
-	len = strlen (hex);
-	if (len == 3 + 1) {
-		*r = hex_char_to_int (hex[1]);
-		*g = hex_char_to_int (hex[2]);
-		*b = hex_char_to_int (hex[3]);
-	}
-	else if (len == 6 + 1) {
-		*r = hex_char_to_int (hex[1]) * 16 + hex_char_to_int (hex[2]);
-		*g = hex_char_to_int (hex[3]) * 16 + hex_char_to_int (hex[4]);
-		*b = hex_char_to_int (hex[5]) * 16 + hex_char_to_int (hex[6]);
-	}
-	else if (len == 12 + 1) {
-		*r = hex_char_to_int (hex[1]) * 16 + hex_char_to_int (hex[2]);
-		*g = hex_char_to_int (hex[5]) * 16 + hex_char_to_int (hex[6]);
-		*b = hex_char_to_int (hex[9]) * 16 + hex_char_to_int (hex[10]);
-	}
-	else return 0;
-
-	return 1;
-}
-
-
-void get_color (char *hex, double *rgb)
-{
-	int r, g, b;
-	hex_to_rgb (hex, &r, &g, &b);
-
-	rgb[0] = (r / 255.0);
-	rgb[1] = (g / 255.0);
-	rgb[2] = (b / 255.0);
-}
-
-
 void get_action (char *event, int *action)
 {
 	if (strcmp (event, "none") == 0)
@@ -283,13 +208,18 @@ void add_entry (char *key, char *value)
 			b[0] = '\0';
 			panel_config.pourcentx = 1;
 		}
-		panel_config.initial_width = atof(value1);
+		panel_config.area.width = atoi(value1);
+		if (panel_config.area.width == 0) {
+			// full width mode
+			panel_config.area.width = 100;
+			panel_config.pourcentx = 1;
+		}
 		if (value2) {
 			if ((b = strchr (value2, '%'))) {
 				b[0] = '\0';
 				panel_config.pourcenty = 1;
 			}
-			panel_config.initial_height = atof(value2);
+			panel_config.area.height = atoi(value2);
 		}
 	}
 	else if (strcmp (key, "panel_margin") == 0) {
@@ -708,35 +638,6 @@ void add_entry (char *key, char *value)
 }
 
 
-int parse_line (const char *line)
-{
-	char *a, *b, *key, *value;
-
-	/* Skip useless lines */
-	if ((line[0] == '#') || (line[0] == '\n')) return 0;
-	if (!(a = strchr (line, '='))) return 0;
-
-	/* overwrite '=' with '\0' */
-	a[0] = '\0';
-	key = strdup (line);
-	a++;
-
-	/* overwrite '\n' with '\0' if '\n' present */
-	if ((b = strchr (a, '\n'))) b[0] = '\0';
-
-	value = strdup (a);
-
-	g_strstrip(key);
-	g_strstrip(value);
-
-	add_entry (key, value);
-
-	free (key);
-	free (value);
-	return 1;
-}
-
-
 void config_finish ()
 {
 	if (panel_config.monitor > (server.nb_monitor-1)) {
@@ -829,15 +730,20 @@ int config_read_file (const char *path)
 {
 	FILE *fp;
 	char line[80];
+	char *key, *value;
 
 	if ((fp = fopen(path, "r")) == NULL) return 0;
 	old_task_font = 0;
 	old_time1_font = 0;
 	old_time2_font = 0;
 
-	while (fgets(line, sizeof(line), fp) != NULL)
-		parse_line (line);
-
+	while (fgets(line, sizeof(line), fp) != NULL) {
+		if (parse_line(line, &key, &value)) {
+			add_entry (key, value);
+			free (key);
+			free (value);
+		}
+	}
 	fclose (fp);
 
 	if (save_file_config)
@@ -867,7 +773,7 @@ void save_config ()
 	FILE *fp;
 
 	if (old_task_icon_size) {
-		panel_config.g_task.area.paddingy = ((int)panel_config.initial_height - (2 * panel_config.area.paddingy) - old_task_icon_size) / 2;
+		panel_config.g_task.area.paddingy = ((int)panel_config.area.height - (2 * panel_config.area.paddingy) - old_task_icon_size) / 2;
 	}
 
 	dir = g_build_filename (g_get_user_config_dir(), "tint2", NULL);
@@ -907,7 +813,7 @@ void save_config ()
 	if (panel_position & LEFT) fputs(" left horizontal\n", fp);
 	else if (panel_position & RIGHT) fputs(" right horizontal\n", fp);
 	else fputs(" center horizontal\n", fp);
-	fprintf(fp, "panel_size = %d %d\n", (int)panel_config.initial_width, (int)panel_config.initial_height);
+	fprintf(fp, "panel_size = %d %d\n", panel_config.area.width, panel_config.area.height);
 	fprintf(fp, "panel_margin = %d %d\n", panel_config.marginx, panel_config.marginy);
 	fprintf(fp, "panel_padding = %d %d %d\n", panel_config.area.paddingxlr, panel_config.area.paddingy, panel_config.area.paddingx);
 	fprintf(fp, "font_shadow = %d\n", panel_config.g_task.font_shadow);