X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkiconfactory.c;h=b40267335b0a78c0a1ec613de399e2a2422de375;hb=e1edc998a2e9c557030d207533932b3120e13fe5;hp=6bcc09f9c331a995fb7174cf188d66d3c6ca99d6;hpb=57223c9a056bfff1635ddd1e67f660cd5a61e9ff;p=~andy%2Fgtk diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 6bcc09f9c..b40267335 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -12,37 +12,143 @@ * 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 . */ /* * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #include "config.h" + #include #include #include + #include "gtkiconfactory.h" #include "gtkiconcache.h" #include "gtkdebug.h" #include "gtkicontheme.h" -#include "gtksettings.h" +#include "gtksettingsprivate.h" #include "gtkstock.h" #include "gtkwidget.h" #include "gtkintl.h" #include "gtkbuildable.h" #include "gtkbuilderprivate.h" -#include "gtkalias.h" +#include "gtktypebuiltins.h" +#include "deprecated/gtkstyle.h" + + +/** + * SECTION:gtkiconfactory + * @Short_description: Manipulating stock icons + * @Title: Themeable Stock Images + * + * Browse the available stock icons in the list of stock IDs found here. You can also use + * the gtk-demo application for this purpose. + * + * An icon factory manages a collection of #GtkIconSet; a #GtkIconSet manages a + * set of variants of a particular icon (i.e. a #GtkIconSet contains variants for + * different sizes and widget states). Icons in an icon factory are named by a + * stock ID, which is a simple string identifying the icon. Each #GtkStyle has a + * list of #GtkIconFactory derived from the current theme; those icon factories + * are consulted first when searching for an icon. If the theme doesn't set a + * particular icon, GTK+ looks for the icon in a list of default icon factories, + * maintained by gtk_icon_factory_add_default() and + * gtk_icon_factory_remove_default(). Applications with icons should add a default + * icon factory with their icons, which will allow themes to override the icons + * for the application. + * + * To display an icon, always use gtk_style_lookup_icon_set() on the widget that + * will display the icon, or the convenience function + * gtk_widget_render_icon(). These functions take the theme into account when + * looking up the icon to use for a given stock ID. + * + * + * GtkIconFactory as GtkBuildable + * + * GtkIconFactory supports a custom <sources> element, which can contain + * multiple <source> elements. + * The following attributes are allowed: + * + * + * stock-id + * + * The stock id of the source, a string. + * This attribute is mandatory + * + * + * + * filename + * + * The filename of the source, a string. + * This attribute is optional + * + * + * + * icon-name + * + * The icon name for the source, a string. + * This attribute is optional. + * + * + * + * size + * + * Size of the icon, a #GtkIconSize enum value. + * This attribute is optional. + * + * + * + * direction + * + * Direction of the source, a #GtkTextDirection enum value. + * This attribute is optional. + * + * + * + * state + * + * State of the source, a #GtkStateType enum value. + * This attribute is optional. + * + * + * + * + * A #GtkIconFactory UI definition fragment. + * + * + * + * + * + * + * + * + * apple-red + * True + * + * + * + * ]]> + * + * + * + * + */ static GSList *all_icon_factories = NULL; +struct _GtkIconFactoryPrivate +{ + GHashTable *icons; +}; + typedef enum { GTK_ICON_SOURCE_EMPTY, GTK_ICON_SOURCE_ICON_NAME, @@ -54,7 +160,7 @@ typedef enum { struct _GtkIconSource { GtkIconSourceType type; - + union { gchar *icon_name; gchar *filename; @@ -74,13 +180,6 @@ struct _GtkIconSource guint any_direction : 1; guint any_state : 1; guint any_size : 1; - -#ifdef G_OS_WIN32 - /* System codepage version of filename, for DLL ABI backward - * compatibility functions. - */ - gchar *cp_filename; -#endif }; @@ -118,7 +217,14 @@ G_DEFINE_TYPE_WITH_CODE (GtkIconFactory, gtk_icon_factory, G_TYPE_OBJECT, static void gtk_icon_factory_init (GtkIconFactory *factory) { - factory->icons = g_hash_table_new (g_str_hash, g_str_equal); + GtkIconFactoryPrivate *priv; + + factory->priv = G_TYPE_INSTANCE_GET_PRIVATE (factory, + GTK_TYPE_ICON_FACTORY, + GtkIconFactoryPrivate); + priv = factory->priv; + + priv->icons = g_hash_table_new (g_str_hash, g_str_equal); all_icon_factories = g_slist_prepend (all_icon_factories, factory); } @@ -126,8 +232,10 @@ static void gtk_icon_factory_class_init (GtkIconFactoryClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - + object_class->finalize = gtk_icon_factory_finalize; + + g_type_class_add_private (klass, sizeof (GtkIconFactoryPrivate)); } static void @@ -148,13 +256,14 @@ static void gtk_icon_factory_finalize (GObject *object) { GtkIconFactory *factory = GTK_ICON_FACTORY (object); + GtkIconFactoryPrivate *priv = factory->priv; all_icon_factories = g_slist_remove (all_icon_factories, factory); - - g_hash_table_foreach (factory->icons, free_icon_set, NULL); - - g_hash_table_destroy (factory->icons); - + + g_hash_table_foreach (priv->icons, free_icon_set, NULL); + + g_hash_table_destroy (priv->icons); + G_OBJECT_CLASS (gtk_icon_factory_parent_class)->finalize (object); } @@ -174,9 +283,9 @@ gtk_icon_factory_finalize (GObject *object) * gtk_icon_factory_remove_default(). Applications with icons should * add a default icon factory with their icons, which will allow * themes to override the icons for the application. - * + * * Return value: a new #GtkIconFactory - **/ + */ GtkIconFactory* gtk_icon_factory_new (void) { @@ -199,33 +308,33 @@ gtk_icon_factory_new (void) * override your application's default icons. If an icon already * existed in @factory for @stock_id, it is unreferenced and replaced * with the new @icon_set. - * - **/ + */ void gtk_icon_factory_add (GtkIconFactory *factory, const gchar *stock_id, GtkIconSet *icon_set) { + GtkIconFactoryPrivate *priv = factory->priv; gpointer old_key = NULL; gpointer old_value = NULL; g_return_if_fail (GTK_IS_ICON_FACTORY (factory)); g_return_if_fail (stock_id != NULL); - g_return_if_fail (icon_set != NULL); + g_return_if_fail (icon_set != NULL); - g_hash_table_lookup_extended (factory->icons, stock_id, + g_hash_table_lookup_extended (priv->icons, stock_id, &old_key, &old_value); if (old_value == icon_set) return; - + gtk_icon_set_ref (icon_set); /* GHashTable key memory management is so fantastically broken. */ if (old_key) - g_hash_table_insert (factory->icons, old_key, icon_set); + g_hash_table_insert (priv->icons, old_key, icon_set); else - g_hash_table_insert (factory->icons, g_strdup (stock_id), icon_set); + g_hash_table_insert (priv->icons, g_strdup (stock_id), icon_set); if (old_value) gtk_icon_set_unref (old_value); @@ -235,47 +344,49 @@ gtk_icon_factory_add (GtkIconFactory *factory, * gtk_icon_factory_lookup: * @factory: a #GtkIconFactory * @stock_id: an icon name - * + * * Looks up @stock_id in the icon factory, returning an icon set * if found, otherwise %NULL. For display to the user, you should * use gtk_style_lookup_icon_set() on the #GtkStyle for the * widget that will display the icon, instead of using this * function directly, so that themes are taken into account. - * - * Return value: icon set of @stock_id. - **/ + * + * Return value: (transfer none): icon set of @stock_id. + */ GtkIconSet * gtk_icon_factory_lookup (GtkIconFactory *factory, const gchar *stock_id) { + GtkIconFactoryPrivate *priv; + g_return_val_if_fail (GTK_IS_ICON_FACTORY (factory), NULL); g_return_val_if_fail (stock_id != NULL, NULL); - - return g_hash_table_lookup (factory->icons, stock_id); + + priv = factory->priv; + + return g_hash_table_lookup (priv->icons, stock_id); } -static GtkIconFactory *gtk_default_icons = NULL; static GSList *default_factories = NULL; /** * gtk_icon_factory_add_default: * @factory: a #GtkIconFactory - * + * * Adds an icon factory to the list of icon factories searched by * gtk_style_lookup_icon_set(). This means that, for example, * gtk_image_new_from_stock() will be able to find icons in @factory. * There will normally be an icon factory added for each library or * application that comes with icons. The default icon factories * can be overridden by themes. - * - **/ + */ void gtk_icon_factory_add_default (GtkIconFactory *factory) { g_return_if_fail (GTK_IS_ICON_FACTORY (factory)); g_object_ref (factory); - + default_factories = g_slist_prepend (default_factories, factory); } @@ -286,8 +397,7 @@ gtk_icon_factory_add_default (GtkIconFactory *factory) * Removes an icon factory from the list of default icon * factories. Not normally used; you might use it for a library that * can be unloaded or shut down. - * - **/ + */ void gtk_icon_factory_remove_default (GtkIconFactory *factory) { @@ -298,15 +408,32 @@ gtk_icon_factory_remove_default (GtkIconFactory *factory) g_object_unref (factory); } -void -_gtk_icon_factory_ensure_default_icons (void) +static GtkIconFactory * +_gtk_icon_factory_get_default_icons (void) { - if (gtk_default_icons == NULL) - { - gtk_default_icons = gtk_icon_factory_new (); + static GtkIconFactory *default_icons = NULL; + GtkIconFactory *icons = NULL; + GdkScreen *screen = gdk_screen_get_default (); - get_default_icons (gtk_default_icons); + if (screen) + icons = g_object_get_data (G_OBJECT (screen), "gtk-default-icons"); + + if (icons == NULL) + { + if (default_icons == NULL) + { + default_icons = gtk_icon_factory_new (); + get_default_icons (default_icons); + } + if (screen) + g_object_set_data_full (G_OBJECT (screen), + I_("gtk-default-icons"), + default_icons, + g_object_unref); + icons = default_icons; } + + return icons; } /** @@ -318,17 +445,17 @@ _gtk_icon_factory_ensure_default_icons (void) * the #GtkStyle for the widget that will display the icon, instead of * using this function directly, so that themes are taken into * account. - * - * - * Return value: a #GtkIconSet, or %NULL - **/ + * + * Return value: (transfer none): a #GtkIconSet, or %NULL + */ GtkIconSet * gtk_icon_factory_lookup_default (const gchar *stock_id) { GSList *tmp_list; + GtkIconFactory *default_icons; g_return_val_if_fail (stock_id != NULL, NULL); - + tmp_list = default_factories; while (tmp_list != NULL) { @@ -338,26 +465,30 @@ gtk_icon_factory_lookup_default (const gchar *stock_id) if (icon_set) return icon_set; - + tmp_list = g_slist_next (tmp_list); } - _gtk_icon_factory_ensure_default_icons (); - - return gtk_icon_factory_lookup (gtk_default_icons, stock_id); + default_icons = _gtk_icon_factory_get_default_icons (); + if (default_icons) + return gtk_icon_factory_lookup (default_icons, stock_id); + else + return NULL; } static void register_stock_icon (GtkIconFactory *factory, - const gchar *stock_id) + const gchar *stock_id, + const gchar *icon_name) { GtkIconSet *set = gtk_icon_set_new (); GtkIconSource source = GTK_ICON_SOURCE_INIT (TRUE, TRUE, TRUE); source.type = GTK_ICON_SOURCE_STATIC_ICON_NAME; - source.source.icon_name = (gchar *)stock_id; + source.source.icon_name = (gchar *)icon_name; + source.direction = GTK_TEXT_DIR_NONE; gtk_icon_set_add_source (set, &source); - + gtk_icon_factory_add (factory, stock_id, set); gtk_icon_set_unref (set); } @@ -365,22 +496,21 @@ register_stock_icon (GtkIconFactory *factory, static void register_bidi_stock_icon (GtkIconFactory *factory, const gchar *stock_id, - const gchar *stock_id_ltr, - const gchar *stock_id_rtl) + const gchar *icon_name) { GtkIconSet *set = gtk_icon_set_new (); GtkIconSource source = GTK_ICON_SOURCE_INIT (FALSE, TRUE, TRUE); source.type = GTK_ICON_SOURCE_STATIC_ICON_NAME; - source.source.icon_name = (gchar *)stock_id_ltr; + source.source.icon_name = (gchar *)icon_name; source.direction = GTK_TEXT_DIR_LTR; gtk_icon_set_add_source (set, &source); - + source.type = GTK_ICON_SOURCE_STATIC_ICON_NAME; - source.source.icon_name = (gchar *)stock_id_rtl; + source.source.icon_name = (gchar *)icon_name; source.direction = GTK_TEXT_DIR_RTL; gtk_icon_set_add_source (set, &source); - + gtk_icon_factory_add (factory, stock_id, set); gtk_icon_set_unref (set); } @@ -390,156 +520,110 @@ get_default_icons (GtkIconFactory *factory) { /* KEEP IN SYNC with gtkstock.c */ - register_stock_icon (factory, GTK_STOCK_DIALOG_AUTHENTICATION); - register_stock_icon (factory, GTK_STOCK_DIALOG_ERROR); - register_stock_icon (factory, GTK_STOCK_DIALOG_INFO); - register_stock_icon (factory, GTK_STOCK_DIALOG_QUESTION); - register_stock_icon (factory, GTK_STOCK_DIALOG_WARNING); - register_stock_icon (factory, GTK_STOCK_DND); - register_stock_icon (factory, GTK_STOCK_DND_MULTIPLE); - register_stock_icon (factory, GTK_STOCK_APPLY); - register_stock_icon (factory, GTK_STOCK_CANCEL); - register_stock_icon (factory, GTK_STOCK_NO); - register_stock_icon (factory, GTK_STOCK_OK); - register_stock_icon (factory, GTK_STOCK_YES); - register_stock_icon (factory, GTK_STOCK_CLOSE); - register_stock_icon (factory, GTK_STOCK_ADD); - register_stock_icon (factory, GTK_STOCK_JUSTIFY_CENTER); - register_stock_icon (factory, GTK_STOCK_JUSTIFY_FILL); - register_stock_icon (factory, GTK_STOCK_JUSTIFY_LEFT); - register_stock_icon (factory, GTK_STOCK_JUSTIFY_RIGHT); - register_stock_icon (factory, GTK_STOCK_GOTO_BOTTOM); - register_stock_icon (factory, GTK_STOCK_CDROM); - register_stock_icon (factory, GTK_STOCK_CONVERT); - register_stock_icon (factory, GTK_STOCK_COPY); - register_stock_icon (factory, GTK_STOCK_CUT); - register_stock_icon (factory, GTK_STOCK_GO_DOWN); - register_stock_icon (factory, GTK_STOCK_EXECUTE); - register_stock_icon (factory, GTK_STOCK_QUIT); - register_bidi_stock_icon (factory, - GTK_STOCK_GOTO_FIRST, - GTK_STOCK_GOTO_FIRST "-ltr", - GTK_STOCK_GOTO_FIRST "-rtl"); - register_stock_icon (factory, GTK_STOCK_SELECT_FONT); - register_stock_icon (factory, GTK_STOCK_FULLSCREEN); - register_stock_icon (factory, GTK_STOCK_LEAVE_FULLSCREEN); - register_stock_icon (factory, GTK_STOCK_HARDDISK); - register_stock_icon (factory, GTK_STOCK_HELP); - register_stock_icon (factory, GTK_STOCK_HOME); - register_stock_icon (factory, GTK_STOCK_INFO); - register_bidi_stock_icon (factory, - GTK_STOCK_JUMP_TO, - GTK_STOCK_JUMP_TO "-ltr", - GTK_STOCK_JUMP_TO "-rtl"); - register_bidi_stock_icon (factory, - GTK_STOCK_GOTO_LAST, - GTK_STOCK_GOTO_LAST "-ltr", - GTK_STOCK_GOTO_LAST "-rtl"); - register_bidi_stock_icon (factory, - GTK_STOCK_GO_BACK, - GTK_STOCK_GO_BACK "-ltr", - GTK_STOCK_GO_BACK "-rtl"); - register_stock_icon (factory, GTK_STOCK_MISSING_IMAGE); - register_stock_icon (factory, GTK_STOCK_NETWORK); - register_stock_icon (factory, GTK_STOCK_NEW); - register_stock_icon (factory, GTK_STOCK_OPEN); - register_stock_icon (factory, GTK_STOCK_ORIENTATION_PORTRAIT); - register_stock_icon (factory, GTK_STOCK_ORIENTATION_LANDSCAPE); - register_stock_icon (factory, GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT); - register_stock_icon (factory, GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE); - register_stock_icon (factory, GTK_STOCK_PAGE_SETUP); - register_stock_icon (factory, GTK_STOCK_PASTE); - register_stock_icon (factory, GTK_STOCK_PREFERENCES); - register_stock_icon (factory, GTK_STOCK_PRINT); - register_stock_icon (factory, GTK_STOCK_PRINT_ERROR); - register_stock_icon (factory, GTK_STOCK_PRINT_PREVIEW); - register_stock_icon (factory, GTK_STOCK_PRINT_REPORT); - register_stock_icon (factory, GTK_STOCK_PRINT_WARNING); - register_stock_icon (factory, GTK_STOCK_PROPERTIES); - register_bidi_stock_icon (factory, - GTK_STOCK_REDO, - GTK_STOCK_REDO "-ltr", - GTK_STOCK_REDO "-rtl"); - register_stock_icon (factory, GTK_STOCK_REMOVE); - register_stock_icon (factory, GTK_STOCK_REFRESH); - register_bidi_stock_icon (factory, - GTK_STOCK_REVERT_TO_SAVED, - GTK_STOCK_REVERT_TO_SAVED "-ltr", - GTK_STOCK_REVERT_TO_SAVED "-rtl"); - register_bidi_stock_icon (factory, - GTK_STOCK_GO_FORWARD, - GTK_STOCK_GO_FORWARD "-ltr", - GTK_STOCK_GO_FORWARD "-rtl"); - register_stock_icon (factory, GTK_STOCK_SAVE); - register_stock_icon (factory, GTK_STOCK_FLOPPY); - register_stock_icon (factory, GTK_STOCK_SAVE_AS); - register_stock_icon (factory, GTK_STOCK_FIND); - register_stock_icon (factory, GTK_STOCK_FIND_AND_REPLACE); - register_stock_icon (factory, GTK_STOCK_SORT_DESCENDING); - register_stock_icon (factory, GTK_STOCK_SORT_ASCENDING); - register_stock_icon (factory, GTK_STOCK_SPELL_CHECK); - register_stock_icon (factory, GTK_STOCK_STOP); - register_stock_icon (factory, GTK_STOCK_BOLD); - register_stock_icon (factory, GTK_STOCK_ITALIC); - register_stock_icon (factory, GTK_STOCK_STRIKETHROUGH); - register_stock_icon (factory, GTK_STOCK_UNDERLINE); - register_bidi_stock_icon (factory, - GTK_STOCK_INDENT, - GTK_STOCK_INDENT "-ltr", - GTK_STOCK_INDENT "-rtl"); - register_bidi_stock_icon (factory, - GTK_STOCK_UNINDENT, - GTK_STOCK_UNINDENT "-ltr", - GTK_STOCK_UNINDENT "-rtl"); - register_stock_icon (factory, GTK_STOCK_GOTO_TOP); - register_stock_icon (factory, GTK_STOCK_DELETE); - register_bidi_stock_icon (factory, - GTK_STOCK_UNDELETE, - GTK_STOCK_UNDELETE "-ltr", - GTK_STOCK_UNDELETE "-rtl"); - register_bidi_stock_icon (factory, - GTK_STOCK_UNDO, - GTK_STOCK_UNDO "-ltr", - GTK_STOCK_UNDO "-rtl"); - register_stock_icon (factory, GTK_STOCK_GO_UP); - register_stock_icon (factory, GTK_STOCK_FILE); - register_stock_icon (factory, GTK_STOCK_DIRECTORY); - register_stock_icon (factory, GTK_STOCK_ABOUT); - register_stock_icon (factory, GTK_STOCK_CONNECT); - register_stock_icon (factory, GTK_STOCK_DISCONNECT); - register_stock_icon (factory, GTK_STOCK_EDIT); - register_bidi_stock_icon (factory, - GTK_STOCK_MEDIA_FORWARD, - GTK_STOCK_MEDIA_FORWARD "-ltr", - GTK_STOCK_MEDIA_FORWARD "-rtl"); - register_bidi_stock_icon (factory, - GTK_STOCK_MEDIA_NEXT, - GTK_STOCK_MEDIA_NEXT "-ltr", - GTK_STOCK_MEDIA_NEXT "-rtl"); - register_stock_icon (factory, GTK_STOCK_MEDIA_PAUSE); - register_bidi_stock_icon (factory, - GTK_STOCK_MEDIA_PLAY, - GTK_STOCK_MEDIA_PLAY "-ltr", - GTK_STOCK_MEDIA_PLAY "-rtl"); - register_bidi_stock_icon (factory, - GTK_STOCK_MEDIA_PREVIOUS, - GTK_STOCK_MEDIA_PREVIOUS "-ltr", - GTK_STOCK_MEDIA_PREVIOUS "-rtl"); - register_stock_icon (factory, GTK_STOCK_MEDIA_RECORD); - register_bidi_stock_icon (factory, - GTK_STOCK_MEDIA_REWIND, - GTK_STOCK_MEDIA_REWIND "-ltr", - GTK_STOCK_MEDIA_REWIND "-rtl"); - register_stock_icon (factory, GTK_STOCK_MEDIA_STOP); - register_stock_icon (factory, GTK_STOCK_INDEX); - register_stock_icon (factory, GTK_STOCK_ZOOM_100); - register_stock_icon (factory, GTK_STOCK_ZOOM_IN); - register_stock_icon (factory, GTK_STOCK_ZOOM_OUT); - register_stock_icon (factory, GTK_STOCK_ZOOM_FIT); - register_stock_icon (factory, GTK_STOCK_SELECT_ALL); - register_stock_icon (factory, GTK_STOCK_CLEAR); - register_stock_icon (factory, GTK_STOCK_SELECT_COLOR); - register_stock_icon (factory, GTK_STOCK_COLOR_PICKER); + register_stock_icon (factory, GTK_STOCK_DIALOG_AUTHENTICATION, "dialog-password"); + register_stock_icon (factory, GTK_STOCK_DIALOG_ERROR, "dialog-error"); + register_stock_icon (factory, GTK_STOCK_DIALOG_INFO, "dialog-information"); + register_stock_icon (factory, GTK_STOCK_DIALOG_QUESTION, "dialog-question"); + register_stock_icon (factory, GTK_STOCK_DIALOG_WARNING, "dialog-warning"); + register_stock_icon (factory, GTK_STOCK_DND, GTK_STOCK_DND); + register_stock_icon (factory, GTK_STOCK_DND_MULTIPLE, GTK_STOCK_DND_MULTIPLE); + register_stock_icon (factory, GTK_STOCK_APPLY, GTK_STOCK_APPLY); + register_stock_icon (factory, GTK_STOCK_CANCEL, GTK_STOCK_CANCEL); + register_stock_icon (factory, GTK_STOCK_NO, GTK_STOCK_NO); + register_stock_icon (factory, GTK_STOCK_OK, GTK_STOCK_OK); + register_stock_icon (factory, GTK_STOCK_YES, GTK_STOCK_YES); + register_stock_icon (factory, GTK_STOCK_CLOSE, "window-close"); + register_stock_icon (factory, GTK_STOCK_ADD, "list-add"); + register_stock_icon (factory, GTK_STOCK_JUSTIFY_CENTER, "format-justify-center"); + register_stock_icon (factory, GTK_STOCK_JUSTIFY_FILL, "format-justify-fill"); + register_stock_icon (factory, GTK_STOCK_JUSTIFY_LEFT, "format-justify-left"); + register_stock_icon (factory, GTK_STOCK_JUSTIFY_RIGHT, "format-justify-right"); + register_stock_icon (factory, GTK_STOCK_GOTO_BOTTOM, "go-bottom"); + register_stock_icon (factory, GTK_STOCK_CDROM, "media-optical"); + register_stock_icon (factory, GTK_STOCK_CONVERT, GTK_STOCK_CONVERT); + register_stock_icon (factory, GTK_STOCK_COPY, "edit-copy"); + register_stock_icon (factory, GTK_STOCK_CUT, "edit-cut"); + register_stock_icon (factory, GTK_STOCK_GO_DOWN, "go-down"); + register_stock_icon (factory, GTK_STOCK_EXECUTE, "system-run"); + register_stock_icon (factory, GTK_STOCK_QUIT, "application-exit"); + register_bidi_stock_icon (factory, GTK_STOCK_GOTO_FIRST, "go-first"); + register_stock_icon (factory, GTK_STOCK_SELECT_FONT, GTK_STOCK_SELECT_FONT); + register_stock_icon (factory, GTK_STOCK_FULLSCREEN, "view-fullscreen"); + register_stock_icon (factory, GTK_STOCK_LEAVE_FULLSCREEN, "view-restore"); + register_stock_icon (factory, GTK_STOCK_HARDDISK, "drive-harddisk"); + register_stock_icon (factory, GTK_STOCK_HELP, "help-contents"); + register_stock_icon (factory, GTK_STOCK_HOME, "go-home"); + register_stock_icon (factory, GTK_STOCK_INFO, "dialog-information"); + register_bidi_stock_icon (factory, GTK_STOCK_JUMP_TO, "go-jump"); + register_bidi_stock_icon (factory, GTK_STOCK_GOTO_LAST, "go-last"); + register_bidi_stock_icon (factory, GTK_STOCK_GO_BACK, "go-previous"); + register_stock_icon (factory, GTK_STOCK_MISSING_IMAGE, "image-missing"); + register_stock_icon (factory, GTK_STOCK_NETWORK, "network-idle"); + register_stock_icon (factory, GTK_STOCK_NEW, "document-new"); + register_stock_icon (factory, GTK_STOCK_OPEN, "document-open"); + register_stock_icon (factory, GTK_STOCK_ORIENTATION_PORTRAIT, GTK_STOCK_ORIENTATION_PORTRAIT); + register_stock_icon (factory, GTK_STOCK_ORIENTATION_LANDSCAPE, GTK_STOCK_ORIENTATION_LANDSCAPE); + register_stock_icon (factory, GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT, GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT); + register_stock_icon (factory, GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE, GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE); + register_stock_icon (factory, GTK_STOCK_PAGE_SETUP, GTK_STOCK_PAGE_SETUP); + register_stock_icon (factory, GTK_STOCK_PASTE, "edit-paste"); + register_stock_icon (factory, GTK_STOCK_PREFERENCES, GTK_STOCK_PREFERENCES); + register_stock_icon (factory, GTK_STOCK_PRINT, "document-print"); + register_stock_icon (factory, GTK_STOCK_PRINT_ERROR, "printer-error"); + register_stock_icon (factory, GTK_STOCK_PRINT_PAUSED, "printer-paused"); + register_stock_icon (factory, GTK_STOCK_PRINT_PREVIEW, "document-print-preview"); + register_stock_icon (factory, GTK_STOCK_PRINT_REPORT, "printer-info"); + register_stock_icon (factory, GTK_STOCK_PRINT_WARNING, "printer-warning"); + register_stock_icon (factory, GTK_STOCK_PROPERTIES, "document-properties"); + register_bidi_stock_icon (factory, GTK_STOCK_REDO, "edit-redo"); + register_stock_icon (factory, GTK_STOCK_REMOVE, "list-remove"); + register_stock_icon (factory, GTK_STOCK_REFRESH, "view-refresh"); + register_bidi_stock_icon (factory, GTK_STOCK_REVERT_TO_SAVED, "document-revert"); + register_bidi_stock_icon (factory, GTK_STOCK_GO_FORWARD, "go-next"); + register_stock_icon (factory, GTK_STOCK_SAVE, "document-save"); + register_stock_icon (factory, GTK_STOCK_FLOPPY, "media-floppy"); + register_stock_icon (factory, GTK_STOCK_SAVE_AS, "document-save-as"); + register_stock_icon (factory, GTK_STOCK_FIND, "edit-find"); + register_stock_icon (factory, GTK_STOCK_FIND_AND_REPLACE, "edit-find-replace"); + register_stock_icon (factory, GTK_STOCK_SORT_DESCENDING, "view-sort-descending"); + register_stock_icon (factory, GTK_STOCK_SORT_ASCENDING, "view-sort-ascending"); + register_stock_icon (factory, GTK_STOCK_SPELL_CHECK, "tools-check-spelling"); + register_stock_icon (factory, GTK_STOCK_STOP, "process-stop"); + register_stock_icon (factory, GTK_STOCK_BOLD, "format-text-bold"); + register_stock_icon (factory, GTK_STOCK_ITALIC, "format-text-italic"); + register_stock_icon (factory, GTK_STOCK_STRIKETHROUGH, "format-text-strikethrough"); + register_stock_icon (factory, GTK_STOCK_UNDERLINE, "format-text-underline"); + register_bidi_stock_icon (factory, GTK_STOCK_INDENT, "format-indent-more"); + register_bidi_stock_icon (factory, GTK_STOCK_UNINDENT, "format-indent-less"); + register_stock_icon (factory, GTK_STOCK_GOTO_TOP, "go-top"); + register_stock_icon (factory, GTK_STOCK_DELETE, "edit-delete"); + register_bidi_stock_icon (factory, GTK_STOCK_UNDELETE, GTK_STOCK_UNDELETE); + register_bidi_stock_icon (factory, GTK_STOCK_UNDO, "edit-undo"); + register_stock_icon (factory, GTK_STOCK_GO_UP, "go-up"); + register_stock_icon (factory, GTK_STOCK_FILE, "text-x-generic"); + register_stock_icon (factory, GTK_STOCK_DIRECTORY, "folder"); + register_stock_icon (factory, GTK_STOCK_ABOUT, "help-about"); + register_stock_icon (factory, GTK_STOCK_CONNECT, GTK_STOCK_CONNECT); + register_stock_icon (factory, GTK_STOCK_DISCONNECT, GTK_STOCK_DISCONNECT); + register_stock_icon (factory, GTK_STOCK_EDIT, GTK_STOCK_EDIT); + register_stock_icon (factory, GTK_STOCK_CAPS_LOCK_WARNING, GTK_STOCK_CAPS_LOCK_WARNING); + register_bidi_stock_icon (factory, GTK_STOCK_MEDIA_FORWARD, "media-seek-forward"); + register_bidi_stock_icon (factory, GTK_STOCK_MEDIA_NEXT, "media-skip-forward"); + register_stock_icon (factory, GTK_STOCK_MEDIA_PAUSE, "media-playback-pause"); + register_bidi_stock_icon (factory, GTK_STOCK_MEDIA_PLAY, "media-playback-start"); + register_bidi_stock_icon (factory, GTK_STOCK_MEDIA_PREVIOUS, "media-skip-backward"); + register_stock_icon (factory, GTK_STOCK_MEDIA_RECORD, "media-record"); + register_bidi_stock_icon (factory, GTK_STOCK_MEDIA_REWIND, "media-seek-backward"); + register_stock_icon (factory, GTK_STOCK_MEDIA_STOP, "media-playback-stop"); + register_stock_icon (factory, GTK_STOCK_INDEX, GTK_STOCK_INDEX); + register_stock_icon (factory, GTK_STOCK_ZOOM_100, "zoom-original"); + register_stock_icon (factory, GTK_STOCK_ZOOM_IN, "zoom-in"); + register_stock_icon (factory, GTK_STOCK_ZOOM_OUT, "zoom-out"); + register_stock_icon (factory, GTK_STOCK_ZOOM_FIT, "zoom-fit-best"); + register_stock_icon (factory, GTK_STOCK_SELECT_ALL, "edit-select-all"); + register_stock_icon (factory, GTK_STOCK_CLEAR, "edit-clear"); + register_stock_icon (factory, GTK_STOCK_SELECT_COLOR, GTK_STOCK_SELECT_COLOR); + register_stock_icon (factory, GTK_STOCK_COLOR_PICKER, GTK_STOCK_COLOR_PICKER); } /************************************************************ @@ -552,7 +636,7 @@ struct _IconSize { gint size; gchar *name; - + gint width; gint height; }; @@ -587,7 +671,7 @@ init_icon_sizes (void) gint i; icon_aliases = g_hash_table_new (g_str_hash, g_str_equal); - + icon_sizes = g_new (IconSize, NUM_BUILTIN_SIZES); icon_sizes_allocated = NUM_BUILTIN_SIZES; icon_sizes_used = NUM_BUILTIN_SIZES; @@ -602,7 +686,7 @@ init_icon_sizes (void) * Even if we did I suppose removing the builtin sizes would be * disallowed. */ - + icon_sizes[GTK_ICON_SIZE_MENU].size = GTK_ICON_SIZE_MENU; icon_sizes[GTK_ICON_SIZE_MENU].name = "gtk-menu"; icon_sizes[GTK_ICON_SIZE_MENU].width = 16; @@ -617,7 +701,7 @@ init_icon_sizes (void) icon_sizes[GTK_ICON_SIZE_SMALL_TOOLBAR].name = "gtk-small-toolbar"; icon_sizes[GTK_ICON_SIZE_SMALL_TOOLBAR].width = 18; icon_sizes[GTK_ICON_SIZE_SMALL_TOOLBAR].height = 18; - + icon_sizes[GTK_ICON_SIZE_LARGE_TOOLBAR].size = GTK_ICON_SIZE_LARGE_TOOLBAR; icon_sizes[GTK_ICON_SIZE_LARGE_TOOLBAR].name = "gtk-large-toolbar"; icon_sizes[GTK_ICON_SIZE_LARGE_TOOLBAR].width = 24; @@ -640,10 +724,10 @@ init_icon_sizes (void) while (i < NUM_BUILTIN_SIZES) { gtk_icon_size_register_alias (icon_sizes[i].name, icon_sizes[i].size); - + ++i; } - + #undef NUM_BUILTIN_SIZES } } @@ -693,7 +777,7 @@ icon_size_set_for_settings (GtkSettings *settings, if (size == GTK_ICON_SIZE_INVALID) /* Reserve a place */ size = icon_size_register_intern (size_name, -1, -1); - + settings_sizes = get_settings_sizes (settings, NULL); if (size >= settings_sizes->len) { @@ -705,7 +789,7 @@ icon_size_set_for_settings (GtkSettings *settings, } settings_size = &g_array_index (settings_sizes, SettingsIconSize, size); - + settings_size->width = width; settings_size->height = height; } @@ -719,7 +803,7 @@ scan_icon_size_name (const char **pos, GString *out) while (g_ascii_isspace (*p)) p++; - + if (!((*p >= 'A' && *p <= 'Z') || (*p >= 'a' && *p <= 'z') || *p == '_' || *p == '-')) @@ -753,7 +837,7 @@ icon_size_setting_parse (GtkSettings *settings, while (pango_skip_space (&p)) { gint width, height; - + if (!scan_icon_size_name (&p, name_buf)) goto err; @@ -833,7 +917,7 @@ icon_size_settings_changed (GtkSettings *settings, { icon_size_set_all_from_settings (settings); - gtk_rc_reset_styles (settings); + gtk_style_context_reset_widgets (_gtk_settings_get_screen (settings)); } static void @@ -843,10 +927,10 @@ icon_sizes_init_for_settings (GtkSettings *settings) "notify::gtk-icon-sizes", G_CALLBACK (icon_size_settings_changed), NULL); - + icon_size_set_all_from_settings (settings); } - + static gboolean icon_size_lookup_intern (GtkSettings *settings, GtkIconSize size, @@ -856,7 +940,7 @@ icon_size_lookup_intern (GtkSettings *settings, GArray *settings_sizes; gint width_for_settings = -1; gint height_for_settings = -1; - + init_icon_sizes (); if (size == (GtkIconSize)-1) @@ -871,17 +955,18 @@ icon_size_lookup_intern (GtkSettings *settings, if (settings) { gboolean initial = FALSE; - + settings_sizes = get_settings_sizes (settings, &initial); + if (initial) icon_sizes_init_for_settings (settings); - + if (size < settings_sizes->len) { SettingsIconSize *settings_size; - + settings_size = &g_array_index (settings_sizes, SettingsIconSize, size); - + width_for_settings = settings_size->width; height_for_settings = settings_size->height; } @@ -900,25 +985,25 @@ icon_size_lookup_intern (GtkSettings *settings, * gtk_icon_size_lookup_for_settings: * @settings: a #GtkSettings object, used to determine * which set of user preferences to used. - * @size: an icon size - * @width: location to store icon width - * @height: location to store icon height + * @size: (type int): an icon size + * @width: (out): location to store icon width + * @height: (out): location to store icon height * * Obtains the pixel size of a semantic icon size, possibly - * modified by user preferences for a particular + * modified by user preferences for a particular * #GtkSettings. Normally @size would be * #GTK_ICON_SIZE_MENU, #GTK_ICON_SIZE_BUTTON, etc. This function - * isn't normally needed, gtk_widget_render_icon() is the usual + * isn't normally needed, gtk_widget_render_icon_pixbuf() is the usual * way to get an icon for rendering, then just look at the size of * the rendered pixbuf. The rendered pixbuf may not even correspond to * the width/height returned by gtk_icon_size_lookup(), because themes * are free to render the pixbuf however they like, including changing * the usual size. - * + * * Return value: %TRUE if @size was a valid size * * Since: 2.2 - **/ + */ gboolean gtk_icon_size_lookup_for_settings (GtkSettings *settings, GtkIconSize size, @@ -932,24 +1017,24 @@ gtk_icon_size_lookup_for_settings (GtkSettings *settings, /** * gtk_icon_size_lookup: - * @size: an icon size - * @width: location to store icon width - * @height: location to store icon height + * @size: (type int): an icon size + * @width: (out): location to store icon width + * @height: (out): location to store icon height * * Obtains the pixel size of a semantic icon size, possibly * modified by user preferences for the default #GtkSettings. * (See gtk_icon_size_lookup_for_settings().) * Normally @size would be * #GTK_ICON_SIZE_MENU, #GTK_ICON_SIZE_BUTTON, etc. This function - * isn't normally needed, gtk_widget_render_icon() is the usual + * isn't normally needed, gtk_widget_render_icon_pixbuf() is the usual * way to get an icon for rendering, then just look at the size of * the rendered pixbuf. The rendered pixbuf may not even correspond to * the width/height returned by gtk_icon_size_lookup(), because themes * are free to render the pixbuf however they like, including changing * the usual size. - * + * * Return value: %TRUE if @size was a valid size - **/ + */ gboolean gtk_icon_size_lookup (GtkIconSize size, gint *widthp, @@ -969,7 +1054,7 @@ icon_size_register_intern (const gchar *name, { IconAlias *old_alias; GtkIconSize size; - + init_icon_sizes (); old_alias = g_hash_table_lookup (icon_aliases, name); @@ -1015,9 +1100,8 @@ icon_size_register_intern (const gchar *name, * Registers a new icon size, along the same lines as #GTK_ICON_SIZE_MENU, * etc. Returns the integer value for the size. * - * Returns: integer value representing the size - * - **/ + * Returns: (type int): integer value representing the size + */ GtkIconSize gtk_icon_size_register (const gchar *name, gint width, @@ -1026,26 +1110,25 @@ gtk_icon_size_register (const gchar *name, g_return_val_if_fail (name != NULL, 0); g_return_val_if_fail (width > 0, 0); g_return_val_if_fail (height > 0, 0); - + return icon_size_register_intern (name, width, height); } /** * gtk_icon_size_register_alias: * @alias: an alias for @target - * @target: an existing icon size + * @target: (type int): an existing icon size * * Registers @alias as another name for @target. * So calling gtk_icon_size_from_name() with @alias as argument * will return @target. - * - **/ + */ void gtk_icon_size_register_alias (const gchar *alias, GtkIconSize target) { IconAlias *ia; - + g_return_if_fail (alias != NULL); init_icon_sizes (); @@ -1075,20 +1158,21 @@ gtk_icon_size_register_alias (const gchar *alias, } } -/** +/** * gtk_icon_size_from_name: * @name: the name to look up. - * @returns: the icon size with the given name. - * + * * Looks up the icon size associated with @name. - **/ + * + * Return value: (type int): the icon size + */ GtkIconSize gtk_icon_size_from_name (const gchar *name) { IconAlias *ia; init_icon_sizes (); - + ia = g_hash_table_lookup (icon_aliases, name); if (ia && icon_sizes[ia->target].width > 0) @@ -1099,13 +1183,14 @@ gtk_icon_size_from_name (const gchar *name) /** * gtk_icon_size_get_name: - * @size: a #GtkIconSize. - * @returns: the name of the given icon size. - * - * Gets the canonical name of the given icon size. The returned string + * @size: (type int): a #GtkIconSize. + * + * Gets the canonical name of the given icon size. The returned string * is statically allocated and should not be freed. - **/ -G_CONST_RETURN gchar* + * + * Returns: the name of the given icon size. + */ +const gchar* gtk_icon_size_get_name (GtkIconSize size) { if (size >= icon_sizes_used) @@ -1120,12 +1205,12 @@ gtk_icon_size_get_name (GtkIconSize size) static GdkPixbuf *find_in_cache (GtkIconSet *icon_set, - GtkStyle *style, + GtkStyleContext *style_context, GtkTextDirection direction, GtkStateType state, GtkIconSize size); static void add_to_cache (GtkIconSet *icon_set, - GtkStyle *style, + GtkStyleContext *style_context, GtkTextDirection direction, GtkStateType state, GtkIconSize size, @@ -1139,9 +1224,9 @@ static void clear_cache (GtkIconSet *icon_set, static GSList* copy_cache (GtkIconSet *icon_set, GtkIconSet *copy_recipient); static void attach_to_style (GtkIconSet *icon_set, - GtkStyle *style); + GtkStyleContext *style_context); static void detach_from_style (GtkIconSet *icon_set, - GtkStyle *style); + GtkStyleContext *style_context); static void style_dnotify (gpointer data); struct _GtkIconSet @@ -1162,19 +1247,19 @@ static guint cache_serial = 0; /** * gtk_icon_set_new: - * + * * Creates a new #GtkIconSet. A #GtkIconSet represents a single icon * in various sizes and widget states. It can provide a #GdkPixbuf * for a given size and state on request, and automatically caches * some of the rendered #GdkPixbuf objects. * - * Normally you would use gtk_widget_render_icon() instead of + * Normally you would use gtk_widget_render_icon_pixbuf() instead of * using #GtkIconSet directly. The one case where you'd use * #GtkIconSet is to create application-specific icon sets to place in * a #GtkIconFactory. - * + * * Return value: a new #GtkIconSet - **/ + */ GtkIconSet* gtk_icon_set_new (void) { @@ -1187,22 +1272,22 @@ gtk_icon_set_new (void) icon_set->cache = NULL; icon_set->cache_size = 0; icon_set->cache_serial = cache_serial; - + return icon_set; } /** * gtk_icon_set_new_from_pixbuf: * @pixbuf: a #GdkPixbuf - * + * * Creates a new #GtkIconSet with @pixbuf as the default/fallback * source image. If you don't add any additional #GtkIconSource to the * icon set, all variants of the icon will be created from @pixbuf, * using scaling, pixelation, etc. as required to adjust the icon size * or make the icon look insensitive/prelighted. - * + * * Return value: a new #GtkIconSet - **/ + */ GtkIconSet * gtk_icon_set_new_from_pixbuf (GdkPixbuf *pixbuf) { @@ -1217,7 +1302,7 @@ gtk_icon_set_new_from_pixbuf (GdkPixbuf *pixbuf) gtk_icon_source_set_pixbuf (&source, pixbuf); gtk_icon_set_add_source (set, &source); gtk_icon_source_set_pixbuf (&source, NULL); - + return set; } @@ -1225,11 +1310,11 @@ gtk_icon_set_new_from_pixbuf (GdkPixbuf *pixbuf) /** * gtk_icon_set_ref: * @icon_set: a #GtkIconSet. - * + * * Increments the reference count on @icon_set. - * + * * Return value: @icon_set. - **/ + */ GtkIconSet* gtk_icon_set_ref (GtkIconSet *icon_set) { @@ -1244,10 +1329,10 @@ gtk_icon_set_ref (GtkIconSet *icon_set) /** * gtk_icon_set_unref: * @icon_set: a #GtkIconSet - * + * * Decrements the reference count on @icon_set, and frees memory * if the reference count reaches 0. - **/ + */ void gtk_icon_set_unref (GtkIconSet *icon_set) { @@ -1273,25 +1358,16 @@ gtk_icon_set_unref (GtkIconSet *icon_set) } } -GType -gtk_icon_set_get_type (void) -{ - static GType our_type = 0; - - if (our_type == 0) - our_type = g_boxed_type_register_static (I_("GtkIconSet"), - (GBoxedCopyFunc) gtk_icon_set_ref, - (GBoxedFreeFunc) gtk_icon_set_unref); - - return our_type; -} +G_DEFINE_BOXED_TYPE (GtkIconSet, gtk_icon_set, + gtk_icon_set_ref, + gtk_icon_set_unref) /** * gtk_icon_set_copy: * @icon_set: a #GtkIconSet - * - * Copies @icon_set by value. - * + * + * Copies @icon_set by value. + * * Return value: a new #GtkIconSet identical to the first. **/ GtkIconSet* @@ -1299,7 +1375,7 @@ gtk_icon_set_copy (GtkIconSet *icon_set) { GtkIconSet *copy; GSList *tmp_list; - + copy = gtk_icon_set_new (); tmp_list = icon_set->sources; @@ -1316,7 +1392,7 @@ gtk_icon_set_copy (GtkIconSet *icon_set) copy->cache = copy_cache (icon_set, copy); copy->cache_size = icon_set->cache_size; copy->cache_serial = icon_set->cache_serial; - + return copy; } @@ -1332,8 +1408,8 @@ sizes_equivalent (GtkIconSize lhs, */ #if 1 return lhs == rhs; -#else - +#else + gint r_w, r_h, l_w, l_h; icon_size_lookup_intern (NULL, rhs, &r_w, &r_h); @@ -1352,7 +1428,7 @@ find_best_matching_source (GtkIconSet *icon_set, { GtkIconSource *source; GSList *tmp_list; - + /* We need to find the best icon source. Direction matters more * than state, state matters more than size. icon_set->sources * is sorted according to wildness, so if we take the first @@ -1360,13 +1436,13 @@ find_best_matching_source (GtkIconSet *icon_set, * multiple matches for a given "wildness" then the RC file contained * dumb stuff, and we end up with an arbitrary matching source) */ - + source = NULL; tmp_list = icon_set->sources; while (tmp_list != NULL) { GtkIconSource *s = tmp_list->data; - + if ((s->any_direction || (s->direction == direction)) && (s->any_state || (s->state == state)) && (s->any_size || size == (GtkIconSize)-1 || (sizes_equivalent (size, s->size)))) @@ -1377,13 +1453,13 @@ find_best_matching_source (GtkIconSet *icon_set, break; } } - + tmp_list = g_slist_next (tmp_list); } return source; } - + static gboolean ensure_filename_pixbuf (GtkIconSet *icon_set, GtkIconSource *source) @@ -1391,36 +1467,32 @@ ensure_filename_pixbuf (GtkIconSet *icon_set, if (source->filename_pixbuf == NULL) { GError *error = NULL; - + source->filename_pixbuf = gdk_pixbuf_new_from_file (source->source.filename, &error); - + if (source->filename_pixbuf == NULL) { /* Remove this icon source so we don't keep trying to * load it. */ - g_warning (_("Error loading icon: %s"), error->message); + g_warning ("Error loading icon: %s", error->message); g_error_free (error); - + icon_set->sources = g_slist_remove (icon_set->sources, source); - + gtk_icon_source_free (source); return FALSE; } } - + return TRUE; } - + static GdkPixbuf * render_icon_name_pixbuf (GtkIconSource *icon_source, - GtkStyle *style, - GtkTextDirection direction, - GtkStateType state, - GtkIconSize size, - GtkWidget *widget, - const char *detail) + GtkStyleContext *context, + GtkIconSize size) { GdkPixbuf *pixbuf; GdkPixbuf *tmp_pixbuf; @@ -1431,18 +1503,8 @@ render_icon_name_pixbuf (GtkIconSource *icon_source, gint width, height, pixel_size; gint *sizes, *s, dist; GError *error = NULL; - - if (widget && gtk_widget_has_screen (widget)) - screen = gtk_widget_get_screen (widget); - else if (style && style->colormap) - screen = gdk_colormap_get_screen (style->colormap); - else - { - screen = gdk_screen_get_default (); - GTK_NOTE (MULTIHEAD, - g_warning ("Using the default screen for gtk_icon_source_render_icon()")); - } + screen = gtk_style_context_get_screen (context); icon_theme = gtk_icon_theme_get_for_screen (screen); settings = gtk_settings_get_for_screen (screen); @@ -1450,8 +1512,7 @@ render_icon_name_pixbuf (GtkIconSource *icon_source, { if (size == (GtkIconSize)-1) { - /* Find an available size close to 48 - */ + /* Find an available size close to 48 */ sizes = gtk_icon_theme_get_icon_sizes (icon_theme, icon_source->source.icon_name); dist = 1000; width = height = 48; @@ -1470,7 +1531,7 @@ render_icon_name_pixbuf (GtkIconSource *icon_source, dist = 48 - *s; } } - else + else { if (*s - 48 < dist) { @@ -1479,7 +1540,7 @@ render_icon_name_pixbuf (GtkIconSource *icon_source, } } } - + g_free (sizes); } else @@ -1491,26 +1552,50 @@ render_icon_name_pixbuf (GtkIconSource *icon_source, pixel_size = MIN (width, height); - tmp_pixbuf = gtk_icon_theme_load_icon (icon_theme, - icon_source->source.icon_name, - pixel_size, 0, - &error); + if (icon_source->direction != GTK_TEXT_DIR_NONE) + { + gchar *suffix[3] = { NULL, "-ltr", "-rtl" }; + gchar *names[3]; + GtkIconInfo *info; + + names[0] = g_strconcat (icon_source->source.icon_name, suffix[icon_source->direction], NULL); + names[1] = icon_source->source.icon_name; + names[2] = NULL; + + info = gtk_icon_theme_choose_icon (icon_theme, + (const char **) names, + pixel_size, GTK_ICON_LOOKUP_USE_BUILTIN); + g_free (names[0]); + if (info) + { + tmp_pixbuf = gtk_icon_info_load_icon (info, &error); + g_object_unref (info); + } + else + tmp_pixbuf = NULL; + } + else + { + tmp_pixbuf = gtk_icon_theme_load_icon (icon_theme, + icon_source->source.icon_name, + pixel_size, 0, + &error); + } if (!tmp_pixbuf) { - g_warning ("Error loading theme icon '%s' for stock: %s", - icon_source->source.icon_name, error->message); - g_error_free (error); + g_warning ("Error loading theme icon '%s' for stock: %s", + icon_source->source.icon_name, error ? error->message : ""); + if (error) + g_error_free (error); return NULL; } - + tmp_source = *icon_source; tmp_source.type = GTK_ICON_SOURCE_PIXBUF; tmp_source.source.pixbuf = tmp_pixbuf; - pixbuf = gtk_style_render_icon (style, &tmp_source, - direction, state, -1, - widget, detail); + pixbuf = gtk_render_icon_pixbuf (context, &tmp_source, -1); if (!pixbuf) g_warning ("Failed to render icon"); @@ -1522,12 +1607,10 @@ render_icon_name_pixbuf (GtkIconSource *icon_source, static GdkPixbuf * find_and_render_icon_source (GtkIconSet *icon_set, - GtkStyle *style, + GtkStyleContext *context, GtkTextDirection direction, GtkStateType state, - GtkIconSize size, - GtkWidget *widget, - const char *detail) + GtkIconSize size) { GSList *failed = NULL; GdkPixbuf *pixbuf = NULL; @@ -1545,7 +1628,7 @@ find_and_render_icon_source (GtkIconSet *icon_set, while (pixbuf == NULL) { GtkIconSource *source = find_best_matching_source (icon_set, direction, state, size, failed); - + if (source == NULL) break; @@ -1556,9 +1639,7 @@ find_and_render_icon_source (GtkIconSet *icon_set, break; /* Fall through */ case GTK_ICON_SOURCE_PIXBUF: - pixbuf = gtk_style_render_icon (style, source, - direction, state, size, - widget, detail); + pixbuf = gtk_render_icon_pixbuf (context, source, size); if (!pixbuf) { g_warning ("Failed to render icon"); @@ -1567,9 +1648,7 @@ find_and_render_icon_source (GtkIconSet *icon_set, break; case GTK_ICON_SOURCE_ICON_NAME: case GTK_ICON_SOURCE_STATIC_ICON_NAME: - pixbuf = render_icon_name_pixbuf (source, style, - direction, state, size, - widget, detail); + pixbuf = render_icon_name_pixbuf (source, context, size); if (!pixbuf) failed = g_slist_prepend (failed, source); break; @@ -1586,12 +1665,10 @@ find_and_render_icon_source (GtkIconSet *icon_set, extern GtkIconCache *_builtin_cache; static GdkPixbuf* -render_fallback_image (GtkStyle *style, +render_fallback_image (GtkStyleContext *context, GtkTextDirection direction, GtkStateType state, - GtkIconSize size, - GtkWidget *widget, - const char *detail) + GtkIconSize size) { /* This icon can be used for any direction/state/size */ static GtkIconSource fallback_source = GTK_ICON_SOURCE_INIT (TRUE, TRUE, TRUE); @@ -1604,46 +1681,107 @@ render_fallback_image (GtkStyle *style, _gtk_icon_theme_ensure_builtin_cache (); index = _gtk_icon_cache_get_directory_index (_builtin_cache, "24"); - pixbuf = _gtk_icon_cache_get_icon (_builtin_cache, - GTK_STOCK_MISSING_IMAGE, - index); + pixbuf = _gtk_icon_cache_get_icon (_builtin_cache, "image-missing", index); + + g_return_val_if_fail(pixbuf != NULL, NULL); + gtk_icon_source_set_pixbuf (&fallback_source, pixbuf); g_object_unref (pixbuf); } - - return gtk_style_render_icon (style, - &fallback_source, - direction, - state, - size, - widget, - detail); + + return gtk_render_icon_pixbuf (context, &fallback_source, size); +} + +/** + * gtk_icon_set_render_icon_pixbuf: + * @icon_set: a #GtkIconSet + * @context: a #GtkStyleContext + * @size: (type int): icon size. A size of (GtkIconSize)-1 + * means render at the size of the source and don't scale. + * + * Renders an icon using gtk_render_icon_pixbuf(). In most cases, + * gtk_widget_render_icon_pixbuf() is better, since it automatically provides + * most of the arguments from the current widget settings. This + * function never returns %NULL; if the icon can't be rendered + * (perhaps because an image file fails to load), a default "missing + * image" icon will be returned instead. + * + * Return value: (transfer full): a #GdkPixbuf to be displayed + * + * Since: 3.0 + */ +GdkPixbuf * +gtk_icon_set_render_icon_pixbuf (GtkIconSet *icon_set, + GtkStyleContext *context, + GtkIconSize size) +{ + GdkPixbuf *icon = NULL; + GtkStateFlags flags = 0; + GtkStateType state; + GtkTextDirection direction; + + g_return_val_if_fail (icon_set != NULL, NULL); + g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), NULL); + + flags = gtk_style_context_get_state (context); + if (flags & GTK_STATE_FLAG_INSENSITIVE) + state = GTK_STATE_INSENSITIVE; + else if (flags & GTK_STATE_FLAG_PRELIGHT) + state = GTK_STATE_PRELIGHT; + else + state = GTK_STATE_NORMAL; + +G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + direction = gtk_style_context_get_direction (context); +G_GNUC_END_IGNORE_DEPRECATIONS; + + if (icon_set->sources) + { + icon = find_in_cache (icon_set, context, direction, state, size); + if (icon) + { + g_object_ref (icon); + return icon; + } + } + + if (icon_set->sources) + icon = find_and_render_icon_source (icon_set, context, direction, state, size); + + if (icon == NULL) + icon = render_fallback_image (context, direction, state, size); + + add_to_cache (icon_set, context, direction, state, size, icon); + + return icon; } /** * gtk_icon_set_render_icon: * @icon_set: a #GtkIconSet - * @style: a #GtkStyle associated with @widget, or %NULL + * @style: (allow-none): a #GtkStyle associated with @widget, or %NULL * @direction: text direction * @state: widget state - * @size: icon size. A size of (GtkIconSize)-1 + * @size: (type int): icon size. A size of (GtkIconSize)-1 * means render at the size of the source and don't scale. - * @widget: widget that will display the icon, or %NULL. + * @widget: (allow-none): widget that will display the icon, or %NULL. * The only use that is typically made of this * is to determine the appropriate #GdkScreen. - * @detail: detail to pass to the theme engine, or %NULL. + * @detail: (allow-none): detail to pass to the theme engine, or %NULL. * Note that passing a detail of anything but %NULL * will disable caching. - * + * * Renders an icon using gtk_style_render_icon(). In most cases, * gtk_widget_render_icon() is better, since it automatically provides * most of the arguments from the current widget settings. This * function never returns %NULL; if the icon can't be rendered * (perhaps because an image file fails to load), a default "missing * image" icon will be returned instead. - * - * Return value: a #GdkPixbuf to be displayed - **/ + * + * Return value: (transfer full): a #GdkPixbuf to be displayed + * + * Deprecated: 3.0: Use gtk_icon_set_render_icon_pixbuf() instead + */ GdkPixbuf* gtk_icon_set_render_icon (GtkIconSet *icon_set, GtkStyle *style, @@ -1654,35 +1792,50 @@ gtk_icon_set_render_icon (GtkIconSet *icon_set, const char *detail) { GdkPixbuf *icon; - + GtkStyleContext *context = NULL; + GtkStateFlags flags = 0; + g_return_val_if_fail (icon_set != NULL, NULL); g_return_val_if_fail (style == NULL || GTK_IS_STYLE (style), NULL); - if (icon_set->sources == NULL) - return render_fallback_image (style, direction, state, size, widget, detail); + if (style && gtk_style_has_context (style)) + { + g_object_get (style, "context", &context, NULL); + /* g_object_get returns a refed object */ + if (context) + g_object_unref (context); + } + else if (widget) + { + context = gtk_widget_get_style_context (widget); + } + + if (!context) + return render_fallback_image (context, direction, state, size); - if (detail == NULL) + gtk_style_context_save (context); + + switch (state) { - icon = find_in_cache (icon_set, style, direction, - state, size); - - if (icon) - { - g_object_ref (icon); - return icon; - } + case GTK_STATE_PRELIGHT: + flags |= GTK_STATE_FLAG_PRELIGHT; + break; + case GTK_STATE_INSENSITIVE: + flags |= GTK_STATE_FLAG_INSENSITIVE; + break; + default: + break; } + gtk_style_context_set_state (context, flags); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + gtk_style_context_set_direction (context, direction); +G_GNUC_END_IGNORE_DEPRECATIONS; - icon = find_and_render_icon_source (icon_set, style, direction, state, size, - widget, detail); + icon = gtk_icon_set_render_icon_pixbuf (icon_set, context, size); - if (icon == NULL) - icon = render_fallback_image (style, direction, state, size, widget, detail); + gtk_style_context_restore (context); - if (detail == NULL) - add_to_cache (icon_set, style, direction, state, size, icon); - return icon; } @@ -1724,7 +1877,7 @@ icon_source_compare (gconstpointer ap, gconstpointer bp) * gtk_icon_set_render_icon(), but #GtkIconSet needs base images to * work with. The base images and when to use them are described by * a #GtkIconSource. - * + * * This function copies @source, so you can reuse the same source immediately * without affecting the icon set. * @@ -1743,10 +1896,9 @@ icon_source_compare (gconstpointer ap, gconstpointer bp) * * gtk_icon_set_new_from_pixbuf() creates a new icon set with a * default icon source based on the given pixbuf. - * - **/ + */ void -gtk_icon_set_add_source (GtkIconSet *icon_set, +gtk_icon_set_add_source (GtkIconSet *icon_set, const GtkIconSource *source) { g_return_if_fail (icon_set != NULL); @@ -1757,7 +1909,7 @@ gtk_icon_set_add_source (GtkIconSet *icon_set, g_warning ("Useless empty GtkIconSource"); return; } - + icon_set->sources = g_slist_insert_sorted (icon_set->sources, gtk_icon_source_copy (source), icon_source_compare); @@ -1766,13 +1918,13 @@ gtk_icon_set_add_source (GtkIconSet *icon_set, /** * gtk_icon_set_get_sizes: * @icon_set: a #GtkIconSet - * @sizes: return location for array of sizes + * @sizes: (array length=n_sizes) (out) (type int): return location + * for array of sizes * @n_sizes: location to store number of elements in returned array * * Obtains a list of icon sizes this icon set can render. The returned * array must be freed with g_free(). - * - **/ + */ void gtk_icon_set_get_sizes (GtkIconSet *icon_set, GtkIconSize **sizes, @@ -1781,11 +1933,11 @@ gtk_icon_set_get_sizes (GtkIconSet *icon_set, GSList *tmp_list; gboolean all_sizes = FALSE; GSList *specifics = NULL; - + g_return_if_fail (icon_set != NULL); g_return_if_fail (sizes != NULL); g_return_if_fail (n_sizes != NULL); - + tmp_list = icon_set->sources; while (tmp_list != NULL) { @@ -1800,7 +1952,7 @@ gtk_icon_set_get_sizes (GtkIconSet *icon_set, } else specifics = g_slist_prepend (specifics, GINT_TO_POINTER (source->size)); - + tmp_list = g_slist_next (tmp_list); } @@ -1810,11 +1962,11 @@ gtk_icon_set_get_sizes (GtkIconSet *icon_set, gint i; init_icon_sizes (); - + *sizes = g_new (GtkIconSize, icon_sizes_used); *n_sizes = icon_sizes_used - 1; - - i = 1; + + i = 1; while (i < icon_sizes_used) { (*sizes)[i - 1] = icon_sizes[i].size; @@ -1824,7 +1976,7 @@ gtk_icon_set_get_sizes (GtkIconSet *icon_set, else { gint i; - + *n_sizes = g_slist_length (specifics); *sizes = g_new (GtkIconSize, *n_sizes); @@ -1845,21 +1997,21 @@ gtk_icon_set_get_sizes (GtkIconSet *icon_set, /** * gtk_icon_source_new: - * + * * Creates a new #GtkIconSource. A #GtkIconSource contains a #GdkPixbuf (or * image filename) that serves as the base image for one or more of the * icons in a #GtkIconSet, along with a specification for which icons in the * icon set will be based on that pixbuf or image file. An icon set contains * a set of icons that represent "the same" logical concept in different states, * different global text directions, and different sizes. - * + * * So for example a web browser's "Back to Previous Page" icon might * point in a different direction in Hebrew and in English; it might * look different when insensitive; and it might change size depending * on toolbar mode (small/large icons). So a single icon set would * contain all those variants of the icon. #GtkIconSet contains a list * of #GtkIconSource from which it can derive specific icon variants in - * the set. + * the set. * * In the simplest case, #GtkIconSet contains one source pixbuf from * which it derives all variants. The convenience function @@ -1874,46 +2026,46 @@ gtk_icon_set_get_sizes (GtkIconSet *icon_set, * By default, the icon source has all parameters wildcarded. That is, * the icon source will be used as the base icon for any desired text * direction, widget state, or icon size. - * + * * Return value: a new #GtkIconSource - **/ + */ GtkIconSource* gtk_icon_source_new (void) { GtkIconSource *src; - + src = g_new0 (GtkIconSource, 1); src->direction = GTK_TEXT_DIR_NONE; src->size = GTK_ICON_SIZE_INVALID; src->state = GTK_STATE_NORMAL; - + src->any_direction = TRUE; src->any_state = TRUE; src->any_size = TRUE; - + return src; } /** * gtk_icon_source_copy: * @source: a #GtkIconSource - * + * * Creates a copy of @source; mostly useful for language bindings. - * + * * Return value: a new #GtkIconSource - **/ + */ GtkIconSource* gtk_icon_source_copy (const GtkIconSource *source) { GtkIconSource *copy; - + g_return_val_if_fail (source != NULL, NULL); copy = g_new (GtkIconSource, 1); *copy = *source; - + switch (copy->type) { case GTK_ICON_SOURCE_EMPTY: @@ -1924,9 +2076,6 @@ gtk_icon_source_copy (const GtkIconSource *source) break; case GTK_ICON_SOURCE_FILENAME: copy->source.filename = g_strdup (copy->source.filename); -#ifdef G_OS_WIN32 - copy->cp_filename = g_strdup (copy->cp_filename); -#endif if (copy->filename_pixbuf) g_object_ref (copy->filename_pixbuf); break; @@ -1943,10 +2092,10 @@ gtk_icon_source_copy (const GtkIconSource *source) /** * gtk_icon_source_free: * @source: a #GtkIconSource - * + * * Frees a dynamically-allocated icon source, along with its * filename, size, and pixbuf fields if those are not %NULL. - **/ + */ void gtk_icon_source_free (GtkIconSource *source) { @@ -1956,18 +2105,9 @@ gtk_icon_source_free (GtkIconSource *source) g_free (source); } -GType -gtk_icon_source_get_type (void) -{ - static GType our_type = 0; - - if (our_type == 0) - our_type = g_boxed_type_register_static (I_("GtkIconSource"), - (GBoxedCopyFunc) gtk_icon_source_copy, - (GBoxedFreeFunc) gtk_icon_source_free); - - return our_type; -} +G_DEFINE_BOXED_TYPE (GtkIconSource, gtk_icon_source, + gtk_icon_source_copy, + gtk_icon_source_free) static void icon_source_clear (GtkIconSource *source) @@ -1985,10 +2125,6 @@ icon_source_clear (GtkIconSource *source) case GTK_ICON_SOURCE_FILENAME: g_free (source->source.filename); source->source.filename = NULL; -#ifdef G_OS_WIN32 - g_free (source->cp_filename); - source->cp_filename = NULL; -#endif if (source->filename_pixbuf) g_object_unref (source->filename_pixbuf); source->filename_pixbuf = NULL; @@ -2007,11 +2143,11 @@ icon_source_clear (GtkIconSource *source) /** * gtk_icon_source_set_filename: * @source: a #GtkIconSource - * @filename: image file to use + * @filename: (type filename): image file to use * * Sets the name of an image file to use as a base image when creating - * icon variants for #GtkIconSet. The filename must be absolute. - **/ + * icon variants for #GtkIconSet. The filename must be absolute. + */ void gtk_icon_source_set_filename (GtkIconSource *source, const gchar *filename) @@ -2022,27 +2158,24 @@ gtk_icon_source_set_filename (GtkIconSource *source, if (source->type == GTK_ICON_SOURCE_FILENAME && source->source.filename == filename) return; - + icon_source_clear (source); - + if (filename != NULL) { source->type = GTK_ICON_SOURCE_FILENAME; source->source.filename = g_strdup (filename); -#ifdef G_OS_WIN32 - source->cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL); -#endif } } /** - * gtk_icon_source_set_icon_name + * gtk_icon_source_set_icon_name: * @source: a #GtkIconSource - * @icon_name: name of icon to use + * @icon_name: (allow-none): name of icon to use * * Sets the name of an icon to look up in the current icon theme * to use as a base image when creating icon variants for #GtkIconSet. - **/ + */ void gtk_icon_source_set_icon_name (GtkIconSource *source, const gchar *icon_name) @@ -2054,7 +2187,7 @@ gtk_icon_source_set_icon_name (GtkIconSource *source, return; icon_source_clear (source); - + if (icon_name != NULL) { source->type = GTK_ICON_SOURCE_ICON_NAME; @@ -2069,20 +2202,20 @@ gtk_icon_source_set_icon_name (GtkIconSource *source, * * Sets a pixbuf to use as a base image when creating icon variants * for #GtkIconSet. - **/ + */ void gtk_icon_source_set_pixbuf (GtkIconSource *source, GdkPixbuf *pixbuf) { g_return_if_fail (source != NULL); g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf)); - + if (source->type == GTK_ICON_SOURCE_PIXBUF && source->source.pixbuf == pixbuf) return; icon_source_clear (source); - + if (pixbuf != NULL) { source->type = GTK_ICON_SOURCE_PIXBUF; @@ -2093,15 +2226,15 @@ gtk_icon_source_set_pixbuf (GtkIconSource *source, /** * gtk_icon_source_get_filename: * @source: a #GtkIconSource - * + * * Retrieves the source filename, or %NULL if none is set. The * filename is not a copy, and should not be modified or expected to * persist beyond the lifetime of the icon source. - * - * Return value: image filename. This string must not be modified - * or freed. - **/ -G_CONST_RETURN gchar* + * + * Return value: (type filename): image filename. This string must not + * be modified or freed. + */ +const gchar* gtk_icon_source_get_filename (const GtkIconSource *source) { g_return_val_if_fail (source != NULL, NULL); @@ -2115,14 +2248,14 @@ gtk_icon_source_get_filename (const GtkIconSource *source) /** * gtk_icon_source_get_icon_name: * @source: a #GtkIconSource - * + * * Retrieves the source icon name, or %NULL if none is set. The * icon_name is not a copy, and should not be modified or expected to * persist beyond the lifetime of the icon source. - * + * * Return value: icon name. This string must not be modified or freed. - **/ -G_CONST_RETURN gchar* + */ +const gchar* gtk_icon_source_get_icon_name (const GtkIconSource *source) { g_return_val_if_fail (source != NULL, NULL); @@ -2137,7 +2270,7 @@ gtk_icon_source_get_icon_name (const GtkIconSource *source) /** * gtk_icon_source_get_pixbuf: * @source: a #GtkIconSource - * + * * Retrieves the source pixbuf, or %NULL if none is set. * In addition, if a filename source is in use, this * function in some cases will return the pixbuf from @@ -2145,14 +2278,14 @@ gtk_icon_source_get_icon_name (const GtkIconSource *source) * for the GtkIconSource passed to the GtkStyle::render_icon() * virtual function. The reference count on the pixbuf is * not incremented. - * - * Return value: source pixbuf - **/ + * + * Return value: (transfer none): source pixbuf + */ GdkPixbuf* gtk_icon_source_get_pixbuf (const GtkIconSource *source) { g_return_val_if_fail (source != NULL, NULL); - + if (source->type == GTK_ICON_SOURCE_PIXBUF) return source->source.pixbuf; else if (source->type == GTK_ICON_SOURCE_FILENAME) @@ -2175,8 +2308,7 @@ gtk_icon_source_get_pixbuf (const GtkIconSource *source) * * #GtkIconSet prefers non-wildcarded sources (exact matches) over * wildcarded sources, and will use an exact match when possible. - * - **/ + */ void gtk_icon_source_set_direction_wildcarded (GtkIconSource *source, gboolean setting) @@ -2204,7 +2336,7 @@ gtk_icon_source_set_direction_wildcarded (GtkIconSource *source, * produce an appropriate icon for a given state, for example * lightening an image on prelight, but will not modify source images * that match exactly. - **/ + */ void gtk_icon_source_set_state_wildcarded (GtkIconSource *source, gboolean setting) @@ -2232,40 +2364,40 @@ gtk_icon_source_set_state_wildcarded (GtkIconSource *source, * #GtkIconSet will normally scale wildcarded source images to produce * an appropriate icon at a given size, but will not change the size * of source images that match exactly. - **/ + */ void gtk_icon_source_set_size_wildcarded (GtkIconSource *source, gboolean setting) { g_return_if_fail (source != NULL); - source->any_size = setting != FALSE; + source->any_size = setting != FALSE; } /** * gtk_icon_source_get_size_wildcarded: * @source: a #GtkIconSource - * + * * Gets the value set by gtk_icon_source_set_size_wildcarded(). - * + * * Return value: %TRUE if this icon source is a base for any icon size variant - **/ + */ gboolean gtk_icon_source_get_size_wildcarded (const GtkIconSource *source) { g_return_val_if_fail (source != NULL, TRUE); - + return source->any_size; } /** * gtk_icon_source_get_state_wildcarded: * @source: a #GtkIconSource - * + * * Gets the value set by gtk_icon_source_set_state_wildcarded(). - * + * * Return value: %TRUE if this icon source is a base for any widget state variant - **/ + */ gboolean gtk_icon_source_get_state_wildcarded (const GtkIconSource *source) { @@ -2277,11 +2409,11 @@ gtk_icon_source_get_state_wildcarded (const GtkIconSource *source) /** * gtk_icon_source_get_direction_wildcarded: * @source: a #GtkIconSource - * + * * Gets the value set by gtk_icon_source_set_direction_wildcarded(). - * + * * Return value: %TRUE if this icon source is a base for any text direction variant - **/ + */ gboolean gtk_icon_source_get_direction_wildcarded (const GtkIconSource *source) { @@ -2297,13 +2429,12 @@ gtk_icon_source_get_direction_wildcarded (const GtkIconSource *source) * * Sets the text direction this icon source is intended to be used * with. - * + * * Setting the text direction on an icon source makes no difference * if the text direction is wildcarded. Therefore, you should usually * call gtk_icon_source_set_direction_wildcarded() to un-wildcard it * in addition to calling this function. - * - **/ + */ void gtk_icon_source_set_direction (GtkIconSource *source, GtkTextDirection direction) @@ -2320,13 +2451,12 @@ gtk_icon_source_set_direction (GtkIconSource *source, * * Sets the widget state this icon source is intended to be used * with. - * + * * Setting the widget state on an icon source makes no difference * if the state is wildcarded. Therefore, you should usually * call gtk_icon_source_set_state_wildcarded() to un-wildcard it * in addition to calling this function. - * - **/ + */ void gtk_icon_source_set_state (GtkIconSource *source, GtkStateType state) @@ -2339,17 +2469,16 @@ gtk_icon_source_set_state (GtkIconSource *source, /** * gtk_icon_source_set_size: * @source: a #GtkIconSource - * @size: icon size this source applies to + * @size: (type int): icon size this source applies to * * Sets the icon size this icon source is intended to be used * with. - * + * * Setting the icon size on an icon source makes no difference * if the size is wildcarded. Therefore, you should usually * call gtk_icon_source_set_size_wildcarded() to un-wildcard it * in addition to calling this function. - * - **/ + */ void gtk_icon_source_set_size (GtkIconSource *source, GtkIconSize size) @@ -2362,13 +2491,13 @@ gtk_icon_source_set_size (GtkIconSource *source, /** * gtk_icon_source_get_direction: * @source: a #GtkIconSource - * + * * Obtains the text direction this icon source applies to. The return - * value is only useful/meaningful if the text direction is not + * value is only useful/meaningful if the text direction is not * wildcarded. - * + * * Return value: text direction this source matches - **/ + */ GtkTextDirection gtk_icon_source_get_direction (const GtkIconSource *source) { @@ -2380,13 +2509,13 @@ gtk_icon_source_get_direction (const GtkIconSource *source) /** * gtk_icon_source_get_state: * @source: a #GtkIconSource - * + * * Obtains the widget state this icon source applies to. The return * value is only useful/meaningful if the widget state is not * wildcarded. - * + * * Return value: widget state this source matches - **/ + */ GtkStateType gtk_icon_source_get_state (const GtkIconSource *source) { @@ -2398,12 +2527,12 @@ gtk_icon_source_get_state (const GtkIconSource *source) /** * gtk_icon_source_get_size: * @source: a #GtkIconSource - * + * * Obtains the icon size this source applies to. The return value * is only useful/meaningful if the icon size is not wildcarded. - * - * Return value: icon size this source matches. - **/ + * + * Return value: (type int): icon size this source matches. + */ GtkIconSize gtk_icon_source_get_size (const GtkIconSource *source) { @@ -2421,7 +2550,7 @@ struct _CachedIcon /* These must all match to use the cached pixbuf. * If any don't match, we must re-render the pixbuf. */ - GtkStyle *style; + GtkStyleContext *style; GtkTextDirection direction; GtkStateType state; GtkIconSize size; @@ -2443,16 +2572,14 @@ static void cached_icon_free (CachedIcon *icon) { g_object_unref (icon->pixbuf); - - if (icon->style) - g_object_unref (icon->style); + g_object_unref (icon->style); g_free (icon); } static GdkPixbuf * find_in_cache (GtkIconSet *icon_set, - GtkStyle *style, + GtkStyleContext *style_context, GtkTextDirection direction, GtkStateType state, GtkIconSize size) @@ -2461,14 +2588,14 @@ find_in_cache (GtkIconSet *icon_set, GSList *prev; ensure_cache_up_to_date (icon_set); - + prev = NULL; tmp_list = icon_set->cache; while (tmp_list != NULL) { CachedIcon *icon = tmp_list->data; - if (icon->style == style && + if (icon->style == style_context && icon->direction == direction && icon->state == state && (size == (GtkIconSize)-1 || icon->size == size)) @@ -2480,10 +2607,10 @@ find_in_cache (GtkIconSet *icon_set, tmp_list->next = icon_set->cache; icon_set->cache = tmp_list; } - + return icon->pixbuf; } - + prev = tmp_list; tmp_list = g_slist_next (tmp_list); } @@ -2493,7 +2620,7 @@ find_in_cache (GtkIconSet *icon_set, static void add_to_cache (GtkIconSet *icon_set, - GtkStyle *style, + GtkStyleContext *style_context, GtkTextDirection direction, GtkStateType state, GtkIconSize size, @@ -2505,32 +2632,22 @@ add_to_cache (GtkIconSet *icon_set, g_object_ref (pixbuf); - /* We have to ref the style, since if the style was finalized - * its address could be reused by another style, creating a - * really weird bug - */ - - if (style) - g_object_ref (style); - icon = g_new (CachedIcon, 1); icon_set->cache = g_slist_prepend (icon_set->cache, icon); icon_set->cache_size++; - icon->style = style; + icon->style = g_object_ref (style_context); icon->direction = direction; icon->state = state; icon->size = size; icon->pixbuf = pixbuf; + attach_to_style (icon_set, icon->style); - if (icon->style) - attach_to_style (icon_set, icon->style); - if (icon_set->cache_size >= NUM_CACHED_ICONS) { /* Remove oldest item in the cache */ GSList *tmp_list; - + tmp_list = icon_set->cache; /* Find next-to-last link */ @@ -2557,7 +2674,7 @@ clear_cache (GtkIconSet *icon_set, gboolean style_detach) { GSList *cache, *tmp_list; - GtkStyle *last_style = NULL; + GtkStyleContext *last_style = NULL; cache = icon_set->cache; icon_set->cache = NULL; @@ -2580,9 +2697,9 @@ clear_cache (GtkIconSet *icon_set, last_style = icon->style; } } - - cached_icon_free (icon); - + + cached_icon_free (icon); + tmp_list = g_slist_next (tmp_list); } @@ -2597,7 +2714,7 @@ copy_cache (GtkIconSet *icon_set, GSList *copy = NULL; ensure_cache_up_to_date (icon_set); - + tmp_list = icon_set->cache; while (tmp_list != NULL) { @@ -2606,18 +2723,15 @@ copy_cache (GtkIconSet *icon_set, *icon_copy = *icon; - if (icon_copy->style) - { - attach_to_style (copy_recipient, icon_copy->style); - g_object_ref (icon_copy->style); - } - + attach_to_style (copy_recipient, icon_copy->style); + g_object_ref (icon_copy->style); + g_object_ref (icon_copy->pixbuf); icon_copy->size = icon->size; - - copy = g_slist_prepend (copy, icon_copy); - + + copy = g_slist_prepend (copy, icon_copy); + tmp_list = g_slist_next (tmp_list); } @@ -2625,18 +2739,18 @@ copy_cache (GtkIconSet *icon_set, } static void -attach_to_style (GtkIconSet *icon_set, - GtkStyle *style) +attach_to_style (GtkIconSet *icon_set, + GtkStyleContext *style_context) { GHashTable *table; - table = g_object_get_qdata (G_OBJECT (style), + table = g_object_get_qdata (G_OBJECT (style_context), g_quark_try_string ("gtk-style-icon-sets")); if (table == NULL) { table = g_hash_table_new (NULL, NULL); - g_object_set_qdata_full (G_OBJECT (style), + g_object_set_qdata_full (G_OBJECT (style_context), g_quark_from_static_string ("gtk-style-icon-sets"), table, style_dnotify); @@ -2646,12 +2760,12 @@ attach_to_style (GtkIconSet *icon_set, } static void -detach_from_style (GtkIconSet *icon_set, - GtkStyle *style) +detach_from_style (GtkIconSet *icon_set, + GtkStyleContext *style_context) { GHashTable *table; - table = g_object_get_qdata (G_OBJECT (style), + table = g_object_get_qdata (G_OBJECT (style_context), g_quark_try_string ("gtk-style-icon-sets")); if (table != NULL) @@ -2671,7 +2785,7 @@ iconsets_foreach (gpointer key, * time all cache entries will have the same style, * so this is faster anyway. */ - + clear_cache (icon_set, FALSE); } @@ -2679,7 +2793,7 @@ static void style_dnotify (gpointer data) { GHashTable *table = data; - + g_hash_table_foreach (table, iconsets_foreach, NULL); g_hash_table_destroy (table); @@ -2694,13 +2808,13 @@ _gtk_icon_set_invalidate_caches (void) /** * _gtk_icon_factory_list_ids: - * + * * Gets all known IDs stored in an existing icon factory. * The strings in the returned list aren't copied. * The list itself should be freed. - * + * * Return value: List of ids in icon factories - **/ + */ GList* _gtk_icon_factory_list_ids (void) { @@ -2709,19 +2823,19 @@ _gtk_icon_factory_list_ids (void) ids = NULL; - _gtk_icon_factory_ensure_default_icons (); - + _gtk_icon_factory_get_default_icons (); + tmp_list = all_icon_factories; while (tmp_list != NULL) { GList *these_ids; - GtkIconFactory *factory = GTK_ICON_FACTORY (tmp_list->data); + GtkIconFactoryPrivate *priv = factory->priv; + + these_ids = g_hash_table_get_keys (priv->icons); - these_ids = g_hash_table_get_keys (factory->icons); - ids = g_list_concat (ids, these_ids); - + tmp_list = g_slist_next (tmp_list); } @@ -2731,7 +2845,7 @@ _gtk_icon_factory_list_ids (void) typedef struct { GSList *sources; gboolean in_source; - + } IconFactoryParserData; typedef struct { @@ -2744,12 +2858,12 @@ typedef struct { } IconSourceParserData; static void -icon_source_start_element (GMarkupParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, - gpointer user_data, - GError **error) +icon_source_start_element (GMarkupParseContext *context, + const gchar *element_name, + const gchar **names, + const gchar **values, + gpointer user_data, + GError **error) { gint i; gchar *stock_id = NULL; @@ -2762,69 +2876,69 @@ icon_source_start_element (GMarkupParseContext *context, IconSourceParserData *source_data; gchar *error_msg; GQuark error_domain; - + parser_data = (IconFactoryParserData*)user_data; if (!parser_data->in_source) { if (strcmp (element_name, "sources") != 0) - { - error_msg = g_strdup_printf ("Unexpected element %s, expected ", element_name); - error_domain = GTK_BUILDER_ERROR_INVALID_TAG; - goto error; - } + { + error_msg = g_strdup_printf ("Unexpected element %s, expected ", element_name); + error_domain = GTK_BUILDER_ERROR_INVALID_TAG; + goto error; + } parser_data->in_source = TRUE; return; } else { if (strcmp (element_name, "source") != 0) - { - error_msg = g_strdup_printf ("Unexpected element %s, expected ", element_name); - error_domain = GTK_BUILDER_ERROR_INVALID_TAG; - goto error; - } + { + error_msg = g_strdup_printf ("Unexpected element %s, expected ", element_name); + error_domain = GTK_BUILDER_ERROR_INVALID_TAG; + goto error; + } } - + for (i = 0; names[i]; i++) { if (strcmp (names[i], "stock-id") == 0) - stock_id = g_strdup (values[i]); + stock_id = g_strdup (values[i]); else if (strcmp (names[i], "filename") == 0) - filename = g_strdup (values[i]); + filename = g_strdup (values[i]); else if (strcmp (names[i], "icon-name") == 0) - icon_name = g_strdup (values[i]); + icon_name = g_strdup (values[i]); else if (strcmp (names[i], "size") == 0) - { + { if (!_gtk_builder_enum_from_string (GTK_TYPE_ICON_SIZE, values[i], &size, error)) - return; - } + return; + } else if (strcmp (names[i], "direction") == 0) - { + { if (!_gtk_builder_enum_from_string (GTK_TYPE_TEXT_DIRECTION, values[i], &direction, error)) - return; - } + return; + } else if (strcmp (names[i], "state") == 0) - { + { if (!_gtk_builder_enum_from_string (GTK_TYPE_STATE_TYPE, values[i], &state, error)) - return; - } + return; + } else - { - error_msg = g_strdup_printf ("'%s' is not a valid attribute of <%s>", - names[i], "source"); - error_domain = GTK_BUILDER_ERROR_INVALID_ATTRIBUTE; - goto error; - } + { + error_msg = g_strdup_printf ("'%s' is not a valid attribute of <%s>", + names[i], "source"); + error_domain = GTK_BUILDER_ERROR_INVALID_ATTRIBUTE; + goto error; + } } if (!stock_id) @@ -2849,21 +2963,12 @@ icon_source_start_element (GMarkupParseContext *context, { gchar *tmp; gint line_number, char_number; - - g_markup_parse_context_get_position (context, - &line_number, - &char_number); + + g_markup_parse_context_get_position (context, &line_number, &char_number); tmp = g_strdup_printf ("%s:%d:%d %s", "input", - line_number, char_number, error_msg); -#if 0 - g_set_error_literal (error, - GTK_BUILDER_ERROR, - error_domain, - tmp); -#else - g_warning (tmp); -#endif + line_number, char_number, error_msg); + g_set_error_literal (error, GTK_BUILDER_ERROR, error_domain, tmp); g_free (tmp); g_free (stock_id); g_free (filename); @@ -2907,7 +3012,7 @@ gtk_icon_factory_buildable_custom_tag_end (GtkBuildable *buildable, gpointer *user_data) { GtkIconFactory *icon_factory; - + icon_factory = GTK_ICON_FACTORY (buildable); if (strcmp (tagname, "sources") == 0) @@ -2978,38 +3083,3 @@ gtk_icon_factory_buildable_custom_tag_end (GtkBuildable *buildable, gtk_icon_factory_add_default (icon_factory); } } - -#ifdef G_OS_WIN32 - -/* DLL ABI stability backward compatibility versions */ - -#undef gtk_icon_source_set_filename - -void -gtk_icon_source_set_filename (GtkIconSource *source, - const gchar *filename) -{ - gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, NULL); - - gtk_icon_source_set_filename_utf8 (source, utf8_filename); - - g_free (utf8_filename); -} - -#undef gtk_icon_source_get_filename - -G_CONST_RETURN gchar* -gtk_icon_source_get_filename (const GtkIconSource *source) -{ - g_return_val_if_fail (source != NULL, NULL); - - if (source->type == GTK_ICON_SOURCE_FILENAME) - return source->cp_filename; - else - return NULL; -} - -#endif - -#define __GTK_ICON_FACTORY_C__ -#include "gtkaliasdef.c"