fixed multi_desktop switching

[chaz/tint2] / src / launcher / launcher.c

diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c
index c90c545a023b73290827dfbcd003bc397293f832..54b6639f4b50be961427dc063e8ab95b5cbcde68 100644 (file)
--- a/src/launcher/launcher.c
+++ b/src/launcher/launcher.c
@@ -70,18 +70,13 @@ void init_launcher_panel(void *p)
        launcher->area._resize = resize_launcher;
        launcher->area.resize = 1;
        launcher->area.redraw = 1;
-       launcher->area.on_screen = 1;
 
-       if (panel_horizontal) {
-               // panel horizonal => fixed height and posy
-               launcher->area.posy = panel->area.bg->border.width + panel->area.paddingy;
-               launcher->area.height = panel->area.height - (2 * launcher->area.posy);
-       }
-       else {
-               // panel vertical => fixed width, height, posy and posx
-               launcher->area.posx = panel->area.bg->border.width + panel->area.paddingxlr;
-               launcher->area.width = panel->area.width - (2 * panel->area.bg->border.width) - (2 * panel->area.paddingy);
-       }
+       // check consistency
+       if (launcher->list_apps == NULL)
+               return;
+
+       launcher->area.on_screen = 1;
+       panel_refresh = 1;
 
        fprintf(stderr, "Loading themes...\n");
        launcher_load_themes(launcher);
@@ -149,10 +144,10 @@ void cleanup_launcher()
        launcher_enabled = 0;
 }
 
-void resize_launcher(void *obj)
+
+int resize_launcher(void *obj)
 {
        Launcher *launcher = obj;
-       Panel *panel = launcher->area.panel;
        GSList *l;
        int count, icon_size;
        int icons_per_column=1, icons_per_row=1, marging=0;
@@ -170,6 +165,7 @@ void resize_launcher(void *obj)
                LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
                if (launcherIcon->icon_size != icon_size || !launcherIcon->icon_original) {
                        launcherIcon->icon_size = icon_size;
+
                        // Get the path for an icon file with the new size
                        char *new_icon_path = icon_path(launcher, launcherIcon->icon_name, launcherIcon->icon_size);
                        if (!new_icon_path) {
@@ -222,9 +218,6 @@ void resize_launcher(void *obj)
                        icons_per_row = count / icons_per_column + (count%icons_per_column != 0);
                        launcher->area.width = (2 * launcher->area.bg->border.width) + (2 * launcher->area.paddingxlr) + (icon_size * icons_per_row) + ((icons_per_row-1) * launcher->area.paddingx);
                }
-
-               launcher->area.posx = panel->area.bg->border.width + panel->area.paddingxlr;
-               launcher->area.posy = panel->area.bg->border.width;
        }
        else {
                if (!count) launcher->area.height = 0;
@@ -236,9 +229,6 @@ void resize_launcher(void *obj)
                        icons_per_column = count / icons_per_row+ (count%icons_per_row != 0);
                        launcher->area.height = (2 * launcher->area.bg->border.width) + (2 * launcher->area.paddingxlr) + (icon_size * icons_per_column) + ((icons_per_column-1) * launcher->area.paddingx);
                }
-
-               launcher->area.posx = panel->area.bg->border.width;
-               launcher->area.posy = panel->area.height - panel->area.bg->border.width - panel->area.paddingxlr - launcher->area.height;
        }
 
        int i, posx, posy;
@@ -274,9 +264,7 @@ void resize_launcher(void *obj)
                        }
                }
        }
-       
-       // resize force the redraw
-       launcher->area.redraw = 1;
+       return 1;
 }
 
 
@@ -486,29 +474,33 @@ IconTheme *load_theme(char *name)
        if (name == NULL)
                return NULL;
 
-       fprintf(stderr, "Loading icon theme %s\n", name);
-
-       file_name = malloc(100 + strlen(name));
-       sprintf(file_name, "~/.icons/%s/index.theme", name);
+       file_name = g_build_filename(g_get_home_dir(), ".icons", name, "index.theme", NULL);
        if (!g_file_test(file_name, G_FILE_TEST_EXISTS)) {
-               sprintf(file_name, "/usr/share/icons/%s/index.theme", name);
+               g_free (file_name);
+               file_name = g_build_filename("/usr/share/icons", name, "index.theme", NULL);
                if (!g_file_test(file_name, G_FILE_TEST_EXISTS)) {
-                       sprintf(file_name, "/usr/share/pixmaps/%s/index.theme", name);
+                       g_free (file_name);
+                       file_name = g_build_filename("/usr/share/pixmaps", name, "index.theme", NULL);
                        if (!g_file_test(file_name, G_FILE_TEST_EXISTS)) {
-                               free(file_name);
+                               g_free (file_name);
                                file_name = NULL;
                        }
                }
        }
+
        if (!file_name) {
-               fprintf(stderr, "Could not load theme %s\n", name);
+               fprintf(stderr, "Could not found theme '%s'\n", name);
                return NULL;
        }
 
-       if ((f = fopen(file_name, "rt")) == NULL)
+       if ((f = fopen(file_name, "rt")) == NULL) {
+               fprintf(stderr, "Could not open theme '%s'\n", file_name);
                return NULL;
+       }
+       else
+               fprintf(stderr, "Loading icon theme '%s'\n", file_name);
 
-       free(file_name);
+       g_free (file_name);
 
        theme = calloc(1, sizeof(IconTheme));
        theme->name = strdup(name);
@@ -577,13 +569,13 @@ IconTheme *load_theme(char *name)
                                        // value is like 2
                                        sscanf(value, "%d", &current_dir->threshold);
                                } else if (strcmp(key, "Type") == 0) {
-                                       // value is Fixed, Scalable or Threshold
+                                       // value is Fixed, Scalable or Threshold : default to scalable for unknown Type.
                                        if (strcmp(value, "Fixed") == 0) {
                                                current_dir->type = ICON_DIR_TYPE_FIXED;
-                                       } else if (strcmp(value, "Scalable") == 0) {
-                                               current_dir->type = ICON_DIR_TYPE_SCALABLE;
                                        } else if (strcmp(value, "Threshold") == 0) {
                                                current_dir->type = ICON_DIR_TYPE_THRESHOLD;
+                                       } else {
+                                               current_dir->type = ICON_DIR_TYPE_SCALABLE;
                                        }
                                } else if (strcmp(key, "Context") == 0) {
                                        // usual values: Actions, Applications, Devices, FileSystems, MimeTypes
@@ -793,7 +785,8 @@ char *icon_path(Launcher *launcher, const char *icon_name, int size)
        }
 
        GSList *basenames = NULL;
-       basenames = g_slist_append(basenames, "~/.icons");
+       char *file_name = g_build_filename(g_get_home_dir(), ".icons", NULL);
+       basenames = g_slist_append(basenames, file_name);
        basenames = g_slist_append(basenames, "/usr/share/icons");
        basenames = g_slist_append(basenames, "/usr/share/pixmaps");
 
@@ -833,6 +826,7 @@ char *icon_path(Launcher *launcher, const char *icon_name, int size)
                        }
                }
        }
+       g_free (file_name);
 
        // Stage 2: best size match
        // Contrary to the freedesktop spec, we are not choosing the closest icon in size, but the next larger icon