]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkcellrendererpixbuf.c
container: use priv in last commit
[~andy/gtk] / gtk / gtkcellrendererpixbuf.c
index 326078f43d223a8751968dd484e46ecafdbc6282..ce88b817a64e4ed0f48286f095be1a83d152200b 100644 (file)
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include <stdlib.h>
 #include "gtkcellrendererpixbuf.h"
+#include "gtkiconfactory.h"
+#include "gtkicontheme.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
+
 
 static void gtk_cell_renderer_pixbuf_get_property  (GObject                    *object,
                                                    guint                       param_id,
@@ -29,8 +34,9 @@ static void gtk_cell_renderer_pixbuf_set_property  (GObject                    *
                                                    guint                       param_id,
                                                    const GValue               *value,
                                                    GParamSpec                 *pspec);
-static void gtk_cell_renderer_pixbuf_init       (GtkCellRendererPixbuf      *celltext);
-static void gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class);
+static void gtk_cell_renderer_pixbuf_finalize   (GObject                    *object);
+static void gtk_cell_renderer_pixbuf_create_stock_pixbuf (GtkCellRendererPixbuf *cellpixbuf,
+                                                         GtkWidget             *widget);
 static void gtk_cell_renderer_pixbuf_get_size   (GtkCellRenderer            *cell,
                                                 GtkWidget                  *widget,
                                                 GdkRectangle               *rectangle,
@@ -39,73 +45,204 @@ static void gtk_cell_renderer_pixbuf_get_size   (GtkCellRenderer            *cel
                                                 gint                       *width,
                                                 gint                       *height);
 static void gtk_cell_renderer_pixbuf_render     (GtkCellRenderer            *cell,
-                                                GdkWindow                  *window,
+                                                GdkDrawable                *window,
                                                 GtkWidget                  *widget,
                                                 GdkRectangle               *background_area,
                                                 GdkRectangle               *cell_area,
                                                 GdkRectangle               *expose_area,
-                                                guint                       flags);
+                                                GtkCellRendererState        flags);
 
 
 enum {
-       PROP_ZERO,
-       PROP_PIXBUF,
-       PROP_PIXBUF_EXPANDER_OPEN,
-       PROP_PIXBUF_EXPANDER_CLOSED
+  PROP_0,
+  PROP_PIXBUF,
+  PROP_PIXBUF_EXPANDER_OPEN,
+  PROP_PIXBUF_EXPANDER_CLOSED,
+  PROP_STOCK_ID,
+  PROP_STOCK_SIZE,
+  PROP_STOCK_DETAIL,
+  PROP_FOLLOW_STATE,
+  PROP_ICON_NAME,
+  PROP_GICON
 };
 
 
-GtkType
-gtk_cell_renderer_pixbuf_get_type (void)
+struct _GtkCellRendererPixbufPrivate
 {
-       static GtkType cell_pixbuf_type = 0;
+  GtkIconSize stock_size;
 
-       if (!cell_pixbuf_type)
-       {
-               static const GTypeInfo cell_pixbuf_info =
-               {
-                       sizeof (GtkCellRendererPixbufClass),
-                       NULL,           /* base_init */
-                       NULL,           /* base_finalize */
-                       (GClassInitFunc) gtk_cell_renderer_pixbuf_class_init,
-                       NULL,           /* class_finalize */
-                       NULL,           /* class_data */
-                       sizeof (GtkCellRendererPixbuf),
-                       0,              /* n_preallocs */
-                       (GInstanceInitFunc) gtk_cell_renderer_pixbuf_init,
-               };
-
-               cell_pixbuf_type = g_type_register_static (GTK_TYPE_CELL_RENDERER, "GtkCellRendererPixbuf", &cell_pixbuf_info, 0);
-       }
+  GdkPixbuf *pixbuf;
+  GdkPixbuf *pixbuf_expander_open;
+  GdkPixbuf *pixbuf_expander_closed;
+
+  GIcon *gicon;
+
+  gboolean follow_state;
+
+  gchar *stock_id;
+  gchar *stock_detail;
+  gchar *icon_name;
+};
+
+
+G_DEFINE_TYPE (GtkCellRendererPixbuf, gtk_cell_renderer_pixbuf, GTK_TYPE_CELL_RENDERER)
 
