X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flauncher%2Flauncher.h;h=10a915101bf9677dc4e9f5ada1688a0999cee919;hb=90eae1e7be4621a84a0253c3048790523f0c8375;hp=1a3f011f1fc019d23faa18dbca4d9e64b91ad99e;hpb=31800fd92d7d89945a41efae3c9e7584da50995d;p=chaz%2Ftint2

diff --git a/src/launcher/launcher.h b/src/launcher/launcher.h
index 1a3f011..10a9151 100644
--- a/src/launcher/launcher.h
+++ b/src/launcher/launcher.h
@@ -9,20 +9,25 @@
 
 #include "common.h"
 #include "area.h"
+#include "xsettings-client.h"
 
 typedef struct Launcher {
 	// always start with area
 	Area area;
-	GSList *list_icon_paths;
-	GSList *list_cmds;
-	GSList *list_icons;
+	GSList *list_apps;			// List of char*, each is a path to a app.desktop file
+	GSList *list_icons; 		// List of LauncherIcon*
+	GSList *list_themes;		// List of IconTheme*
 } Launcher;
 
 typedef struct LauncherIcon {
-	Imlib_Image icon;
+	Imlib_Image icon_scaled;
+	Imlib_Image icon_original;
 	char *cmd;
+	char *icon_name;
+	char *icon_path;
+	int icon_size;
+	int is_app_desktop;
 	int x, y;
-	int width, height;
 } LauncherIcon;
 
 typedef struct DesktopEntry {
@@ -41,6 +46,7 @@ typedef struct IconThemeDir {
 	int max_size;
 	int min_size;
 	int threshold;
+	char *context;
 } IconThemeDir;
 
 typedef struct IconTheme {
@@ -51,8 +57,8 @@ typedef struct IconTheme {
 
 extern int launcher_enabled;
 extern int launcher_max_icon_size;
-
-extern GSList *icon_themes; // each item is an IconTheme*
+extern char *icon_theme_name; 	// theme name
+extern XSettingsClient *xsettings_client;
 
 // default global data
 void default_launcher();
@@ -61,12 +67,18 @@ void default_launcher();
 void init_launcher();
 void init_launcher_panel(void *panel);
 void cleanup_launcher();
+void cleanup_launcher_theme(Launcher *launcher);
 
-void resize_launcher(void *obj);
+int  resize_launcher(void *obj);
 void draw_launcher (void *obj, cairo_t *c);
 
+// Populates the list_themes list
+void launcher_load_themes(Launcher *launcher);
+// Populates the list_icons list
+void launcher_load_icons(Launcher *launcher);
 void launcher_action(LauncherIcon *icon);
 
 void test_launcher_read_desktop_file();
+void test_launcher_read_theme_file();
 
 #endif