X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flauncher%2Flauncher.c;h=ef007ecf2976c35be3fbac08e7714aae50ca94c5;hb=9296b3695c552753e2cd7a47b20262aba6158199;hp=87abfc0f7e25bebe152b2a7f8701ea5095b766e1;hpb=2d23d59344c465e699ee87656307596c0c230e69;p=chaz%2Ftint2 diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c index 87abfc0..ef007ec 100644 --- a/src/launcher/launcher.c +++ b/src/launcher/launcher.c @@ -37,7 +37,7 @@ int launcher_max_icon_size; 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); @@ -73,11 +73,13 @@ 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; + if (launcher->area.bg == 0) + launcher->area.bg = &g_array_index(backgrounds, Background, 0); // check consistency if (launcher->list_apps == NULL) @@ -126,6 +128,7 @@ void cleanup_launcher_theme(Launcher *launcher) free(launcherIcon->icon_name); free(launcherIcon->icon_path); free(launcherIcon->cmd); + free(launcherIcon->icon_tooltip); } free(launcherIcon); } @@ -161,6 +164,8 @@ int 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); @@ -261,27 +266,32 @@ int resize_launcher(void *obj) 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); } } @@ -403,7 +413,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; @@ -413,7 +424,7 @@ int launcher_read_desktop_file(const char *path, DesktopEntry *entry) return 0; } - while (fgets(line, sizeof(line), fp) != NULL) { + while (getline(&line, &line_size, fp) >= 0) { int len = strlen(line); if (len == 0) continue; @@ -434,6 +445,7 @@ int launcher_read_desktop_file(const char *path, DesktopEntry *entry) expand_exec(entry, path); + free(line); return 1; } @@ -463,7 +475,8 @@ 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; @@ -500,7 +513,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); @@ -594,6 +607,8 @@ IconTheme *load_theme(char *name) } fclose(f); + free(line); + return theme; } @@ -654,12 +669,25 @@ void launcher_load_icons(Launcher *launcher) 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; + launcherIcon->area._get_tooltip_text = launcher_icon_get_tooltip_text; 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); } @@ -673,7 +701,7 @@ void launcher_load_themes(Launcher *launcher) // avoid inheritance loops if (!icon_theme_name) { fprintf(stderr, "Missing launcher theme, default to 'hicolor'.\n"); - icon_theme_name = "hicolor"; + icon_theme_name = strdup("hicolor"); } else fprintf(stderr, "Loading %s. Icon theme :", icon_theme_name);