X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flauncher%2Flauncher.c;h=0cb9fc88157a800355f2efd73b54cdfbebf89747;hb=90eae1e7be4621a84a0253c3048790523f0c8375;hp=e0266d155405cefab3d8a57f8b824c451abf7025;hpb=1c1cfea95e549170ede1eaf05240b935aa2186a9;p=chaz%2Ftint2

diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c
index e0266d1..0cb9fc8 100644
--- a/src/launcher/launcher.c
+++ b/src/launcher/launcher.c
@@ -34,7 +34,8 @@
 
 int launcher_enabled;
 int launcher_max_icon_size;
-GSList *icon_themes = 0;
+char *icon_theme_name; 
+XSettingsClient *xsettings_client;
 
 #define ICON_FALLBACK "exec"
 
@@ -46,15 +47,22 @@ Imlib_Image scale_icon(Imlib_Image original, int icon_size);
 void free_icon(Imlib_Image icon);
 void free_icon_theme(IconTheme *theme);
 
+
 void default_launcher()
 {
 	launcher_enabled = 0;
 	launcher_max_icon_size = 0;
+	icon_theme_name = 0;
+	xsettings_client = NULL;
 }
 
 
 void init_launcher()
 {
+	if (launcher_enabled) {
+		// if XSETTINGS manager running, tint2 read the icon_theme_name.
+		xsettings_client = xsettings_client_new(server.dsp, server.screen, xsettings_notify_cb, NULL, NULL);
+	}
 }
 
 
@@ -78,26 +86,8 @@ void init_launcher_panel(void *p)
 	launcher->area.on_screen = 1;
 	panel_refresh = 1;
 
-	fprintf(stderr, "Loading themes...\n");
 	launcher_load_themes(launcher);
-	fprintf(stderr, "Done\n");
-
-	// Load apps (.desktop style launcher items)
-	GSList* app = launcher->list_apps;
-	while (app != NULL) {
-		DesktopEntry entry;
-		launcher_read_desktop_file(app->data, &entry);
-		if (entry.exec) {
-			LauncherIcon *launcherIcon = calloc(1, sizeof(LauncherIcon));
-			launcherIcon->is_app_desktop = 1;
-			launcherIcon->cmd = strdup(entry.exec);
-			launcherIcon->icon_name = entry.icon ? strdup(entry.icon) : strdup(ICON_FALLBACK);
-			launcherIcon->icon_size = 1;
-			free_desktop_entry(&entry);
-			launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
-		}
-		app = g_slist_next(app);
-	}
+	launcher_load_icons(launcher);
 }
 
 
@@ -105,43 +95,49 @@ void cleanup_launcher()
 {
 	int i;
 
+	if (xsettings_client)
+		xsettings_client_destroy(xsettings_client);
 	for (i = 0 ; i < nb_panel ; i++) {
 		Panel *panel = &panel1[i];
-		Launcher *launcher = &panel->launcher;
-		free_area(&launcher->area);
+		Launcher *launcher = &panel->launcher;		
+		cleanup_launcher_theme(launcher);
+		
 		GSList *l;
-		for (l = launcher->list_icons; l ; l = l->next) {
-			LauncherIcon *launcherIcon = (LauncherIcon*)l->data;
-			if (launcherIcon) {
-				free_icon(launcherIcon->icon_scaled);
-				free_icon(launcherIcon->icon_original);
-				free(launcherIcon->icon_name);
-				free(launcherIcon->icon_path);
-				free(launcherIcon->cmd);
-			}
-			free(launcherIcon);
-		}
-		g_slist_free(launcher->list_icons);
-
 		for (l = launcher->list_apps; l ; l = l->next) {
 			free(l->data);
 		}
 		g_slist_free(launcher->list_apps);
+		launcher->list_apps = NULL;
+	}
+	g_free(icon_theme_name);
+	launcher_enabled = 0;
+}
 
-		for (l = launcher->icon_themes; l ; l = l->next) {
-			IconTheme *theme = (IconTheme*) l->data;
-			free_icon_theme(theme);
-			free(theme);
-		}
-		g_slist_free(launcher->icon_themes);
 
-		for (l = launcher->icon_theme_names; l ; l = l->next) {
-			free(l->data);
+void cleanup_launcher_theme(Launcher *launcher)
+{
+	free_area(&launcher->area);
+	GSList *l;
+	for (l = launcher->list_icons; l ; l = l->next) {
+		LauncherIcon *launcherIcon = (LauncherIcon*)l->data;
+		if (launcherIcon) {
+			free_icon(launcherIcon->icon_scaled);
+			free_icon(launcherIcon->icon_original);
+			free(launcherIcon->icon_name);
+			free(launcherIcon->icon_path);
+			free(launcherIcon->cmd);
 		}
-		g_slist_free(launcher->icon_theme_names);
-		launcher->list_apps = launcher->list_icons = launcher->icon_theme_names = launcher->icon_themes = NULL;
+		free(launcherIcon);
 	}
-	launcher_enabled = 0;
+	g_slist_free(launcher->list_icons);
+
+	for (l = launcher->list_themes; l ; l = l->next) {
+		IconTheme *theme = (IconTheme*) l->data;
+		free_icon_theme(theme);
+		free(theme);
+	}
+	g_slist_free(launcher->list_themes);
+	launcher->list_icons = launcher->list_themes = NULL;
 }
 
 
@@ -489,7 +485,6 @@ IconTheme *load_theme(char *name)
 	}
 
 	if (!file_name) {
-		fprintf(stderr, "Could not found theme '%s'\n", name);
 		return NULL;
 	}
 