-       return cell_pixbuf_type;
-}
 
 static void
 gtk_cell_renderer_pixbuf_init (GtkCellRendererPixbuf *cellpixbuf)
 {
+  GtkCellRendererPixbufPrivate *priv;
+
+  cellpixbuf->priv = G_TYPE_INSTANCE_GET_PRIVATE (cellpixbuf,
+                                                  GTK_TYPE_CELL_RENDERER_PIXBUF,
+                                                  GtkCellRendererPixbufPrivate);
+  priv = cellpixbuf->priv;
+
+  priv->stock_size = GTK_ICON_SIZE_MENU;
 }
 
 static void
 gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class)
 {
-       GObjectClass *object_class = G_OBJECT_CLASS (class);
-       GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
-
-       object_class->get_property = gtk_cell_renderer_pixbuf_get_property;
-       object_class->set_property = gtk_cell_renderer_pixbuf_set_property;
-
-       cell_class->get_size = gtk_cell_renderer_pixbuf_get_size;
-       cell_class->render = gtk_cell_renderer_pixbuf_render;
-
-       g_object_class_install_property (object_class,
-                                        PROP_PIXBUF,
-                                        g_param_spec_object ("pixbuf",
-                                                             _("Pixbuf Object"),
-                                                             _("The pixbuf to render."),
-                                                             GDK_TYPE_PIXBUF,
-                                                             G_PARAM_READABLE |
-                                                             G_PARAM_WRITABLE));
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
+
+  object_class->finalize = gtk_cell_renderer_pixbuf_finalize;
+
+  object_class->get_property = gtk_cell_renderer_pixbuf_get_property;
+  object_class->set_property = gtk_cell_renderer_pixbuf_set_property;
+
+  cell_class->get_size = gtk_cell_renderer_pixbuf_get_size;
+  cell_class->render = gtk_cell_renderer_pixbuf_render;
+
+  g_object_class_install_property (object_class,
+                                  PROP_PIXBUF,
+                                  g_param_spec_object ("pixbuf",
+                                                       P_("Pixbuf Object"),
+                                                       P_("The pixbuf to render"),
+                                                       GDK_TYPE_PIXBUF,
+                                                       GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                  PROP_PIXBUF_EXPANDER_OPEN,
+                                  g_param_spec_object ("pixbuf-expander-open",
+                                                       P_("Pixbuf Expander Open"),
+                                                       P_("Pixbuf for open expander"),
+                                                       GDK_TYPE_PIXBUF,
+                                                       GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                  PROP_PIXBUF_EXPANDER_CLOSED,
+                                  g_param_spec_object ("pixbuf-expander-closed",
+                                                       P_("Pixbuf Expander Closed"),
+                                                       P_("Pixbuf for closed expander"),
+                                                       GDK_TYPE_PIXBUF,
+                                                       GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                  PROP_STOCK_ID,
+                                  g_param_spec_string ("stock-id",
+                                                       P_("Stock ID"),
+                                                       P_("The stock ID of the stock icon to render"),
+                                                       NULL,
+                                                       GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                  PROP_STOCK_SIZE,
+                                  g_param_spec_uint ("stock-size",
+                                                     P_("Size"),
+                                                     P_("The GtkIconSize value that specifies the size of the rendered icon"),
+                                                     0,
+                                                     G_MAXUINT,
+                                                     GTK_ICON_SIZE_MENU,
+                                                     GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                  PROP_STOCK_DETAIL,
+                                  g_param_spec_string ("stock-detail",
+                                                       P_("Detail"),
+                                                       P_("Render detail to pass to the theme engine"),
+                                                       NULL,
+                                                       GTK_PARAM_READWRITE));
+
+  
+  /**
+   * GtkCellRendererPixbuf:icon-name:
+   *
+   * The name of the themed icon to display.
+   * This property only has an effect if not overridden by "stock_id" 
+   * or "pixbuf" properties.
+   *
+   * Since: 2.8 
+   */
+  g_object_class_install_property (object_class,
+                                  PROP_ICON_NAME,
+                                  g_param_spec_string ("icon-name",
+                                                       P_("Icon Name"),
+                                                       P_("The name of the icon from the icon theme"),
+                                                       NULL,
+                                                       GTK_PARAM_READWRITE));
+
+  /**
+   * GtkCellRendererPixbuf:follow-state:
+   *
+   * Specifies whether the rendered pixbuf should be colorized
+   * according to the #GtkCellRendererState.
+   *
+   * Since: 2.8
+   */
+  g_object_class_install_property (object_class,
+                                  PROP_FOLLOW_STATE,
+                                  g_param_spec_boolean ("follow-state",
+                                                        P_("Follow State"),
+                                                        P_("Whether the rendered pixbuf should be "
+                                                           "colorized according to the state"),
+                                                        FALSE,
+                                                        GTK_PARAM_READWRITE));
+
+  /**
+   * GtkCellRendererPixbuf:gicon:
+   *
+   * The GIcon representing the icon to display.
+   * If the icon theme is changed, the image will be updated
+   * automatically.
+   *
+   * Since: 2.14
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_GICON,
+                                   g_param_spec_object ("gicon",
+                                                        P_("Icon"),
+                                                        P_("The GIcon being displayed"),
+                                                        G_TYPE_ICON,
+                                                        GTK_PARAM_READWRITE));
+
+
+
+  g_type_class_add_private (object_class, sizeof (GtkCellRendererPixbufPrivate));
+}
+
+static void
+gtk_cell_renderer_pixbuf_finalize (GObject *object)
+{
+  GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
+
+  if (priv->pixbuf)
+    g_object_unref (priv->pixbuf);
+  if (priv->pixbuf_expander_open)
+    g_object_unref (priv->pixbuf_expander_open);
+  if (priv->pixbuf_expander_closed)
+    g_object_unref (priv->pixbuf_expander_closed);
+
+  g_free (priv->stock_id);
+  g_free (priv->stock_detail);
+  g_free (priv->icon_name);
+
+  if (priv->gicon)
+    g_object_unref (priv->gicon);
+
+  G_OBJECT_CLASS (gtk_cell_renderer_pixbuf_parent_class)->finalize (object);
 }
 
 static void
@@ -115,20 +252,36 @@ gtk_cell_renderer_pixbuf_get_property (GObject        *object,
                                       GParamSpec     *pspec)
 {
   GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
-  
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
+
   switch (param_id)
     {
     case PROP_PIXBUF:
-      g_value_set_object (value,
-                          cellpixbuf->pixbuf ? G_OBJECT (cellpixbuf->pixbuf) : NULL);
+      g_value_set_object (value, priv->pixbuf);
       break;
     case PROP_PIXBUF_EXPANDER_OPEN:
-      g_value_set_object (value,
-                          cellpixbuf->pixbuf_expander_open ? G_OBJECT (cellpixbuf->pixbuf_expander_open) : NULL);
+      g_value_set_object (value, priv->pixbuf_expander_open);
       break;
     case PROP_PIXBUF_EXPANDER_CLOSED:
-      g_value_set_object (value,
-                          cellpixbuf->pixbuf_expander_closed ? G_OBJECT (cellpixbuf->pixbuf_expander_closed) : NULL);
+      g_value_set_object (value, priv->pixbuf_expander_closed);
+      break;
+    case PROP_STOCK_ID:
+      g_value_set_string (value, priv->stock_id);
+      break;
+    case PROP_STOCK_SIZE:
+      g_value_set_uint (value, priv->stock_size);
+      break;
+    case PROP_STOCK_DETAIL:
+      g_value_set_string (value, priv->stock_detail);
+      break;
+    case PROP_FOLLOW_STATE:
+      g_value_set_boolean (value, priv->follow_state);
+      break;
+    case PROP_ICON_NAME:
+      g_value_set_string (value, priv->icon_name);
+      break;
+    case PROP_GICON:
+      g_value_set_object (value, priv->gicon);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -136,44 +289,164 @@ gtk_cell_renderer_pixbuf_get_property (GObject        *object,
     }
 }
 
-
 static void
 gtk_cell_renderer_pixbuf_set_property (GObject      *object,
                                       guint         param_id,
                                       const GValue *value,
                                       GParamSpec   *pspec)
 {
-  GdkPixbuf *pixbuf;
   GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
-  
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
+
   switch (param_id)
     {
     case PROP_PIXBUF:
-      pixbuf = (GdkPixbuf*) g_value_get_object (value);
-      if (pixbuf)
-        g_object_ref (G_OBJECT (pixbuf));
-      if (cellpixbuf->pixbuf)
-       g_object_unref (G_OBJECT (cellpixbuf->pixbuf));
-      cellpixbuf->pixbuf = pixbuf;
-      g_object_notify (object, "pixbuf");
+      if (priv->pixbuf)
+        g_object_unref (priv->pixbuf);
+      priv->pixbuf = (GdkPixbuf*) g_value_dup_object (value);
+      if (priv->pixbuf)
+        {
+          if (priv->stock_id)
+            {
+              g_free (priv->stock_id);
+              priv->stock_id = NULL;
+              g_object_notify (object, "stock-id");
+            }
+          if (priv->icon_name)
+            {
+              g_free (priv->icon_name);
+              priv->icon_name = NULL;
+              g_object_notify (object, "icon-name");
+            }
+          if (priv->gicon)
+            {
+              g_object_unref (priv->gicon);
+              priv->gicon = NULL;
+              g_object_notify (object, "gicon");
+            }
+        }
       break;
     case PROP_PIXBUF_EXPANDER_OPEN:
-      pixbuf = (GdkPixbuf*) g_value_get_object (value);
-      if (pixbuf)
-        g_object_ref (G_OBJECT (pixbuf));
-      if (cellpixbuf->pixbuf_expander_open)
-       g_object_unref (G_OBJECT (cellpixbuf->pixbuf_expander_open));
-      cellpixbuf->pixbuf_expander_open = pixbuf;
-      g_object_notify (object, "pixbuf_expander_open");
+      if (priv->pixbuf_expander_open)
+        g_object_unref (priv->pixbuf_expander_open);
+      priv->pixbuf_expander_open = (GdkPixbuf*) g_value_dup_object (value);
       break;
     case PROP_PIXBUF_EXPANDER_CLOSED:
-      pixbuf = (GdkPixbuf*) g_value_get_object (value);
-      if (pixbuf)
-        g_object_ref (G_OBJECT (pixbuf));
-      if (cellpixbuf->pixbuf_expander_closed)
-       g_object_unref (G_OBJECT (cellpixbuf->pixbuf_expander_closed));
-      cellpixbuf->pixbuf_expander_closed = pixbuf;
-      g_object_notify (object, "pixbuf_expander_closed");
+      if (priv->pixbuf_expander_closed)
+        g_object_unref (priv->pixbuf_expander_closed);
+      priv->pixbuf_expander_closed = (GdkPixbuf*) g_value_dup_object (value);
+      break;
+    case PROP_STOCK_ID:
+      if (priv->stock_id)
+        {
+          if (priv->pixbuf)
+            {
+              g_object_unref (priv->pixbuf);
+              priv->pixbuf = NULL;
+              g_object_notify (object, "pixbuf");
+            }
+          g_free (priv->stock_id);
+        }
+      priv->stock_id = g_value_dup_string (value);
+      if (priv->stock_id)
+        {
+          if (priv->pixbuf)
+            {
+              g_object_unref (priv->pixbuf);
+              priv->pixbuf = NULL;
+              g_object_notify (object, "pixbuf");
+            }
+          if (priv->icon_name)
+            {
+              g_free (priv->icon_name);
+              priv->icon_name = NULL;
+              g_object_notify (object, "icon-name");
+            }
+          if (priv->gicon)
+            {
+              g_object_unref (priv->gicon);
+              priv->gicon = NULL;
+              g_object_notify (object, "gicon");
+            }
+        }
+      break;
+    case PROP_STOCK_SIZE:
+      priv->stock_size = g_value_get_uint (value);
+      break;
+    case PROP_STOCK_DETAIL:
+      g_free (priv->stock_detail);
+      priv->stock_detail = g_value_dup_string (value);
+      break;
+    case PROP_ICON_NAME:
+      if (priv->icon_name)
+        {
+          if (priv->pixbuf)
+            {
+              g_object_unref (priv->pixbuf);
+              priv->pixbuf = NULL;
+              g_object_notify (object, "pixbuf");
+            }
+          g_free (priv->icon_name);
+        }
+      priv->icon_name = g_value_dup_string (value);
+      if (priv->icon_name)
+        {
+          if (priv->pixbuf)
+            {
+              g_object_unref (priv->pixbuf);
+              priv->pixbuf = NULL;
+              g_object_notify (object, "pixbuf");
+            }
+          if (priv->stock_id)
+            {
+              g_free (priv->stock_id);
+              priv->stock_id = NULL;
+              g_object_notify (object, "stock-id");
+            }
+          if (priv->gicon)
+            {
+              g_object_unref (priv->gicon);
+              priv->gicon = NULL;
+              g_object_notify (object, "gicon");
+            }
+        }
+      break;
+    case PROP_FOLLOW_STATE:
+      priv->follow_state = g_value_get_boolean (value);
+      break;
+    case PROP_GICON:
+      if (priv->gicon)
+        {
+          if (priv->pixbuf)
+            {
+              g_object_unref (priv->pixbuf);
+              priv->pixbuf = NULL;
+              g_object_notify (object, "pixbuf");
+            }
+          g_object_unref (priv->gicon);
+        }
+      priv->gicon = (GIcon *) g_value_dup_object (value);
+      if (priv->gicon)
+        {
+          if (priv->pixbuf)
+            {
+              g_object_unref (priv->pixbuf);
+              priv->pixbuf = NULL;
+              g_object_notify (object, "pixbuf");
+            }
+          if (priv->stock_id)
+            {
+              g_free (priv->stock_id);
+              priv->stock_id = NULL;
+              g_object_notify (object, "stock-id");
+            }
+          if (priv->icon_name)
+            {
+              g_free (priv->icon_name);
+              priv->icon_name = NULL;
+              g_object_notify (object, "icon-name");
+            }
+        }
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -197,9 +470,200 @@ gtk_cell_renderer_pixbuf_set_property (GObject      *object,
 GtkCellRenderer *
 gtk_cell_renderer_pixbuf_new (void)
 {
-  return GTK_CELL_RENDERER (gtk_type_new (gtk_cell_renderer_pixbuf_get_type ()));
+  return g_object_new (GTK_TYPE_CELL_RENDERER_PIXBUF, NULL);
 }
 
+static void
+gtk_cell_renderer_pixbuf_create_stock_pixbuf (GtkCellRendererPixbuf *cellpixbuf,
+                                              GtkWidget             *widget)
+{
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
+
+  if (priv->pixbuf)
+    g_object_unref (priv->pixbuf);
+
+  priv->pixbuf = gtk_widget_render_icon (widget,
+                                               priv->stock_id,
+                                               priv->stock_size,
+                                               priv->stock_detail);
+
+  g_object_notify (G_OBJECT (cellpixbuf), "pixbuf");
+}
+
+static void 
+gtk_cell_renderer_pixbuf_create_themed_pixbuf (GtkCellRendererPixbuf *cellpixbuf,
+                                              GtkWidget             *widget)
+{
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
+  GdkScreen *screen;
+  GtkIconTheme *icon_theme;
+  GtkSettings *settings;
+  gint width, height;
+  GtkIconInfo *info;
+
+  if (priv->pixbuf)
+    {
+      g_object_unref (priv->pixbuf);
+      priv->pixbuf = NULL;
+    }
+
+  screen = gtk_widget_get_screen (GTK_WIDGET (widget));
+  icon_theme = gtk_icon_theme_get_for_screen (screen);
+  settings = gtk_settings_get_for_screen (screen);
+
+  if (!gtk_icon_size_lookup_for_settings (settings,
+                                         priv->stock_size,
+                                         &width, &height))
+    {
+      g_warning ("Invalid icon size %u\n", priv->stock_size);
+      width = height = 24;
+    }
+
+  if (priv->icon_name)
+    info = gtk_icon_theme_lookup_icon (icon_theme,
+                                       priv->icon_name,
+                                       MIN (width, height),
+                                       GTK_ICON_LOOKUP_USE_BUILTIN);
+  else if (priv->gicon)
+    info = gtk_icon_theme_lookup_by_gicon (icon_theme,
+                                           priv->gicon,
+                                           MIN (width, height),
+                                           GTK_ICON_LOOKUP_USE_BUILTIN);
+  else
+    info = NULL;
+
+  if (info)
+    {
+      GtkStyle *style;
+
+      style = gtk_widget_get_style (GTK_WIDGET (widget));
+      priv->pixbuf = gtk_icon_info_load_symbolic_for_style (info,
+                                                            style,
+                                                            GTK_STATE_NORMAL,
+                                                            NULL,
+                                                            NULL);
+      gtk_icon_info_free (info);
+    }
+
+  g_object_notify (G_OBJECT (cellpixbuf), "pixbuf");
+}
+
+static GdkPixbuf *
+create_symbolic_pixbuf (GtkCellRendererPixbuf *cellpixbuf,
+                       GtkWidget             *widget,
+                       GtkStateType           state)
+{
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
+  GdkScreen *screen;
+  GtkIconTheme *icon_theme;
+  GtkSettings *settings;
+  gint width, height;
+  GtkIconInfo *info;
+  GdkPixbuf *pixbuf;
+
+  /* Not a named symbolic icon? */
+  if (priv->icon_name) {
+    if (!g_str_has_suffix (priv->icon_name, "-symbolic"))
+      return NULL;
+  } else if (priv->gicon) {
+    const gchar * const *names;
+    if (!G_IS_THEMED_ICON (priv->gicon))
+      return NULL;
+    names = g_themed_icon_get_names (G_THEMED_ICON (priv->gicon));
+    if (names == NULL || !g_str_has_suffix (names[0], "-symbolic"))
+      return NULL;
+  } else {
+    return NULL;
+  }
+
+  screen = gtk_widget_get_screen (GTK_WIDGET (widget));
+  icon_theme = gtk_icon_theme_get_for_screen (screen);
+  settings = gtk_settings_get_for_screen (screen);
+
+  if (!gtk_icon_size_lookup_for_settings (settings,
+                                         priv->stock_size,
+                                         &width, &height))
+    {
+      g_warning ("Invalid icon size %u\n", priv->stock_size);
+      width = height = 24;
+    }
+
+
+  if (priv->icon_name)
+    info = gtk_icon_theme_lookup_icon (icon_theme,
+                                       priv->icon_name,
+                                       MIN (width, height),
+                                       GTK_ICON_LOOKUP_USE_BUILTIN);
+  else if (priv->gicon)
+    info = gtk_icon_theme_lookup_by_gicon (icon_theme,
+                                           priv->gicon,
+                                           MIN (width, height),
+                                           GTK_ICON_LOOKUP_USE_BUILTIN);
+  else
+    return NULL;
+
+  if (info)
+    {
+      GtkStyle *style;
+
+      style = gtk_widget_get_style (GTK_WIDGET (widget));
+      pixbuf = gtk_icon_info_load_symbolic_for_style (info,
+                                                      style, state,
+                                                      NULL, NULL);
+      gtk_icon_info_free (info);
+      return pixbuf;
+    }
+
+  return NULL;
+}
+
+static GdkPixbuf *
+create_colorized_pixbuf (GdkPixbuf *src, 
+                        GdkColor  *new_color)
+{
+  gint i, j;
+  gint width, height, has_alpha, src_row_stride, dst_row_stride;
+  gint red_value, green_value, blue_value;
+  guchar *target_pixels;
+  guchar *original_pixels;
+  guchar *pixsrc;
+  guchar *pixdest;
+  GdkPixbuf *dest;
+  
+  red_value = new_color->red / 255.0;
+  green_value = new_color->green / 255.0;
+  blue_value = new_color->blue / 255.0;
+  
+  dest = gdk_pixbuf_new (gdk_pixbuf_get_colorspace (src),
+                        gdk_pixbuf_get_has_alpha (src),
+                        gdk_pixbuf_get_bits_per_sample (src),
+                        gdk_pixbuf_get_width (src),
+                        gdk_pixbuf_get_height (src));
+  
+  has_alpha = gdk_pixbuf_get_has_alpha (src);
+  width = gdk_pixbuf_get_width (src);
+  height = gdk_pixbuf_get_height (src);
+  src_row_stride = gdk_pixbuf_get_rowstride (src);
+  dst_row_stride = gdk_pixbuf_get_rowstride (dest);
+  target_pixels = gdk_pixbuf_get_pixels (dest);
+  original_pixels = gdk_pixbuf_get_pixels (src);
+  
+  for (i = 0; i < height; i++) {
+    pixdest = target_pixels + i*dst_row_stride;
+    pixsrc = original_pixels + i*src_row_stride;
+    for (j = 0; j < width; j++) {              
+      *pixdest++ = (*pixsrc++ * red_value) >> 8;
+      *pixdest++ = (*pixsrc++ * green_value) >> 8;
+      *pixdest++ = (*pixsrc++ * blue_value) >> 8;
+      if (has_alpha) {
+       *pixdest++ = *pixsrc++;
+      }
+    }
+  }
+  return dest;
+}
+
+
 static void
 gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer *cell,
                                   GtkWidget       *widget,
@@ -210,48 +674,67 @@ gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer *cell,
                                   gint            *height)
 {
   GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
-  gint pixbuf_width = 0;
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
+  gint pixbuf_width  = 0;
   gint pixbuf_height = 0;
   gint calc_width;
   gint calc_height;
+  gint xpad, ypad;
 
-  if (cellpixbuf->pixbuf)
+  if (!priv->pixbuf)
     {
-      pixbuf_width = gdk_pixbuf_get_width (cellpixbuf->pixbuf);
-      pixbuf_height = gdk_pixbuf_get_height (cellpixbuf->pixbuf);
+      if (priv->stock_id)
+       gtk_cell_renderer_pixbuf_create_stock_pixbuf (cellpixbuf, widget);
+      else if (priv->icon_name || priv->gicon)
+       gtk_cell_renderer_pixbuf_create_themed_pixbuf (cellpixbuf, widget);
     }
-  if (cellpixbuf->pixbuf_expander_open)
+  
+  if (priv->pixbuf)
     {
-      pixbuf_width = MAX (pixbuf_width, gdk_pixbuf_get_width (cellpixbuf->pixbuf_expander_open));
-      pixbuf_height = MAX (pixbuf_height, gdk_pixbuf_get_height (cellpixbuf->pixbuf_expander_open));
+      pixbuf_width  = gdk_pixbuf_get_width (priv->pixbuf);
+      pixbuf_height = gdk_pixbuf_get_height (priv->pixbuf);
     }
-  if (cellpixbuf->pixbuf_expander_closed)
+  if (priv->pixbuf_expander_open)
     {
-      pixbuf_width = MAX (pixbuf_width, gdk_pixbuf_get_width (cellpixbuf->pixbuf_expander_closed));
-      pixbuf_height = MAX (pixbuf_height, gdk_pixbuf_get_height (cellpixbuf->pixbuf_expander_closed));
+      pixbuf_width  = MAX (pixbuf_width, gdk_pixbuf_get_width (priv->pixbuf_expander_open));
+      pixbuf_height = MAX (pixbuf_height, gdk_pixbuf_get_height (priv->pixbuf_expander_open));
+    }
+  if (priv->pixbuf_expander_closed)
+    {
+      pixbuf_width  = MAX (pixbuf_width, gdk_pixbuf_get_width (priv->pixbuf_expander_closed));
+      pixbuf_height = MAX (pixbuf_height, gdk_pixbuf_get_height (priv->pixbuf_expander_closed));
     }
-  
-  calc_width = (gint) GTK_CELL_RENDERER (cellpixbuf)->xpad * 2 + pixbuf_width;
-  calc_height = (gint) GTK_CELL_RENDERER (cellpixbuf)->ypad * 2 + pixbuf_height;
-  
-  if (x_offset) *x_offset = 0;
-  if (y_offset) *y_offset = 0;
 
+  gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
+  calc_width  = (gint) xpad * 2 + pixbuf_width;
+  calc_height = (gint) ypad * 2 + pixbuf_height;
+  
   if (cell_area && pixbuf_width > 0 && pixbuf_height > 0)
     {
+      gfloat xalign, yalign;
+
+      gtk_cell_renderer_get_alignment (cell, &xalign, &yalign);
       if (x_offset)
        {
-         *x_offset = GTK_CELL_RENDERER (cellpixbuf)->xalign * (cell_area->width - calc_width - (2 * GTK_CELL_RENDERER (cellpixbuf)->xpad));
-         *x_offset = MAX (*x_offset, 0) + GTK_CELL_RENDERER (cellpixbuf)->xpad;
+         *x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
+                        (1.0 - xalign) : xalign) *
+                       (cell_area->width - calc_width));
+         *x_offset = MAX (*x_offset, 0);
        }
       if (y_offset)
        {
-         *y_offset = GTK_CELL_RENDERER (cellpixbuf)->yalign * (cell_area->height - calc_height - (2 * GTK_CELL_RENDERER (cellpixbuf)->ypad));
-         *y_offset = MAX (*y_offset, 0) + GTK_CELL_RENDERER (cellpixbuf)->ypad;
+         *y_offset = (yalign *
+                       (cell_area->height - calc_height));
+          *y_offset = MAX (*y_offset, 0);
        }
     }
+  else
+    {
+      if (x_offset) *x_offset = 0;
+      if (y_offset) *y_offset = 0;
+    }
 
-  if (calc_width)
+  if (width)
     *width = calc_width;
   
   if (height)
@@ -259,62 +742,130 @@ gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer *cell,
 }
 
 static void
-gtk_cell_renderer_pixbuf_render (GtkCellRenderer    *cell,
-                                GdkWindow          *window,
-                                GtkWidget          *widget,
-                                GdkRectangle       *background_area,
-                                GdkRectangle       *cell_area,
-                                GdkRectangle       *expose_area,
-                                guint               flags)
+gtk_cell_renderer_pixbuf_render (GtkCellRenderer      *cell,
+                                GdkWindow            *window,
+                                GtkWidget            *widget,
+                                GdkRectangle         *background_area,
+                                GdkRectangle         *cell_area,
+                                GdkRectangle         *expose_area,
+                                GtkCellRendererState  flags)
 
 {
   GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
   GdkPixbuf *pixbuf;
-  guchar *pixels;
-  gint rowstride;
+  GdkPixbuf *invisible = NULL;
+  GdkPixbuf *colorized = NULL;
+  GdkPixbuf *symbolic = NULL;
   GdkRectangle pix_rect;
   GdkRectangle draw_rect;
+  cairo_t *cr;
+  gboolean is_expander;
+  gint xpad, ypad;
+
+  gtk_cell_renderer_pixbuf_get_size (cell, widget, cell_area,
+                                    &pix_rect.x,
+                                    &pix_rect.y,
+                                    &pix_rect.width,
+                                    &pix_rect.height);
+
+  gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
+  pix_rect.x += cell_area->x + xpad;
+  pix_rect.y += cell_area->y + ypad;
+  pix_rect.width  -= xpad * 2;
+  pix_rect.height -= ypad * 2;
+
+  if (!gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect) ||
+      !gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect))
+    return;
 
-  pixbuf = cellpixbuf->pixbuf;
-  if (cell->is_expander)
+  pixbuf = priv->pixbuf;
+
+  g_object_get (cell, "is-expander", &is_expander, NULL);
+  if (is_expander)
     {
-      if (cell->is_expanded &&
-         cellpixbuf->pixbuf_expander_open != NULL)
-       pixbuf = cellpixbuf->pixbuf_expander_open;
-      else if (! cell->is_expanded &&
-              cellpixbuf->pixbuf_expander_closed != NULL)
-       pixbuf = cellpixbuf->pixbuf_expander_closed;
+      gboolean is_expanded;
+
+      g_object_get (cell, "is-expanded", &is_expanded, NULL);
+
+      if (is_expanded &&
+         priv->pixbuf_expander_open != NULL)
+       pixbuf = priv->pixbuf_expander_open;
+      else if (!is_expanded &&
+              priv->pixbuf_expander_closed != NULL)
+       pixbuf = priv->pixbuf_expander_closed;
     }
 
   if (!pixbuf)
     return;
 
-  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-  pixels = gdk_pixbuf_get_pixels (pixbuf);
+  if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE ||
+      !gtk_cell_renderer_get_sensitive (cell))
+    {
+      GtkIconSource *source;
+      
+      source = gtk_icon_source_new ();
+      gtk_icon_source_set_pixbuf (source, pixbuf);
+      /* The size here is arbitrary; since size isn't
+       * wildcarded in the source, it isn't supposed to be
+       * scaled by the engine function
+       */
+      gtk_icon_source_set_size (source, GTK_ICON_SIZE_SMALL_TOOLBAR);
+      gtk_icon_source_set_size_wildcarded (source, FALSE);
 
-  gtk_cell_renderer_pixbuf_get_size (cell, widget, cell_area,
-                                    &pix_rect.x,
-                                    &pix_rect.y,
-                                    &pix_rect.width,
-                                    &pix_rect.height);
+     invisible = gtk_style_render_icon (gtk_widget_get_style (widget),
+                                       source,
+                                       gtk_widget_get_direction (widget),
+                                       GTK_STATE_INSENSITIVE,
+                                       /* arbitrary */
+                                       (GtkIconSize)-1,
+                                       widget,
+                                       "gtkcellrendererpixbuf");
+     
+     gtk_icon_source_free (source);
+     
+     pixbuf = invisible;
+    }
+  else if (priv->follow_state && 
+          (flags & (GTK_CELL_RENDERER_SELECTED|GTK_CELL_RENDERER_PRELIT)) != 0)
+    {
+      GtkStateType state;
+
+      if ((flags & GTK_CELL_RENDERER_SELECTED) != 0)
+       {
+         if (gtk_widget_has_focus (widget))
+           state = GTK_STATE_SELECTED;
+         else
+           state = GTK_STATE_ACTIVE;
+       }
+      else
+       state = GTK_STATE_PRELIGHT;
+
+      symbolic = create_symbolic_pixbuf (cellpixbuf, widget, state);
+      if (!symbolic) {
+        colorized = create_colorized_pixbuf (pixbuf,
+                                             &gtk_widget_get_style (widget)->base[state]);
+
+       pixbuf = colorized;
+      } else {
+        pixbuf = symbolic;
+      }
+    }
+
+  cr = gdk_cairo_create (window);
   
-  pix_rect.x += cell_area->x;
-  pix_rect.y += cell_area->y;
-  pix_rect.width -= cell->xpad * 2;
-  pix_rect.height -= cell->ypad * 2;
+  gdk_cairo_set_source_pixbuf (cr, pixbuf, pix_rect.x, pix_rect.y);
+  gdk_cairo_rectangle (cr, &draw_rect);
+  cairo_fill (cr);
+
+  cairo_destroy (cr);
   
-  if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect))
-    gdk_pixbuf_render_to_drawable_alpha (pixbuf,
-                                         window,
-                                         /* pixbuf 0, 0 is at pix_rect.x, pix_rect.y */
-                                         draw_rect.x - pix_rect.x,
-                                         draw_rect.y - pix_rect.y,
-                                         draw_rect.x,
-                                         draw_rect.y,
-                                         draw_rect.width,
-                                         draw_rect.height,
-                                         GDK_PIXBUF_ALPHA_FULL,
-                                         0,
-                                         GDK_RGB_DITHER_NORMAL,
-                                         0, 0);
+  if (invisible)
+    g_object_unref (invisible);
+
+  if (colorized)
+    g_object_unref (colorized);
+
+  if (symbolic)
+    g_object_unref (symbolic);
 }