int launcher_enabled;
int launcher_max_icon_size;
-GSList *icon_themes = 0;
+char *icon_theme_name;
+XSettingsClient *xsettings_client;
#define ICON_FALLBACK "exec"
void free_icon(Imlib_Image icon);
void free_icon_theme(IconTheme *theme);
+
void default_launcher()
{
launcher_enabled = 0;
launcher_max_icon_size = 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);
+ }
}
return;
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);
- }
+ panel_refresh = 1;
- fprintf(stderr, "Loading themes...\n");
launcher_load_themes(launcher);
- fprintf(stderr, "Done\n");
-
- // 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_icons(launcher);
}
{
int i;
+ 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);
+ Launcher *launcher = &panel->launcher;
+ cleanup_launcher_theme(launcher);
+
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_apps; l ; l = l->next) {
free(l->data);
}
g_slist_free(launcher->list_apps);
+ launcher->list_apps = NULL;
+ }
+ g_free(icon_theme_name);
+ launcher_enabled = 0;
+}
- for (l = launcher->icon_themes; l ; l = l->next) {
- IconTheme *theme = (IconTheme*) l->data;
- free_icon_theme(theme);
- free(theme);
- }
- g_slist_free(launcher->icon_themes);
- for (l = launcher->icon_theme_names; l ; l = l->next) {
- free(l->data);
+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);
}
- g_slist_free(launcher->icon_theme_names);
- launcher->list_apps = launcher->list_icons = launcher->icon_theme_names = launcher->icon_themes = NULL;
+ 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;
}
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) {
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);
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);
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;
}
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;
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;
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);
// 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
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->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);
+ }
+}
+
+
+// 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 = "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) {
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;
}
}
}
+ fprintf(stderr, "\n");
// Free the queue
GSList *l;
}
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);
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)) {
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);
return file_name;
} else {
free(file_name);
}
}
}
+ 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;
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 (g_file_test(file_name, G_FILE_TEST_EXISTS)) {
- if (directory_size_distance((IconThemeDir*)dir->data, size) < minimal_size) {
+ //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;
+ //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;
+ //printf("next_larger = %s; next_larger_size = %d\n", next_larger, next_larger_size);
}
}
free(file_name);
g_slist_free(basenames);
g_slist_free(extensions);
free(best_file_name);
+ g_free(home_icons);
return next_larger;
}
if (best_file_name) {
g_slist_free(basenames);
g_slist_free(extensions);
+ g_free(home_icons);
return best_file_name;
}
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);
+ sprintf(file_name, "%s/%s%s", base_name, icon_name, extension);
//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);
return file_name;
} else {
free(file_name);
fprintf(stderr, "Could not find icon %s\n", icon_name);
+ g_slist_free(basenames);
+ g_slist_free(extensions);
+ g_free(home_icons);
return NULL;
}
+
projects / chaz / tint2 / blobdiff