Move more text widget headers into the private header list
2000-09-26 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am (gtk_private_h_sources): Move more text widget
headers into the private header list
* Makefile.am (pkgconfig_DATA): install pkg-config files
* configure.in: add pkg-config files
* gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files
* gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate
outstanding icon caches on theme change.
* gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three
important types:
(GtkIconSource): Specification for creating a pixbuf
appropriate for a direction/state/size triplet from
a source pixbuf or filename
(GtkIconSet): List of GtkIconSource objects that are used to
create the "same" icon (e.g. an OK button icon), and cache for
rendered icons
(GtkIconFactory): Hash from stock ID to GtkIconSet; used to look
up the icon set for a given stock ID. GTK maintains a stack of
GtkIconFactory to search, and applications or libraries can add
additional icon factories on top of the stack
* gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse
the set of GtkIconSource specified for a given stock ID into
a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the
RcStyle, under the specified stock ID.
* gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function
render_icon used to derive a GdkPixbuf from a GtkIconSource.
This allows people to theme how prelight, insensitive, etc. are
done.
(gtk_style_lookup_icon_set): Look up a stock ID in the list of
icon factories for a style, and return the resulting
icon set if any.
(gtk_style_render_icon): Render an icon using the render_icon
method in the GtkStyleClass.
* gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon):
Use the style for a given widget to look up a stock ID, get the
icon set, and render an icon using the render_icon method
of the style
* gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type
(contains information about a stock item), the built-in stock item
IDs, and functions to add/lookup stock items.
* gtk/stock-icons/*: Stock icons that come with GTK
* gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns
a button based on a GtkStockItem
(gtk_button_new_accel): Takes a uline string and accel group, and
installs the accelerator.
* gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic
image-display widget.
2000-09-26 20:22:17 +00:00
|
|
|
/* GTK - The GIMP Toolkit
|
2000-10-04 16:39:44 +00:00
|
|
|
* Copyright (C) 2000 Red Hat, Inc.
|
Move more text widget headers into the private header list
2000-09-26 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am (gtk_private_h_sources): Move more text widget
headers into the private header list
* Makefile.am (pkgconfig_DATA): install pkg-config files
* configure.in: add pkg-config files
* gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files
* gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate
outstanding icon caches on theme change.
* gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three
important types:
(GtkIconSource): Specification for creating a pixbuf
appropriate for a direction/state/size triplet from
a source pixbuf or filename
(GtkIconSet): List of GtkIconSource objects that are used to
create the "same" icon (e.g. an OK button icon), and cache for
rendered icons
(GtkIconFactory): Hash from stock ID to GtkIconSet; used to look
up the icon set for a given stock ID. GTK maintains a stack of
GtkIconFactory to search, and applications or libraries can add
additional icon factories on top of the stack
* gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse
the set of GtkIconSource specified for a given stock ID into
a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the
RcStyle, under the specified stock ID.
* gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function
render_icon used to derive a GdkPixbuf from a GtkIconSource.
This allows people to theme how prelight, insensitive, etc. are
done.
(gtk_style_lookup_icon_set): Look up a stock ID in the list of
icon factories for a style, and return the resulting
icon set if any.
(gtk_style_render_icon): Render an icon using the render_icon
method in the GtkStyleClass.
* gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon):
Use the style for a given widget to look up a stock ID, get the
icon set, and render an icon using the render_icon method
of the style
* gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type
(contains information about a stock item), the built-in stock item
IDs, and functions to add/lookup stock items.
* gtk/stock-icons/*: Stock icons that come with GTK
* gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns
a button based on a GtkStockItem
(gtk_button_new_accel): Takes a uline string and accel group, and
installs the accelerator.
* gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic
image-display widget.
2000-09-26 20:22:17 +00:00
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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/.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "gtkiconfactory.h"
|
|
|
|
#include "stock-icons/gtkstockpixbufs.h"
|
|
|
|
#include "gtkstock.h"
|
2000-10-18 18:42:54 +00:00
|
|
|
#include "gtkintl.h"
|
Move more text widget headers into the private header list
2000-09-26 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am (gtk_private_h_sources): Move more text widget
headers into the private header list
* Makefile.am (pkgconfig_DATA): install pkg-config files
* configure.in: add pkg-config files
* gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files
* gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate
outstanding icon caches on theme change.
* gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three
important types:
(GtkIconSource): Specification for creating a pixbuf
appropriate for a direction/state/size triplet from
a source pixbuf or filename
(GtkIconSet): List of GtkIconSource objects that are used to
create the "same" icon (e.g. an OK button icon), and cache for
rendered icons
(GtkIconFactory): Hash from stock ID to GtkIconSet; used to look
up the icon set for a given stock ID. GTK maintains a stack of
GtkIconFactory to search, and applications or libraries can add
additional icon factories on top of the stack
* gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse
the set of GtkIconSource specified for a given stock ID into
a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the
RcStyle, under the specified stock ID.
* gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function
render_icon used to derive a GdkPixbuf from a GtkIconSource.
This allows people to theme how prelight, insensitive, etc. are
done.
(gtk_style_lookup_icon_set): Look up a stock ID in the list of
icon factories for a style, and return the resulting
icon set if any.
(gtk_style_render_icon): Render an icon using the render_icon
method in the GtkStyleClass.
* gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon):
Use the style for a given widget to look up a stock ID, get the
icon set, and render an icon using the render_icon method
of the style
* gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type
(contains information about a stock item), the built-in stock item
IDs, and functions to add/lookup stock items.
* gtk/stock-icons/*: Stock icons that come with GTK
* gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns
a button based on a GtkStockItem
(gtk_button_new_accel): Takes a uline string and accel group, and
installs the accelerator.
* gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic
image-display widget.
2000-09-26 20:22:17 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
static gpointer parent_class = NULL;
|
|
|
|
|
|
|
|
static void gtk_icon_factory_init (GtkIconFactory *icon_factory);
|
|
|
|
static void gtk_icon_factory_class_init (GtkIconFactoryClass *klass);
|
|
|
|
static void gtk_icon_factory_finalize (GObject *object);
|
|
|
|
static void get_default_icons (GtkIconFactory *icon_factory);
|
|
|
|
|
|
|
|
GType
|
|
|
|
gtk_icon_factory_get_type (void)
|
|
|
|
{
|
|
|
|
static GType object_type = 0;
|
|
|
|
|
|
|
|
if (!object_type)
|
|
|
|
{
|
|
|
|
static const GTypeInfo object_info =
|
|
|
|
{
|
|
|
|
sizeof (GtkIconFactoryClass),
|
|
|
|
(GBaseInitFunc) NULL,
|
|
|
|
(GBaseFinalizeFunc) NULL,
|
|
|
|
(GClassInitFunc) gtk_icon_factory_class_init,
|
|
|
|
NULL, /* class_finalize */
|
|
|
|
NULL, /* class_data */
|
|
|
|
sizeof (GtkIconFactory),
|
|
|
|
0, /* n_preallocs */
|
|
|
|
(GInstanceInitFunc) gtk_icon_factory_init,
|
|
|
|
};
|
|
|
|
|
|
|
|
object_type = g_type_register_static (G_TYPE_OBJECT,
|
|
|
|
"GtkIconFactory",
|
|
|
|
&object_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
return object_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_icon_factory_init (GtkIconFactory *factory)
|
|
|
|
{
|
|
|
|
factory->icons = g_hash_table_new (g_str_hash, g_str_equal);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_icon_factory_class_init (GtkIconFactoryClass *klass)
|
|
|
|
{
|
|
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
|
|
|
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
|
|
|
|
|
|
|
object_class->finalize = gtk_icon_factory_finalize;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
free_icon_set (gpointer key, gpointer value, gpointer data)
|
|
|
|
{
|
|
|
|
g_free (key);
|
|
|
|
gtk_icon_set_unref (value);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_icon_factory_finalize (GObject *object)
|
|
|
|
{
|
|
|
|
GtkIconFactory *factory = GTK_ICON_FACTORY (object);
|
|
|
|
|
|
|
|
g_hash_table_foreach (factory->icons, free_icon_set, NULL);
|
|
|
|
|
|
|
|
g_hash_table_destroy (factory->icons);
|
|
|
|
|
|
|
|
G_OBJECT_CLASS (parent_class)->finalize (object);
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkIconFactory*
|
|
|
|
gtk_icon_factory_new (void)
|
|
|
|
{
|
|
|
|
return GTK_ICON_FACTORY (g_object_new (GTK_TYPE_ICON_FACTORY, NULL));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_icon_factory_add (GtkIconFactory *factory,
|
|
|
|
const gchar *stock_id,
|
|
|
|
GtkIconSet *icon_set)
|
|
|
|
{
|
|
|
|
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_hash_table_lookup_extended (factory->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);
|
|
|
|
else
|
|
|
|
g_hash_table_insert (factory->icons, g_strdup (stock_id), icon_set);
|
|
|
|
|
|
|
|
if (old_value)
|
|
|
|
gtk_icon_set_unref (old_value);
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkIconSet *
|
|
|
|
gtk_icon_factory_lookup (GtkIconFactory *factory,
|
|
|
|
const gchar *stock_id)
|
|
|
|
{
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
static GtkIconFactory *gtk_default_icons = NULL;
|
|
|
|
static GSList *default_factories = NULL;
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_icon_factory_add_default (GtkIconFactory *factory)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GTK_IS_ICON_FACTORY (factory));
|
|
|
|
|
|
|
|
g_object_ref (G_OBJECT (factory));
|
|
|
|
|
|
|
|
default_factories = g_slist_prepend (default_factories, factory);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_icon_factory_remove_default (GtkIconFactory *factory)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GTK_IS_ICON_FACTORY (factory));
|
|
|
|
|
|
|
|
default_factories = g_slist_remove (default_factories, factory);
|
|
|
|
|
|
|
|
g_object_unref (G_OBJECT (factory));
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkIconSet *
|
|
|
|
gtk_icon_factory_lookup_default (const gchar *stock_id)
|
|
|
|
{
|
|
|
|
GSList *tmp_list;
|
|
|
|
|
|
|
|
g_return_val_if_fail (stock_id != NULL, NULL);
|
|
|
|
|
|
|
|
tmp_list = default_factories;
|
|
|
|
while (tmp_list != NULL)
|
|
|
|
{
|
|
|
|
GtkIconSet *icon_set =
|
|
|
|
gtk_icon_factory_lookup (GTK_ICON_FACTORY (tmp_list->data),
|
|
|
|
stock_id);
|
|
|
|
|
|
|
|
if (icon_set)
|
|
|
|
return icon_set;
|
|
|
|
|
|
|
|
tmp_list = g_slist_next (tmp_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (gtk_default_icons == NULL)
|
|
|
|
{
|
|
|
|
gtk_default_icons = gtk_icon_factory_new ();
|
|
|
|
|
|
|
|
get_default_icons (gtk_default_icons);
|
|
|
|
}
|
|
|
|
|
|
|
|
return gtk_icon_factory_lookup (gtk_default_icons, stock_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
static GtkIconSet *
|
|
|
|
sized_icon_set_from_inline (const guchar *inline_data,
|
|
|
|
const gchar *size)
|
|
|
|
{
|
|
|
|
GtkIconSet *set;
|
|
|
|
|
|
|
|
GtkIconSource source = { NULL, NULL, 0, 0, NULL,
|
|
|
|
TRUE, TRUE, FALSE };
|
|
|
|
|
2000-09-26 20:35:39 +00:00
|
|
|
source.size = (gchar*) size;
|
Move more text widget headers into the private header list
2000-09-26 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am (gtk_private_h_sources): Move more text widget
headers into the private header list
* Makefile.am (pkgconfig_DATA): install pkg-config files
* configure.in: add pkg-config files
* gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files
* gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate
outstanding icon caches on theme change.
* gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three
important types:
(GtkIconSource): Specification for creating a pixbuf
appropriate for a direction/state/size triplet from
a source pixbuf or filename
(GtkIconSet): List of GtkIconSource objects that are used to
create the "same" icon (e.g. an OK button icon), and cache for
rendered icons
(GtkIconFactory): Hash from stock ID to GtkIconSet; used to look
up the icon set for a given stock ID. GTK maintains a stack of
GtkIconFactory to search, and applications or libraries can add
additional icon factories on top of the stack
* gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse
the set of GtkIconSource specified for a given stock ID into
a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the
RcStyle, under the specified stock ID.
* gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function
render_icon used to derive a GdkPixbuf from a GtkIconSource.
This allows people to theme how prelight, insensitive, etc. are
done.
(gtk_style_lookup_icon_set): Look up a stock ID in the list of
icon factories for a style, and return the resulting
icon set if any.
(gtk_style_render_icon): Render an icon using the render_icon
method in the GtkStyleClass.
* gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon):
Use the style for a given widget to look up a stock ID, get the
icon set, and render an icon using the render_icon method
of the style
* gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type
(contains information about a stock item), the built-in stock item
IDs, and functions to add/lookup stock items.
* gtk/stock-icons/*: Stock icons that come with GTK
* gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns
a button based on a GtkStockItem
(gtk_button_new_accel): Takes a uline string and accel group, and
installs the accelerator.
* gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic
image-display widget.
2000-09-26 20:22:17 +00:00
|
|
|
|
|
|
|
set = gtk_icon_set_new ();
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
source.pixbuf = gdk_pixbuf_new_from_inline (inline_data, FALSE, -1, NULL);
|
Move more text widget headers into the private header list
2000-09-26 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am (gtk_private_h_sources): Move more text widget
headers into the private header list
* Makefile.am (pkgconfig_DATA): install pkg-config files
* configure.in: add pkg-config files
* gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files
* gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate
outstanding icon caches on theme change.
* gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three
important types:
(GtkIconSource): Specification for creating a pixbuf
appropriate for a direction/state/size triplet from
a source pixbuf or filename
(GtkIconSet): List of GtkIconSource objects that are used to
create the "same" icon (e.g. an OK button icon), and cache for
rendered icons
(GtkIconFactory): Hash from stock ID to GtkIconSet; used to look
up the icon set for a given stock ID. GTK maintains a stack of
GtkIconFactory to search, and applications or libraries can add
additional icon factories on top of the stack
* gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse
the set of GtkIconSource specified for a given stock ID into
a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the
RcStyle, under the specified stock ID.
* gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function
render_icon used to derive a GdkPixbuf from a GtkIconSource.
This allows people to theme how prelight, insensitive, etc. are
done.
(gtk_style_lookup_icon_set): Look up a stock ID in the list of
icon factories for a style, and return the resulting
icon set if any.
(gtk_style_render_icon): Render an icon using the render_icon
method in the GtkStyleClass.
* gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon):
Use the style for a given widget to look up a stock ID, get the
icon set, and render an icon using the render_icon method
of the style
* gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type
(contains information about a stock item), the built-in stock item
IDs, and functions to add/lookup stock items.
* gtk/stock-icons/*: Stock icons that come with GTK
* gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns
a button based on a GtkStockItem
(gtk_button_new_accel): Takes a uline string and accel group, and
installs the accelerator.
* gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic
image-display widget.
2000-09-26 20:22:17 +00:00
|
|
|
|
|
|
|
g_assert (source.pixbuf);
|
|
|
|
|
|
|
|
gtk_icon_set_add_source (set, &source);
|
|
|
|
|
|
|
|
g_object_unref (G_OBJECT (source.pixbuf));
|
|
|
|
|
|
|
|
return set;
|
|
|
|
}
|
|
|
|
|
|
|
|
static GtkIconSet *
|
|
|
|
unsized_icon_set_from_inline (const guchar *inline_data)
|
|
|
|
{
|
|
|
|
GtkIconSet *set;
|
|
|
|
|
|
|
|
/* This icon can be used for any direction/state/size */
|
|
|
|
GtkIconSource source = { NULL, NULL, 0, 0, 0,
|
|
|
|
TRUE, TRUE, TRUE };
|
|
|
|
|
|
|
|
set = gtk_icon_set_new ();
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
source.pixbuf = gdk_pixbuf_new_from_inline (inline_data, FALSE, -1, NULL);
|
Move more text widget headers into the private header list
2000-09-26 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am (gtk_private_h_sources): Move more text widget
headers into the private header list
* Makefile.am (pkgconfig_DATA): install pkg-config files
* configure.in: add pkg-config files
* gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files
* gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate
outstanding icon caches on theme change.
* gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three
important types:
(GtkIconSource): Specification for creating a pixbuf
appropriate for a direction/state/size triplet from
a source pixbuf or filename
(GtkIconSet): List of GtkIconSource objects that are used to
create the "same" icon (e.g. an OK button icon), and cache for
rendered icons
(GtkIconFactory): Hash from stock ID to GtkIconSet; used to look
up the icon set for a given stock ID. GTK maintains a stack of
GtkIconFactory to search, and applications or libraries can add
additional icon factories on top of the stack
* gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse
the set of GtkIconSource specified for a given stock ID into
a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the
RcStyle, under the specified stock ID.
* gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function
render_icon used to derive a GdkPixbuf from a GtkIconSource.
This allows people to theme how prelight, insensitive, etc. are
done.
(gtk_style_lookup_icon_set): Look up a stock ID in the list of
icon factories for a style, and return the resulting
icon set if any.
(gtk_style_render_icon): Render an icon using the render_icon
method in the GtkStyleClass.
* gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon):
Use the style for a given widget to look up a stock ID, get the
icon set, and render an icon using the render_icon method
of the style
* gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type
(contains information about a stock item), the built-in stock item
IDs, and functions to add/lookup stock items.
* gtk/stock-icons/*: Stock icons that come with GTK
* gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns
a button based on a GtkStockItem
(gtk_button_new_accel): Takes a uline string and accel group, and
installs the accelerator.
* gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic
image-display widget.
2000-09-26 20:22:17 +00:00
|
|
|
|
|
|
|
g_assert (source.pixbuf);
|
|
|
|
|
|
|
|
gtk_icon_set_add_source (set, &source);
|
|
|
|
|
|
|
|
g_object_unref (G_OBJECT (source.pixbuf));
|
|
|
|
|
|
|
|
return set;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
add_sized (GtkIconFactory *factory,
|
|
|
|
const guchar *inline_data,
|
|
|
|
const gchar *size,
|
|
|
|
const gchar *stock_id)
|
|
|
|
{
|
|
|
|
GtkIconSet *set;
|
|
|
|
|
|
|
|
set = sized_icon_set_from_inline (inline_data, size);
|
|
|
|
|
|
|
|
gtk_icon_factory_add (factory, stock_id, set);
|
|
|
|
|
|
|
|
gtk_icon_set_unref (set);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
add_unsized (GtkIconFactory *factory,
|
|
|
|
const guchar *inline_data,
|
|
|
|
const gchar *stock_id)
|
|
|
|
{
|
|
|
|
GtkIconSet *set;
|
|
|
|
|
|
|
|
set = unsized_icon_set_from_inline (inline_data);
|
|
|
|
|
|
|
|
gtk_icon_factory_add (factory, stock_id, set);
|
|
|
|
|
|
|
|
gtk_icon_set_unref (set);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
get_default_icons (GtkIconFactory *factory)
|
|
|
|
{
|
|
|
|
/* KEEP IN SYNC with gtkstock.c */
|
|
|
|
|
|
|
|
add_sized (factory, dialog_error, GTK_ICON_SIZE_DIALOG, GTK_STOCK_DIALOG_ERROR);
|
|
|
|
add_sized (factory, dialog_info, GTK_ICON_SIZE_DIALOG, GTK_STOCK_DIALOG_INFO);
|
|
|
|
add_sized (factory, dialog_question, GTK_ICON_SIZE_DIALOG, GTK_STOCK_DIALOG_QUESTION);
|
|
|
|
add_sized (factory, dialog_warning, GTK_ICON_SIZE_DIALOG, GTK_STOCK_DIALOG_WARNING);
|
|
|
|
|
|
|
|
add_sized (factory, stock_button_apply, GTK_ICON_SIZE_BUTTON, GTK_STOCK_BUTTON_APPLY);
|
|
|
|
add_sized (factory, stock_button_ok, GTK_ICON_SIZE_BUTTON, GTK_STOCK_BUTTON_OK);
|
|
|
|
add_sized (factory, stock_button_cancel, GTK_ICON_SIZE_BUTTON, GTK_STOCK_BUTTON_CANCEL);
|
|
|
|
add_sized (factory, stock_button_close, GTK_ICON_SIZE_BUTTON, GTK_STOCK_BUTTON_CLOSE);
|
|
|
|
add_sized (factory, stock_button_yes, GTK_ICON_SIZE_BUTTON, GTK_STOCK_BUTTON_YES);
|
|
|
|
add_sized (factory, stock_button_no, GTK_ICON_SIZE_BUTTON, GTK_STOCK_BUTTON_NO);
|
|
|
|
|
|
|
|
add_unsized (factory, stock_close, GTK_STOCK_CLOSE);
|
|
|
|
add_unsized (factory, stock_exit, GTK_STOCK_QUIT);
|
|
|
|
add_unsized (factory, stock_help, GTK_STOCK_HELP);
|
|
|
|
add_unsized (factory, stock_new, GTK_STOCK_NEW);
|
|
|
|
add_unsized (factory, stock_open, GTK_STOCK_OPEN);
|
|
|
|
add_unsized (factory, stock_save, GTK_STOCK_SAVE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Sizes */
|
|
|
|
|
|
|
|
static GHashTable *icon_sizes = NULL;
|
|
|
|
|
|
|
|
typedef struct _IconSize IconSize;
|
|
|
|
|
|
|
|
struct _IconSize
|
|
|
|
{
|
|
|
|
gchar *name;
|
|
|
|
|
|
|
|
gboolean is_alias;
|
|
|
|
|
|
|
|
union
|
|
|
|
{
|
|
|
|
gchar *target;
|
|
|
|
struct
|
|
|
|
{
|
|
|
|
gint width;
|
|
|
|
gint height;
|
|
|
|
} size;
|
|
|
|
} d;
|
|
|
|
};
|
|
|
|
|
|
|
|
static IconSize*
|
|
|
|
icon_size_new (const gchar *name)
|
|
|
|
{
|
|
|
|
IconSize *is;
|
|
|
|
|
|
|
|
is = g_new0 (IconSize, 1);
|
|
|
|
|
|
|
|
is->name = g_strdup (name);
|
|
|
|
|
|
|
|
return is;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
icon_size_free (IconSize *is)
|
|
|
|
{
|
|
|
|
g_free (is->name);
|
|
|
|
|
|
|
|
if (is->is_alias)
|
|
|
|
g_free (is->d.target);
|
|
|
|
|
|
|
|
g_free (is);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
icon_size_insert (IconSize *is)
|
|
|
|
{
|
|
|
|
gpointer old_key, old_value;
|
|
|
|
|
|
|
|
/* Remove old ones */
|
|
|
|
if (g_hash_table_lookup_extended (icon_sizes,
|
|
|
|
is->name,
|
|
|
|
&old_key, &old_value))
|
|
|
|
{
|
|
|
|
g_hash_table_remove (icon_sizes, is->name);
|
|
|
|
icon_size_free (old_value);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_hash_table_insert (icon_sizes,
|
|
|
|
is->name, is);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static IconSize*
|
|
|
|
icon_size_lookup (const gchar *name)
|
|
|
|
{
|
|
|
|
IconSize *is;
|
|
|
|
|
|
|
|
is = g_hash_table_lookup (icon_sizes,
|
|
|
|
name);
|
|
|
|
|
|
|
|
while (is && is->is_alias)
|
|
|
|
{
|
|
|
|
is = g_hash_table_lookup (icon_sizes,
|
|
|
|
is->d.target);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return is;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
icon_size_add (const gchar *name,
|
|
|
|
gint width,
|
|
|
|
gint height)
|
|
|
|
{
|
|
|
|
IconSize *is;
|
|
|
|
|
|
|
|
is = icon_size_new (name);
|
|
|
|
is->d.size.width = width;
|
|
|
|
is->d.size.height = height;
|
|
|
|
|
|
|
|
icon_size_insert (is);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
icon_alias_add (const gchar *name,
|
|
|
|
const gchar *target)
|
|
|
|
{
|
|
|
|
IconSize *is;
|
|
|
|
|
|
|
|
is = icon_size_new (name);
|
|
|
|
is->is_alias = TRUE;
|
|
|
|
|
|
|
|
is->d.target = g_strdup (target);
|
|
|
|
|
|
|
|
icon_size_insert (is);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
init_icon_sizes (void)
|
|
|
|
{
|
|
|
|
if (icon_sizes == NULL)
|
|
|
|
{
|
|
|
|
icon_sizes = g_hash_table_new (g_str_hash, g_str_equal);
|
|
|
|
|
|
|
|
icon_size_add (GTK_ICON_SIZE_MENU, 16, 16);
|
|
|
|
icon_size_add (GTK_ICON_SIZE_BUTTON, 24, 24);
|
|
|
|
icon_size_add (GTK_ICON_SIZE_SMALL_TOOLBAR, 18, 18);
|
|
|
|
icon_size_add (GTK_ICON_SIZE_LARGE_TOOLBAR, 24, 24);
|
|
|
|
icon_size_add (GTK_ICON_SIZE_DIALOG, 48, 48);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
gtk_icon_size_lookup (const gchar *alias,
|
|
|
|
gint *widthp,
|
|
|
|
gint *heightp)
|
|
|
|
{
|
|
|
|
IconSize *is;
|
|
|
|
|
|
|
|
g_return_val_if_fail (alias != NULL, FALSE);
|
|
|
|
|
|
|
|
init_icon_sizes ();
|
|
|
|
|
|
|
|
is = icon_size_lookup (alias);
|
|
|
|
|
|
|
|
if (is == NULL)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (widthp)
|
|
|
|
*widthp = is->d.size.width;
|
|
|
|
|
|
|
|
if (heightp)
|
|
|
|
*heightp = is->d.size.height;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_icon_size_register (const gchar *alias,
|
|
|
|
gint width,
|
|
|
|
gint height)
|
|
|
|
{
|
|
|
|
g_return_if_fail (alias != NULL);
|
|
|
|
g_return_if_fail (width > 0);
|
|
|
|
g_return_if_fail (height > 0);
|
|
|
|
|
|
|
|
init_icon_sizes ();
|
|
|
|
|
|
|
|
icon_size_add (alias, width, height);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_icon_size_register_alias (const gchar *alias,
|
|
|
|
const gchar *target)
|
|
|
|
{
|
|
|
|
g_return_if_fail (alias != NULL);
|
|
|
|
g_return_if_fail (target != NULL);
|
|
|
|
|
|
|
|
init_icon_sizes ();
|
|
|
|
|
|
|
|
icon_alias_add (alias, target);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Icon Set */
|
|
|
|
|
|
|
|
|
|
|
|
/* Clear icon set contents, drop references to all contained
|
|
|
|
* GdkPixbuf objects and forget all GtkIconSources. Used to
|
|
|
|
* recycle an icon set.
|
|
|
|
*/
|
|
|
|
static GdkPixbuf *find_in_cache (GtkIconSet *icon_set,
|
|
|
|
GtkStyle *style,
|
|
|
|
GtkTextDirection direction,
|
|
|
|
GtkStateType state,
|
|
|
|
const gchar *size);
|
|
|
|
static void add_to_cache (GtkIconSet *icon_set,
|
|
|
|
GtkStyle *style,
|
|
|
|
GtkTextDirection direction,
|
|
|
|
GtkStateType state,
|
|
|
|
const gchar *size,
|
|
|
|
GdkPixbuf *pixbuf);
|
|
|
|
static void clear_cache (GtkIconSet *icon_set,
|
|
|
|
gboolean style_detach);
|
|
|
|
static GSList* copy_cache (GtkIconSet *icon_set,
|
|
|
|
GtkIconSet *copy_recipient);
|
|
|
|
static void attach_to_style (GtkIconSet *icon_set,
|
|
|
|
GtkStyle *style);
|
|
|
|
static void detach_from_style (GtkIconSet *icon_set,
|
|
|
|
GtkStyle *style);
|
|
|
|
static void style_dnotify (gpointer data);
|
|
|
|
|
|
|
|
struct _GtkIconSet
|
|
|
|
{
|
|
|
|
guint ref_count;
|
|
|
|
|
|
|
|
GSList *sources;
|
|
|
|
|
|
|
|
/* Cache of the last few rendered versions of the icon. */
|
|
|
|
GSList *cache;
|
|
|
|
|
|
|
|
guint cache_size;
|
|
|
|
|
|
|
|
guint cache_serial;
|
|
|
|
};
|
|
|
|
|
|
|
|
static guint cache_serial = 0;
|
|
|
|
|
|
|
|
GtkIconSet*
|
|
|
|
gtk_icon_set_new (void)
|
|
|
|
{
|
|
|
|
GtkIconSet *icon_set;
|
|
|
|
|
|
|
|
icon_set = g_new (GtkIconSet, 1);
|
|
|
|
|
|
|
|
icon_set->ref_count = 1;
|
|
|
|
icon_set->sources = NULL;
|
|
|
|
icon_set->cache = NULL;
|
|
|
|
icon_set->cache_size = 0;
|
|
|
|
icon_set->cache_serial = cache_serial;
|
|
|
|
|
|
|
|
return icon_set;
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkIconSet*
|
|
|
|
gtk_icon_set_ref (GtkIconSet *icon_set)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (icon_set != NULL, NULL);
|
|
|
|
g_return_val_if_fail (icon_set->ref_count > 0, NULL);
|
|
|
|
|
|
|
|
icon_set->ref_count += 1;
|
|
|
|
|
|
|
|
return icon_set;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_icon_set_unref (GtkIconSet *icon_set)
|
|
|
|
{
|
|
|
|
g_return_if_fail (icon_set != NULL);
|
|
|
|
g_return_if_fail (icon_set->ref_count > 0);
|
|
|
|
|
|
|
|
icon_set->ref_count -= 1;
|
|
|
|
|
|
|
|
if (icon_set->ref_count == 0)
|
|
|
|
{
|
|
|
|
GSList *tmp_list = icon_set->sources;
|
|
|
|
while (tmp_list != NULL)
|
|
|
|
{
|
|
|
|
gtk_icon_source_free (tmp_list->data);
|
|
|
|
|
|
|
|
tmp_list = g_slist_next (tmp_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
clear_cache (icon_set, TRUE);
|
|
|
|
|
|
|
|
g_free (icon_set);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkIconSet*
|
|
|
|
gtk_icon_set_copy (GtkIconSet *icon_set)
|
|
|
|
{
|
|
|
|
GtkIconSet *copy;
|
|
|
|
GSList *tmp_list;
|
|
|
|
|
|
|
|
copy = gtk_icon_set_new ();
|
|
|
|
|
|
|
|
tmp_list = icon_set->sources;
|
|
|
|
while (tmp_list != NULL)
|
|
|
|
{
|
|
|
|
copy->sources = g_slist_prepend (copy->sources,
|
|
|
|
gtk_icon_source_copy (tmp_list->data));
|
|
|
|
|
|
|
|
tmp_list = g_slist_next (tmp_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
copy->sources = g_slist_reverse (copy->sources);
|
|
|
|
|
|
|
|
copy->cache = copy_cache (icon_set, copy);
|
|
|
|
copy->cache_size = icon_set->cache_size;
|
|
|
|
copy->cache_serial = icon_set->cache_serial;
|
|
|
|
|
|
|
|
return copy;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
sizes_equivalent (const gchar *rhs, const gchar *lhs)
|
|
|
|
{
|
|
|
|
gint r_w, r_h, l_w, l_h;
|
|
|
|
|
|
|
|
gtk_icon_size_lookup (rhs, &r_w, &r_h);
|
|
|
|
gtk_icon_size_lookup (lhs, &l_w, &l_h);
|
|
|
|
|
|
|
|
return r_w == l_w && r_h == l_h;
|
|
|
|
}
|
|
|
|
|
|
|
|
static GtkIconSource*
|
|
|
|
find_and_prep_icon_source (GtkIconSet *icon_set,
|
|
|
|
GtkTextDirection direction,
|
|
|
|
GtkStateType state,
|
|
|
|
const gchar *size)
|
|
|
|
{
|
|
|
|
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
|
|
|
|
* match we find it will be the least-wild match (if there are
|
|
|
|
* 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 || (sizes_equivalent (size, s->size))))
|
|
|
|
{
|
|
|
|
source = s;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp_list = g_slist_next (tmp_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (source == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (source->pixbuf == NULL)
|
|
|
|
{
|
2000-10-18 18:42:54 +00:00
|
|
|
GError *error;
|
Move more text widget headers into the private header list
2000-09-26 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am (gtk_private_h_sources): Move more text widget
headers into the private header list
* Makefile.am (pkgconfig_DATA): install pkg-config files
* configure.in: add pkg-config files
* gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files
* gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate
outstanding icon caches on theme change.
* gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three
important types:
(GtkIconSource): Specification for creating a pixbuf
appropriate for a direction/state/size triplet from
a source pixbuf or filename
(GtkIconSet): List of GtkIconSource objects that are used to
create the "same" icon (e.g. an OK button icon), and cache for
rendered icons
(GtkIconFactory): Hash from stock ID to GtkIconSet; used to look
up the icon set for a given stock ID. GTK maintains a stack of
GtkIconFactory to search, and applications or libraries can add
additional icon factories on top of the stack
* gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse
the set of GtkIconSource specified for a given stock ID into
a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the
RcStyle, under the specified stock ID.
* gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function
render_icon used to derive a GdkPixbuf from a GtkIconSource.
This allows people to theme how prelight, insensitive, etc. are
done.
(gtk_style_lookup_icon_set): Look up a stock ID in the list of
icon factories for a style, and return the resulting
icon set if any.
(gtk_style_render_icon): Render an icon using the render_icon
method in the GtkStyleClass.
* gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon):
Use the style for a given widget to look up a stock ID, get the
icon set, and render an icon using the render_icon method
of the style
* gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type
(contains information about a stock item), the built-in stock item
IDs, and functions to add/lookup stock items.
* gtk/stock-icons/*: Stock icons that come with GTK
* gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns
a button based on a GtkStockItem
(gtk_button_new_accel): Takes a uline string and accel group, and
installs the accelerator.
* gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic
image-display widget.
2000-09-26 20:22:17 +00:00
|
|
|
gchar *full;
|
|
|
|
|
|
|
|
g_assert (source->filename);
|
|
|
|
|
|
|
|
if (*source->filename != G_DIR_SEPARATOR)
|
|
|
|
full = gtk_rc_find_pixmap_in_path (NULL, source->filename);
|
|
|
|
else
|
|
|
|
full = g_strdup (source->filename);
|
2000-10-18 18:42:54 +00:00
|
|
|
|
|
|
|
error = NULL;
|
|
|
|
source->pixbuf = gdk_pixbuf_new_from_file (full, &error);
|
Move more text widget headers into the private header list
2000-09-26 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am (gtk_private_h_sources): Move more text widget
headers into the private header list
* Makefile.am (pkgconfig_DATA): install pkg-config files
* configure.in: add pkg-config files
* gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files
* gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate
outstanding icon caches on theme change.
* gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three
important types:
(GtkIconSource): Specification for creating a pixbuf
appropriate for a direction/state/size triplet from
a source pixbuf or filename
(GtkIconSet): List of GtkIconSource objects that are used to
create the "same" icon (e.g. an OK button icon), and cache for
rendered icons
(GtkIconFactory): Hash from stock ID to GtkIconSet; used to look
up the icon set for a given stock ID. GTK maintains a stack of
GtkIconFactory to search, and applications or libraries can add
additional icon factories on top of the stack
* gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse
the set of GtkIconSource specified for a given stock ID into
a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the
RcStyle, under the specified stock ID.
* gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function
render_icon used to derive a GdkPixbuf from a GtkIconSource.
This allows people to theme how prelight, insensitive, etc. are
done.
(gtk_style_lookup_icon_set): Look up a stock ID in the list of
icon factories for a style, and return the resulting
icon set if any.
(gtk_style_render_icon): Render an icon using the render_icon
method in the GtkStyleClass.
* gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon):
Use the style for a given widget to look up a stock ID, get the
icon set, and render an icon using the render_icon method
of the style
* gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type
(contains information about a stock item), the built-in stock item
IDs, and functions to add/lookup stock items.
* gtk/stock-icons/*: Stock icons that come with GTK
* gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns
a button based on a GtkStockItem
(gtk_button_new_accel): Takes a uline string and accel group, and
installs the accelerator.
* gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic
image-display widget.
2000-09-26 20:22:17 +00:00
|
|
|
|
|
|
|
g_free (full);
|
|
|
|
|
|
|
|
if (source->pixbuf == NULL)
|
|
|
|
{
|
|
|
|
/* Remove this icon source so we don't keep trying to
|
|
|
|
* load it.
|
|
|
|
*/
|
2000-10-18 18:42:54 +00:00
|
|
|
g_warning (_("Error loading icon: %s"), error->message);
|
|
|
|
g_error_free (error);
|
Move more text widget headers into the private header list
2000-09-26 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am (gtk_private_h_sources): Move more text widget
headers into the private header list
* Makefile.am (pkgconfig_DATA): install pkg-config files
* configure.in: add pkg-config files
* gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files
* gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate
outstanding icon caches on theme change.
* gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three
important types:
(GtkIconSource): Specification for creating a pixbuf
appropriate for a direction/state/size triplet from
a source pixbuf or filename
(GtkIconSet): List of GtkIconSource objects that are used to
create the "same" icon (e.g. an OK button icon), and cache for
rendered icons
(GtkIconFactory): Hash from stock ID to GtkIconSet; used to look
up the icon set for a given stock ID. GTK maintains a stack of
GtkIconFactory to search, and applications or libraries can add
additional icon factories on top of the stack
* gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse
the set of GtkIconSource specified for a given stock ID into
a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the
RcStyle, under the specified stock ID.
* gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function
render_icon used to derive a GdkPixbuf from a GtkIconSource.
This allows people to theme how prelight, insensitive, etc. are
done.
(gtk_style_lookup_icon_set): Look up a stock ID in the list of
icon factories for a style, and return the resulting
icon set if any.
(gtk_style_render_icon): Render an icon using the render_icon
method in the GtkStyleClass.
* gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon):
Use the style for a given widget to look up a stock ID, get the
icon set, and render an icon using the render_icon method
of the style
* gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type
(contains information about a stock item), the built-in stock item
IDs, and functions to add/lookup stock items.
* gtk/stock-icons/*: Stock icons that come with GTK
* gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns
a button based on a GtkStockItem
(gtk_button_new_accel): Takes a uline string and accel group, and
installs the accelerator.
* gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic
image-display widget.
2000-09-26 20:22:17 +00:00
|
|
|
|
|
|
|
icon_set->sources = g_slist_remove (icon_set->sources, source);
|
|
|
|
|
|
|
|
gtk_icon_source_free (source);
|
|
|
|
|
|
|
|
/* Try to fall back to other sources */
|
|
|
|
if (icon_set->sources != NULL)
|
|
|
|
return find_and_prep_icon_source (icon_set,
|
|
|
|
direction,
|
|
|
|
state,
|
|
|
|
size);
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return source;
|
|
|
|
}
|
|
|
|
|
|
|
|
GdkPixbuf*
|
|
|
|
gtk_icon_set_render_icon (GtkIconSet *icon_set,
|
|
|
|
GtkStyle *style,
|
|
|
|
GtkTextDirection direction,
|
|
|
|
GtkStateType state,
|
|
|
|
const gchar *size,
|
|
|
|
GtkWidget *widget,
|
|
|
|
const char *detail)
|
|
|
|
{
|
|
|
|
GdkPixbuf *icon;
|
|
|
|
GtkIconSource *source;
|
|
|
|
|
|
|
|
/* FIXME conceivably, everywhere this function
|
|
|
|
* returns NULL, we should return some default
|
|
|
|
* dummy icon like a question mark or the image icon
|
|
|
|
* from netscape
|
|
|
|
*/
|
|
|
|
|
|
|
|
g_return_val_if_fail (icon_set != NULL, NULL);
|
|
|
|
g_return_val_if_fail (GTK_IS_STYLE (style), NULL);
|
|
|
|
|
|
|
|
if (icon_set->sources == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
icon = find_in_cache (icon_set, style, direction,
|
|
|
|
state, size);
|
|
|
|
|
|
|
|
if (icon)
|
|
|
|
{
|
|
|
|
g_object_ref (G_OBJECT (icon));
|
|
|
|
return icon;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
source = find_and_prep_icon_source (icon_set, direction, state, size);
|
|
|
|
|
|
|
|
if (source == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
g_assert (source->pixbuf != NULL);
|
|
|
|
|
|
|
|
icon = gtk_style_render_icon (style,
|
|
|
|
source,
|
|
|
|
direction,
|
|
|
|
state,
|
|
|
|
size,
|
|
|
|
widget,
|
|
|
|
detail);
|
|
|
|
|
|
|
|
if (icon == NULL)
|
|
|
|
{
|
|
|
|
g_warning ("Theme engine failed to render icon");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
add_to_cache (icon_set, style, direction, state, size, icon);
|
|
|
|
|
|
|
|
return icon;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Order sources by their "wildness", so that "wilder" sources are
|
|
|
|
* greater than "specific" sources; for determining ordering,
|
|
|
|
* direction beats state beats size.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int
|
|
|
|
icon_source_compare (gconstpointer ap, gconstpointer bp)
|
|
|
|
{
|
|
|
|
const GtkIconSource *a = ap;
|
|
|
|
const GtkIconSource *b = bp;
|
|
|
|
|
|
|
|
if (!a->any_direction && b->any_direction)
|
|
|
|
return -1;
|
|
|
|
else if (a->any_direction && !b->any_direction)
|
|
|
|
return 1;
|
|
|
|
else if (!a->any_state && b->any_state)
|
|
|
|
return -1;
|
|
|
|
else if (a->any_state && !b->any_state)
|
|
|
|
return 1;
|
|
|
|
else if (!a->any_size && b->any_size)
|
|
|
|
return -1;
|
|
|
|
else if (a->any_size && !b->any_size)
|
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_icon_set_add_source (GtkIconSet *icon_set,
|
|
|
|
const GtkIconSource *source)
|
|
|
|
{
|
|
|
|
g_return_if_fail (icon_set != NULL);
|
|
|
|
g_return_if_fail (source != NULL);
|
|
|
|
|
|
|
|
if (source->pixbuf == NULL &&
|
|
|
|
source->filename == NULL)
|
|
|
|
{
|
|
|
|
g_warning ("Useless GtkIconSource contains NULL filename and pixbuf");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
icon_set->sources = g_slist_insert_sorted (icon_set->sources,
|
|
|
|
gtk_icon_source_copy (source),
|
|
|
|
icon_source_compare);
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
copy->filename = g_strdup (source->filename);
|
|
|
|
copy->size = g_strdup (source->size);
|
|
|
|
if (copy->pixbuf)
|
|
|
|
g_object_ref (G_OBJECT (copy->pixbuf));
|
|
|
|
|
|
|
|
return copy;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_icon_source_free (GtkIconSource *source)
|
|
|
|
{
|
|
|
|
g_return_if_fail (source != NULL);
|
|
|
|
|
|
|
|
g_free ((char*) source->filename);
|
|
|
|
g_free ((char*) source->size);
|
|
|
|
if (source->pixbuf)
|
|
|
|
g_object_unref (G_OBJECT (source->pixbuf));
|
|
|
|
|
|
|
|
g_free (source);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Note that the logical maximum is 20 per GtkTextDirection, so we could
|
|
|
|
* eventually set this to >20 to never throw anything out.
|
|
|
|
*/
|
|
|
|
#define NUM_CACHED_ICONS 8
|
|
|
|
|
|
|
|
typedef struct _CachedIcon CachedIcon;
|
|
|
|
|
|
|
|
struct _CachedIcon
|
|
|
|
{
|
|
|
|
/* These must all match to use the cached pixbuf.
|
|
|
|
* If any don't match, we must re-render the pixbuf.
|
|
|
|
*/
|
|
|
|
GtkStyle *style;
|
|
|
|
GtkTextDirection direction;
|
|
|
|
GtkStateType state;
|
|
|
|
gchar *size;
|
|
|
|
|
|
|
|
GdkPixbuf *pixbuf;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
|
|
|
ensure_cache_up_to_date (GtkIconSet *icon_set)
|
|
|
|
{
|
|
|
|
if (icon_set->cache_serial != cache_serial)
|
|
|
|
clear_cache (icon_set, TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
cached_icon_free (CachedIcon *icon)
|
|
|
|
{
|
|
|
|
g_free (icon->size);
|
|
|
|
g_object_unref (G_OBJECT (icon->pixbuf));
|
|
|
|
|
|
|
|
g_free (icon);
|
|
|
|
}
|
|
|
|
|
|
|
|
static GdkPixbuf *
|
|
|
|
find_in_cache (GtkIconSet *icon_set,
|
|
|
|
GtkStyle *style,
|
|
|
|
GtkTextDirection direction,
|
|
|
|
GtkStateType state,
|
|
|
|
const gchar *size)
|
|
|
|
{
|
|
|
|
GSList *tmp_list;
|
|
|
|
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 &&
|
|
|
|
icon->direction == direction &&
|
|
|
|
icon->state == state &&
|
|
|
|
strcmp (icon->size, size) == 0)
|
|
|
|
{
|
|
|
|
if (prev)
|
|
|
|
{
|
|
|
|
/* Move this icon to the front of the list. */
|
|
|
|
prev->next = tmp_list->next;
|
|
|
|
tmp_list->next = icon_set->cache;
|
|
|
|
icon_set->cache = tmp_list;
|
|
|
|
}
|
|
|
|
|
|
|
|
return icon->pixbuf;
|
|
|
|
}
|
|
|
|
|
|
|
|
prev = tmp_list;
|
|
|
|
tmp_list = g_slist_next (tmp_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
add_to_cache (GtkIconSet *icon_set,
|
|
|
|
GtkStyle *style,
|
|
|
|
GtkTextDirection direction,
|
|
|
|
GtkStateType state,
|
|
|
|
const gchar *size,
|
|
|
|
GdkPixbuf *pixbuf)
|
|
|
|
{
|
|
|
|
CachedIcon *icon;
|
|
|
|
|
|
|
|
ensure_cache_up_to_date (icon_set);
|
|
|
|
|
|
|
|
g_object_ref (G_OBJECT (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 (G_OBJECT (style));
|
|
|
|
|
|
|
|
|
|
|
|
icon = g_new (CachedIcon, 1);
|
|
|
|
icon_set->cache = g_slist_prepend (icon_set->cache, icon);
|
|
|
|
|
|
|
|
icon->style = style;
|
|
|
|
icon->direction = direction;
|
|
|
|
icon->state = state;
|
|
|
|
icon->size = g_strdup (size);
|
|
|
|
icon->pixbuf = pixbuf;
|
|
|
|
|
|
|
|
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 */
|
|
|
|
g_assert (NUM_CACHED_ICONS > 2);
|
|
|
|
while (tmp_list->next->next)
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
|
|
|
|
g_assert (tmp_list != NULL);
|
|
|
|
g_assert (tmp_list->next != NULL);
|
|
|
|
g_assert (tmp_list->next->next == NULL);
|
|
|
|
|
|
|
|
/* Free the last icon */
|
|
|
|
icon = tmp_list->next->data;
|
|
|
|
|
|
|
|
g_slist_free (tmp_list->next);
|
|
|
|
tmp_list->next = NULL;
|
|
|
|
|
|
|
|
cached_icon_free (icon);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clear_cache (GtkIconSet *icon_set,
|
|
|
|
gboolean style_detach)
|
|
|
|
{
|
|
|
|
GSList *tmp_list;
|
|
|
|
GtkStyle *last_style = NULL;
|
|
|
|
|
|
|
|
tmp_list = icon_set->cache;
|
|
|
|
while (tmp_list != NULL)
|
|
|
|
{
|
|
|
|
CachedIcon *icon = tmp_list->data;
|
|
|
|
|
|
|
|
if (style_detach)
|
|
|
|
{
|
|
|
|
/* simple optimization for the case where the cache
|
|
|
|
* contains contiguous icons from the same style.
|
|
|
|
* it's safe to call detach_from_style more than
|
|
|
|
* once on the same style though.
|
|
|
|
*/
|
|
|
|
if (last_style != icon->style)
|
|
|
|
{
|
|
|
|
detach_from_style (icon_set, icon->style);
|
|
|
|
last_style = icon->style;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
cached_icon_free (icon);
|
|
|
|
|
|
|
|
tmp_list = g_slist_next (tmp_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_slist_free (icon_set->cache);
|
|
|
|
icon_set->cache = NULL;
|
|
|
|
icon_set->cache_size = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static GSList*
|
|
|
|
copy_cache (GtkIconSet *icon_set,
|
|
|
|
GtkIconSet *copy_recipient)
|
|
|
|
{
|
|
|
|
GSList *tmp_list;
|
|
|
|
GSList *copy = NULL;
|
|
|
|
|
|
|
|
ensure_cache_up_to_date (icon_set);
|
|
|
|
|
|
|
|
tmp_list = icon_set->cache;
|
|
|
|
while (tmp_list != NULL)
|
|
|
|
{
|
|
|
|
CachedIcon *icon = tmp_list->data;
|
|
|
|
CachedIcon *icon_copy = g_new (CachedIcon, 1);
|
|
|
|
|
|
|
|
*icon_copy = *icon;
|
|
|
|
|
|
|
|
if (icon_copy->style)
|
|
|
|
attach_to_style (copy_recipient, icon_copy->style);
|
|
|
|
|
|
|
|
g_object_ref (G_OBJECT (icon_copy->pixbuf));
|
|
|
|
|
|
|
|
icon_copy->size = g_strdup (icon->size);
|
|
|
|
|
|
|
|
copy = g_slist_prepend (copy, icon_copy);
|
|
|
|
|
|
|
|
tmp_list = g_slist_next (tmp_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
return g_slist_reverse (copy);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
attach_to_style (GtkIconSet *icon_set,
|
|
|
|
GtkStyle *style)
|
|
|
|
{
|
|
|
|
GHashTable *table;
|
|
|
|
|
|
|
|
table = g_object_get_qdata (G_OBJECT (style),
|
|
|
|
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_quark_from_static_string ("gtk-style-icon-sets"),
|
|
|
|
table,
|
|
|
|
style_dnotify);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_hash_table_insert (table, icon_set, icon_set);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
detach_from_style (GtkIconSet *icon_set,
|
|
|
|
GtkStyle *style)
|
|
|
|
{
|
|
|
|
GHashTable *table;
|
|
|
|
|
|
|
|
table = g_object_get_qdata (G_OBJECT (style),
|
|
|
|
g_quark_try_string ("gtk-style-icon-sets"));
|
|
|
|
|
|
|
|
if (table != NULL)
|
|
|
|
g_hash_table_remove (table, icon_set);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
iconsets_foreach (gpointer key,
|
|
|
|
gpointer value,
|
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
GtkIconSet *icon_set = key;
|
|
|
|
|
|
|
|
/* We only need to remove cache entries for the given style;
|
|
|
|
* but that complicates things because in destroy notify
|
|
|
|
* we don't know which style got destroyed, and 95% of the
|
|
|
|
* time all cache entries will have the same style,
|
|
|
|
* so this is faster anyway.
|
|
|
|
*/
|
|
|
|
|
|
|
|
clear_cache (icon_set, FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
style_dnotify (gpointer data)
|
|
|
|
{
|
|
|
|
GHashTable *table = data;
|
|
|
|
|
|
|
|
g_hash_table_foreach (table, iconsets_foreach, NULL);
|
|
|
|
|
|
|
|
g_hash_table_destroy (table);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This allows the icon set to detect that its cache is out of date. */
|
|
|
|
void
|
|
|
|
_gtk_icon_set_invalidate_caches (void)
|
|
|
|
{
|
|
|
|
++cache_serial;
|
|
|
|
}
|