int launcher_enabled;
int launcher_max_icon_size;
-GSList *icon_themes = 0;
+char *icon_theme_name;
+XSettingsClient *xsettings_client;
+GSList *icon_themes;
#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_themes = 0;
+ icon_theme_name = 0;
+ xsettings_client = NULL;
+ printf("default_launcher\n");
}
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);
+ }
}
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);
- fprintf(stderr, "Done\n");
// Load apps (.desktop style launcher items)
GSList* app = launcher->list_apps;
{
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;
}
g_slist_free(launcher->icon_themes);
- 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;
+ launcher->list_apps = launcher->list_icons = launcher->icon_themes = NULL;
}
+ g_free(icon_theme_name);
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;
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);
}
}
}
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;
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;
}
}
}
-
- // resize force the redraw
- launcher->area.redraw = 1;
+ return 1;
}
// %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++) {
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
{
// 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_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, "icon theme '%s', ", name);
IconTheme *theme = load_theme(name);
if (theme != NULL) {
launcher->icon_themes = g_slist_append(launcher->icon_themes, theme);
GSList* item = theme->list_inherits;
+ int pos = 0;
while (item != NULL)
{
char *parent = item->data;
queued_item = g_slist_next(queued_item);
}
if (!duplicate) {
- queue = g_slist_append(queue, strdup(parent));
+ 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;
}
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");
}
}
}
+ 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
return NULL;
}
+
projects / chaz / tint2 / blobdiff