X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftint2;a=blobdiff_plain;f=src%2Flauncher%2Flauncher.c;h=6915d05b00cd7d445177e827a50c79e9a236b824;hp=d338d96e425d309c0cf9594b9b05ecc0925c0a44;hb=c939ed4e8e0f59470a78179918111bc2ee46cb90;hpb=488f613b4efdd0a0116c1bb6dde545ca3e5bb20e diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c index d338d96..6915d05 100644 --- a/src/launcher/launcher.c +++ b/src/launcher/launcher.c @@ -34,17 +34,43 @@ 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 "application-x-executable" + +char *icon_path(Launcher *launcher, const char *icon_name, int size); +void launcher_load_themes(Launcher *launcher); +void free_desktop_entry(DesktopEntry *entry); +int launcher_read_desktop_file(const char *path, DesktopEntry *entry); +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); + } } @@ -55,76 +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; - // Load icons - { - GSList* path = launcher->list_icon_paths; - GSList* cmd = launcher->list_cmds; - while (path != NULL && cmd != NULL) - { - LauncherIcon *launcherIcon = malloc(sizeof(LauncherIcon)); - launcherIcon->icon = imlib_load_image(path->data); - launcherIcon->cmd = strdup(cmd->data); - launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon); - path = g_slist_next(path); - cmd = g_slist_next(cmd); - } - } + launcher->area.on_screen = 1; + panel_refresh = 1; + + 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 && launcherIcon->icon) { - imlib_context_set_image (launcherIcon->icon); - imlib_free_image(); - } + 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; +} + + +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); - } - g_slist_free(launcher->list_icons); - for (l = launcher->list_icon_paths; l ; l = l->next) { - free(l->data); + free(launcherIcon->icon_tooltip); } - g_slist_free(launcher->list_icon_paths); - for (l = launcher->list_cmds; l ; l = l->next) { - free(l->data); - } - g_slist_free(launcher->list_cmds); + 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; } -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; @@ -136,11 +166,53 @@ void resize_launcher(void *obj) icon_size = icon_size - (2 * launcher->area.bg->border.width) - (2 * launcher->area.paddingy); if (launcher_max_icon_size > 0 && icon_size > launcher_max_icon_size) icon_size = launcher_max_icon_size; - - count = 0; + + // Resize icons if necessary for (l = launcher->list_icons; l ; l = l->next) { - count++; + 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) { + // Draw a blank icon + free_icon(launcherIcon->icon_original); + launcherIcon->icon_original = NULL; + free_icon(launcherIcon->icon_scaled); + launcherIcon->icon_scaled = NULL; + 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, "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); + continue; + } + if (launcherIcon->icon_path && strcmp(new_icon_path, launcherIcon->icon_path) == 0) { + // If it's the same file just rescale + free_icon(launcherIcon->icon_scaled); + launcherIcon->icon_scaled = scale_icon(launcherIcon->icon_original, icon_size); + free(new_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); + free_icon(launcherIcon->icon_scaled); + // Load the new file and scale + launcherIcon->icon_original = imlib_load_image(new_icon_path); + launcherIcon->icon_scaled = scale_icon(launcherIcon->icon_original, launcherIcon->icon_size); + free(launcherIcon->icon_path); + launcherIcon->icon_path = new_icon_path; + fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path); + } + } } + + count = g_slist_length(launcher->list_icons); if (panel_horizontal) { if (!count) launcher->area.width = 0; @@ -152,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; @@ -166,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; @@ -187,8 +253,7 @@ void resize_launcher(void *obj) launcherIcon->y = posy; launcherIcon->x = posx; - launcherIcon->width = icon_size; - launcherIcon->height = icon_size; + //printf("launcher %d : %d,%d\n", i, posx, posy); if (panel_horizontal) { if (i % icons_per_column) posy += icon_size + launcher->area.paddingx; @@ -206,44 +271,62 @@ 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; - int width = launcherIcon->width; - int height = launcherIcon->height; - Imlib_Image icon_scaled; - if (launcherIcon->icon) { - imlib_context_set_image (launcherIcon->icon); - icon_scaled = imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), width, height); - } else { - icon_scaled = imlib_create_image(width, height); - imlib_context_set_image (icon_scaled); - imlib_context_set_color(255, 255, 255, 255); - imlib_image_fill_rectangle(0, 0, width, height); - } +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); + } +} - // Render +Imlib_Image scale_icon(Imlib_Image original, int icon_size) +{ + Imlib_Image icon_scaled; + 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); - 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); - } + 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); + imlib_context_set_color(255, 255, 255, 255); + imlib_image_fill_rectangle(0, 0, icon_size, icon_size); + } + return icon_scaled; +} + +void free_icon(Imlib_Image icon) +{ + if (icon) { + imlib_context_set_image(icon); imlib_free_image(); } } @@ -260,6 +343,8 @@ void launcher_action(LauncherIcon *icon) /* http://standards.freedesktop.org/desktop-entry-spec/ */ /* http://standards.freedesktop.org/icon-theme-spec/ */ +// Splits line at first '=' and returns 1 if successful, and parts are not empty +// key and value point to the parts int parse_dektop_line(char *line, char **key, char **value) { char *p; @@ -280,6 +365,11 @@ int parse_dektop_line(char *line, char **key, char **value) return 1; } +int parse_theme_line(char *line, char **key, char **value) +{ + return parse_dektop_line(line, key, value); +} + void expand_exec(DesktopEntry *entry, const char *path) { // Expand % in exec @@ -287,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++) { @@ -332,46 +422,36 @@ void expand_exec(DesktopEntry *entry, const char *path) } } +//TODO Use UTF8 when parsing the file int launcher_read_desktop_file(const char *path, DesktopEntry *entry) { FILE *fp; - char line[4096]; - char *buffer; + char *line = NULL; + size_t line_size; char *key, *value; entry->name = entry->icon = entry->exec = NULL; - if ((fp = fopen(path, "r")) == NULL) { + if ((fp = fopen(path, "rt")) == NULL) { fprintf(stderr, "Could not open file %s\n", path); return 0; } - buffer = line; - while (fgets(buffer, sizeof(line) - (buffer - line), fp) != NULL) { - //TODO use UTF8 capable strlen - int len = strlen(buffer); - int total_len = strlen(line); - if (!g_utf8_validate(buffer, total_len, NULL)) { - // Not a real newline, read more - buffer += len; - if (sizeof(line) - (buffer - line) < 2) { - fprintf(stderr, "%s %d: line too long (%s)\n", __FILE__, __LINE__, path); - break; - } else { - continue; - } + 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 (line[0] == '[') { + inside_desktop_entry = (strcmp(line, "[Desktop Entry]") == 0); } - // We have a valid line - buffer[len-1] = '\0'; - buffer = line; - if (parse_dektop_line(line, &key, &value)) { - if (strcmp(key, "Name") == 0) { - //TODO use UTF-8 capable strdup + 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) { - //TODO use UTF-8 capable strdup + } else if (!entry->icon && strcmp(key, "Icon") == 0) { entry->icon = strdup(value); } } @@ -382,103 +462,564 @@ int launcher_read_desktop_file(const char *path, DesktopEntry *entry) expand_exec(entry, path); + free(line); return 1; } +void free_desktop_entry(DesktopEntry *entry) +{ + free(entry->name); + free(entry->icon); + free(entry->exec); +} + void test_launcher_read_desktop_file() { + fprintf(stdout, "\033[1;33m"); DesktopEntry entry; launcher_read_desktop_file("/usr/share/applications/firefox.desktop", &entry); printf("Name:%s Icon:%s Exec:%s\n", entry.name, entry.icon, entry.exec); + fprintf(stdout, "\033[0m"); } +//TODO Use UTF8 when parsing the file IconTheme *load_theme(char *name) { - //TODO // Look for name/index.theme in $HOME/.icons, /usr/share/icons, /usr/share/pixmaps (stop at the first found) // Parse index.theme -> list of IconThemeDir with attributes - // Return IconTheme struct - return NULL; + // Return IconTheme* + + IconTheme *theme; + char *file_name; + FILE *f; + char *line = NULL; + size_t line_size; + + if (name == NULL) + return NULL; + + file_name = g_build_filename(g_get_home_dir(), ".icons", name, "index.theme", NULL); + if (!g_file_test(file_name, G_FILE_TEST_EXISTS)) { + 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)) { + 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)) { + g_free (file_name); + file_name = NULL; + } + } + } + + if (!file_name) { + return NULL; + } + + if ((f = fopen(file_name, "rt")) == NULL) { + fprintf(stderr, "Could not open theme '%s'\n", file_name); + return NULL; + } + + g_free (file_name); + + theme = calloc(1, sizeof(IconTheme)); + theme->name = strdup(name); + theme->list_inherits = NULL; + theme->list_directories = NULL; + + IconThemeDir *current_dir = NULL; + int inside_header = 1; + while (getline(&line, &line_size, f) >= 0) { + char *key, *value; + + int line_len = strlen(line); + if (line_len >= 1) { + if (line[line_len - 1] == '\n') { + line[line_len - 1] = '\0'; + line_len--; + } + } + + if (line_len == 0) + continue; + + if (inside_header) { + if (parse_theme_line(line, &key, &value)) { + if (strcmp(key, "Inherits") == 0) { + // value is like oxygen,wood,default + char *token; + token = strtok(value, ",\n"); + while (token != NULL) + { + theme->list_inherits = g_slist_append(theme->list_inherits, strdup(token)); + token = strtok(NULL, ",\n"); + } + } else if (strcmp(key, "Directories") == 0) { + // value is like 48x48/apps,48x48/mimetypes,32x32/apps,scalable/apps,scalable/mimetypes + char *token; + token = strtok(value, ",\n"); + while (token != NULL) + { + IconThemeDir *dir = calloc(1, sizeof(IconThemeDir)); + dir->name = strdup(token); + dir->max_size = dir->min_size = dir->size = -1; + dir->type = ICON_DIR_TYPE_THRESHOLD; + dir->threshold = 2; + theme->list_directories = g_slist_append(theme->list_directories, dir); + token = strtok(NULL, ",\n"); + } + } + } + } else if (current_dir != NULL) { + if (parse_theme_line(line, &key, &value)) { + if (strcmp(key, "Size") == 0) { + // value is like 24 + sscanf(value, "%d", ¤t_dir->size); + if (current_dir->max_size == -1) + current_dir->max_size = current_dir->size; + if (current_dir->min_size == -1) + current_dir->min_size = current_dir->size; + } else if (strcmp(key, "MaxSize") == 0) { + // value is like 24 + sscanf(value, "%d", ¤t_dir->max_size); + } else if (strcmp(key, "MinSize") == 0) { + // value is like 24 + sscanf(value, "%d", ¤t_dir->min_size); + } else if (strcmp(key, "Threshold") == 0) { + // value is like 2 + sscanf(value, "%d", ¤t_dir->threshold); + } else if (strcmp(key, "Type") == 0) { + // 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, "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 + current_dir->context = strdup(value); + } + } + } + + if (line[0] == '[' && line[line_len - 1] == ']' && strcmp(line, "[Icon Theme]") != 0) { + inside_header = 0; + current_dir = NULL; + line[line_len - 1] = '\0'; + char *dir_name = line + 1; + GSList* dir_item = theme->list_directories; + while (dir_item != NULL) + { + IconThemeDir *dir = dir_item->data; + if (strcmp(dir->name, dir_name) == 0) { + current_dir = dir; + break; + } + dir_item = g_slist_next(dir_item); + } + } + } + fclose(f); + + free(line); + + return theme; } -// Populates the icon_themes list -void launcher_load_themes() +void free_icon_theme(IconTheme *theme) { - //TODO load the user theme, all the inherited themes recursively (DFS), and the hicolor theme - // avoid inheritance loops + free(theme->name); + GSList *l_inherits; + for (l_inherits = theme->list_inherits; l_inherits ; l_inherits = l_inherits->next) { + free(l_inherits->data); + } + GSList *l_dir; + for (l_dir = theme->list_directories; l_dir ; l_dir = l_dir->next) { + IconThemeDir *dir = (IconThemeDir *)l_dir->data; + free(dir->name); + free(dir->context); + free(l_dir->data); + } } -// Returns the full path to an icon file (or NULL) given the icon name -char *icon_path(const char *name) +void test_launcher_read_theme_file() { - //TODO - /* - -// Stage 1: exact size match -LookupIcon (iconname, size): -for each subdir in $(theme subdir list) { // <---- each subdir in each theme - for each directory in $(basename list) { - for extension in ("png", "svg", "xpm") { - if DirectoryMatchesSize(subdir, size) { - filename = directory/$(themename)/subdirectory/iconname.extension - if exist filename - return filename -} -} + fprintf(stdout, "\033[1;33m"); + IconTheme *theme = load_theme("oxygen"); + if (!theme) { + printf("Could not load theme\n"); + return; + } + printf("Loaded theme: %s\n", theme->name); + GSList* item = theme->list_inherits; + while (item != NULL) + { + printf("Inherits:%s\n", (char*)item->data); + item = g_slist_next(item); + } + item = theme->list_directories; + while (item != NULL) + { + IconThemeDir *dir = item->data; + printf("Dir:%s Size=%d MinSize=%d MaxSize=%d Threshold=%d Type=%s Context=%s\n", + dir->name, dir->size, dir->min_size, dir->max_size, dir->threshold, + dir->type == ICON_DIR_TYPE_FIXED ? "Fixed" : + dir->type == ICON_DIR_TYPE_SCALABLE ? "Scalable" : + dir->type == ICON_DIR_TYPE_THRESHOLD ? "Threshold" : "?????", + dir->context); + item = g_slist_next(item); + } + fprintf(stdout, "\033[0m"); } + + +// 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); + } } -// Stage 2: best size match -minimal_size = MAXINT -for each subdir in $(theme subdir list) { // <---- each subdir in each theme - for each directory in $(basename list) { - for extension in ("png", "svg", "xpm") { - filename = directory/$(themename)/subdirectory/iconname.extension - if exist filename and DirectorySizeDistance(subdir, size) < minimal_size - closest_filename = filename - minimal_size = DirectorySizeDistance(subdir, size) + +// 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 + 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) { + GSList* queued_item = queued; + while (queued_item != NULL) { + if (strcmp(queued_item->data, "hicolor") == 0) { + hicolor_loaded = 1; + break; + } + queued_item = g_slist_next(queued_item); + } + if (hicolor_loaded) + break; + queue = g_slist_append(queue, strdup("hicolor")); + queued = g_slist_append(queued, strdup("hicolor")); + } + + char *name = queue->data; + queue = g_slist_remove(queue, name); + + fprintf(stderr, " '%s',", name); + IconTheme *theme = load_theme(name); + if (theme != NULL) { + launcher->list_themes = g_slist_append(launcher->list_themes, theme); + + GSList* item = theme->list_inherits; + int pos = 0; + while (item != NULL) + { + char *parent = item->data; + int duplicate = 0; + GSList* queued_item = queued; + while (queued_item != NULL) { + if (strcmp(queued_item->data, parent) == 0) { + duplicate = 1; + break; + } + queued_item = g_slist_next(queued_item); + } + if (!duplicate) { + queue = g_slist_insert(queue, strdup(parent), pos); + pos++; + queued = g_slist_append(queued, strdup(parent)); + } + item = g_slist_next(item); + } + } + } + fprintf(stderr, "\n"); + + // Free the queue + GSList *l; + for (l = queue; l ; l = l->next) + free(l->data); + g_slist_free(queue); + for (l = queued; l ; l = l->next) + free(l->data); + g_slist_free(queued); } + +int directory_matches_size(IconThemeDir *dir, int size) +{ + if (dir->type == ICON_DIR_TYPE_FIXED) { + return dir->size == size; + } else if (dir->type == ICON_DIR_TYPE_SCALABLE) { + return dir->min_size <= size && size <= dir->max_size; + } else /*if (dir->type == ICON_DIR_TYPE_THRESHOLD)*/ { + return dir->size - dir->threshold <= size && size <= dir->size + dir->threshold; + } } + +int directory_size_distance(IconThemeDir *dir, int size) +{ + if (dir->type == ICON_DIR_TYPE_FIXED) { + return abs(dir->size - size); + } else if (dir->type == ICON_DIR_TYPE_SCALABLE) { + if (size < dir->min_size) { + return dir->min_size - size; + } else if (size > dir->max_size) { + return size - dir->max_size; + } else { + return 0; + } + } else /*if (dir->type == ICON_DIR_TYPE_THRESHOLD)*/ { + if (size < dir->size - dir->threshold) { + return dir->min_size - size; + } else if (size > dir->size + dir->threshold) { + return size - dir->max_size; + } else { + return 0; + } + } } -if closest_filename set - return closest_filename - -// Stage 3: look in unthemed icons -for each directory in $(basename list) { // <---- $HOME/.icons, /usr/share/icons, /usr/share/pixmaps - for extension in ("png", "svg", "xpm") { - if exists directory/iconname.extension - return directory/iconname.extension - } - } - - return failed icon lookup - -// With the following helper functions: - -DirectoryMatchesSize(subdir, iconsize): -read Type and size data from subdir -if Type is Fixed -return Size == iconsize -if Type is Scaled -return MinSize <= iconsize <= MaxSize -if Type is Threshold -return Size - Threshold <= iconsize <= Size + Threshold - -DirectorySizeDistance(subdir, size): -read Type and size data from subdir -if Type is Fixed -return abs(Size - iconsize) -if Type is Scaled -if iconsize < MinSize -return MinSize - iconsize -if iconsize > MaxSize -return iconsize - MaxSize -return 0 -if Type is Threshold -if iconsize < Size - Threshold -return MinSize - iconsize -if iconsize > Size + Threshold -return iconsize - MaxSize -return 0 + +#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) +{ + if (icon_name == NULL) + return NULL; + + // If the icon_name is already a path and the file exists, return it + if (strstr(icon_name, "/") == icon_name) { + if (g_file_test(icon_name, G_FILE_TEST_EXISTS)) + return strdup(icon_name); + else + return NULL; + } + + GSList *basenames = NULL; + 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"); + // 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; + } + } + + GSList *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)) { + GSList *base; + for (base = basenames; base; base = g_slist_next(base)) { + GSList *ext; + for (ext = extensions; ext; ext = g_slist_next(ext)) { + char *base_name = (char*) base->data; + char *theme_name = ((IconTheme*)theme->data)->name; + char *dir_name = ((IconThemeDir*)dir->data)->name; + char *extension = (char*) ext->data; + 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); + //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); + file_name = NULL; + } + } + } + } + } + } + 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; + 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; + for (base = basenames; base; base = g_slist_next(base)) { + GSList *ext; + for (ext = extensions; ext; ext = g_slist_next(ext)) { + char *base_name = (char*) base->data; + char *theme_name = ((IconTheme*)theme->data)->name; + char *dir_name = ((IconThemeDir*)dir->data)->name; + char *extension = (char*) ext->data; + 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); + if (DEBUG_ICON_SEARCH) + printf("checking %s\n", file_name); + if (g_file_test(file_name, G_FILE_TEST_EXISTS)) { + 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); + } + // 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); + } + } + } + } + if (next_larger) { + 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; + } + + // Stage 3: look in unthemed icons + { + GSList *base; + for (base = basenames; base; base = g_slist_next(base)) { + GSList *ext; + for (ext = extensions; ext; ext = g_slist_next(ext)) { + char *base_name = (char*) base->data; + char *extension = (char*) ext->data; + 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); + 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); + file_name = NULL; + } + } + } + } + + 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; } +