X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftint2;a=blobdiff_plain;f=src%2Flauncher%2Flauncher.c;h=6915d05b00cd7d445177e827a50c79e9a236b824;hp=6418a4cebc447205e30a5f22e5d4fac10fe2cbfa;hb=c939ed4e8e0f59470a78179918111bc2ee46cb90;hpb=dc4092064f5febcc3bea4e4a19905ac99b6f628e diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c index 6418a4c..6915d05 100644 --- a/src/launcher/launcher.c +++ b/src/launcher/launcher.c @@ -34,9 +34,14 @@ int launcher_enabled; int launcher_max_icon_size; -GSList *icon_themes = 0; +int launcher_tooltip_enabled; +int launcher_alpha; +int launcher_saturation; +int launcher_brightness; +char *icon_theme_name; +XSettingsClient *xsettings_client; -#define ICON_FALLBACK "exec" +#define ICON_FALLBACK "application-x-executable" char *icon_path(Launcher *launcher, const char *icon_name, int size); void launcher_load_themes(Launcher *launcher); @@ -46,15 +51,26 @@ 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; + launcher_tooltip_enabled = 0; + launcher_alpha = 100; + launcher_saturation = 0; + launcher_brightness = 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); + } } @@ -65,94 +81,80 @@ void init_launcher_panel(void *p) launcher->area.parent = p; launcher->area.panel = p; - launcher->area._draw_foreground = draw_launcher; + launcher->area._draw_foreground = NULL; launcher->area.size_mode = SIZE_BY_CONTENT; launcher->area._resize = resize_launcher; launcher->area.resize = 1; launcher->area.redraw = 1; - launcher->area.on_screen = 1; + if (launcher->area.bg == 0) + launcher->area.bg = &g_array_index(backgrounds, Background, 0); - 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; - fprintf(stderr, "Loading themes...\n"); - launcher_load_themes(launcher); - fprintf(stderr, "Done\n"); + launcher->area.on_screen = 1; + panel_refresh = 1; - // 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_themes(launcher); + launcher_load_icons(launcher); } void cleanup_launcher() { int i; + GSList *l; + 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); - 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); + Launcher *launcher = &panel->launcher; + cleanup_launcher_theme(launcher); + } + for (l = panel_config.launcher.list_apps; l ; l = l->next) { + free(l->data); + } + g_slist_free(panel_config.launcher.list_apps); + panel_config.launcher.list_apps = NULL; + free(icon_theme_name); + icon_theme_name = 0; + launcher_enabled = 0; +} - for (l = launcher->list_apps; l ; l = l->next) { - free(l->data); - } - g_slist_free(launcher->list_apps); - for (l = launcher->icon_themes; l ; l = l->next) { - IconTheme *theme = (IconTheme*) l->data; - free_icon_theme(theme); - free(theme); +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); + free(launcherIcon->icon_tooltip); } - g_slist_free(launcher->icon_themes); + free(launcherIcon); + } + g_slist_free(launcher->list_icons); - for (l = launcher->icon_theme_names; l ; l = l->next) { - free(l->data); - } - g_slist_free(launcher->icon_theme_names); - launcher->list_apps = launcher->list_icons = launcher->icon_theme_names = launcher->icon_themes = NULL; + for (l = launcher->list_themes; l ; l = l->next) { + IconTheme *theme = (IconTheme*) l->data; + free_icon_theme(theme); + free(theme); } - launcher_enabled = 0; + g_slist_free(launcher->list_themes); + launcher->list_icons = launcher->list_themes = NULL; } -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 +172,9 @@ void resize_launcher(void *obj) LauncherIcon *launcherIcon = (LauncherIcon *)l->data; if (launcherIcon->icon_size != icon_size || !launcherIcon->icon_original) { launcherIcon->icon_size = icon_size; + launcherIcon->area.width = launcherIcon->icon_size; + launcherIcon->area.height = launcherIcon->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) { @@ -181,7 +186,7 @@ void resize_launcher(void *obj) new_icon_path = icon_path(launcher, ICON_FALLBACK, launcherIcon->icon_size); if (new_icon_path) { launcherIcon->icon_original = imlib_load_image(new_icon_path); - fprintf(stderr, "%s %d: Using icon %s\n", __FILE__, __LINE__, new_icon_path); + fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, new_icon_path); free(new_icon_path); } launcherIcon->icon_scaled = scale_icon(launcherIcon->icon_original, icon_size); @@ -192,7 +197,7 @@ void resize_launcher(void *obj) free_icon(launcherIcon->icon_scaled); launcherIcon->icon_scaled = scale_icon(launcherIcon->icon_original, icon_size); free(new_icon_path); - fprintf(stderr, "%s %d: Using icon %s\n", __FILE__, __LINE__, launcherIcon->icon_path); + fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path); } else { // Free the old files free_icon(launcherIcon->icon_original); @@ -202,15 +207,12 @@ void resize_launcher(void *obj) launcherIcon->icon_scaled = scale_icon(launcherIcon->icon_original, launcherIcon->icon_size); free(launcherIcon->icon_path); launcherIcon->icon_path = new_icon_path; - fprintf(stderr, "%s %d: Using icon %s\n", __FILE__, __LINE__, launcherIcon->icon_path); + fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path); } } } - count = 0; - for (l = launcher->list_icons; l ; l = l->next) { - count++; - } + count = g_slist_length(launcher->list_icons); if (panel_horizontal) { if (!count) launcher->area.width = 0; @@ -222,9 +224,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,13 +235,10 @@ 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; - int start = launcher->area.bg->border.width + launcher->area.paddingy;// +marging/2; + int start = launcher->area.bg->border.width + launcher->area.paddingy + marging/2; if (panel_horizontal) { posy = start; posx = launcher->area.bg->border.width + launcher->area.paddingxlr; @@ -257,6 +253,7 @@ void resize_launcher(void *obj) launcherIcon->y = posy; launcherIcon->x = posx; + //printf("launcher %d : %d,%d\n", i, posx, posy); if (panel_horizontal) { if (i % icons_per_column) posy += icon_size + launcher->area.paddingx; @@ -274,32 +271,35 @@ void resize_launcher(void *obj) } } } - - // resize force the redraw - launcher->area.redraw = 1; + return 1; } +// Here we override the default layout of the icons; normally Area layouts its children +// in a stack; we need to layout them in a kind of table +void launcher_icon_on_change_layout(void *obj) +{ + LauncherIcon *launcherIcon = (LauncherIcon*)obj; + launcherIcon->area.posy = ((Area*)launcherIcon->area.parent)->posy + launcherIcon->y; + launcherIcon->area.posx = ((Area*)launcherIcon->area.parent)->posx + launcherIcon->x; +} -void draw_launcher(void *obj, cairo_t *c) +const char* launcher_icon_get_tooltip_text(void *obj) { - Launcher *launcher = obj; - GSList *l; - if (launcher->list_icons == 0) return; + LauncherIcon *launcherIcon = (LauncherIcon*)obj; + return launcherIcon->icon_tooltip; +} - for (l = launcher->list_icons; l ; l = l->next) { - LauncherIcon *launcherIcon = (LauncherIcon*)l->data; - int pos_x = launcherIcon->x; - int pos_y = launcherIcon->y; - Imlib_Image icon_scaled = launcherIcon->icon_scaled; - // Render - imlib_context_set_image (icon_scaled); - if (server.real_transparency) { - render_image(launcher->area.pix, pos_x, pos_y, imlib_image_get_width(), imlib_image_get_height() ); - } - else { - imlib_context_set_drawable(launcher->area.pix); - imlib_render_image_on_drawable (pos_x, pos_y); - } +void draw_launcher_icon(void *obj, cairo_t *c) +{ + LauncherIcon *launcherIcon = (LauncherIcon*)obj; + Imlib_Image icon_scaled = launcherIcon->icon_scaled; + // Render + imlib_context_set_image (icon_scaled); + if (server.real_transparency) { + render_image(launcherIcon->area.pix, 0, 0, imlib_image_get_width(), imlib_image_get_height() ); + } else { + imlib_context_set_drawable(launcherIcon->area.pix); + imlib_render_image_on_drawable (0, 0); } } @@ -309,6 +309,11 @@ Imlib_Image scale_icon(Imlib_Image original, int icon_size) if (original) { imlib_context_set_image (original); icon_scaled = imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), icon_size, icon_size); + imlib_context_set_image (icon_scaled); + imlib_image_set_has_alpha(1); + DATA32* data = imlib_image_get_data(); + adjust_asb(data, icon_size, icon_size, launcher_alpha, (float)launcher_saturation/100, (float)launcher_brightness/100); + imlib_image_put_back_data(data); } else { icon_scaled = imlib_create_image(icon_size, icon_size); imlib_context_set_image (icon_scaled); @@ -372,7 +377,7 @@ void expand_exec(DesktopEntry *entry, const char *path) // %c -> Name // %k -> path if (entry->exec) { - char *exec2 = malloc(strlen(entry->exec) + strlen(entry->name) + strlen(entry->icon) + 100); + char *exec2 = malloc(strlen(entry->exec) + (entry->name ? strlen(entry->name) : 1) + (entry->icon ? strlen(entry->icon) : 1) + 100); char *p, *q; // p will never point to an escaped char for (p = entry->exec, q = exec2; *p; p++, q++) { @@ -421,7 +426,8 @@ void expand_exec(DesktopEntry *entry, const char *path) int launcher_read_desktop_file(const char *path, DesktopEntry *entry) { FILE *fp; - char line[4096]; + char *line = NULL; + size_t line_size; char *key, *value; entry->name = entry->icon = entry->exec = NULL; @@ -431,17 +437,21 @@ int launcher_read_desktop_file(const char *path, DesktopEntry *entry) return 0; } - while (fgets(line, sizeof(line), fp) != NULL) { + int inside_desktop_entry = 0; + while (getline(&line, &line_size, fp) >= 0) { int len = strlen(line); if (len == 0) continue; line[len - 1] = '\0'; - if (parse_dektop_line(line, &key, &value)) { - if (strcmp(key, "Name") == 0) { + if (line[0] == '[') { + inside_desktop_entry = (strcmp(line, "[Desktop Entry]") == 0); + } + if (inside_desktop_entry && parse_dektop_line(line, &key, &value)) { + if (!entry->name && strcmp(key, "Name") == 0) { entry->name = strdup(value); - } else if (strcmp(key, "Exec") == 0) { + } else if (!entry->exec && strcmp(key, "Exec") == 0) { entry->exec = strdup(value); - } else if (strcmp(key, "Icon") == 0) { + } else if (!entry->icon && strcmp(key, "Icon") == 0) { entry->icon = strdup(value); } } @@ -452,6 +462,7 @@ int launcher_read_desktop_file(const char *path, DesktopEntry *entry) expand_exec(entry, path); + free(line); return 1; } @@ -481,34 +492,36 @@ IconTheme *load_theme(char *name) IconTheme *theme; char *file_name; FILE *f; - char line[2048]; + char *line = NULL; + size_t line_size; 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); 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; + } - free(file_name); + g_free (file_name); theme = calloc(1, sizeof(IconTheme)); theme->name = strdup(name); @@ -517,7 +530,7 @@ IconTheme *load_theme(char *name) IconThemeDir *current_dir = NULL; int inside_header = 1; - while (fgets(line, sizeof(line), f) != NULL) { + while (getline(&line, &line_size, f) >= 0) { char *key, *value; int line_len = strlen(line); @@ -577,13 +590,13 @@ IconTheme *load_theme(char *name) // value is like 2 sscanf(value, "%d", ¤t_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 @@ -611,6 +624,8 @@ IconTheme *load_theme(char *name) } fclose(f); + free(line); + return theme; } @@ -660,32 +675,60 @@ 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->area.parent = launcher; + launcherIcon->area.panel = launcher->area.panel; + launcherIcon->area._draw_foreground = draw_launcher_icon; + launcherIcon->area.size_mode = SIZE_BY_CONTENT; + launcherIcon->area._resize = NULL; + launcherIcon->area.resize = 0; + launcherIcon->area.redraw = 1; + launcherIcon->area.bg = &g_array_index(backgrounds, Background, 0); + launcherIcon->area.on_screen = 1; + launcherIcon->area._on_change_layout = launcher_icon_on_change_layout; + if (launcher_tooltip_enabled) + launcherIcon->area._get_tooltip_text = launcher_icon_get_tooltip_text; + else + launcherIcon->area._get_tooltip_text = NULL; + 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; + launcherIcon->icon_tooltip = entry.name ? strdup(entry.name) : strdup(entry.exec); + free_desktop_entry(&entry); + launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon); + add_area(&launcherIcon->area); + } + 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 = strdup("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) { if (!queue) { @@ -706,9 +749,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; @@ -733,6 +777,7 @@ void launcher_load_themes(Launcher *launcher) } } } + fprintf(stderr, "\n"); // Free the queue GSList *l; @@ -778,6 +823,7 @@ int directory_size_distance(IconThemeDir *dir, int size) } } +#define DEBUG_ICON_SEARCH 0 // Returns the full path to an icon file (or NULL) given the icon name char *icon_path(Launcher *launcher, const char *icon_name, int size) { @@ -793,17 +839,35 @@ char *icon_path(Launcher *launcher, const char *icon_name, int size) } GSList *basenames = NULL; - basenames = g_slist_append(basenames, "~/.icons"); + char *home_icons = g_build_filename(g_get_home_dir(), ".icons", NULL); + basenames = g_slist_append(basenames, home_icons); + char *home_local_icons = g_build_filename(g_get_home_dir(), ".local/share/icons", NULL); + basenames = g_slist_append(basenames, home_local_icons); + basenames = g_slist_append(basenames, "/usr/local/share/icons"); + basenames = g_slist_append(basenames, "/usr/local/share/pixmaps"); basenames = g_slist_append(basenames, "/usr/share/icons"); basenames = g_slist_append(basenames, "/usr/share/pixmaps"); GSList *extensions = NULL; - extensions = g_slist_append(extensions, "png"); - extensions = g_slist_append(extensions, "xpm"); + extensions = g_slist_append(extensions, ".png"); + extensions = g_slist_append(extensions, ".xpm"); + // if the icon name already contains one of the extensions (e.g. vlc.png instead of vlc) add a special entry + GSList *ext; + for (ext = extensions; ext; ext = g_slist_next(ext)) { + char *extension = (char*) ext->data; + if (strlen(icon_name) > strlen(extension) && + strcmp(extension, icon_name + strlen(icon_name) - strlen(extension)) == 0) { + extensions = g_slist_append(extensions, ""); + break; + } + } - // Stage 1: exact size match GSList *theme; - for (theme = launcher->icon_themes; theme; theme = g_slist_next(theme)) { + // Stage 1: exact size match + // the theme must have a higher priority than having an exact size match, so we will just use + // the code that searches for the best size match (it will find the exact size match if one exists) + /* + 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)) { @@ -818,11 +882,14 @@ char *icon_path(Launcher *launcher, const char *icon_name, int size) char *file_name = malloc(strlen(base_name) + strlen(theme_name) + strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100); // filename = directory/$(themename)/subdirectory/iconname.extension - sprintf(file_name, "%s/%s/%s/%s.%s", base_name, theme_name, dir_name, icon_name, extension); + sprintf(file_name, "%s/%s/%s/%s%s", base_name, theme_name, dir_name, icon_name, extension); + //printf("found exact: %s\n", file_name); //printf("checking %s\n", file_name); if (g_file_test(file_name, G_FILE_TEST_EXISTS)) { g_slist_free(basenames); g_slist_free(extensions); + g_free(home_icons); + g_free(home_local_icons); return file_name; } else { free(file_name); @@ -833,16 +900,25 @@ 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 // otherwise the quality is usually crap (for size 22, if you can choose 16 or 32, you're better with 32) // We do fallback to the closest size if we cannot find a larger or equal icon + + // These 3 variables are used for keeping the closest size match int minimal_size = INT_MAX; char *best_file_name = NULL; + GSList *best_file_theme = NULL; + + // These 3 variables are used for keeping the next larger match int next_larger_size = -1; char *next_larger = NULL; - for (theme = launcher->icon_themes; theme; theme = g_slist_next(theme)) { + GSList *next_larger_theme = NULL; + + 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; @@ -856,23 +932,37 @@ char *icon_path(Launcher *launcher, const char *icon_name, int size) char *file_name = malloc(strlen(base_name) + strlen(theme_name) + strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100); // filename = directory/$(themename)/subdirectory/iconname.extension - sprintf(file_name, "%s/%s/%s/%s.%s", base_name, theme_name, dir_name, icon_name, extension); + sprintf(file_name, "%s/%s/%s/%s%s", base_name, theme_name, dir_name, icon_name, extension); + if (DEBUG_ICON_SEARCH) + printf("checking %s\n", file_name); if (g_file_test(file_name, G_FILE_TEST_EXISTS)) { - if (directory_size_distance((IconThemeDir*)dir->data, size) < minimal_size) { + if (DEBUG_ICON_SEARCH) + printf("found: %s\n", file_name); + // Closest match + if (directory_size_distance((IconThemeDir*)dir->data, size) < minimal_size && (!best_file_theme ? 1 : theme == best_file_theme)) { if (best_file_name) { free(best_file_name); best_file_name = NULL; } best_file_name = strdup(file_name); minimal_size = directory_size_distance((IconThemeDir*)dir->data, size); + best_file_theme = theme; + if (DEBUG_ICON_SEARCH) + printf("best_file_name = %s; minimal_size = %d\n", best_file_name, minimal_size); } - if (((IconThemeDir*)dir->data)->size >= size && (next_larger_size == -1 || ((IconThemeDir*)dir->data)->size < next_larger_size)) { + // Next larger match + if (((IconThemeDir*)dir->data)->size >= size && + (next_larger_size == -1 || ((IconThemeDir*)dir->data)->size < next_larger_size) && + (!next_larger_theme ? 1 : theme == next_larger_theme)) { if (next_larger) { free(next_larger); next_larger = NULL; } next_larger = strdup(file_name); next_larger_size = ((IconThemeDir*)dir->data)->size; + next_larger_theme = theme; + if (DEBUG_ICON_SEARCH) + printf("next_larger = %s; next_larger_size = %d\n", next_larger, next_larger_size); } } free(file_name); @@ -884,11 +974,15 @@ char *icon_path(Launcher *launcher, const char *icon_name, int size) g_slist_free(basenames); g_slist_free(extensions); free(best_file_name); + g_free(home_icons); + g_free(home_local_icons); return next_larger; } if (best_file_name) { g_slist_free(basenames); g_slist_free(extensions); + g_free(home_icons); + g_free(home_local_icons); return best_file_name; } @@ -903,11 +997,14 @@ char *icon_path(Launcher *launcher, const char *icon_name, int size) char *file_name = malloc(strlen(base_name) + strlen(icon_name) + strlen(extension) + 100); // filename = directory/iconname.extension - sprintf(file_name, "%s/%s.%s", base_name, icon_name, extension); - //printf("checking %s\n", file_name); + sprintf(file_name, "%s/%s%s", base_name, icon_name, extension); + if (DEBUG_ICON_SEARCH) + printf("checking %s\n", file_name); if (g_file_test(file_name, G_FILE_TEST_EXISTS)) { g_slist_free(basenames); g_slist_free(extensions); + g_free(home_icons); + g_free(home_local_icons); return file_name; } else { free(file_name); @@ -919,5 +1016,10 @@ char *icon_path(Launcher *launcher, const char *icon_name, int size) fprintf(stderr, "Could not find icon %s\n", icon_name); + g_slist_free(basenames); + g_slist_free(extensions); + g_free(home_icons); + g_free(home_local_icons); return NULL; } +