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.

1 files changed, 99 insertions, 0 deletions

diff --git a/gdk-pixbuf/gdk-pixbuf-util.c b/gdk-pixbuf/gdk-pixbuf-util.c
index 848aadd14..db8ca758e 100644
--- a/gdk-pixbuf/gdk-pixbuf-util.c
+++ b/gdk-pixbuf/gdk-pixbuf-util.c
@@ -131,3 +131,102 @@ gdk_pixbuf_copy_area (const GdkPixbuf *src_pixbuf,
 			  1.0, 1.0,
 			  GDK_INTERP_NEAREST);
 }
+
+
+
+#define INTENSITY(r, g, b) ((r) * 0.30 + (g) * 0.59 + (b) * 0.11)
+
+/**
+ * gdk_pixbuf_saturate_and_pixelate:
+ * @src: source image
+ * @dest: place to write modified version of @src
+ * @saturation: saturation factor
+ * @pixelate: whether to pixelate
+ *
+ * Modifies saturation and optionally pixelates @src, placing the
+ * result in @dest. @src and @dest may be the same pixbuf with no ill
+ * effects.  If @saturation is 1.0 then saturation is not changed. If
+ * it's less than 1.0, saturation is reduced (the image is darkened);
+ * if greater than 1.0, saturation is increased (the image is
+ * brightened). If @pixelate is TRUE, then pixels are faded in a
+ * checkerboard pattern to create a pixelated image. @src and @dest
+ * must have the same image format, size, and rowstride.
+ * 
+ **/
+void
+gdk_pixbuf_saturate_and_pixelate(const GdkPixbuf *src,
+                                 GdkPixbuf *dest,
+                                 gfloat saturation,
+                                 gboolean pixelate)
+{
+        /* NOTE that src and dest MAY be the same pixbuf! */
+  
+        g_return_if_fail (GDK_IS_PIXBUF (src));
+        g_return_if_fail (GDK_IS_PIXBUF (dest));
+        g_return_if_fail (gdk_pixbuf_get_height (src) == gdk_pixbuf_get_height (dest));
+        g_return_if_fail (gdk_pixbuf_get_width (src) == gdk_pixbuf_get_width (dest));
+        g_return_if_fail (gdk_pixbuf_get_rowstride (src) == gdk_pixbuf_get_rowstride (dest));
+        g_return_if_fail (gdk_pixbuf_get_colorspace (src) == gdk_pixbuf_get_colorspace (dest));
+  
+        if (saturation == 1.0 && !pixelate) {
+                if (dest != src)
+                        memcpy (gdk_pixbuf_get_pixels (dest),
+                                gdk_pixbuf_get_pixels (src),
+                                gdk_pixbuf_get_height (src) * gdk_pixbuf_get_rowstride (src));
+
+                return;
+        } else {
+                gint i, j;
+                gint width, height, has_alpha, rowstride;
+                guchar *target_pixels;
+                guchar *original_pixels;
+                guchar *current_pixel;
+                guchar intensity;
+
+                has_alpha = gdk_pixbuf_get_has_alpha (src);
+                width = gdk_pixbuf_get_width (src);
+                height = gdk_pixbuf_get_height (src);
+                rowstride = gdk_pixbuf_get_rowstride (src);
+                
+                target_pixels = gdk_pixbuf_get_pixels (dest);
+                original_pixels = gdk_pixbuf_get_pixels (src);
+
+                for (i = 0; i < height; i++) {
+                        for (j = 0; j < width; j++) {
+                                current_pixel = original_pixels + i*rowstride + j*(has_alpha?4:3);
+                                intensity = INTENSITY (*(current_pixel), *(current_pixel + 1), *(current_pixel + 2));
+                                if (pixelate && (i+j)%2 == 0) {
+                                        *(target_pixels + i*rowstride + j*(has_alpha?4:3)) = intensity/2 + 127;
+                                        *(target_pixels + i*rowstride + j*(has_alpha?4:3) + 1) = intensity/2 + 127;
+                                        *(target_pixels + i*rowstride + j*(has_alpha?4:3) + 2) = intensity/2 + 127;
+                                } else if (pixelate) {
+#define DARK_FACTOR 0.7
+                                        *(target_pixels + i*rowstride + j*(has_alpha?4:3)) =
+                                                (guchar) (((1.0 - saturation) * intensity
+                                                           + saturation * (*(current_pixel)))) * DARK_FACTOR;
+                                        *(target_pixels + i*rowstride + j*(has_alpha?4:3) + 1) =
+                                                (guchar) (((1.0 - saturation) * intensity
+                                                           + saturation * (*(current_pixel + 1)))) * DARK_FACTOR;
+                                        *(target_pixels + i*rowstride + j*(has_alpha?4:3) + 2) =
+                                                (guchar) (((1.0 - saturation) * intensity
+                                                           + saturation * (*(current_pixel + 2)))) * DARK_FACTOR;
+                                } else {
+                                        *(target_pixels + i*rowstride + j*(has_alpha?4:3)) =
+                                                (guchar) ((1.0 - saturation) * intensity
+                                                          + saturation * (*(current_pixel)));
+                                        *(target_pixels + i*rowstride + j*(has_alpha?4:3) + 1) =
+                                                (guchar) ((1.0 - saturation) * intensity
+                                                          + saturation * (*(current_pixel + 1)));
+                                        *(target_pixels + i*rowstride + j*(has_alpha?4:3) + 2) =
+                                                (guchar) ((1.0 - saturation) * intensity
+                                                          + saturation * (*(current_pixel + 2)));
+                                }
+              
+                                if (has_alpha)
+                                        *(target_pixels + i*rowstride + j*(has_alpha?4:3) + 3) = *(current_pixel + 3);
+                        }
+                }
+
+                return;
+        }
+}