* 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>
#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"
+#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"
typedef enum
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;
guint loading_themes : 1;
-
- char *current_theme;
- char *fallback_theme;
- char **search_path;
- int search_path_len;
/* 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;
-#if defined (G_OS_WIN32) && !defined (_WIN64)
- /* System codepage version of filename, for DLL ABI backward
- * compatibility functions.
- */
- gchar *cp_filename;
-#endif
+ GFile *icon_file;
GLoadableIcon *loadable;
GSList *emblem_infos;
GdkPixbuf *cache_pixbuf;
GtkIconData *data;
-
+
/* Information about the directory where
* the source was found
*/
gint desired_size;
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;
- guint ref_count;
+ SymbolicPixbufCache *symbolic_pixbuf_cache;
+
+ GtkRequisition *symbolic_pixbuf_size;
};
typedef struct
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)
/**
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
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;
xdg_data_dirs = g_get_system_data_dirs ();
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);
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;
{
GtkIconThemePrivate *priv = icon_theme->priv;
+ g_hash_table_remove_all (priv->info_cache);
+
if (!priv->themes_valid)
return;
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: (allow-none): (array length=n_elements) (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
- *
+ * @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
GKeyFile *theme_file;
GError *error = NULL;
IconThemeDirMtime *dir_mtime;
- struct stat stat_buf;
+ GStatBuf stat_buf;
priv = icon_theme->priv;
IconSuffix old_suffix, new_suffix;
GTimeVal tv;
IconThemeDirMtime *dir_mtime;
- struct stat stat_buf;
+ GStatBuf stat_buf;
priv = icon_theme->priv;
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);
}
if (was_valid)
{
g_signal_emit (icon_theme, signal_changed, 0);
+ }
+ }
+
+ priv->loading_themes = FALSE;
+}
- if (!priv->check_reload && priv->screen)
- {
- static GdkAtom atom_iconthemes = GDK_NONE;
- GdkEvent *event = gdk_event_new (GDK_CLIENT_EVENT);
- int i;
+/* 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.
+*/
- if (!atom_iconthemes)
- atom_iconthemes = gdk_atom_intern_static_string ("_GTK_LOAD_ICONTHEMES");
+static void
+ensure_lru_cache_space (GtkIconTheme *icon_theme)
+{
+ GtkIconThemePrivate *priv = icon_theme->priv;
+ GList *l;
- for (i = 0; i < 5; i++)
- event->client.data.l[i] = 0;
- event->client.data_format = 32;
- event->client.message_type = atom_iconthemes;
+ /* 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;
- gdk_screen_broadcast_client_message (priv->screen, event);
- }
- }
+ 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);
}
+}
- priv->loading_themes = FALSE;
+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 *
gboolean allow_svg;
gboolean use_builtin;
gint i;
+ IconInfoKey key;
priv = icon_theme->priv;
+ 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)
allow_svg = priv->pixbuf_supports_svg;
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)
{
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);
-#if defined (G_OS_WIN32) && !defined (_WIN64)
- 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)
+ if (icon_info)
{
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
{
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"),
+ 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");
}
}
* 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()
+ * Return value: (transfer full): a #GtkIconInfo object containing information
+ * about the icon, or %NULL if the icon wasn't found.
*
* Since: 2.4
*/
/**
* gtk_icon_theme_choose_icon:
* @icon_theme: a #GtkIconTheme
- * @icon_names: %NULL-terminated array of icon names to lookup
+ * @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
*
* tries them all in the given order before falling back to
* inherited icon themes.
*
- * Return value: a #GtkIconInfo structure containing information
- * about the icon, or %NULL if the icon wasn't found. Free with
- * gtk_icon_info_free()
+ * Return value: (transfer full): a #GtkIconInfo object containing information
+ * about the icon, or %NULL if the icon wasn't found.
*
* Since: 2.12
*/
* @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().
+ * 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.
- *
+ * @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
+ * 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
**/
}
pixbuf = gtk_icon_info_load_icon (icon_info, error);
- gtk_icon_info_free (icon_info);
+ g_object_unref (icon_info);
return pixbuf;
}
* 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
**/
/**
* 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.
* but will typically include such values as "Applications" and
* "MimeTypes".
*
- * Return value: (element-type utf8) (transfer none): 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
**/
* 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().
+ * 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
**/
IconThemeDirMtime *dir_mtime;
GList *d;
int stat_res;
- struct stat stat_buf;
+ GStatBuf stat_buf;
GTimeVal tv;
priv = icon_theme->priv;
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);
}
{
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);
-#if defined (G_OS_WIN32) && !defined (_WIN64)
- icon_info->cp_filename = g_locale_from_utf8 (icon_info->filename,
- -1, NULL, NULL, NULL);
-#endif
}
else
{
icon_info->filename = NULL;
-#if defined (G_OS_WIN32) && !defined (_WIN64)
- icon_info->cp_filename = NULL;
-#endif
+ icon_info->icon_file = NULL;
}
if (min_dir->icon_data != NULL)
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,
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_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)
{
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.;
- icon_info->ref_count = 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 *
}
/**
- * 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)
g_return_val_if_fail (icon_info != NULL, NULL);
- icon_info->ref_count++;
-
- return icon_info;
+ 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);
- icon_info->ref_count--;
- if (icon_info->ref_count > 0)
- return;
-
+ 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);
-#if defined (G_OS_WIN32) && !defined (_WIN64)
- g_free (icon_info->cp_filename);
-#endif
+ g_clear_object (&icon_info->icon_file);
+
if (icon_info->loadable)
g_object_unref (icon_info->loadable);
- g_slist_foreach (icon_info->emblem_infos, (GFunc)gtk_icon_info_free, NULL);
- g_slist_free (icon_info->emblem_infos);
+ 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_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);
- g_slice_free (GtkIconInfo, icon_info);
+ 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);
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);
g_object_unref (info->pixbuf);
info->pixbuf = icon;
}
+
+ 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 complicated logic for deciding
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 && !icon_info->loadable)
- {
- GFile *file;
-
- file = g_file_new_for_path (icon_info->filename);
- icon_info->loadable = G_LOADABLE_ICON (g_file_icon_new (file));
- g_object_unref (file);
- }
-
- is_svg = FALSE;
- if (G_IS_FILE_ICON (icon_info->loadable))
+ 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;
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: (allow-none): 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
* 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: 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.
+ * 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
**/
return NULL;
}
- return g_object_ref (icon_info->pixbuf);
+ /* 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 *
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 #GdkColor representing the foreground color of the icon
- * @success_color: (allow-none): a #GdkColor representing the warning color
+ * @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 #GdkColor representing the warning 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 #GdkColor representing the error 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: (allow-none): a #gboolean, returns whether the loaded icon
- * was a symbolic one and whether the @fg color was applied to it.
+ * @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.
*
* See the <ulink url="http://www.freedesktop.org/wiki/SymbolicIcons">Symbolic Icons spec</ulink>
* for more information about symbolic icons.
*
- * Return value: a #GdkPixbuf representing the loaded icon
+ * Return value: (transfer full): a #GdkPixbuf representing the loaded icon
*
* Since: 3.0
**/
GdkPixbuf *
-gtk_icon_info_load_symbolic (GtkIconInfo *icon_info,
- GdkColor *fg,
- GdkColor *success_color,
- GdkColor *warning_color,
- GdkColor *error_color,
- gboolean *was_symbolic,
- GError **error)
+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)
{
- GdkPixbuf *pixbuf;
- GInputStream *stream;
- gchar *data;
- gchar *css_fg;
- gchar *css_success;
- gchar *css_warning;
- gchar *css_error;
+ gchar *icon_uri;
+ gboolean is_symbolic;
+ g_return_val_if_fail (icon_info != NULL, NULL);
g_return_val_if_fail (fg != NULL, NULL);
- if (!icon_info->filename ||
- !g_str_has_suffix (icon_info->filename, "-symbolic.svg"))
- {
- if (was_symbolic)
- *was_symbolic = FALSE;
- return gtk_icon_info_load_icon (icon_info, error);
- }
+ 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 = TRUE;
+ *was_symbolic = is_symbolic;
- css_fg = gdk_color_to_css (fg);
- if (!warning_color)
+ 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)
{
- GdkColor warning_default_color = { 0, 0xf500, 0x7900, 0x3e00 };
- css_warning = gdk_color_to_css (&warning_default_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;
+
+ 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
- css_warning = gdk_color_to_css (warning_color);
- if (!error_color)
+ 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)
{
- GdkColor error_default_color = { 0, 0xcc00, 0x0000, 0x0000 };
- css_error = gdk_color_to_css (&error_default_color);
+ gtk_icon_info_load_icon_async (icon_info, cancellable, async_load_no_symbolic_cb, g_object_ref (task));
}
else
- css_error = gdk_color_to_css (error_color);
- if (!success_color)
{
- GdkColor success_default_color = { 0, 0x4e00, 0x9a00, 0x0600 };
- css_success = gdk_color_to_css (&success_default_color);
+ 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);
+ }
}
- else
- css_success = gdk_color_to_css (success_color);
-
- 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=\"16\"\n"
-" height=\"16\">\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=\"", icon_info->filename, "\"/>\n"
-"</svg>",
- NULL);
- g_free (css_fg);
- g_free (css_warning);
- g_free (css_success);
- g_free (css_error);
+ g_object_unref (task);
+}
- stream = g_memory_input_stream_new_from_data (data, -1, g_free);
+/**
+ * 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;
- 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 (was_symbolic)
+ *was_symbolic = data->is_symbolic;
- return pixbuf;
+ 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_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;
}
/**
* @icon_info: a #GtkIconInfo
* @style: a #GtkStyle to take the colors from
* @state: the widget state to use for colors
- * @was_symbolic: (allow-none): a #gboolean, returns whether the loaded icon
- * was a symbolic one and whether the @fg color was applied to it.
+ * @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.
*
*
* See gtk_icon_info_load_symbolic() for more details.
*
- * Return value: a #GdkPixbuf representing the loaded icon
+ * 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,
gboolean *was_symbolic,
GError **error)
{
- GdkColor success_color;
- GdkColor warning_color;
- GdkColor error_color;
- GdkColor *fg;
- GdkColor *success = NULL;
- GdkColor *warning = NULL;
- GdkColor *err = NULL;
+ 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;
- fg = &style->fg[state];
- if (gtk_style_lookup_color (style, "success_color", &success_color))
- success = &success_color;
- if (gtk_style_lookup_color (style, "warning_color", &warning_color))
- warning = &warning_color;
- if (gtk_style_lookup_color (style, "error_color", &error_color))
- err = &error_color;
+ 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);
- return gtk_icon_info_load_symbolic (icon_info, fg, success, warning, err,
- was_symbolic, error);
+ 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: (allow-none): (array length=n_points) (out): 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: (allow-none): location to store the number of points in @points, or %NULL
*
*
* 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);
* The icon can then be rendered into a pixbuf using
* gtk_icon_info_load_icon().
*
- * Return value: a #GtkIconInfo structure containing
+ * Return value: (transfer full): a #GtkIconInfo structure containing
* information about the icon, or %NULL if the icon
- * wasn't found. Free with gtk_icon_info_free()
+ * wasn't found. Unref with g_object_unref()
*
* Since: 2.14
*/
info = icon_info_new ();
info->loadable = G_LOADABLE_ICON (g_object_ref (icon));
+ 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;
{
GIcon *base, *emblem;
GList *list, *l;
- GtkIconInfo *emblem_info;
+ GtkIconInfo *base_info, *emblem_info;
+
+ 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));
- info = gtk_icon_theme_lookup_by_gicon (icon_theme, base, size, flags);
- if (info)
+ 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));
- emblem_info = gtk_icon_theme_lookup_by_gicon (icon_theme, emblem, size / 2, flags);
+ /* 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;
+
+ pixbuf = GDK_PIXBUF (icon);
+
+ if ((flags & GTK_ICON_LOOKUP_FORCE_SIZE) != 0)
+ {
+ gint width, height, max;
+ gdouble scale;
+ GdkPixbuf *scaled;
+
+ width = gdk_pixbuf_get_width (pixbuf);
+ height = gdk_pixbuf_get_height (pixbuf);
+ max = MAX (width, height);
+ scale = (gdouble) size / (gdouble) max;
+
+ scaled = gdk_pixbuf_scale_simple (pixbuf,
+ 0.5 + width * scale,
+ 0.5 + height * scale,
+ GDK_INTERP_BILINEAR);
+
+ info = gtk_icon_info_new_for_pixbuf (icon_theme, scaled);
+
+ g_object_unref (scaled);
+ }
+ else
+ {
+ info = gtk_icon_info_new_for_pixbuf (icon_theme, pixbuf);
+ }
return info;
}
*
* Creates a #GtkIconInfo for a #GdkPixbuf.
*
- * Returns: a #GtkIconInfo
+ * Return value: (transfer full): a #GtkIconInfo
*
* Since: 2.14
*/
return info;
}
-
-#if defined (G_OS_WIN32) && !defined (_WIN64)
-
-/* 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)
-{
- 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);
-}
-
-#undef gtk_icon_theme_get_search_path
-
-void
-gtk_icon_theme_get_search_path (GtkIconTheme *icon_theme,
- gchar **path[],
- gint *n_elements)
-{
- gint i, n;
-
- gtk_icon_theme_get_search_path_utf8 (icon_theme, path, &n);
-
- if (n_elements)
- *n_elements = n;
-
- if (path)
- {
- for (i = 0; i < n; i++)
- {
- gchar *tem = (*path)[i];
-
- (*path)[i] = g_locale_from_utf8 ((*path)[i], -1, NULL, NULL, NULL);
- g_free (tem);
- }
- }
-}
-
-#undef gtk_icon_theme_append_search_path
-
-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);
-
- gtk_icon_theme_append_search_path_utf8 (icon_theme, utf8_path);
-
- g_free (utf8_path);
-}
-
-#undef gtk_icon_theme_prepend_search_path
-
-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);
-
- gtk_icon_theme_prepend_search_path_utf8 (icon_theme, utf8_path);
-
- g_free (utf8_path);
-}
-
-#undef gtk_icon_info_get_filename
-
-G_CONST_RETURN gchar *
-gtk_icon_info_get_filename (GtkIconInfo *icon_info)
-{
- g_return_val_if_fail (icon_info != NULL, NULL);
-
- return icon_info->cp_filename;
-}
-
-#endif
projects / ~andy / gtk / blobdiff