X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=756a6339ffa771e48d1e0a3dad3ab5f0227f3f15;hb=f3e92f7e3626e3992efff2b55a08a938af38efff;hp=22d6f6f241b10bea549c943614f12c09bf345732;hpb=f37ea09ea4e634ba4c15023013f430d00858da99;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index 22d6f6f..756a633 100644
--- a/src/config.c
+++ b/src/config.c
@@ -41,6 +41,7 @@
 #include "task.h"
 #include "taskbar.h"
 #include "systraybar.h"
+#include "launcher.h"
 #include "clock.h"
 #include "config.h"
 #include "window.h"
@@ -500,12 +501,13 @@ void add_entry (char *key, char *value)
 	// 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 && snapshot_path == 0) {
-		if (old_config_file)
+		if (old_config_file) {
+			// if tint2rc is an old config file, systray_padding enabled the systray bar.
 			systray_enabled = 1;
+		}
 		extract_values(value, &value1, &value2, &value3);
 		systray.area.paddingxlr = systray.area.paddingx = atoi (value1);
 		if (value2) systray.area.paddingy = atoi (value2);
@@ -536,6 +538,33 @@ void add_entry (char *key, char *value)
 		systray.brightness = atoi(value3);
 	}
 
+	/* 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);
+		if (value2) panel_config.launcher.area.paddingy = atoi (value2);
+		if (value3) panel_config.launcher.area.paddingx = atoi (value3);
+	}
+	else if (strcmp (key, "launcher_background_id") == 0) {
+		int id = atoi (value);
+		id = (id < backgrounds->len && id >= 0) ? id : 0;
+		panel_config.launcher.area.bg = &g_array_index(backgrounds, Background, id);
+	}
+	else if (strcmp(key, "launcher_icon_size") == 0) {
+		launcher_max_icon_size = atoi(value);
+	}
+	else if (strcmp(key, "launcher_item_icon") == 0) {
+		char *path = strdup(value);
+		panel_config.launcher.list_icon_paths = g_slist_append(panel_config.launcher.list_icon_paths, path);
+	}
+	else if (strcmp(key, "launcher_item_cmd") == 0) {
+		char *cmd = strdup(value);
+		panel_config.launcher.list_cmds = g_slist_append(panel_config.launcher.list_cmds, cmd);
+	}
+
 	/* Tooltip */
 	else if (strcmp (key, "tooltip") == 0)
 		g_tooltip.enabled = atoi(value);