@@ -497,8 +492,6 @@ IconTheme *load_theme(char *name)
 		fprintf(stderr, "Could not open theme '%s'\n", file_name);
 		return NULL;
 	}
-	else
-		fprintf(stderr, "Loading icon theme '%s'\n", file_name);
 
 	g_free (file_name);
 
@@ -652,31 +645,43 @@ void test_launcher_read_theme_file()
 	fprintf(stdout, "\033[0m");
 }
 
-// Populates the icon_themes list
+
+// Populates the list_icons list
+void launcher_load_icons(Launcher *launcher)
+{
+	// Load apps (.desktop style launcher items)
+	GSList* app = launcher->list_apps;
+	while (app != NULL) {
+		DesktopEntry entry;
+		launcher_read_desktop_file(app->data, &entry);
+		if (entry.exec) {
+			LauncherIcon *launcherIcon = calloc(1, sizeof(LauncherIcon));
+			launcherIcon->is_app_desktop = 1;
+			launcherIcon->cmd = strdup(entry.exec);
+			launcherIcon->icon_name = entry.icon ? strdup(entry.icon) : strdup(ICON_FALLBACK);
+			launcherIcon->icon_size = 1;
+			free_desktop_entry(&entry);
+			launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
+		}
+		app = g_slist_next(app);
+	}
+}
+
+
+// Populates the list_themes list
 void launcher_load_themes(Launcher *launcher)
 {
 	// load the user theme, all the inherited themes recursively (DFS), and the hicolor theme
 	// avoid inheritance loops
-
-	GSList *queue = NULL;
-	GSList *queued = NULL;
-
-	GSList* icon_theme_name_item;
-	for (icon_theme_name_item = launcher->icon_theme_names; icon_theme_name_item; icon_theme_name_item = g_slist_next(icon_theme_name_item)) {
-		int duplicate = 0;
-		GSList* queued_item = queued;
-		while (queued_item != NULL) {
-			if (strcmp(queued_item->data, icon_theme_name_item->data) == 0) {
-				duplicate = 1;
-				break;
-			}
-			queued_item = g_slist_next(queued_item);
-		}
-		if (!duplicate) {
-			queue = g_slist_append(queue, strdup(icon_theme_name_item->data));
-			queued = g_slist_append(queued, strdup(icon_theme_name_item->data));
-		}
+	if (!icon_theme_name) {
+		fprintf(stderr, "Missing launcher theme, default to 'hicolor'.\n");
+		icon_theme_name = "hicolor";
 	}
+	else
+		fprintf(stderr, "Loading %s. Icon theme :", icon_theme_name);
+
+	GSList *queue = g_slist_append(NULL, strdup(icon_theme_name));
+	GSList *queued = g_slist_append(NULL, strdup(icon_theme_name));
 
 	int hicolor_loaded = 0;
 	while (queue || !hicolor_loaded) {
@@ -698,9 +703,10 @@ void launcher_load_themes(Launcher *launcher)
 		char *name = queue->data;
 		queue = g_slist_remove(queue, name);
 
+		fprintf(stderr, " '%s',", name);
 		IconTheme *theme = load_theme(name);
 		if (theme != NULL) {
-			launcher->icon_themes = g_slist_append(launcher->icon_themes, theme);
+			launcher->list_themes = g_slist_append(launcher->list_themes, theme);
 
 			GSList* item = theme->list_inherits;
 			int pos = 0;
@@ -725,6 +731,7 @@ void launcher_load_themes(Launcher *launcher)
 			}
 		}
 	}
+	fprintf(stderr, "\n");
 
 	// Free the queue
 	GSList *l;
@@ -796,7 +803,7 @@ char *icon_path(Launcher *launcher, const char *icon_name, int size)
 
 	// Stage 1: exact size match
 	GSList *theme;
-	for (theme = launcher->icon_themes; theme; theme = g_slist_next(theme)) {
+	for (theme = launcher->list_themes; theme; theme = g_slist_next(theme)) {
 		GSList *dir;
 		for (dir = ((IconTheme*)theme->data)->list_directories; dir; dir = g_slist_next(dir)) {
 			if (directory_matches_size((IconThemeDir*)dir->data, size)) {
@@ -836,7 +843,7 @@ char *icon_path(Launcher *launcher, const char *icon_name, int size)
 	char *best_file_name = NULL;
 	int next_larger_size = -1;
 	char *next_larger = NULL;
-	for (theme = launcher->icon_themes; theme; theme = g_slist_next(theme)) {
+	for (theme = launcher->list_themes; theme; theme = g_slist_next(theme)) {
 		GSList *dir;
 		for (dir = ((IconTheme*)theme->data)->list_directories; dir; dir = g_slist_next(dir)) {
 			GSList *base;
@@ -915,3 +922,4 @@ char *icon_path(Launcher *launcher, const char *icon_name, int size)
 
 	return NULL;
 }
+