* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#endif
#include <string.h>
#include <stdlib.h>
+#include <math.h>
#include <glib.h>
#include <glib/gstdio.h>
#ifndef S_ISDIR
#define S_ISDIR(mode) ((mode)&_S_IFDIR)
#endif
+#define WIN32_MEAN_AND_LEAN
+#include <windows.h>
+#include "win32/gdkwin32.h"
#endif /* G_OS_WIN32 */
#include "gtkicontheme.h"
+#include "gtkdebug.h"
#include "gtkiconfactory.h"
#include "gtkiconcache.h"
#include "gtkbuiltincache.h"
#include "gtkintl.h"
#include "gtkmain.h"
+#include "gtknumerableiconprivate.h"
#include "gtksettings.h"
#include "gtkprivate.h"
-#include "gtkalias.h"
+
+#undef GDK_DEPRECATED
+#undef GDK_DEPRECATED_FOR
+#define GDK_DEPRECATED
+#define GDK_DEPRECATED_FOR(f)
+
+#include "deprecated/gtkstyle.h"
+
+
+/**
+ * SECTION:gtkicontheme
+ * @Short_description: Looking up icons by name
+ * @Title: GtkIconTheme
+ *
+ * #GtkIconTheme provides a facility for looking up icons by name
+ * and size. The main reason for using a name rather than simply
+ * providing a filename is to allow different icons to be used
+ * depending on what <firstterm>icon theme</firstterm> is selected
+ * by the user. The operation of icon themes on Linux and Unix
+ * follows the <ulink
+ * url="http://www.freedesktop.org/Standards/icon-theme-spec">Icon
+ * Theme Specification</ulink>. There is a default icon theme,
+ * named <literal>hicolor</literal> where applications should install
+ * their icons, but more additional application themes can be
+ * installed as operating system vendors and users choose.
+ *
+ * Named icons are similar to the <xref linkend="gtk3-Themeable-Stock-Images"/>
+ * facility, and the distinction between the two may be a bit confusing.
+ * A few things to keep in mind:
+ * <itemizedlist>
+ * <listitem>
+ * Stock images usually are used in conjunction with
+ * <xref linkend="gtk3-Stock-Items"/>, such as %GTK_STOCK_OK or
+ * %GTK_STOCK_OPEN. Named icons are easier to set up and therefore
+ * are more useful for new icons that an application wants to
+ * add, such as application icons or window icons.
+ * </listitem>
+ * <listitem>
+ * Stock images can only be loaded at the symbolic sizes defined
+ * by the #GtkIconSize enumeration, or by custom sizes defined
+ * by gtk_icon_size_register(), while named icons are more flexible
+ * and any pixel size can be specified.
+ * </listitem>
+ * <listitem>
+ * Because stock images are closely tied to stock items, and thus
+ * to actions in the user interface, stock images may come in
+ * multiple variants for different widget states or writing
+ * directions.
+ * </listitem>
+ * </itemizedlist>
+ * A good rule of thumb is that if there is a stock image for what
+ * you want to use, use it, otherwise use a named icon. It turns
+ * out that internally stock images are generally defined in
+ * terms of one or more named icons. (An example of the
+ * more than one case is icons that depend on writing direction;
+ * %GTK_STOCK_GO_FORWARD uses the two themed icons
+ * "gtk-stock-go-forward-ltr" and "gtk-stock-go-forward-rtl".)
+ *
+ * In many cases, named themes are used indirectly, via #GtkImage
+ * or stock items, rather than directly, but looking up icons
+ * directly is also simple. The #GtkIconTheme object acts
+ * as a database of all the icons in the current theme. You
+ * can create new #GtkIconTheme objects, but it's much more
+ * efficient to use the standard icon theme for the #GdkScreen
+ * so that the icon information is shared with other people
+ * looking up icons. In the case where the default screen is
+ * being used, looking up an icon can be as simple as:
+ * <informalexample>
+ * <programlisting>
+ * GError *error = NULL;
+ * GtkIconTheme *icon_theme;
+ * GdkPixbuf *pixbuf;
+ *
+ * icon_theme = gtk_icon_theme_get_default ();
+ * pixbuf = gtk_icon_theme_load_icon (icon_theme,
+ * "my-icon-name", // icon name
+ * 48, // size
+ * 0, // flags
+ * &error);
+ * if (!pixbuf)
+ * {
+ * g_warning ("Couldn't load icon: %s", error->message);
+ * g_error_free (error);
+ * }
+ * else
+ * {
+ * // Use the pixbuf
+ * g_object_unref (pixbuf);
+ * }
+ * </programlisting>
+ * </informalexample>
+ */
+
#define DEFAULT_THEME_NAME "hicolor"
HAS_ICON_FILE = 1 << 3
} IconSuffix;
+#define INFO_CACHE_LRU_SIZE 32
+#if 0
+#define DEBUG_CACHE(args) g_print args
+#else
+#define DEBUG_CACHE(args)
+#endif
struct _GtkIconThemePrivate
{
+ GHashTable *info_cache;
+ GList *info_cache_lru;
+
+ gchar *current_theme;
+ gchar *fallback_theme;
+ gchar **search_path;
+ gint search_path_len;
+
guint custom_theme : 1;
guint is_screen_singleton : 1;
guint pixbuf_supports_svg : 1;
guint themes_valid : 1;
guint check_reload : 1;
-
- char *current_theme;
- char *fallback_theme;
- char **search_path;
- int search_path_len;
+ guint loading_themes : 1;
/* A list of all the themes needed to look up icons.
* In search order, without duplicates
*/
GList *themes;
GHashTable *unthemed_icons;
-
+
/* Note: The keys of this hashtable are owned by the
* themedir and unthemed hashtables.
*/
/* GdkScreen for the icon theme (may be NULL)
*/
GdkScreen *screen;
-
+
/* time when we last stat:ed for theme changes */
- long last_stat_time;
+ glong last_stat_time;
GList *dir_mtimes;
gulong reset_styles_idle;
};
+typedef struct {
+ gchar **icon_names;
+ gint size;
+ GtkIconLookupFlags flags;
+} IconInfoKey;
+
+typedef struct _SymbolicPixbufCache SymbolicPixbufCache;
+
+struct _SymbolicPixbufCache {
+ GdkPixbuf *pixbuf;
+ GdkPixbuf *proxy_pixbuf;
+ GdkRGBA fg;
+ GdkRGBA success_color;
+ GdkRGBA warning_color;
+ GdkRGBA error_color;
+ SymbolicPixbufCache *next;
+};
+
+struct _GtkIconInfoClass
+{
+ GObjectClass parent_class;
+};
+
struct _GtkIconInfo
{
+ GObject parent_instance;
+
/* Information about the source
*/
+ IconInfoKey key;
+ GtkIconTheme *in_cache;
+
gchar *filename;
-#ifdef G_OS_WIN32
- /* System codepage version of filename, for DLL ABI backward
- * compatibility functions.
- */
- gchar *cp_filename;
-#endif
+ GFile *icon_file;
+ GLoadableIcon *loadable;
+ GSList *emblem_infos;
+
/* Cache pixbuf (if there is any) */
GdkPixbuf *cache_pixbuf;
GtkIconData *data;
-
+
/* Information about the directory where
* the source was found
*/
/* Parameters influencing the scaled icon
*/
gint desired_size;
- gboolean raw_coordinates;
+ guint raw_coordinates : 1;
+ guint forced_size : 1;
+ guint emblems_applied : 1;
/* Cached information if we go ahead and try to load
* the icon.
*/
GdkPixbuf *pixbuf;
+ GdkPixbuf *proxy_pixbuf;
GError *load_error;
gdouble scale;
+
+ SymbolicPixbufCache *symbolic_pixbuf_cache;
+
+ GtkRequisition *symbolic_pixbuf_size;
};
typedef struct
char *dir;
char *subdir;
+ int subdir_index;
GtkIconCache *cache;
static void theme_list_icons (IconTheme *theme,
GHashTable *icons,
GQuark context);
+static void theme_list_contexts (IconTheme *theme,
+ GHashTable *contexts);
static void theme_subdir_load (GtkIconTheme *icon_theme,
IconTheme *theme,
GKeyFile *theme_file,
char *subdir);
static void do_theme_change (GtkIconTheme *icon_theme);
-static void blow_themes (GtkIconTheme *icon_themes);
+static void blow_themes (GtkIconTheme *icon_themes);
+static gboolean rescan_themes (GtkIconTheme *icon_themes);
+static GtkIconData *icon_data_dup (GtkIconData *icon_data);
static void icon_data_free (GtkIconData *icon_data);
static void load_icon_data (IconThemeDir *dir,
const char *path,
gint size,
gint *min_difference_p,
gboolean *has_larger_p);
+static void remove_from_lru_cache (GtkIconTheme *icon_theme,
+ GtkIconInfo *icon_info);
static guint signal_changed = 0;
GtkIconCache *_builtin_cache = NULL;
static GList *builtin_dirs = NULL;
+static guint
+icon_info_key_hash (gconstpointer _key)
+{
+ const IconInfoKey *key = _key;
+ guint h = 0;
+ int i;
+ for (i = 0; key->icon_names[i] != NULL; i++)
+ h ^= g_str_hash (key->icon_names[i]);
+
+ h ^= key->size * 0x10001;
+ h ^= key->flags * 0x1000010;
+
+ return h;
+}
+
+static gboolean
+icon_info_key_equal (gconstpointer _a,
+ gconstpointer _b)
+{
+ const IconInfoKey *a = _a;
+ const IconInfoKey *b = _b;
+ int i;
+
+ if (a->size != b->size)
+ return FALSE;
+
+ if (a->flags != b->flags)
+ return FALSE;
+
+ for (i = 0;
+ a->icon_names[i] != NULL &&
+ b->icon_names[i] != NULL; i++)
+ {
+ if (strcmp (a->icon_names[i], b->icon_names[i]) != 0)
+ return FALSE;
+ }
+
+ return a->icon_names[i] == NULL && b->icon_names[i] == NULL;
+}
+
G_DEFINE_TYPE (GtkIconTheme, gtk_icon_theme, G_TYPE_OBJECT)
/**
*
* Gets the icon theme for the default screen. See
* gtk_icon_theme_get_for_screen().
- *
- * Return value: A unique #GtkIconTheme associated with
+ *
+ * Return value: (transfer none): A unique #GtkIconTheme associated with
* the default screen. This icon theme is associated with
* the screen and can be used as long as the screen
* is open. Do not ref or unref it.
* is usually a better choice than calling than gtk_icon_theme_new()
* and setting the screen yourself; by using this function
* a single icon theme object will be shared between users.
- *
- * Return value: A unique #GtkIconTheme associated with
+ *
+ * Return value: (transfer none): A unique #GtkIconTheme associated with
* the given screen. This icon theme is associated with
* the screen and can be used as long as the screen
* is open. Do not ref or unref it.
GtkIconTheme *icon_theme;
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
- g_return_val_if_fail (!screen->closed, NULL);
icon_theme = g_object_get_data (G_OBJECT (screen), "gtk-icon-theme");
if (!icon_theme)
gobject_class->finalize = gtk_icon_theme_finalize;
/**
- * GtkIconTheme::changed
+ * GtkIconTheme::changed:
* @icon_theme: the icon theme
*
* Emitted when the current icon theme is switched or GTK+ detects
static void
update_current_theme (GtkIconTheme *icon_theme)
{
+#define theme_changed(_old, _new) \
+ ((_old && !_new) || (!_old && _new) || \
+ (_old && _new && strcmp (_old, _new) != 0))
GtkIconThemePrivate *priv = icon_theme->priv;
if (!priv->custom_theme)
"gtk-fallback-icon-theme", &fallback_theme, NULL);
}
- if (!theme)
+ /* ensure that the current theme (even when just the default)
+ * is searched before any fallback theme
+ */
+ if (!theme && fallback_theme)
theme = g_strdup (DEFAULT_THEME_NAME);
- if (strcmp (priv->current_theme, theme) != 0)
+ if (theme_changed (priv->current_theme, theme))
{
g_free (priv->current_theme);
priv->current_theme = theme;
-
changed = TRUE;
}
else
g_free (theme);
- if ((priv->fallback_theme && !fallback_theme) ||
- (!priv->fallback_theme && fallback_theme) ||
- (priv->fallback_theme && fallback_theme &&
- strcmp (priv->fallback_theme, fallback_theme) != 0))
+ if (theme_changed (priv->fallback_theme, fallback_theme))
{
g_free (priv->fallback_theme);
priv->fallback_theme = fallback_theme;
-
changed = TRUE;
}
else
if (changed)
do_theme_change (icon_theme);
}
+#undef theme_changed
}
/* Callback when the icon theme GtkSetting changes
return found_svg;
}
+/* The icon info was removed from the icon_info_hash hash table */
+static void
+icon_info_uncached (GtkIconInfo *icon_info)
+{
+ GtkIconTheme *icon_theme = icon_info->in_cache;
+
+ DEBUG_CACHE (("removing %p (%s %d 0x%x) from cache (icon_them: %p) (cache size %d)\n",
+ icon_info,
+ g_strjoinv (",", icon_info->key.icon_names),
+ icon_info->key.size, icon_info->key.flags,
+ icon_theme,
+ icon_theme != NULL ? g_hash_table_size (icon_theme->priv->info_cache) : 0));
+
+ icon_info->in_cache = NULL;
+
+ if (icon_theme != NULL)
+ remove_from_lru_cache (icon_theme, icon_info);
+}
+
static void
gtk_icon_theme_init (GtkIconTheme *icon_theme)
{
GtkIconThemePrivate *priv;
const gchar * const *xdg_data_dirs;
int i, j;
-
- priv = g_type_instance_get_private ((GTypeInstance *)icon_theme,
- GTK_TYPE_ICON_THEME);
+
+ priv = G_TYPE_INSTANCE_GET_PRIVATE (icon_theme,
+ GTK_TYPE_ICON_THEME,
+ GtkIconThemePrivate);
icon_theme->priv = priv;
+ priv->info_cache = g_hash_table_new_full (icon_info_key_hash, icon_info_key_equal, NULL,
+ (GDestroyNotify)icon_info_uncached);
+
priv->custom_theme = FALSE;
- priv->current_theme = g_strdup (DEFAULT_THEME_NAME);
xdg_data_dirs = g_get_system_data_dirs ();
for (i = 0; xdg_data_dirs[i]; i++) ;
priv->search_path = g_new (char *, priv->search_path_len);
i = 0;
- priv->search_path[i++] = g_build_filename (g_get_home_dir (), ".icons", NULL);
priv->search_path[i++] = g_build_filename (g_get_user_data_dir (), "icons", NULL);
+ priv->search_path[i++] = g_build_filename (g_get_home_dir (), ".icons", NULL);
for (j = 0; xdg_data_dirs[j]; j++)
priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "icons", NULL);
GtkIconTheme *icon_theme;
GtkIconThemePrivate *priv;
- GDK_THREADS_ENTER ();
-
icon_theme = GTK_ICON_THEME (user_data);
priv = icon_theme->priv;
if (priv->screen && priv->is_screen_singleton)
- {
- GtkSettings *settings = gtk_settings_get_for_screen (priv->screen);
- gtk_rc_reset_styles (settings);
- }
+ gtk_style_context_reset_widgets (priv->screen);
priv->reset_styles_idle = 0;
- GDK_THREADS_LEAVE ();
-
return FALSE;
}
do_theme_change (GtkIconTheme *icon_theme)
{
GtkIconThemePrivate *priv = icon_theme->priv;
+
+ g_hash_table_remove_all (priv->info_cache);
+
+ if (!priv->themes_valid)
+ return;
GTK_NOTE (ICONTHEME,
g_print ("change to icon theme \"%s\"\n", priv->current_theme));
if (!priv->reset_styles_idle)
priv->reset_styles_idle =
- g_idle_add_full (GTK_PRIORITY_RESIZE - 2,
+ gdk_threads_add_idle_full (GTK_PRIORITY_RESIZE - 2,
reset_styles_idle, icon_theme, NULL);
}
if (priv->themes_valid)
{
g_hash_table_destroy (priv->all_icons);
- g_list_foreach (priv->themes, (GFunc)theme_destroy, NULL);
- g_list_free (priv->themes);
- g_list_foreach (priv->dir_mtimes, (GFunc)free_dir_mtime, NULL);
- g_list_free (priv->dir_mtimes);
+ g_list_free_full (priv->themes, (GDestroyNotify) theme_destroy);
+ g_list_free_full (priv->dir_mtimes, (GDestroyNotify) free_dir_mtime);
g_hash_table_destroy (priv->unthemed_icons);
}
priv->themes = NULL;
icon_theme = GTK_ICON_THEME (object);
priv = icon_theme->priv;
+ g_hash_table_destroy (priv->info_cache);
+ g_assert (priv->info_cache_lru == NULL);
+
if (priv->reset_styles_idle)
{
g_source_remove (priv->reset_styles_idle);
/**
* gtk_icon_theme_set_search_path:
* @icon_theme: a #GtkIconTheme
- * @path: array of directories that are searched for icon themes
+ * @path: (array length=n_elements) (element-type filename): array of
+ * directories that are searched for icon themes
* @n_elements: number of elements in @path.
*
* Sets the search path for the icon theme object. When looking
/**
* gtk_icon_theme_get_search_path:
* @icon_theme: a #GtkIconTheme
- * @path: location to store a list of icon theme path directories or %NULL
- * The stored value should be freed with g_strfreev().
- * @n_elements: location to store number of elements
- * in @path, or %NULL
- *
+ * @path: (allow-none) (array length=n_elements) (element-type filename) (out):
+ * location to store a list of icon theme path directories or %NULL.
+ * The stored value should be freed with g_strfreev().
+ * @n_elements: location to store number of elements in @path, or %NULL
+ *
* Gets the current search path. See gtk_icon_theme_set_search_path().
*
* Since: 2.4
- **/
+ */
void
-gtk_icon_theme_get_search_path (GtkIconTheme *icon_theme,
- gchar **path[],
- gint *n_elements)
+gtk_icon_theme_get_search_path (GtkIconTheme *icon_theme,
+ gchar **path[],
+ gint *n_elements)
{
GtkIconThemePrivate *priv;
int i;
/**
* gtk_icon_theme_append_search_path:
* @icon_theme: a #GtkIconTheme
- * @path: directory name to append to the icon path
+ * @path: (type filename): directory name to append to the icon path
*
* Appends a directory to the search path.
* See gtk_icon_theme_set_search_path().
/**
* gtk_icon_theme_prepend_search_path:
* @icon_theme: a #GtkIconTheme
- * @path: directory name to prepend to the icon path
+ * @path: (type filename): directory name to prepend to the icon path
*
* Prepends a directory to the search path.
* See gtk_icon_theme_set_search_path().
/**
* gtk_icon_theme_set_custom_theme:
* @icon_theme: a #GtkIconTheme
- * @theme_name: name of icon theme to use instead of configured theme,
- * or %NULL to unset a previously set custom theme
+ * @theme_name: (allow-none): name of icon theme to use instead of
+ * configured theme, or %NULL to unset a previously set custom theme
*
* Sets the name of the icon theme that the #GtkIconTheme object uses
* overriding system configuration. This function cannot be called
if (theme_name != NULL)
{
priv->custom_theme = TRUE;
- if (strcmp (theme_name, priv->current_theme) != 0)
+ if (!priv->current_theme || strcmp (theme_name, priv->current_theme) != 0)
{
g_free (priv->current_theme);
priv->current_theme = g_strdup (theme_name);
}
else
{
- priv->custom_theme = FALSE;
+ if (priv->custom_theme)
+ {
+ priv->custom_theme = FALSE;
- update_current_theme (icon_theme);
+ update_current_theme (icon_theme);
+ }
}
}
GKeyFile *theme_file;
GError *error = NULL;
IconThemeDirMtime *dir_mtime;
- struct stat stat_buf;
+ GStatBuf stat_buf;
priv = icon_theme->priv;
if (!dirs)
{
g_warning ("Theme file for %s has no directories\n", theme_name);
+ priv->themes = g_list_remove (priv->themes, theme);
+ g_free (theme->name);
g_free (theme->display_name);
g_free (theme);
g_key_file_free (theme_file);
static void
free_unthemed_icon (UnthemedIcon *unthemed_icon)
{
- if (unthemed_icon->svg_filename)
- g_free (unthemed_icon->svg_filename);
- if (unthemed_icon->no_svg_filename)
- g_free (unthemed_icon->no_svg_filename);
+ g_free (unthemed_icon->svg_filename);
+ g_free (unthemed_icon->no_svg_filename);
g_slice_free (UnthemedIcon, unthemed_icon);
}
IconSuffix old_suffix, new_suffix;
GTimeVal tv;
IconThemeDirMtime *dir_mtime;
- struct stat stat_buf;
+ GStatBuf stat_buf;
priv = icon_theme->priv;
priv->all_icons = g_hash_table_new (g_str_hash, g_str_equal);
- insert_theme (icon_theme, priv->current_theme);
+ if (priv->current_theme)
+ insert_theme (icon_theme, priv->current_theme);
/* Always look in the "default" icon theme, and in a fallback theme */
if (priv->fallback_theme)
dir = icon_theme->priv->search_path[base];
dir_mtime = g_slice_new (IconThemeDirMtime);
- dir_mtime->cache = _gtk_icon_cache_new_for_path (dir);
- dir_mtime->dir = g_strdup (dir);
- if (g_stat (dir, &stat_buf) == 0 && S_ISDIR (stat_buf.st_mode))
- dir_mtime->mtime = stat_buf.st_mtime;
- else
- dir_mtime->mtime = 0;
-
priv->dir_mtimes = g_list_append (priv->dir_mtimes, dir_mtime);
+ dir_mtime->dir = g_strdup (dir);
+ dir_mtime->mtime = 0;
+ dir_mtime->cache = NULL;
+
+ if (g_stat (dir, &stat_buf) != 0 || !S_ISDIR (stat_buf.st_mode))
+ continue;
+ dir_mtime->mtime = stat_buf.st_mtime;
+
+ dir_mtime->cache = _gtk_icon_cache_new_for_path (dir);
if (dir_mtime->cache != NULL)
continue;
gdir = g_dir_open (dir, 0, NULL);
-
if (gdir == NULL)
continue;
else
unthemed_icon->no_svg_filename = abs_file;
- g_hash_table_insert (priv->unthemed_icons,
- base_name,
- unthemed_icon);
+ /* takes ownership of base_name */
+ g_hash_table_replace (priv->unthemed_icons,
+ base_name,
+ unthemed_icon);
g_hash_table_insert (priv->all_icons,
base_name, NULL);
}
IconThemeDir *dir;
static IconThemeDir dirs[5] =
{
- { ICON_THEME_DIR_THRESHOLD, 0, 16, 16, 16, 2, NULL, "16", NULL, NULL, NULL },
- { ICON_THEME_DIR_THRESHOLD, 0, 20, 20, 20, 2, NULL, "20", NULL, NULL, NULL },
- { ICON_THEME_DIR_THRESHOLD, 0, 24, 24, 24, 2, NULL, "24", NULL, NULL, NULL },
- { ICON_THEME_DIR_THRESHOLD, 0, 32, 32, 32, 2, NULL, "32", NULL, NULL, NULL },
- { ICON_THEME_DIR_THRESHOLD, 0, 48, 48, 48, 2, NULL, "48", NULL, NULL, NULL }
+ { ICON_THEME_DIR_THRESHOLD, 0, 16, 16, 16, 2, NULL, "16", -1, NULL, NULL, NULL },
+ { ICON_THEME_DIR_THRESHOLD, 0, 20, 20, 20, 2, NULL, "20", -1, NULL, NULL, NULL },
+ { ICON_THEME_DIR_THRESHOLD, 0, 24, 24, 24, 2, NULL, "24", -1, NULL, NULL, NULL },
+ { ICON_THEME_DIR_THRESHOLD, 0, 32, 32, 32, 2, NULL, "32", -1, NULL, NULL, NULL },
+ { ICON_THEME_DIR_THRESHOLD, 0, 48, 48, 48, 2, NULL, "48", -1, NULL, NULL, NULL }
};
gint i;
{
dir = &(dirs[i]);
dir->cache = _gtk_icon_cache_ref (_builtin_cache);
+ dir->subdir_index = _gtk_icon_cache_get_directory_index (dir->cache, dir->subdir);
builtin_dirs = g_list_append (builtin_dirs, dir);
}
GTimeVal tv;
gboolean was_valid = priv->themes_valid;
+ if (priv->loading_themes)
+ return;
+ priv->loading_themes = TRUE;
+
_gtk_icon_theme_ensure_builtin_cache ();
if (priv->themes_valid)
{
g_get_current_time (&tv);
- if (ABS (tv.tv_sec - priv->last_stat_time) > 5)
- gtk_icon_theme_rescan_if_needed (icon_theme);
+ if (ABS (tv.tv_sec - priv->last_stat_time) > 5 &&
+ rescan_themes (icon_theme))
+ blow_themes (icon_theme);
}
if (!priv->themes_valid)
{
load_themes (icon_theme);
-
- if (!priv->check_reload && was_valid && priv->screen)
- {
- static GdkAtom atom_iconthemes = GDK_NONE;
- GdkEvent *event = gdk_event_new (GDK_CLIENT_EVENT);
- int i;
- if (!atom_iconthemes)
- atom_iconthemes = gdk_atom_intern_static_string ("_GTK_LOAD_ICONTHEMES");
+ if (was_valid)
+ {
+ g_signal_emit (icon_theme, signal_changed, 0);
+ }
+ }
+
+ priv->loading_themes = FALSE;
+}
- for (i = 0; i < 5; i++)
- event->client.data.l[i] = 0;
- event->client.data_format = 32;
- event->client.message_type = atom_iconthemes;
+/* The LRU cache is a short list of IconInfos that are kept
+ alive even though their IconInfo would otherwise have
+ been freed, so that we can avoid reloading these
+ constantly.
+ We put infos on the lru list when nothing otherwise
+ references the info. So, when we get a cache hit
+ we remove it from the list, and when the proxy
+ pixmap is released we put it on the list.
+*/
- gdk_screen_broadcast_client_message (priv->screen, event);
- }
+static void
+ensure_lru_cache_space (GtkIconTheme *icon_theme)
+{
+ GtkIconThemePrivate *priv = icon_theme->priv;
+ GList *l;
+
+ /* Remove last item if LRU full */
+ l = g_list_nth (priv->info_cache_lru, INFO_CACHE_LRU_SIZE - 1);
+ if (l)
+ {
+ GtkIconInfo *icon_info = l->data;
+
+ DEBUG_CACHE (("removing (due to out of space) %p (%s %d 0x%x) from LRU cache (cache size %d)\n",
+ icon_info,
+ g_strjoinv (",", icon_info->key.icon_names),
+ icon_info->key.size, icon_info->key.flags,
+ g_list_length (priv->info_cache_lru)));
+
+ priv->info_cache_lru = g_list_delete_link (priv->info_cache_lru, l);
+ g_object_unref (icon_info);
}
}
-/**
- * gtk_icon_theme_lookup_icon:
- * @icon_theme: a #GtkIconTheme
- * @icon_name: the name of the icon to lookup
- * @size: desired icon size
- * @flags: flags modifying the behavior of the icon lookup
- *
- * Looks up a named icon and returns a structure containing
- * information such as the filename of the icon. The icon
- * can then be rendered into a pixbuf using
- * gtk_icon_info_load_icon(). (gtk_icon_theme_load_icon()
- * combines these two steps if all you need is the pixbuf.)
- *
- * Return value: a #GtkIconInfo structure containing information
- * about the icon, or %NULL if the icon wasn't found. Free with
- * gtk_icon_info_free()
- *
- * Since: 2.4
- **/
-GtkIconInfo *
-gtk_icon_theme_lookup_icon (GtkIconTheme *icon_theme,
- const gchar *icon_name,
- gint size,
- GtkIconLookupFlags flags)
+static void
+add_to_lru_cache (GtkIconTheme *icon_theme,
+ GtkIconInfo *icon_info)
+{
+ GtkIconThemePrivate *priv = icon_theme->priv;
+
+ DEBUG_CACHE (("adding %p (%s %d 0x%x) to LRU cache (cache size %d)\n",
+ icon_info,
+ g_strjoinv (",", icon_info->key.icon_names),
+ icon_info->key.size, icon_info->key.flags,
+ g_list_length (priv->info_cache_lru)));
+
+ g_assert (g_list_find (priv->info_cache_lru, icon_info) == NULL);
+
+ ensure_lru_cache_space (icon_theme);
+ /* prepend new info to LRU */
+ priv->info_cache_lru = g_list_prepend (priv->info_cache_lru,
+ g_object_ref (icon_info));
+}
+
+static void
+ensure_in_lru_cache (GtkIconTheme *icon_theme,
+ GtkIconInfo *icon_info)
+{
+ GtkIconThemePrivate *priv = icon_theme->priv;
+ GList *l;
+
+ l = g_list_find (priv->info_cache_lru, icon_info);
+ if (l)
+ {
+ /* Move to front of LRU if already in it */
+ priv->info_cache_lru = g_list_remove_link (priv->info_cache_lru, l);
+ priv->info_cache_lru = g_list_concat (l, priv->info_cache_lru);
+ }
+ else
+ add_to_lru_cache (icon_theme, icon_info);
+}
+
+static void
+remove_from_lru_cache (GtkIconTheme *icon_theme,
+ GtkIconInfo *icon_info)
+{
+ GtkIconThemePrivate *priv = icon_theme->priv;
+ if (g_list_find (priv->info_cache_lru, icon_info))
+ {
+ DEBUG_CACHE (("removing %p (%s %d 0x%x) from LRU cache (cache size %d)\n",
+ icon_info,
+ g_strjoinv (",", icon_info->key.icon_names),
+ icon_info->key.size, icon_info->key.flags,
+ g_list_length (priv->info_cache_lru)));
+
+ priv->info_cache_lru = g_list_remove (priv->info_cache_lru, icon_info);
+ g_object_unref (icon_info);
+ }
+}
+
+static SymbolicPixbufCache *
+symbolic_pixbuf_cache_new (GdkPixbuf *pixbuf,
+ const GdkRGBA *fg,
+ const GdkRGBA *success_color,
+ const GdkRGBA *warning_color,
+ const GdkRGBA *error_color,
+ SymbolicPixbufCache *next)
+{
+ SymbolicPixbufCache *cache;
+
+ cache = g_new0 (SymbolicPixbufCache, 1);
+ cache->pixbuf = g_object_ref (pixbuf);
+ if (fg)
+ cache->fg = *fg;
+ if (success_color)
+ cache->success_color = *success_color;
+ if (warning_color)
+ cache->warning_color = *warning_color;
+ if (error_color)
+ cache->error_color = *error_color;
+ cache->next = next;
+ return cache;
+}
+
+static gboolean
+rgba_matches (const GdkRGBA *a, const GdkRGBA *b)
+{
+ GdkRGBA transparent = { 0 };
+
+ /* For matching we treat unset colors as transparent rather
+ than default, which works as well, because transparent
+ will never be used for real symbolic icon colors */
+ if (a == NULL)
+ a = &transparent;
+
+ return
+ fabs(a->red - b->red) < 0.0001 &&
+ fabs(a->green - b->green) < 0.0001 &&
+ fabs(a->blue - b->blue) < 0.0001 &&
+ fabs(a->alpha - b->alpha) < 0.0001;
+}
+
+static SymbolicPixbufCache *
+symbolic_pixbuf_cache_matches (SymbolicPixbufCache *cache,
+ const GdkRGBA *fg,
+ const GdkRGBA *success_color,
+ const GdkRGBA *warning_color,
+ const GdkRGBA *error_color)
+{
+ while (cache != NULL)
+ {
+ if (rgba_matches (fg, &cache->fg) &&
+ rgba_matches (success_color, &cache->success_color) &&
+ rgba_matches (warning_color, &cache->warning_color) &&
+ rgba_matches (error_color, &cache->error_color))
+ return cache;
+
+ cache = cache->next;
+ }
+
+ return NULL;
+}
+
+static void
+symbolic_pixbuf_cache_free (SymbolicPixbufCache *cache)
+{
+ SymbolicPixbufCache *next;
+
+ while (cache != NULL)
+ {
+ next = cache->next;
+ g_object_unref (cache->pixbuf);
+ g_free (cache);
+
+ cache = next;
+ }
+}
+
+static GtkIconInfo *
+choose_icon (GtkIconTheme *icon_theme,
+ const gchar *icon_names[],
+ gint size,
+ GtkIconLookupFlags flags)
{
GtkIconThemePrivate *priv;
GList *l;
GtkIconInfo *icon_info = NULL;
- UnthemedIcon *unthemed_icon;
+ UnthemedIcon *unthemed_icon = NULL;
gboolean allow_svg;
gboolean use_builtin;
-
- g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
- g_return_val_if_fail (icon_name != NULL, NULL);
- g_return_val_if_fail ((flags & GTK_ICON_LOOKUP_NO_SVG) == 0 ||
- (flags & GTK_ICON_LOOKUP_FORCE_SVG) == 0, NULL);
+ gint i;
+ IconInfoKey key;
priv = icon_theme->priv;
- GTK_NOTE (ICONTHEME,
- g_print ("gtk_icon_theme_lookup_icon %s\n", icon_name));
+ ensure_valid_themes (icon_theme);
+
+ key.icon_names = (char **)icon_names;
+ key.size = size;
+ key.flags = flags;
+
+ icon_info = g_hash_table_lookup (priv->info_cache, &key);
+ if (icon_info != NULL)
+ {
+ DEBUG_CACHE (("cache hit %p (%s %d 0x%x) (cache size %d)\n",
+ icon_info,
+ g_strjoinv (",", icon_info->key.icon_names),
+ icon_info->key.size, icon_info->key.flags,
+ g_hash_table_size (priv->info_cache)));
+
+ icon_info = g_object_ref (icon_info);
+ remove_from_lru_cache (icon_theme, icon_info);
+
+ return icon_info;
+ }
+
if (flags & GTK_ICON_LOOKUP_NO_SVG)
allow_svg = FALSE;
else if (flags & GTK_ICON_LOOKUP_FORCE_SVG)
else
allow_svg = priv->pixbuf_supports_svg;
- use_builtin = (flags & GTK_ICON_LOOKUP_USE_BUILTIN);
+ use_builtin = flags & GTK_ICON_LOOKUP_USE_BUILTIN;
- ensure_valid_themes (icon_theme);
+ /* for symbolic icons, do a search in all registered themes first;
+ * a theme that inherits them from a parent theme might provide
+ * an alternative highcolor version, but still expect the symbolic icon
+ * to show up instead.
+ */
+ if (icon_names[0] &&
+ g_str_has_suffix (icon_names[0], "-symbolic"))
+ {
+ for (l = priv->themes; l; l = l->next)
+ {
+ IconTheme *theme = l->data;
+ icon_info = theme_lookup_icon (theme, icon_names[0], size, allow_svg, use_builtin);
+ if (icon_info)
+ goto out;
+ }
+ }
for (l = priv->themes; l; l = l->next)
{
IconTheme *theme = l->data;
- icon_info = theme_lookup_icon (theme, icon_name, size, allow_svg, use_builtin);
- if (icon_info)
- goto out;
+ for (i = 0; icon_names[i]; i++)
+ {
+ icon_info = theme_lookup_icon (theme, icon_names[i], size, allow_svg, use_builtin);
+ if (icon_info)
+ goto out;
+ }
+ }
+
+ for (i = 0; icon_names[i]; i++)
+ {
+ unthemed_icon = g_hash_table_lookup (priv->unthemed_icons, icon_names[i]);
+ if (unthemed_icon)
+ break;
+ }
+#ifdef G_OS_WIN32
+ /* Still not found an icon, check if reference to a Win32 resource */
+ if (!unthemed_icon)
+ {
+ gchar **resources;
+ HICON hIcon = NULL;
+
+ resources = g_strsplit (icon_names[0], ",", 0);
+ if (resources[0])
+ {
+ wchar_t *wfile = g_utf8_to_utf16 (resources[0], -1, NULL, NULL, NULL);
+ ExtractIconExW (wfile, resources[1] ? atoi (resources[1]) : 0, &hIcon, NULL, 1);
+ g_free (wfile);
+ }
+
+ if (hIcon)
+ {
+ icon_info = icon_info_new ();
+ icon_info->cache_pixbuf = gdk_win32_icon_to_pixbuf_libgtk_only (hIcon);
+ DestroyIcon (hIcon);
+ icon_info->dir_type = ICON_THEME_DIR_UNTHEMED;
+ icon_info->dir_size = size;
+ }
+ g_strfreev (resources);
}
+#endif
- unthemed_icon = g_hash_table_lookup (priv->unthemed_icons, icon_name);
if (unthemed_icon)
{
icon_info = icon_info_new ();
icon_info->filename = g_strdup (unthemed_icon->svg_filename);
else if (unthemed_icon->no_svg_filename)
icon_info->filename = g_strdup (unthemed_icon->no_svg_filename);
-#ifdef G_OS_WIN32
- icon_info->cp_filename = g_locale_from_utf8 (icon_info->filename,
- -1, NULL, NULL, NULL);
-#endif
+
+ icon_info->icon_file = g_file_new_for_path (icon_info->filename);
icon_info->dir_type = ICON_THEME_DIR_UNTHEMED;
+ icon_info->dir_size = size;
}
out:
if (icon_info)
- icon_info->desired_size = size;
+ {
+ icon_info->desired_size = size;
+ icon_info->forced_size = (flags & GTK_ICON_LOOKUP_FORCE_SIZE) != 0;
+
+ icon_info->key.icon_names = g_strdupv ((char **)icon_names);
+ icon_info->key.size = size;
+ icon_info->key.flags = flags;
+ icon_info->in_cache = icon_theme;
+ DEBUG_CACHE (("adding %p (%s %d 0x%x) to cache (cache size %d)\n",
+ icon_info,
+ g_strjoinv (",", icon_info->key.icon_names),
+ icon_info->key.size, icon_info->key.flags,
+ g_hash_table_size (priv->info_cache)));
+ g_hash_table_insert (priv->info_cache, &icon_info->key, icon_info);
+ }
else
{
static gboolean check_for_default_theme = TRUE;
found = g_file_test (default_theme_path, G_FILE_TEST_IS_REGULAR);
g_free (default_theme_path);
}
+
if (!found)
{
- g_warning (_("Could not find the icon '%s'. The '%s' theme\n"
- "was not found either, perhaps you need to install it.\n"
- "You can get a copy from:\n"
- "\t%s"),
- icon_name, DEFAULT_THEME_NAME, "http://icon-theme.freedesktop.org/releases");
+ g_warning ("Could not find the icon '%s'. The '%s' theme\n"
+ "was not found either, perhaps you need to install it.\n"
+ "You can get a copy from:\n"
+ "\t%s",
+ icon_names[0], DEFAULT_THEME_NAME, "http://icon-theme.freedesktop.org/releases");
}
}
}
return icon_info;
}
-/* Error quark */
-GQuark
-gtk_icon_theme_error_quark (void)
-{
- return g_quark_from_static_string ("gtk-icon-theme-error-quark");
-}
/**
- * gtk_icon_theme_load_icon:
+ * gtk_icon_theme_lookup_icon:
* @icon_theme: a #GtkIconTheme
* @icon_name: the name of the icon to lookup
- * @size: the desired icon size. The resulting icon may not be
- * exactly this size; see gtk_icon_info_load_icon().
+ * @size: desired icon size
* @flags: flags modifying the behavior of the icon lookup
- * @error: Location to store error information on failure, or %NULL.
*
- * Looks up an icon in an icon theme, scales it to the given size
- * and renders it into a pixbuf. This is a convenience function;
- * if more details about the icon are needed, use
- * gtk_icon_theme_lookup_icon() followed by gtk_icon_info_load_icon().
+ * Looks up a named icon and returns a structure containing
+ * information such as the filename of the icon. The icon
+ * can then be rendered into a pixbuf using
+ * gtk_icon_info_load_icon(). (gtk_icon_theme_load_icon()
+ * combines these two steps if all you need is the pixbuf.)
+ *
+ * Return value: (transfer full): a #GtkIconInfo object containing information
+ * about the icon, or %NULL if the icon wasn't found.
*
- * Note that you probably want to listen for icon theme changes and
- * update the icon. This is usually done by connecting to the
+ * Since: 2.4
+ */
+GtkIconInfo *
+gtk_icon_theme_lookup_icon (GtkIconTheme *icon_theme,
+ const gchar *icon_name,
+ gint size,
+ GtkIconLookupFlags flags)
+{
+ GtkIconInfo *info;
+
+ g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
+ g_return_val_if_fail (icon_name != NULL, NULL);
+ g_return_val_if_fail ((flags & GTK_ICON_LOOKUP_NO_SVG) == 0 ||
+ (flags & GTK_ICON_LOOKUP_FORCE_SVG) == 0, NULL);
+
+ GTK_NOTE (ICONTHEME,
+ g_print ("gtk_icon_theme_lookup_icon %s\n", icon_name));
+
+ if (flags & GTK_ICON_LOOKUP_GENERIC_FALLBACK)
+ {
+ gchar **names;
+ gint dashes, i;
+ gchar *p;
+
+ dashes = 0;
+ for (p = (gchar *) icon_name; *p; p++)
+ if (*p == '-')
+ dashes++;
+
+ names = g_new (gchar *, dashes + 2);
+ names[0] = g_strdup (icon_name);
+ for (i = 1; i <= dashes; i++)
+ {
+ names[i] = g_strdup (names[i - 1]);
+ p = strrchr (names[i], '-');
+ *p = '\0';
+ }
+ names[dashes + 1] = NULL;
+
+ info = choose_icon (icon_theme, (const gchar **) names, size, flags);
+
+ g_strfreev (names);
+ }
+ else
+ {
+ const gchar *names[2];
+
+ names[0] = icon_name;
+ names[1] = NULL;
+
+ info = choose_icon (icon_theme, names, size, flags);
+ }
+
+ return info;
+}
+
+/**
+ * gtk_icon_theme_choose_icon:
+ * @icon_theme: a #GtkIconTheme
+ * @icon_names: (array zero-terminated=1): %NULL-terminated array of
+ * icon names to lookup
+ * @size: desired icon size
+ * @flags: flags modifying the behavior of the icon lookup
+ *
+ * Looks up a named icon and returns a structure containing
+ * information such as the filename of the icon. The icon
+ * can then be rendered into a pixbuf using
+ * gtk_icon_info_load_icon(). (gtk_icon_theme_load_icon()
+ * combines these two steps if all you need is the pixbuf.)
+ *
+ * If @icon_names contains more than one name, this function
+ * tries them all in the given order before falling back to
+ * inherited icon themes.
+ *
+ * Return value: (transfer full): a #GtkIconInfo object containing information
+ * about the icon, or %NULL if the icon wasn't found.
+ *
+ * Since: 2.12
+ */
+GtkIconInfo *
+gtk_icon_theme_choose_icon (GtkIconTheme *icon_theme,
+ const gchar *icon_names[],
+ gint size,
+ GtkIconLookupFlags flags)
+{
+ g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
+ g_return_val_if_fail (icon_names != NULL, NULL);
+ g_return_val_if_fail ((flags & GTK_ICON_LOOKUP_NO_SVG) == 0 ||
+ (flags & GTK_ICON_LOOKUP_FORCE_SVG) == 0, NULL);
+
+ return choose_icon (icon_theme, icon_names, size, flags);
+}
+
+/* Error quark */
+GQuark
+gtk_icon_theme_error_quark (void)
+{
+ return g_quark_from_static_string ("gtk-icon-theme-error-quark");
+}
+
+/**
+ * gtk_icon_theme_load_icon:
+ * @icon_theme: a #GtkIconTheme
+ * @icon_name: the name of the icon to lookup
+ * @size: the desired icon size. The resulting icon may not be
+ * exactly this size; see gtk_icon_info_load_icon().
+ * @flags: flags modifying the behavior of the icon lookup
+ * @error: (allow-none): Location to store error information on failure,
+ * or %NULL.
+ *
+ * Looks up an icon in an icon theme, scales it to the given size
+ * and renders it into a pixbuf. This is a convenience function;
+ * if more details about the icon are needed, use
+ * gtk_icon_theme_lookup_icon() followed by gtk_icon_info_load_icon().
+ *
+ * Note that you probably want to listen for icon theme changes and
+ * update the icon. This is usually done by connecting to the
* GtkWidget::style-set signal. If for some reason you do not want to
* update the icon when the icon theme changes, you should consider
* using gdk_pixbuf_copy() to make a private copy of the pixbuf
- * returned by this function. Otherwise GTK+ may need to keep the old
+ * returned by this function. Otherwise GTK+ may need to keep the old
* icon theme loaded, which would be a waste of memory.
- *
- * Return value: the rendered icon; this may be a newly created icon
- * or a new reference to an internal icon, so you must not modify
- * the icon. Use g_object_unref() to release your reference to the
- * icon. %NULL if the icon isn't found.
+ *
+ * Return value: (transfer full): the rendered icon; this may be a
+ * newly created icon or a new reference to an internal icon, so
+ * you must not modify the icon. Use g_object_unref() to release
+ * your reference to the icon. %NULL if the icon isn't found.
*
* Since: 2.4
**/
(flags & GTK_ICON_LOOKUP_FORCE_SVG) == 0, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size,
- flags | GTK_ICON_LOOKUP_USE_BUILTIN);
+ icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size,
+ flags | GTK_ICON_LOOKUP_USE_BUILTIN);
if (!icon_info)
{
g_set_error (error, GTK_ICON_THEME_ERROR, GTK_ICON_THEME_NOT_FOUND,
}
pixbuf = gtk_icon_info_load_icon (icon_info, error);
- gtk_icon_info_free (icon_info);
+ g_object_unref (icon_info);
return pixbuf;
}
GList *l;
g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), FALSE);
-
+ g_return_val_if_fail (icon_name != NULL, FALSE);
+
priv = icon_theme->priv;
ensure_valid_themes (icon_theme);
* that the icon is available in a scalable format. The array
* is zero-terminated.
*
- * Return value: An newly allocated array describing the sizes at
- * which the icon is available. The array should be freed with g_free()
- * when it is no longer needed.
+ * Return value: (array zero-terminated=1): An newly allocated array
+ * describing the sizes at which the icon is available. The array
+ * should be freed with g_free() when it is no longer needed.
*
* Since: 2.6
**/
{
IconThemeDir *dir = d->data;
+ if (dir->type != ICON_THEME_DIR_SCALABLE && g_hash_table_lookup_extended (sizes, GINT_TO_POINTER (dir->size), NULL, NULL))
+ continue;
+
suffix = theme_dir_get_icon_suffix (dir, icon_name, NULL);
if (suffix != ICON_SUFFIX_NONE)
{
{
IconThemeDir *dir = d->data;
+ if (dir->type != ICON_THEME_DIR_SCALABLE && g_hash_table_lookup_extended (sizes, GINT_TO_POINTER (dir->size), NULL, NULL))
+ continue;
+
suffix = theme_dir_get_icon_suffix (dir, icon_name, NULL);
if (suffix != ICON_SUFFIX_NONE)
{
/**
* gtk_icon_theme_list_icons:
* @icon_theme: a #GtkIconTheme
- * @context: a string identifying a particular type of icon,
- * or %NULL to list all icons.
+ * @context: (allow-none): a string identifying a particular type of
+ * icon, or %NULL to list all icons.
*
* Lists the icons in the current icon theme. Only a subset
* of the icons can be listed by providing a context string.
* The set of values for the context string is system dependent,
* but will typically include such values as "Applications" and
* "MimeTypes".
- *
- * Return value: a #GList list holding the names of all the
- * icons in the theme. You must first free each element
- * in the list with g_free(), then free the list itself
- * with g_list_free().
+ *
+ * Return value: (element-type utf8) (transfer full): a #GList list
+ * holding the names of all the icons in the theme. You must first
+ * free each element in the list with g_free(), then free the list
+ * itself with g_list_free().
*
* Since: 2.4
**/
return list;
}
+/**
+ * gtk_icon_theme_list_contexts:
+ * @icon_theme: a #GtkIconTheme
+ *
+ * Gets the list of contexts available within the current
+ * hierarchy of icon themes
+ *
+ * Return value: (element-type utf8) (transfer full): a #GList list
+ * holding the names of all the contexts in the theme. You must first
+ * free each element in the list with g_free(), then free the list
+ * itself with g_list_free().
+ *
+ * Since: 2.12
+ **/
+GList *
+gtk_icon_theme_list_contexts (GtkIconTheme *icon_theme)
+{
+ GtkIconThemePrivate *priv;
+ GHashTable *contexts;
+ GList *list, *l;
+
+ priv = icon_theme->priv;
+
+ ensure_valid_themes (icon_theme);
+
+ contexts = g_hash_table_new (g_str_hash, g_str_equal);
+
+ l = priv->themes;
+ while (l != NULL)
+ {
+ theme_list_contexts (l->data, contexts);
+ l = l->next;
+ }
+
+ list = NULL;
+
+ g_hash_table_foreach (contexts,
+ add_key_to_list,
+ &list);
+
+ g_hash_table_destroy (contexts);
+
+ return list;
+}
+
/**
* gtk_icon_theme_get_example_icon_name:
* @icon_theme: a #GtkIconTheme
return NULL;
}
-/**
- * gtk_icon_theme_rescan_if_needed:
- * @icon_theme: a #GtkIconTheme
- *
- * Checks to see if the icon theme has changed; if it has, any
- * currently cached information is discarded and will be reloaded
- * next time @icon_theme is accessed.
- *
- * Return value: %TRUE if the icon theme has changed and needed
- * to be reloaded.
- *
- * Since: 2.4
- **/
-gboolean
-gtk_icon_theme_rescan_if_needed (GtkIconTheme *icon_theme)
+
+static gboolean
+rescan_themes (GtkIconTheme *icon_theme)
{
GtkIconThemePrivate *priv;
IconThemeDirMtime *dir_mtime;
GList *d;
int stat_res;
- struct stat stat_buf;
+ GStatBuf stat_buf;
GTimeVal tv;
- g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), FALSE);
-
priv = icon_theme->priv;
-
+
for (d = priv->dir_mtimes; d != NULL; d = d->next)
{
dir_mtime = d->data;
stat_res = g_stat (dir_mtime->dir, &stat_buf);
/* dir mtime didn't change */
- if (stat_res == 0 &&
+ if (stat_res == 0 &&
S_ISDIR (stat_buf.st_mode) &&
dir_mtime->mtime == stat_buf.st_mtime)
continue;
if (dir_mtime->mtime == 0 &&
(stat_res != 0 || !S_ISDIR (stat_buf.st_mode)))
continue;
-
- do_theme_change (icon_theme);
+
return TRUE;
}
-
+
g_get_current_time (&tv);
priv->last_stat_time = tv.tv_sec;
return FALSE;
}
+/**
+ * gtk_icon_theme_rescan_if_needed:
+ * @icon_theme: a #GtkIconTheme
+ *
+ * Checks to see if the icon theme has changed; if it has, any
+ * currently cached information is discarded and will be reloaded
+ * next time @icon_theme is accessed.
+ *
+ * Return value: %TRUE if the icon theme has changed and needed
+ * to be reloaded.
+ *
+ * Since: 2.4
+ **/
+gboolean
+gtk_icon_theme_rescan_if_needed (GtkIconTheme *icon_theme)
+{
+ gboolean retval;
+
+ g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), FALSE);
+
+ retval = rescan_themes (icon_theme);
+ if (retval)
+ do_theme_change (icon_theme);
+
+ return retval;
+}
+
static void
theme_destroy (IconTheme *theme)
{
g_free (theme->name);
g_free (theme->example);
- g_list_foreach (theme->dirs, (GFunc)theme_dir_destroy, NULL);
- g_list_free (theme->dirs);
+ g_list_free_full (theme->dirs, (GDestroyNotify) theme_dir_destroy);
g_free (theme);
}
{
suffix = (IconSuffix)_gtk_icon_cache_get_icon_flags (dir->cache,
icon_name,
- dir->subdir);
+ dir->subdir_index);
if (has_icon_file)
*has_icon_file = suffix & HAS_ICON_FILE;
char *file;
int min_difference, difference;
BuiltinIcon *closest_builtin = NULL;
- gboolean smaller, has_larger;
+ gboolean smaller, has_larger, match;
IconSuffix suffix;
min_difference = G_MAXINT;
min_dir = NULL;
has_larger = FALSE;
+ match = FALSE;
/* Builtin icons are logically part of the default theme and
* are searched before other subdirectories of the default theme.
*/
- if (strcmp (theme->name, DEFAULT_THEME_NAME) == 0 && use_builtin)
+ if (use_builtin && strcmp (theme->name, DEFAULT_THEME_NAME) == 0)
{
closest_builtin = find_builtin_icon (icon_name,
size,
{
dir = l->data;
- GTK_NOTE (ICONTHEME,
+ GTK_NOTE (ICONTHEME,
g_print ("theme_lookup_icon dir %s\n", dir->dir));
suffix = theme_dir_get_icon_suffix (dir, icon_name, NULL);
if (best_suffix (suffix, allow_svg) != ICON_SUFFIX_NONE)
if (difference == 0)
{
- min_dir = dir;
- break;
- }
-
- if (!has_larger)
- {
- if (difference < min_difference || smaller)
- {
- min_difference = difference;
- min_dir = dir;
- closest_builtin = NULL;
- has_larger = smaller;
- }
- }
- else
- {
- if (difference < min_difference && smaller)
- {
- min_difference = difference;
- min_dir = dir;
- closest_builtin = NULL;
- }
+ if (dir->type == ICON_THEME_DIR_SCALABLE)
+ {
+ /* don't pick scalable if we already found
+ * a matching non-scalable dir
+ */
+ if (!match)
+ {
+ min_dir = dir;
+ break;
+ }
+ }
+ else
+ {
+ /* for a matching non-scalable dir keep
+ * going and look for a closer match
+ */
+ difference = abs (size - dir->size);
+ if (!match || difference < min_difference)
+ {
+ match = TRUE;
+ min_difference = difference;
+ min_dir = dir;
+ }
+ if (difference == 0)
+ break;
+ }
+ }
+
+ if (!match)
+ {
+ if (!has_larger)
+ {
+ if (difference < min_difference || smaller)
+ {
+ min_difference = difference;
+ min_dir = dir;
+ has_larger = smaller;
+ }
+ }
+ else
+ {
+ if (difference < min_difference && smaller)
+ {
+ min_difference = difference;
+ min_dir = dir;
+ }
+ }
}
-
- }
+ }
l = l->next;
}
}
- if (closest_builtin)
- return icon_info_new_builtin (closest_builtin);
-
if (min_dir)
{
GtkIconInfo *icon_info = icon_info_new ();
suffix = best_suffix (suffix, allow_svg);
g_assert (suffix != ICON_SUFFIX_NONE);
- file = g_strconcat (icon_name, string_from_suffix (suffix), NULL);
- icon_info->filename = g_build_filename (min_dir->dir, file, NULL);
- g_free (file);
-#ifdef G_OS_WIN32
- icon_info->cp_filename = g_locale_from_utf8 (icon_info->filename,
- -1, NULL, NULL, NULL);
-#endif
+ if (min_dir->dir)
+ {
+ file = g_strconcat (icon_name, string_from_suffix (suffix), NULL);
+ icon_info->filename = g_build_filename (min_dir->dir, file, NULL);
+ icon_info->icon_file = g_file_new_for_path (icon_info->filename);
+ g_free (file);
+ }
+ else
+ {
+ icon_info->filename = NULL;
+ icon_info->icon_file = NULL;
+ }
if (min_dir->icon_data != NULL)
icon_info->data = g_hash_table_lookup (min_dir->icon_data, icon_name);
if (icon_info->data == NULL && min_dir->cache != NULL)
{
- icon_info->data = _gtk_icon_cache_get_icon_data (min_dir->cache, icon_name, min_dir->subdir);
+ icon_info->data = _gtk_icon_cache_get_icon_data (min_dir->cache, icon_name, min_dir->subdir_index);
if (icon_info->data)
{
if (min_dir->icon_data == NULL)
if (min_dir->cache)
{
icon_info->cache_pixbuf = _gtk_icon_cache_get_icon (min_dir->cache, icon_name,
- min_dir->subdir);
+ min_dir->subdir_index);
}
icon_info->dir_type = min_dir->type;
return icon_info;
}
-
+
+ if (closest_builtin)
+ return icon_info_new_builtin (closest_builtin);
+
return NULL;
}
}
}
+static void
+theme_list_contexts (IconTheme *theme,
+ GHashTable *contexts)
+{
+ GList *l = theme->dirs;
+ IconThemeDir *dir;
+ const char *context;
+
+ while (l != NULL)
+ {
+ dir = l->data;
+
+ context = g_quark_to_string (dir->context);
+ g_hash_table_replace (contexts, (gpointer) context, NULL);
+
+ l = l->next;
+ }
+}
+
static void
load_icon_data (IconThemeDir *dir, const char *path, const char *name)
{
base_name = strip_suffix (name);
data = g_slice_new0 (GtkIconData);
+ /* takes ownership of base_name */
g_hash_table_replace (dir->icon_data, base_name, data);
ivalues = g_key_file_get_integer_list (icon_file,
base_name = strip_suffix (name);
hash_suffix = GPOINTER_TO_INT (g_hash_table_lookup (dir->icons, base_name));
+ g_hash_table_replace (icon_theme->all_icons, base_name, NULL);
+ /* takes ownership of base_name */
g_hash_table_replace (dir->icons, base_name, GUINT_TO_POINTER (hash_suffix| suffix));
- g_hash_table_insert (icon_theme->all_icons, base_name, NULL);
}
g_dir_close (gdir);
g_free (context_string);
}
- max_size = g_key_file_get_integer (theme_file, subdir, "MaxSize", &error);
- if (error)
- {
- max_size = size;
-
- g_error_free (error);
- error = NULL;
- }
-
- min_size = g_key_file_get_integer (theme_file, subdir, "MinSize", &error);
- if (error)
- {
- min_size = size;
+ if (g_key_file_has_key (theme_file, subdir, "MaxSize", NULL))
+ max_size = g_key_file_get_integer (theme_file, subdir, "MaxSize", NULL);
+ else
+ max_size = size;
- g_error_free (error);
- error = NULL;
- }
-
- threshold = g_key_file_get_integer (theme_file, subdir, "Threshold", &error);
- if (error)
- {
- threshold = 2;
+ if (g_key_file_has_key (theme_file, subdir, "MinSize", NULL))
+ min_size = g_key_file_get_integer (theme_file, subdir, "MinSize", NULL);
+ else
+ min_size = size;
- g_error_free (error);
- error = NULL;
- }
+ if (g_key_file_has_key (theme_file, subdir, "Threshold", NULL))
+ threshold = g_key_file_get_integer (theme_file, subdir, "Threshold", NULL);
+ else
+ threshold = 2;
for (d = icon_theme->priv->dir_mtimes; d; d = d->next)
{
dir->icon_data = NULL;
dir->subdir = g_strdup (subdir);
if (dir_mtime->cache != NULL)
- dir->cache = _gtk_icon_cache_ref (dir_mtime->cache);
+ {
+ dir->cache = _gtk_icon_cache_ref (dir_mtime->cache);
+ dir->subdir_index = _gtk_icon_cache_get_directory_index (dir->cache, dir->subdir);
+ }
else
{
dir->cache = NULL;
+ dir->subdir_index = -1;
scan_directory (icon_theme->priv, dir, full_dir);
}
g_slice_free (GtkIconData, icon_data);
}
+static GtkIconData *
+icon_data_dup (GtkIconData *icon_data)
+{
+ GtkIconData *dup = NULL;
+ if (icon_data)
+ {
+ dup = g_slice_new0 (GtkIconData);
+ *dup = *icon_data;
+ if (dup->n_attach_points > 0)
+ {
+ dup->attach_points = g_memdup (dup->attach_points,
+ sizeof (GdkPoint) * dup->n_attach_points);
+ }
+ dup->display_name = g_strdup (dup->display_name);
+ }
+
+ return dup;
+}
+
+
/*
* GtkIconInfo
*/
-GType
-gtk_icon_info_get_type (void)
-{
- static GType our_type = 0;
-
- if (our_type == 0)
- our_type = g_boxed_type_register_static (I_("GtkIconInfo"),
- (GBoxedCopyFunc) gtk_icon_info_copy,
- (GBoxedFreeFunc) gtk_icon_info_free);
+static void gtk_icon_info_class_init (GtkIconInfoClass *klass);
- return our_type;
+G_DEFINE_TYPE (GtkIconInfo, gtk_icon_info, G_TYPE_OBJECT)
+
+static void
+gtk_icon_info_init (GtkIconInfo *icon_info)
+{
+ icon_info->scale = -1.;
}
static GtkIconInfo *
icon_info_new (void)
{
- GtkIconInfo *icon_info = g_slice_new0 (GtkIconInfo);
+ return g_object_new (GTK_TYPE_ICON_INFO, NULL);
+}
- icon_info->scale = -1.;
+/* This only copies whatever is needed to load the pixbuf, so that we can do
+ * a load in a thread without affecting the original IconInfo from the thread.
+ */
+static GtkIconInfo *
+icon_info_dup (GtkIconInfo *icon_info)
+{
+ GtkIconInfo *dup;
+ GSList *l;
- return icon_info;
+ dup = icon_info_new ();
+
+ dup->filename = g_strdup (icon_info->filename);
+ if (icon_info->icon_file)
+ dup->icon_file = g_object_ref (icon_info->icon_file);
+ if (icon_info->loadable)
+ dup->loadable = g_object_ref (icon_info->loadable);
+ if (icon_info->pixbuf)
+ dup->pixbuf = g_object_ref (icon_info->pixbuf);
+
+ for (l = icon_info->emblem_infos; l != NULL; l = l->next)
+ {
+ dup->emblem_infos =
+ g_slist_append (dup->emblem_infos,
+ icon_info_dup (l->data));
+ }
+
+ if (icon_info->cache_pixbuf)
+ dup->cache_pixbuf = g_object_ref (icon_info->cache_pixbuf);
+
+ dup->data = icon_data_dup (icon_info->data);
+ dup->dir_type = icon_info->dir_type;
+ dup->dir_size = icon_info->dir_size;
+ dup->threshold = icon_info->threshold;
+ dup->desired_size = icon_info->desired_size;
+ dup->raw_coordinates = icon_info->raw_coordinates;
+ dup->forced_size = icon_info->forced_size;
+ dup->emblems_applied = icon_info->emblems_applied;
+
+ return dup;
}
static GtkIconInfo *
icon_info->dir_type = ICON_THEME_DIR_THRESHOLD;
icon_info->dir_size = icon->size;
icon_info->threshold = 2;
-
+
return icon_info;
}
/**
- * gtk_icon_info_copy:
+ * gtk_icon_info_copy: (skip)
* @icon_info: a #GtkIconInfo
*
* Make a copy of a #GtkIconInfo.
* Return value: the new GtkIconInfo
*
* Since: 2.4
+ *
+ * Deprecated: 3.8: Use g_object_ref()
**/
GtkIconInfo *
gtk_icon_info_copy (GtkIconInfo *icon_info)
{
- GtkIconInfo *copy;
g_return_val_if_fail (icon_info != NULL, NULL);
- copy = memcpy (g_slice_new (GtkIconInfo), icon_info, sizeof (GtkIconInfo));
- if (copy->cache_pixbuf)
- g_object_ref (copy->cache_pixbuf);
- if (copy->pixbuf)
- g_object_ref (copy->pixbuf);
- if (copy->load_error)
- copy->load_error = g_error_copy (copy->load_error);
- if (copy->filename)
- copy->filename = g_strdup (copy->filename);
-#ifdef G_OS_WIN32
- if (copy->cp_filename)
- copy->cp_filename = g_strdup (copy->cp_filename);
-#endif
-
- return copy;
+ return g_object_ref (icon_info);
}
/**
- * gtk_icon_info_free:
+ * gtk_icon_info_free: (skip)
* @icon_info: a #GtkIconInfo
*
* Free a #GtkIconInfo and associated information
*
* Since: 2.4
+ *
+ * Deprecated: 3.8: Use g_object_unref()
**/
void
gtk_icon_info_free (GtkIconInfo *icon_info)
{
g_return_if_fail (icon_info != NULL);
- if (icon_info->filename)
- g_free (icon_info->filename);
-#ifdef G_OS_WIN32
- if (icon_info->cp_filename)
- g_free (icon_info->cp_filename);
-#endif
+ g_object_unref (icon_info);
+}
+
+static void
+gtk_icon_info_finalize (GObject *object)
+{
+ GtkIconInfo *icon_info = (GtkIconInfo *) object;
+
+ if (icon_info->in_cache)
+ g_hash_table_remove (icon_info->in_cache->priv->info_cache, &icon_info->key);
+
+ g_strfreev (icon_info->key.icon_names);
+
+ g_free (icon_info->filename);
+ g_clear_object (&icon_info->icon_file);
+
+ if (icon_info->loadable)
+ g_object_unref (icon_info->loadable);
+ g_slist_free_full (icon_info->emblem_infos, (GDestroyNotify) g_object_unref);
if (icon_info->pixbuf)
g_object_unref (icon_info->pixbuf);
if (icon_info->cache_pixbuf)
g_object_unref (icon_info->cache_pixbuf);
+ if (icon_info->symbolic_pixbuf_size)
+ gtk_requisition_free (icon_info->symbolic_pixbuf_size);
+
+ symbolic_pixbuf_cache_free (icon_info->symbolic_pixbuf_cache);
- g_slice_free (GtkIconInfo, icon_info);
+ G_OBJECT_CLASS (gtk_icon_info_parent_class)->finalize (object);
+}
+
+static void
+gtk_icon_info_class_init (GtkIconInfoClass *klass)
+{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+ gobject_class->finalize = gtk_icon_info_finalize;
}
/**
* no filename if a builtin icon is returned; in this
* case, you should use gtk_icon_info_get_builtin_pixbuf().
*
- * Return value: the filename for the icon, or %NULL
- * if gtk_icon_info_get_builtin_pixbuf() should
- * be used instead. The return value is owned by
- * GTK+ and should not be modified or freed.
+ * Return value: (type filename): the filename for the icon, or %NULL
+ * if gtk_icon_info_get_builtin_pixbuf() should be used instead. The
+ * return value is owned by GTK+ and should not be modified or freed.
*
* Since: 2.4
**/
-G_CONST_RETURN gchar *
+const gchar *
gtk_icon_info_get_filename (GtkIconInfo *icon_info)
{
g_return_val_if_fail (icon_info != NULL, NULL);
* GTK+ to use built in icon images, you must pass the
* %GTK_ICON_LOOKUP_USE_BUILTIN to
* gtk_icon_theme_lookup_icon().
- *
- * Return value: the built-in image pixbuf, or %NULL. No
+ *
+ * Return value: (transfer none): the built-in image pixbuf, or %NULL. No
* extra reference is added to the returned pixbuf, so if
* you want to keep it around, you must use g_object_ref().
* The returned image must not be modified.
return icon_info->cache_pixbuf;
}
-static GdkPixbuf *
-load_svg_at_size (const gchar *filename,
- gint size,
- GError **error)
+static gboolean icon_info_ensure_scale_and_pixbuf (GtkIconInfo*, gboolean);
+
+/* Combine the icon with all emblems, the first emblem is placed
+ * in the southeast corner. Scale emblems to be at most 3/4 of the
+ * size of the icon itself.
+ */
+static void
+apply_emblems (GtkIconInfo *info)
{
- GdkPixbuf *pixbuf = NULL;
- GdkPixbufLoader *loader = NULL;
- gchar *contents = NULL;
- gsize length;
-
- if (!g_file_get_contents (filename,
- &contents, &length, error))
- goto bail;
-
- loader = gdk_pixbuf_loader_new_with_type ("svg", error);
- if (loader == NULL)
- goto bail;
+ GdkPixbuf *icon = NULL;
+ gint w, h, pos;
+ GSList *l;
- gdk_pixbuf_loader_set_size (loader, size, size);
-
- if (!gdk_pixbuf_loader_write (loader, contents, length, error))
+ if (info->emblem_infos == NULL)
+ return;
+
+ if (info->emblems_applied)
+ return;
+
+ w = gdk_pixbuf_get_width (info->pixbuf);
+ h = gdk_pixbuf_get_height (info->pixbuf);
+
+ for (l = info->emblem_infos, pos = 0; l; l = l->next, pos++)
{
- gdk_pixbuf_loader_close (loader, NULL);
- goto bail;
+ GtkIconInfo *emblem_info = l->data;
+
+ if (icon_info_ensure_scale_and_pixbuf (emblem_info, FALSE))
+ {
+ GdkPixbuf *emblem = emblem_info->pixbuf;
+ gint ew, eh;
+ gint x = 0, y = 0; /* silence compiler */
+ gdouble scale;
+
+ ew = gdk_pixbuf_get_width (emblem);
+ eh = gdk_pixbuf_get_height (emblem);
+ if (ew >= w)
+ {
+ scale = 0.75;
+ ew = ew * 0.75;
+ eh = eh * 0.75;
+ }
+ else
+ scale = 1.0;
+
+ switch (pos % 4)
+ {
+ case 0:
+ x = w - ew;
+ y = h - eh;
+ break;
+ case 1:
+ x = w - ew;
+ y = 0;
+ break;
+ case 2:
+ x = 0;
+ y = h - eh;
+ break;
+ case 3:
+ x = 0;
+ y = 0;
+ break;
+ }
+
+ if (icon == NULL)
+ {
+ icon = gdk_pixbuf_copy (info->pixbuf);
+ if (icon == NULL)
+ break;
+ }
+
+ gdk_pixbuf_composite (emblem, icon, x, y, ew, eh, x, y,
+ scale, scale, GDK_INTERP_BILINEAR, 255);
+ }
+ }
+
+ if (icon)
+ {
+ g_object_unref (info->pixbuf);
+ info->pixbuf = icon;
}
-
- if (!gdk_pixbuf_loader_close (loader, error))
- goto bail;
-
- pixbuf = g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader));
-
- bail:
- if (loader)
- g_object_unref (loader);
- if (contents)
- g_free (contents);
-
- return pixbuf;
+
+ info->emblems_applied = TRUE;
+}
+
+/* If this returns TRUE, its safe to call
+ icon_info_ensure_scale_and_pixbuf without blocking */
+static gboolean
+icon_info_get_pixbuf_ready (GtkIconInfo *icon_info)
+{
+ if (icon_info->pixbuf &&
+ (icon_info->emblem_infos == NULL || icon_info->emblems_applied))
+ return TRUE;
+
+ if (icon_info->load_error)
+ return TRUE;
+
+ return FALSE;
}
-/* This function contains the complicatd logic for deciding
+/* This function contains the complicated logic for deciding
* on the size at which to load the icon and loading it at
* that size.
*/
static gboolean
-icon_info_ensure_scale_and_pixbuf (GtkIconInfo *icon_info,
- gboolean scale_only)
+icon_info_ensure_scale_and_pixbuf (GtkIconInfo *icon_info,
+ gboolean scale_only)
{
int image_width, image_height;
GdkPixbuf *source_pixbuf;
+ gboolean is_svg;
/* First check if we already succeeded have the necessary
* information (or failed earlier)
return TRUE;
if (icon_info->pixbuf)
- return TRUE;
+ {
+ apply_emblems (icon_info);
+ return TRUE;
+ }
if (icon_info->load_error)
return FALSE;
/* SVG icons are a special case - we just immediately scale them
* to the desired size
*/
- if (icon_info->filename && g_str_has_suffix (icon_info->filename, ".svg"))
+ if (icon_info->icon_file && !icon_info->loadable)
+ icon_info->loadable = G_LOADABLE_ICON (g_file_icon_new (icon_info->icon_file));
+
+ is_svg = FALSE;
+ if (G_IS_FILE_ICON (icon_info->loadable))
+ {
+ GFile *file;
+ GFileInfo *file_info;
+ const gchar *content_type;
+
+ file = g_file_icon_get_file (G_FILE_ICON (icon_info->loadable));
+ file_info = g_file_query_info (file,
+ G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+ G_FILE_QUERY_INFO_NONE,
+ NULL, NULL);
+ if (file_info)
+ {
+ content_type = g_file_info_get_content_type (file_info);
+
+ if (content_type && strcmp (content_type, "image/svg+xml") == 0)
+ is_svg = TRUE;
+
+ g_object_unref (file_info);
+ }
+ }
+
+ if (is_svg)
{
+ GInputStream *stream;
+
icon_info->scale = icon_info->desired_size / 1000.;
if (scale_only)
return TRUE;
- icon_info->pixbuf = load_svg_at_size (icon_info->filename,
- icon_info->desired_size,
- &icon_info->load_error);
-
- return icon_info->pixbuf != NULL;
+ stream = g_loadable_icon_load (icon_info->loadable,
+ icon_info->desired_size,
+ NULL, NULL,
+ &icon_info->load_error);
+ if (stream)
+ {
+ icon_info->pixbuf = gdk_pixbuf_new_from_stream_at_scale (stream,
+ icon_info->desired_size,
+ icon_info->desired_size,
+ TRUE,
+ NULL,
+ &icon_info->load_error);
+ g_object_unref (stream);
+ }
+
+ if (!icon_info->pixbuf)
+ return FALSE;
+
+ apply_emblems (icon_info);
+
+ return TRUE;
}
/* In many cases, the scale can be determined without actual access
* for the directory where the icon is; the image size doesn't
* matter in that case.
*/
- if (icon_info->dir_type == ICON_THEME_DIR_FIXED)
+ if (icon_info->forced_size)
+ icon_info->scale = -1;
+ else if (icon_info->dir_type == ICON_THEME_DIR_FIXED)
icon_info->scale = 1.0;
else if (icon_info->dir_type == ICON_THEME_DIR_THRESHOLD)
{
return TRUE;
/* At this point, we need to actually get the icon; either from the
- * builting image or by loading the file
+ * builtin image or by loading the file
*/
+ source_pixbuf = NULL;
if (icon_info->cache_pixbuf)
source_pixbuf = g_object_ref (icon_info->cache_pixbuf);
else
{
+ GInputStream *stream;
- source_pixbuf = gdk_pixbuf_new_from_file (icon_info->filename,
- &icon_info->load_error);
- if (!source_pixbuf)
- return FALSE;
+ stream = g_loadable_icon_load (icon_info->loadable,
+ icon_info->desired_size,
+ NULL, NULL,
+ &icon_info->load_error);
+ if (stream)
+ {
+ source_pixbuf = gdk_pixbuf_new_from_stream (stream,
+ NULL,
+ &icon_info->load_error);
+ g_object_unref (stream);
+ }
}
+ if (!source_pixbuf)
+ return FALSE;
+
/* Do scale calculations that depend on the image size
*/
image_width = gdk_pixbuf_get_width (source_pixbuf);
{
gint image_size = MAX (image_width, image_height);
if (image_size > 0)
- icon_info->scale = icon_info->desired_size / (gdouble)image_size;
+ icon_info->scale = (gdouble)icon_info->desired_size / (gdouble)image_size;
else
icon_info->scale = 1.0;
- if (icon_info->dir_type == ICON_THEME_DIR_UNTHEMED)
+ if (icon_info->dir_type == ICON_THEME_DIR_UNTHEMED &&
+ !icon_info->forced_size)
icon_info->scale = MIN (icon_info->scale, 1.0);
}
* the job. This is a bit of a waste when we scale here
* and never get the final pixbuf; at the cost of a bit of
* extra complexity, we could keep the source pixbuf around
- * but not actually scale it until neede.
+ * but not actually scale it until needed.
*/
-
if (icon_info->scale == 1.0)
icon_info->pixbuf = source_pixbuf;
else
g_object_unref (source_pixbuf);
}
+ apply_emblems (icon_info);
+
return TRUE;
}
+static void
+proxy_pixbuf_destroy (guchar *pixels, gpointer data)
+{
+ GtkIconInfo *icon_info = data;
+ GtkIconTheme *icon_theme = icon_info->in_cache;
+
+ g_assert (icon_info->proxy_pixbuf != NULL);
+ icon_info->proxy_pixbuf = NULL;
+
+ /* Keep it alive a bit longer */
+ if (icon_theme != NULL)
+ ensure_in_lru_cache (icon_theme, icon_info);
+
+ g_object_unref (icon_info);
+}
+
/**
* gtk_icon_info_load_icon:
* @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
- * @error: location to store error information on failure, or %NULL.
- *
+ * @error: (allow-none): location to store error information on failure,
+ * or %NULL.
+ *
* Renders an icon previously looked up in an icon theme using
* gtk_icon_theme_lookup_icon(); the size will be based on the size
* passed to gtk_icon_theme_lookup_icon(). Note that the resulting
* that differ slightly from their nominal sizes, and in addition GTK+
* will avoid scaling icons that it considers sufficiently close to the
* requested size or for which the source image would have to be scaled
- * up too far. (This maintains sharpness.)
- *
- * Return value: the rendered icon; this may be a newly created icon
- * or a new reference to an internal icon, so you must not modify
- * the icon. Use g_object_unref() to release your reference to the
- * icon.
+ * up too far. (This maintains sharpness.). This behaviour can be changed
+ * by passing the %GTK_ICON_LOOKUP_FORCE_SIZE flag when obtaining
+ * the #GtkIconInfo. If this flag has been specified, the pixbuf
+ * returned by this function will be scaled to the exact size.
+ *
+ * Return value: (transfer full): the rendered icon; this may be a newly
+ * created icon or a new reference to an internal icon, so you must
+ * not modify the icon. Use g_object_unref() to release your reference
+ * to the icon.
*
* Since: 2.4
**/
GError **error)
{
g_return_val_if_fail (icon_info != NULL, NULL);
+ g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ if (!icon_info_ensure_scale_and_pixbuf (icon_info, FALSE))
+ {
+ if (icon_info->load_error)
+ g_propagate_error (error, icon_info->load_error);
+ else
+ g_set_error_literal (error,
+ GTK_ICON_THEME_ERROR,
+ GTK_ICON_THEME_NOT_FOUND,
+ _("Failed to load icon"));
+
+ return NULL;
+ }
+
+ /* Instead of returning the pixbuf directly we
+ return a proxy to it that we don't own (but that
+ shares the data with the one we own). This way
+ we can know when it is freed and ensure the
+ IconInfo is alive (and thus cached) while
+ the pixbuf is still alive. */
+
+ if (icon_info->proxy_pixbuf != NULL)
+ return g_object_ref (icon_info->proxy_pixbuf);
+
+ icon_info->proxy_pixbuf =
+ gdk_pixbuf_new_from_data (gdk_pixbuf_get_pixels (icon_info->pixbuf),
+ gdk_pixbuf_get_colorspace (icon_info->pixbuf),
+ gdk_pixbuf_get_has_alpha (icon_info->pixbuf),
+ gdk_pixbuf_get_bits_per_sample (icon_info->pixbuf),
+ gdk_pixbuf_get_width (icon_info->pixbuf),
+ gdk_pixbuf_get_height (icon_info->pixbuf),
+ gdk_pixbuf_get_rowstride (icon_info->pixbuf),
+ proxy_pixbuf_destroy,
+ g_object_ref (icon_info));
+
+ return icon_info->proxy_pixbuf;
+}
+
+static void
+load_icon_thread (GTask *task,
+ gpointer source_object,
+ gpointer task_data,
+ GCancellable *cancellable)
+{
+ GtkIconInfo *dup = task_data;
+
+ icon_info_ensure_scale_and_pixbuf (dup, FALSE);
+ g_task_return_pointer (task, NULL, NULL);
+}
+
+/**
+ * gtk_icon_info_load_icon_async:
+ * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @cancellable: (allow-none): optional #GCancellable object,
+ * %NULL to ignore
+ * @callback: (scope async): a #GAsyncReadyCallback to call when the
+ * request is satisfied
+ * @user_data: (closure): the data to pass to callback function
+ *
+ * Asynchronously load, render and scale an icon previously looked up
+ * from the icon theme using gtk_icon_theme_lookup_icon().
+ *
+ * For more details, see gtk_icon_info_load_icon() which is the synchronous
+ * version of this call.
+ *
+ * Since: 3.8
+ **/
+void
+gtk_icon_info_load_icon_async (GtkIconInfo *icon_info,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ GTask *task;
+ GdkPixbuf *pixbuf;
+ GtkIconInfo *dup;
+ GError *error = NULL;
+
+ task = g_task_new (icon_info, cancellable, callback, user_data);
+
+ if (icon_info_get_pixbuf_ready (icon_info))
+ {
+ pixbuf = gtk_icon_info_load_icon (icon_info, &error);
+ if (pixbuf == NULL)
+ g_task_return_error (task, error);
+ else
+ g_task_return_pointer (task, pixbuf, g_object_unref);
+ g_object_unref (task);
+ }
+ else
+ {
+ dup = icon_info_dup (icon_info);
+ g_task_set_task_data (task, dup, g_object_unref);
+ g_task_run_in_thread (task, load_icon_thread);
+ g_object_unref (task);
+ }
+}
+
+/**
+ * gtk_icon_info_load_icon_finish:
+ * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @res: a #GAsyncResult
+ * @error: (allow-none): location to store error information on failure,
+ * or %NULL.
+ *
+ * Finishes an async icon load, see gtk_icon_info_load_icon_async().
+ *
+ * Return value: (transfer full): the rendered icon; this may be a newly
+ * created icon or a new reference to an internal icon, so you must
+ * not modify the icon. Use g_object_unref() to release your reference
+ * to the icon.
+ *
+ * Since: 3.8
+ **/
+GdkPixbuf *
+gtk_icon_info_load_icon_finish (GtkIconInfo *icon_info,
+ GAsyncResult *result,
+ GError **error)
+{
+ GTask *task = G_TASK (result);
+ GtkIconInfo *dup;
+
+ g_return_val_if_fail (g_task_is_valid (result, icon_info), NULL);
+
+ dup = g_task_get_task_data (task);
+ if (dup == NULL || g_task_had_error (task))
+ return g_task_propagate_pointer (task, error);
+
+ /* We ran the thread and it was not cancelled */
+
+ /* Check if someone else updated the icon_info in between */
+ if (!icon_info_get_pixbuf_ready (icon_info))
+ {
+ /* If not, copy results from dup back to icon_info */
+
+ icon_info->emblems_applied = dup->emblems_applied;
+ icon_info->scale = dup->scale;
+ g_clear_object (&icon_info->pixbuf);
+ if (dup->pixbuf)
+ icon_info->pixbuf = g_object_ref (dup->pixbuf);
+ g_clear_error (&icon_info->load_error);
+ if (dup->load_error)
+ icon_info->load_error = g_error_copy (dup->load_error);
+ }
+
+ g_assert (icon_info_get_pixbuf_ready (icon_info));
+
+ /* This is now guaranteed to not block */
+ return gtk_icon_info_load_icon (icon_info, error);
+}
+
+static gchar *
+gdk_color_to_css (GdkColor *color)
+{
+ return g_strdup_printf ("rgb(%d,%d,%d)",
+ color->red >> 8,
+ color->green >> 8,
+ color->blue >> 8);
+}
+
+static gchar *
+gdk_rgba_to_css (const GdkRGBA *color)
+{
+ /* drop alpha for now, since librsvg does not understand rgba() */
+ return g_strdup_printf ("rgb(%d,%d,%d)",
+ (gint)(color->red * 255),
+ (gint)(color->green * 255),
+ (gint)(color->blue * 255));
+}
+
+static void
+proxy_symbolic_pixbuf_destroy (guchar *pixels, gpointer data)
+{
+ GtkIconInfo *icon_info = data;
+ GtkIconTheme *icon_theme = icon_info->in_cache;
+ SymbolicPixbufCache *symbolic_cache;
+
+ for (symbolic_cache = icon_info->symbolic_pixbuf_cache;
+ symbolic_cache != NULL;
+ symbolic_cache = symbolic_cache->next)
+ {
+ if (symbolic_cache->proxy_pixbuf != NULL &&
+ gdk_pixbuf_get_pixels (symbolic_cache->proxy_pixbuf) == pixels)
+ break;
+ }
+
+ g_assert (symbolic_cache != NULL);
+ g_assert (symbolic_cache->proxy_pixbuf != NULL);
+
+ symbolic_cache->proxy_pixbuf = NULL;
+
+ /* Keep it alive a bit longer */
+ if (icon_theme != NULL)
+ ensure_in_lru_cache (icon_theme, icon_info);
+
+ g_object_unref (icon_info);
+}
+
+static GdkPixbuf *
+symbolic_cache_get_proxy (SymbolicPixbufCache *symbolic_cache,
+ GtkIconInfo *icon_info)
+{
+ if (symbolic_cache->proxy_pixbuf)
+ return g_object_ref (symbolic_cache->proxy_pixbuf);
+
+ symbolic_cache->proxy_pixbuf =
+ gdk_pixbuf_new_from_data (gdk_pixbuf_get_pixels (symbolic_cache->pixbuf),
+ gdk_pixbuf_get_colorspace (symbolic_cache->pixbuf),
+ gdk_pixbuf_get_has_alpha (symbolic_cache->pixbuf),
+ gdk_pixbuf_get_bits_per_sample (symbolic_cache->pixbuf),
+ gdk_pixbuf_get_width (symbolic_cache->pixbuf),
+ gdk_pixbuf_get_height (symbolic_cache->pixbuf),
+ gdk_pixbuf_get_rowstride (symbolic_cache->pixbuf),
+ proxy_symbolic_pixbuf_destroy,
+ g_object_ref (icon_info));
+
+ return symbolic_cache->proxy_pixbuf;
+}
+
+static GdkPixbuf *
+_gtk_icon_info_load_symbolic_internal (GtkIconInfo *icon_info,
+ const GdkRGBA *fg,
+ const GdkRGBA *success_color,
+ const GdkRGBA *warning_color,
+ const GdkRGBA *error_color,
+ gboolean use_cache,
+ GError **error)
+{
+ GInputStream *stream;
+ GdkPixbuf *pixbuf;
+ gchar *css_fg;
+ gchar *css_success;
+ gchar *css_warning;
+ gchar *css_error;
+ gchar *data;
+ gchar *width, *height, *uri;
+ SymbolicPixbufCache *symbolic_cache;
+
+ if (use_cache)
+ {
+ symbolic_cache = symbolic_pixbuf_cache_matches (icon_info->symbolic_pixbuf_cache,
+ fg, success_color, warning_color, error_color);
+ if (symbolic_cache)
+ return symbolic_cache_get_proxy (symbolic_cache, icon_info);
+ }
+
+ /* css_fg can't possibly have failed, otherwise
+ * that would mean we have a broken style */
+ g_return_val_if_fail (fg != NULL, NULL);
+
+ css_fg = gdk_rgba_to_css (fg);
+
+ css_success = css_warning = css_error = NULL;
+
+ if (warning_color)
+ css_warning = gdk_rgba_to_css (warning_color);
+
+ if (error_color)
+ css_error = gdk_rgba_to_css (error_color);
+
+ if (success_color)
+ css_success = gdk_rgba_to_css (success_color);
+
+ if (!css_success)
+ {
+ GdkColor success_default_color = { 0, 0x4e00, 0x9a00, 0x0600 };
+ css_success = gdk_color_to_css (&success_default_color);
+ }
+ if (!css_warning)
+ {
+ GdkColor warning_default_color = { 0, 0xf500, 0x7900, 0x3e00 };
+ css_warning = gdk_color_to_css (&warning_default_color);
+ }
+ if (!css_error)
+ {
+ GdkColor error_default_color = { 0, 0xcc00, 0x0000, 0x0000 };
+ css_error = gdk_color_to_css (&error_default_color);
+ }
+
+ if (!icon_info->symbolic_pixbuf_size)
+ {
+ stream = G_INPUT_STREAM (g_file_read (icon_info->icon_file, NULL, error));
+
+ if (!stream)
+ return NULL;
+
+ /* Fetch size from the original icon */
+ pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, error);
+ g_object_unref (stream);
+
+ if (!pixbuf)
+ return NULL;
+
+ icon_info->symbolic_pixbuf_size = gtk_requisition_new ();
+ icon_info->symbolic_pixbuf_size->width = gdk_pixbuf_get_width (pixbuf);
+ icon_info->symbolic_pixbuf_size->height = gdk_pixbuf_get_height (pixbuf);
+ g_object_unref (pixbuf);
+ }
+
+ width = g_strdup_printf ("%d", icon_info->symbolic_pixbuf_size->width);
+ height = g_strdup_printf ("%d", icon_info->symbolic_pixbuf_size->height);
+ uri = g_file_get_uri (icon_info->icon_file);
+
+ data = g_strconcat ("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+ "<svg version=\"1.1\"\n"
+ " xmlns=\"http://www.w3.org/2000/svg\"\n"
+ " xmlns:xi=\"http://www.w3.org/2001/XInclude\"\n"
+ " width=\"", width, "\"\n"
+ " height=\"", height, "\">\n"
+ " <style type=\"text/css\">\n"
+ " rect,path {\n"
+ " fill: ", css_fg," !important;\n"
+ " }\n"
+ " .warning {\n"
+ " fill: ", css_warning, " !important;\n"
+ " }\n"
+ " .error {\n"
+ " fill: ", css_error ," !important;\n"
+ " }\n"
+ " .success {\n"
+ " fill: ", css_success, " !important;\n"
+ " }\n"
+ " </style>\n"
+ " <xi:include href=\"", uri, "\"/>\n"
+ "</svg>",
+ NULL);
+ g_free (css_fg);
+ g_free (css_warning);
+ g_free (css_error);
+ g_free (css_success);
+ g_free (width);
+ g_free (height);
+ g_free (uri);
+
+ stream = g_memory_input_stream_new_from_data (data, -1, g_free);
+ pixbuf = gdk_pixbuf_new_from_stream_at_scale (stream,
+ icon_info->desired_size,
+ icon_info->desired_size,
+ TRUE,
+ NULL,
+ error);
+ g_object_unref (stream);
+
+ if (pixbuf != NULL)
+ {
+ if (use_cache)
+ {
+ icon_info->symbolic_pixbuf_cache =
+ symbolic_pixbuf_cache_new (pixbuf, fg, success_color, warning_color, error_color,
+ icon_info->symbolic_pixbuf_cache);
+ g_object_unref (pixbuf);
+ return symbolic_cache_get_proxy (icon_info->symbolic_pixbuf_cache, icon_info);
+ }
+ else
+ return pixbuf;
+ }
+
+ return NULL;
+}
+
+/**
+ * gtk_icon_info_load_symbolic:
+ * @icon_info: a #GtkIconInfo
+ * @fg: a #GdkRGBA representing the foreground color of the icon
+ * @success_color: (allow-none): a #GdkRGBA representing the warning color
+ * of the icon or %NULL to use the default color
+ * @warning_color: (allow-none): a #GdkRGBA representing the warning color
+ * of the icon or %NULL to use the default color
+ * @error_color: (allow-none): a #GdkRGBA representing the error color
+ * of the icon or %NULL to use the default color (allow-none)
+ * @was_symbolic: (out) (allow-none): a #gboolean, returns whether the
+ * loaded icon was a symbolic one and whether the @fg color was
+ * applied to it.
+ * @error: (allow-none): location to store error information on failure,
+ * or %NULL.
+ *
+ * Loads an icon, modifying it to match the system colours for the foreground,
+ * success, warning and error colors provided. If the icon is not a symbolic
+ * one, the function will return the result from gtk_icon_info_load_icon().
+ *
+ * This allows loading symbolic icons that will match the system theme.
+ *
+ * Unless you are implementing a widget, you will want to use
+ * g_themed_icon_new_with_default_fallbacks() to load the icon.
+ *
+ * As implementation details, the icon loaded needs to be of SVG type,
+ * contain the "symbolic" term as the last component of the icon name,
+ * and use the 'fg', 'success', 'warning' and 'error' CSS styles in the
+ * SVG file itself.
+ *
+ * See the <ulink url="http://www.freedesktop.org/wiki/SymbolicIcons">Symbolic Icons spec</ulink>
+ * for more information about symbolic icons.
+ *
+ * Return value: (transfer full): a #GdkPixbuf representing the loaded icon
+ *
+ * Since: 3.0
+ **/
+GdkPixbuf *
+gtk_icon_info_load_symbolic (GtkIconInfo *icon_info,
+ const GdkRGBA *fg,
+ const GdkRGBA *success_color,
+ const GdkRGBA *warning_color,
+ const GdkRGBA *error_color,
+ gboolean *was_symbolic,
+ GError **error)
+{
+ gchar *icon_uri;
+ gboolean is_symbolic;
g_return_val_if_fail (icon_info != NULL, NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+ g_return_val_if_fail (fg != NULL, NULL);
- icon_info_ensure_scale_and_pixbuf (icon_info, FALSE);
+ icon_uri = NULL;
+ if (icon_info->icon_file)
+ icon_uri = g_file_get_uri (icon_info->icon_file);
- if (icon_info->load_error)
+ is_symbolic = (icon_uri != NULL) && (g_str_has_suffix (icon_uri, "-symbolic.svg"));
+ g_free (icon_uri);
+
+ if (was_symbolic)
+ *was_symbolic = is_symbolic;
+
+ if (!is_symbolic)
+ return gtk_icon_info_load_icon (icon_info, error);
+
+ return _gtk_icon_info_load_symbolic_internal (icon_info,
+ fg, success_color,
+ warning_color, error_color,
+ TRUE,
+ error);
+}
+
+/**
+ * gtk_icon_info_load_symbolic_for_context:
+ * @icon_info: a #GtkIconInfo
+ * @context: a #GtkStyleContext
+ * @was_symbolic: (out) (allow-none): a #gboolean, returns whether the
+ * loaded icon was a symbolic one and whether the @fg color was
+ * applied to it.
+ * @error: (allow-none): location to store error information on failure,
+ * or %NULL.
+ *
+ * Loads an icon, modifying it to match the system colors for the foreground,
+ * success, warning and error colors provided. If the icon is not a symbolic
+ * one, the function will return the result from gtk_icon_info_load_icon().
+ * This function uses the regular foreground color and the symbolic colors
+ * with the names "success_color", "warning_color" and "error_color" from
+ * the context.
+ *
+ * This allows loading symbolic icons that will match the system theme.
+ *
+ * See gtk_icon_info_load_symbolic() for more details.
+ *
+ * Return value: (transfer full): a #GdkPixbuf representing the loaded icon
+ *
+ * Since: 3.0
+ **/
+GdkPixbuf *
+gtk_icon_info_load_symbolic_for_context (GtkIconInfo *icon_info,
+ GtkStyleContext *context,
+ gboolean *was_symbolic,
+ GError **error)
+{
+ GdkRGBA *color = NULL;
+ GdkRGBA fg;
+ GdkRGBA *fgp;
+ GdkRGBA success_color;
+ GdkRGBA *success_colorp;
+ GdkRGBA warning_color;
+ GdkRGBA *warning_colorp;
+ GdkRGBA error_color;
+ GdkRGBA *error_colorp;
+ GtkStateFlags state;
+ gchar *icon_uri;
+ gboolean is_symbolic;
+
+ g_return_val_if_fail (icon_info != NULL, NULL);
+ g_return_val_if_fail (context != NULL, NULL);
+
+ icon_uri = NULL;
+ if (icon_info->icon_file)
+ icon_uri = g_file_get_uri (icon_info->icon_file);
+
+ is_symbolic = (icon_uri != NULL) && (g_str_has_suffix (icon_uri, "-symbolic.svg"));
+ g_free (icon_uri);
+
+ if (was_symbolic)
+ *was_symbolic = is_symbolic;
+
+ if (!is_symbolic)
+ return gtk_icon_info_load_icon (icon_info, error);
+
+ fgp = success_colorp = warning_colorp = error_colorp = NULL;
+
+ state = gtk_style_context_get_state (context);
+ gtk_style_context_get (context, state, "color", &color, NULL);
+ if (color)
{
- g_propagate_error (error, icon_info->load_error);
- return NULL;
+ fg = *color;
+ fgp = &fg;
+ gdk_rgba_free (color);
+ }
+
+ if (gtk_style_context_lookup_color (context, "success_color", &success_color))
+ success_colorp = &success_color;
+
+ if (gtk_style_context_lookup_color (context, "warning_color", &warning_color))
+ warning_colorp = &warning_color;
+
+ if (gtk_style_context_lookup_color (context, "error_color", &error_color))
+ error_colorp = &error_color;
+
+ return _gtk_icon_info_load_symbolic_internal (icon_info,
+ fgp, success_colorp,
+ warning_colorp, error_colorp,
+ TRUE,
+ error);
+}
+
+typedef struct {
+ gboolean is_symbolic;
+ GtkIconInfo *dup;
+ GdkRGBA fg;
+ gboolean fg_set;
+ GdkRGBA success_color;
+ gboolean success_color_set;
+ GdkRGBA warning_color;
+ gboolean warning_color_set;
+ GdkRGBA error_color;
+ gboolean error_color_set;
+} AsyncSymbolicData;
+
+static void
+async_symbolic_data_free (AsyncSymbolicData *data)
+{
+ if (data->dup)
+ g_object_unref (data->dup);
+ g_slice_free (AsyncSymbolicData, data);
+}
+
+static void
+async_load_no_symbolic_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GtkIconInfo *icon_info = GTK_ICON_INFO (source_object);
+ GTask *task = user_data;
+ GError *error = NULL;
+ GdkPixbuf *pixbuf;
+
+ pixbuf = gtk_icon_info_load_icon_finish (icon_info, res, &error);
+ if (pixbuf == NULL)
+ g_task_return_error (task, error);
+ else
+ g_task_return_pointer (task, pixbuf, g_object_unref);
+ g_object_unref (task);
+}
+
+static void
+load_symbolic_icon_thread (GTask *task,
+ gpointer source_object,
+ gpointer task_data,
+ GCancellable *cancellable)
+{
+ AsyncSymbolicData *data = task_data;
+ GError *error;
+ GdkPixbuf *pixbuf;
+
+ error = NULL;
+ pixbuf =
+ _gtk_icon_info_load_symbolic_internal (data->dup,
+ data->fg_set ? &data->fg : NULL,
+ data->success_color_set ? &data->success_color : NULL,
+ data->warning_color_set ? &data->warning_color : NULL,
+ data->error_color_set ? &data->error_color : NULL,
+ FALSE,
+ &error);
+ if (pixbuf == NULL)
+ g_task_return_error (task, error);
+ else
+ g_task_return_pointer (task, pixbuf, g_object_unref);
+}
+
+/**
+ * gtk_icon_info_load_symbolic_async:
+ * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @fg: a #GdkRGBA representing the foreground color of the icon
+ * @success_color: (allow-none): a #GdkRGBA representing the warning color
+ * of the icon or %NULL to use the default color
+ * @warning_color: (allow-none): a #GdkRGBA representing the warning color
+ * of the icon or %NULL to use the default color
+ * @error_color: (allow-none): a #GdkRGBA representing the error color
+ * of the icon or %NULL to use the default color (allow-none)
+ * @cancellable: (allow-none): optional #GCancellable object,
+ * %NULL to ignore
+ * @callback: (scope async): a #GAsyncReadyCallback to call when the
+ * request is satisfied
+ * @user_data: (closure): the data to pass to callback function
+ *
+ * Asynchronously load, render and scale a symbolic icon previously looked up
+ * from the icon theme using gtk_icon_theme_lookup_icon().
+ *
+ * For more details, see gtk_icon_info_load_symbolic() which is the synchronous
+ * version of this call.
+ *
+ * Since: 3.8
+ **/
+void
+gtk_icon_info_load_symbolic_async (GtkIconInfo *icon_info,
+ const GdkRGBA *fg,
+ const GdkRGBA *success_color,
+ const GdkRGBA *warning_color,
+ const GdkRGBA *error_color,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ GTask *task;
+ AsyncSymbolicData *data;
+ gchar *icon_uri;
+ SymbolicPixbufCache *symbolic_cache;
+ GdkPixbuf *pixbuf;
+
+ g_return_if_fail (icon_info != NULL);
+ g_return_if_fail (fg != NULL);
+
+ task = g_task_new (icon_info, cancellable, callback, user_data);
+
+ data = g_slice_new0 (AsyncSymbolicData);
+ g_task_set_task_data (task, data, (GDestroyNotify) async_symbolic_data_free);
+
+ icon_uri = NULL;
+ if (icon_info->icon_file)
+ icon_uri = g_file_get_uri (icon_info->icon_file);
+
+ data->is_symbolic = (icon_uri != NULL) && (g_str_has_suffix (icon_uri, "-symbolic.svg"));
+ g_free (icon_uri);
+
+ if (!data->is_symbolic)
+ {
+ gtk_icon_info_load_icon_async (icon_info, cancellable, async_load_no_symbolic_cb, g_object_ref (task));
+ }
+ else
+ {
+ symbolic_cache = symbolic_pixbuf_cache_matches (icon_info->symbolic_pixbuf_cache,
+ fg, success_color, warning_color, error_color);
+ if (symbolic_cache)
+ {
+ pixbuf = symbolic_cache_get_proxy (symbolic_cache, icon_info);
+ g_task_return_pointer (task, pixbuf, g_object_unref);
+ }
+ else
+ {
+ if (fg)
+ {
+ data->fg = *fg;
+ data->fg_set = TRUE;
+ }
+
+ if (success_color)
+ {
+ data->success_color = *success_color;
+ data->success_color_set = TRUE;
+ }
+
+ if (warning_color)
+ {
+ data->warning_color = *warning_color;
+ data->warning_color_set = TRUE;
+ }
+
+ if (error_color)
+ {
+ data->error_color = *error_color;
+ data->error_color_set = TRUE;
+ }
+
+ data->dup = icon_info_dup (icon_info);
+ g_task_run_in_thread (task, load_symbolic_icon_thread);
+ }
+ }
+ g_object_unref (task);
+}
+
+/**
+ * gtk_icon_info_load_symbolic_finish:
+ * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @res: a #GAsyncResult
+ * @was_symbolic: (out) (allow-none): a #gboolean, returns whether the
+ * loaded icon was a symbolic one and whether the @fg color was
+ * applied to it.
+ * @error: (allow-none): location to store error information on failure,
+ * or %NULL.
+ *
+ * Finishes an async icon load, see gtk_icon_info_load_symbolic_async().
+ *
+ * Return value: (transfer full): the rendered icon; this may be a newly
+ * created icon or a new reference to an internal icon, so you must
+ * not modify the icon. Use g_object_unref() to release your reference
+ * to the icon.
+ *
+ * Since: 3.8
+ **/
+GdkPixbuf *
+gtk_icon_info_load_symbolic_finish (GtkIconInfo *icon_info,
+ GAsyncResult *result,
+ gboolean *was_symbolic,
+ GError **error)
+{
+ GTask *task = G_TASK (result);
+ AsyncSymbolicData *data = g_task_get_task_data (task);
+ SymbolicPixbufCache *symbolic_cache;
+ GdkPixbuf *pixbuf;
+
+ if (was_symbolic)
+ *was_symbolic = data->is_symbolic;
+
+ if (data->dup && !g_task_had_error (task))
+ {
+ pixbuf = g_task_propagate_pointer (task, NULL);
+
+ g_assert (pixbuf != NULL); /* we checked for !had_error above */
+
+ symbolic_cache = symbolic_pixbuf_cache_matches (icon_info->symbolic_pixbuf_cache,
+ data->fg_set ? &data->fg : NULL,
+ data->success_color_set ? &data->success_color : NULL,
+ data->warning_color_set ? &data->warning_color : NULL,
+ data->error_color_set ? &data->error_color : NULL);
+
+ if (symbolic_cache == NULL)
+ {
+ symbolic_cache = icon_info->symbolic_pixbuf_cache =
+ symbolic_pixbuf_cache_new (pixbuf,
+ data->fg_set ? &data->fg : NULL,
+ data->success_color_set ? &data->success_color : NULL,
+ data->warning_color_set ? &data->warning_color : NULL,
+ data->error_color_set ? &data->error_color : NULL,
+ icon_info->symbolic_pixbuf_cache);
+ }
+
+ g_object_unref (pixbuf);
+
+ return symbolic_cache_get_proxy (symbolic_cache, icon_info);
}
- return g_object_ref (icon_info->pixbuf);
+ return g_task_propagate_pointer (task, error);
+}
+
+/**
+ * gtk_icon_info_load_symbolic_for_context_async:
+ * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @context: a #GtkStyleContext
+ * @cancellable: (allow-none): optional #GCancellable object,
+ * %NULL to ignore
+ * @callback: (scope async): a #GAsyncReadyCallback to call when the
+ * request is satisfied
+ * @user_data: (closure): the data to pass to callback function
+ *
+ * Asynchronously load, render and scale a symbolic icon previously looked up
+ * from the icon theme using gtk_icon_theme_lookup_icon().
+ *
+ * For more details, see gtk_icon_info_load_symbolic_for_context() which is the synchronous
+ * version of this call.
+ *
+ * Since: 3.8
+ **/
+void
+gtk_icon_info_load_symbolic_for_context_async (GtkIconInfo *icon_info,
+ GtkStyleContext *context,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ GdkRGBA *color = NULL;
+ GdkRGBA fg;
+ GdkRGBA *fgp;
+ GdkRGBA success_color;
+ GdkRGBA *success_colorp;
+ GdkRGBA warning_color;
+ GdkRGBA *warning_colorp;
+ GdkRGBA error_color;
+ GdkRGBA *error_colorp;
+ GtkStateFlags state;
+
+ g_return_if_fail (icon_info != NULL);
+ g_return_if_fail (context != NULL);
+
+ fgp = success_colorp = warning_colorp = error_colorp = NULL;
+
+ state = gtk_style_context_get_state (context);
+ gtk_style_context_get (context, state, "color", &color, NULL);
+ if (color)
+ {
+ fg = *color;
+ fgp = &fg;
+ gdk_rgba_free (color);
+ }
+
+ if (gtk_style_context_lookup_color (context, "success_color", &success_color))
+ success_colorp = &success_color;
+
+ if (gtk_style_context_lookup_color (context, "warning_color", &warning_color))
+ warning_colorp = &warning_color;
+
+ if (gtk_style_context_lookup_color (context, "error_color", &error_color))
+ error_colorp = &error_color;
+
+ gtk_icon_info_load_symbolic_async (icon_info,
+ fgp, success_colorp,
+ warning_colorp, error_colorp,
+ cancellable, callback, user_data);
+}
+
+/**
+ * gtk_icon_info_load_symbolic_for_context_finish:
+ * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @res: a #GAsyncResult
+ * @was_symbolic: (out) (allow-none): a #gboolean, returns whether the
+ * loaded icon was a symbolic one and whether the @fg color was
+ * applied to it.
+ * @error: (allow-none): location to store error information on failure,
+ * or %NULL.
+ *
+ * Finishes an async icon load, see gtk_icon_info_load_symbolic_for_context_async().
+ *
+ * Return value: (transfer full): the rendered icon; this may be a newly
+ * created icon or a new reference to an internal icon, so you must
+ * not modify the icon. Use g_object_unref() to release your reference
+ * to the icon.
+ *
+ * Since: 3.8
+ **/
+GdkPixbuf *
+gtk_icon_info_load_symbolic_for_context_finish (GtkIconInfo *icon_info,
+ GAsyncResult *result,
+ gboolean *was_symbolic,
+ GError **error)
+{
+ return gtk_icon_info_load_symbolic_finish (icon_info, result, was_symbolic, error);
+}
+
+static GdkRGBA *
+color_to_rgba (GdkColor *color, GdkRGBA *rgba)
+{
+ rgba->red = color->red / 65535.0;
+ rgba->green = color->green / 65535.0;
+ rgba->blue = color->blue / 65535.0;
+ rgba->alpha = 1.0;
+ return rgba;
+}
+
+/**
+ * gtk_icon_info_load_symbolic_for_style:
+ * @icon_info: a #GtkIconInfo
+ * @style: a #GtkStyle to take the colors from
+ * @state: the widget state to use for colors
+ * @was_symbolic: (out) (allow-none): a #gboolean, returns whether the
+ * loaded icon was a symbolic one and whether the @fg color was
+ * applied to it.
+ * @error: (allow-none): location to store error information on failure,
+ * or %NULL.
+ *
+ * Loads an icon, modifying it to match the system colours for the foreground,
+ * success, warning and error colors provided. If the icon is not a symbolic
+ * one, the function will return the result from gtk_icon_info_load_icon().
+ *
+ * This allows loading symbolic icons that will match the system theme.
+ *
+ * See gtk_icon_info_load_symbolic() for more details.
+ *
+ * Return value: (transfer full): a #GdkPixbuf representing the loaded icon
+ *
+ * Since: 3.0
+ *
+ * Deprecated: 3.0: Use gtk_icon_info_load_symbolic_for_context() instead
+ **/
+GdkPixbuf *
+gtk_icon_info_load_symbolic_for_style (GtkIconInfo *icon_info,
+ GtkStyle *style,
+ GtkStateType state,
+ gboolean *was_symbolic,
+ GError **error)
+{
+ GdkColor color;
+ GdkRGBA fg;
+ GdkRGBA success_color;
+ GdkRGBA *success_colorp;
+ GdkRGBA warning_color;
+ GdkRGBA *warning_colorp;
+ GdkRGBA error_color;
+ GdkRGBA *error_colorp;
+ gchar *icon_uri;
+ gboolean is_symbolic;
+
+ g_return_val_if_fail (icon_info != NULL, NULL);
+ g_return_val_if_fail (style != NULL, NULL);
+
+ icon_uri = NULL;
+ if (icon_info->icon_file)
+ icon_uri = g_file_get_uri (icon_info->icon_file);
+
+ is_symbolic = (icon_uri != NULL) && (g_str_has_suffix (icon_uri, "-symbolic.svg"));
+ g_free (icon_uri);
+
+ if (was_symbolic)
+ *was_symbolic = is_symbolic;
+
+ if (!is_symbolic)
+ return gtk_icon_info_load_icon (icon_info, error);
+
+ color_to_rgba (&style->fg[state], &fg);
+
+ success_colorp = warning_colorp = error_colorp = NULL;
+
+ if (gtk_style_lookup_color (style, "success_color", &color))
+ success_colorp = color_to_rgba (&color, &success_color);
+
+ if (gtk_style_lookup_color (style, "warning_color", &color))
+ warning_colorp = color_to_rgba (&color, &warning_color);
+
+ if (gtk_style_lookup_color (style, "error_color", &color))
+ error_colorp = color_to_rgba (&color, &error_color);
+
+ return _gtk_icon_info_load_symbolic_internal (icon_info,
+ &fg, success_colorp,
+ warning_colorp, error_colorp,
+ TRUE,
+ error);
}
/**
/**
* gtk_icon_info_get_embedded_rect:
* @icon_info: a #GtkIconInfo
- * @rectangle: #GdkRectangle in which to store embedded
+ * @rectangle: (out): #GdkRectangle in which to store embedded
* rectangle coordinates; coordinates are only stored
* when this function returns %TRUE.
*
/**
* gtk_icon_info_get_attach_points:
* @icon_info: a #GtkIconInfo
- * @points: location to store pointer to an array of points, or %NULL
+ * @points: (allow-none) (array length=n_points) (out): location to store pointer to an array of points, or %NULL
* free the array of points with g_free().
- * @n_points: location to store the number of points in @points, or %NULL
+ * @n_points: (allow-none): location to store the number of points in @points, or %NULL
*
* Fetches the set of attach points for an icon. An attach point
* is a location in the icon that can be used as anchor points for attaching
*
* Since: 2.4
**/
-G_CONST_RETURN gchar *
+const gchar *
gtk_icon_info_get_display_name (GtkIconInfo *icon_info)
{
g_return_val_if_fail (icon_info != NULL, NULL);
}
}
-#ifdef G_OS_WIN32
-
-/* DLL ABI stability backward compatibility versions */
-
-#undef gtk_icon_theme_set_search_path
-void
-gtk_icon_theme_set_search_path (GtkIconTheme *icon_theme,
- const gchar *path[],
- gint n_elements)
+/**
+ * gtk_icon_theme_lookup_by_gicon:
+ * @icon_theme: a #GtkIconTheme
+ * @icon: the #GIcon to look up
+ * @size: desired icon size
+ * @flags: flags modifying the behavior of the icon lookup
+ *
+ * Looks up an icon and returns a structure containing
+ * information such as the filename of the icon.
+ * The icon can then be rendered into a pixbuf using
+ * gtk_icon_info_load_icon().
+ *
+ * Return value: (transfer full): a #GtkIconInfo structure containing
+ * information about the icon, or %NULL if the icon
+ * wasn't found. Unref with g_object_unref()
+ *
+ * Since: 2.14
+ */
+GtkIconInfo *
+gtk_icon_theme_lookup_by_gicon (GtkIconTheme *icon_theme,
+ GIcon *icon,
+ gint size,
+ GtkIconLookupFlags flags)
{
- const gchar **utf8_path;
- gint i;
-
- utf8_path = g_new (const gchar *, n_elements);
-
- for (i = 0; i < n_elements; i++)
- utf8_path[i] = g_locale_to_utf8 (path[i], -1, NULL, NULL, NULL);
-
- gtk_icon_theme_set_search_path_utf8 (icon_theme, utf8_path, n_elements);
-
- for (i = 0; i < n_elements; i++)
- g_free ((gchar *) utf8_path[i]);
-
- g_free (utf8_path);
-}
+ GtkIconInfo *info;
-#undef gtk_icon_theme_get_search_path
+ g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
+ g_return_val_if_fail (G_IS_ICON (icon), NULL);
-void
-gtk_icon_theme_get_search_path (GtkIconTheme *icon_theme,
- gchar **path[],
- gint *n_elements)
-{
- gint i, n;
+ if (G_IS_LOADABLE_ICON (icon))
+ {
+ info = icon_info_new ();
+ info->loadable = G_LOADABLE_ICON (g_object_ref (icon));
- gtk_icon_theme_get_search_path_utf8 (icon_theme, path, &n);
+ if (G_IS_FILE_ICON (icon))
+ {
+ GFile *file = g_file_icon_get_file (G_FILE_ICON (icon));
+ if (file != NULL)
+ {
+ info->icon_file = g_object_ref (file);
+ info->filename = g_file_get_path (file);
+ }
+ }
+
+ info->dir_type = ICON_THEME_DIR_UNTHEMED;
+ info->dir_size = size;
+ info->desired_size = size;
+ info->threshold = 2;
+ info->forced_size = (flags & GTK_ICON_LOOKUP_FORCE_SIZE) != 0;
+
+ return info;
+ }
+ else if (G_IS_THEMED_ICON (icon))
+ {
+ const gchar **names;
- if (n_elements)
- *n_elements = n;
+ names = (const gchar **)g_themed_icon_get_names (G_THEMED_ICON (icon));
+ info = gtk_icon_theme_choose_icon (icon_theme, names, size, flags);
- if (path)
+ return info;
+ }
+ else if (G_IS_EMBLEMED_ICON (icon))
{
- for (i = 0; i < n; i++)
- {
- gchar *tem = (*path)[i];
+ GIcon *base, *emblem;
+ GList *list, *l;
+ GtkIconInfo *base_info, *emblem_info;
- (*path)[i] = g_locale_from_utf8 ((*path)[i], -1, NULL, NULL, NULL);
- g_free (tem);
- }
+ if (GTK_IS_NUMERABLE_ICON (icon))
+ _gtk_numerable_icon_set_background_icon_size (GTK_NUMERABLE_ICON (icon), size / 2);
+
+ base = g_emblemed_icon_get_icon (G_EMBLEMED_ICON (icon));
+ base_info = gtk_icon_theme_lookup_by_gicon (icon_theme, base, size, flags);
+ if (base_info)
+ {
+ info = icon_info_dup (base_info);
+ g_object_unref (base_info);
+
+ list = g_emblemed_icon_get_emblems (G_EMBLEMED_ICON (icon));
+ for (l = list; l; l = l->next)
+ {
+ emblem = g_emblem_get_icon (G_EMBLEM (l->data));
+ /* always force size for emblems */
+ emblem_info = gtk_icon_theme_lookup_by_gicon (icon_theme, emblem, size / 2, flags | GTK_ICON_LOOKUP_FORCE_SIZE);
+ if (emblem_info)
+ info->emblem_infos = g_slist_prepend (info->emblem_infos, emblem_info);
+ }
+
+ return info;
+ }
+ else
+ return NULL;
}
-}
+ else if (GDK_IS_PIXBUF (icon))
+ {
+ GdkPixbuf *pixbuf;
-#undef gtk_icon_theme_append_search_path
+ pixbuf = GDK_PIXBUF (icon);
-void
-gtk_icon_theme_append_search_path (GtkIconTheme *icon_theme,
- const gchar *path)
-{
- gchar *utf8_path = g_locale_from_utf8 (path, -1, NULL, NULL, NULL);
+ if ((flags & GTK_ICON_LOOKUP_FORCE_SIZE) != 0)
+ {
+ gint width, height, max;
+ gdouble scale;
+ GdkPixbuf *scaled;
- gtk_icon_theme_append_search_path_utf8 (icon_theme, utf8_path);
+ width = gdk_pixbuf_get_width (pixbuf);
+ height = gdk_pixbuf_get_height (pixbuf);
+ max = MAX (width, height);
+ scale = (gdouble) size / (gdouble) max;
- g_free (utf8_path);
-}
+ scaled = gdk_pixbuf_scale_simple (pixbuf,
+ 0.5 + width * scale,
+ 0.5 + height * scale,
+ GDK_INTERP_BILINEAR);
-#undef gtk_icon_theme_prepend_search_path
+ info = gtk_icon_info_new_for_pixbuf (icon_theme, scaled);
-void
-gtk_icon_theme_prepend_search_path (GtkIconTheme *icon_theme,
- const gchar *path)
-{
- gchar *utf8_path = g_locale_from_utf8 (path, -1, NULL, NULL, NULL);
+ g_object_unref (scaled);
+ }
+ else
+ {
+ info = gtk_icon_info_new_for_pixbuf (icon_theme, pixbuf);
+ }
- gtk_icon_theme_prepend_search_path_utf8 (icon_theme, utf8_path);
+ return info;
+ }
- g_free (utf8_path);
+ return NULL;
}
-#undef gtk_icon_info_get_filename
-
-G_CONST_RETURN gchar *
-gtk_icon_info_get_filename (GtkIconInfo *icon_info)
+/**
+ * gtk_icon_info_new_for_pixbuf:
+ * @icon_theme: a #GtkIconTheme
+ * @pixbuf: the pixbuf to wrap in a #GtkIconInfo
+ *
+ * Creates a #GtkIconInfo for a #GdkPixbuf.
+ *
+ * Return value: (transfer full): a #GtkIconInfo
+ *
+ * Since: 2.14
+ */
+GtkIconInfo *
+gtk_icon_info_new_for_pixbuf (GtkIconTheme *icon_theme,
+ GdkPixbuf *pixbuf)
{
- g_return_val_if_fail (icon_info != NULL, NULL);
+ GtkIconInfo *info;
- return icon_info->cp_filename;
-}
+ g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
+ g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#endif
+ info = icon_info_new ();
+ info->pixbuf = g_object_ref (pixbuf);
+ info->scale = 1.0;
+ info->dir_type = ICON_THEME_DIR_UNTHEMED;
-#define __GTK_ICON_THEME_C__
-#include "gtkaliasdef.c"
+ return info;
+}
projects / ~andy / gtk / blobdiff