]> Pileus Git - ~andy/gtk/blobdiff - gdk/gdkpixbuf-drawable.c
Broadway/Quartz/Win32: make event source prepare()/check() note paused status
[~andy/gtk] / gdk / gdkpixbuf-drawable.c
index b2af116aef669ffbdee810385ce43731e63aa191..f8736bac7c802a08f03b9f5f694a7a4f6ae47016 100644 (file)
-/*
- * Creates an GdkPixbuf from a Drawable
+/* GdkPixbuf library - convert X drawable information to RGB
  *
- * Authors:
- *   Cody Russell <bratsche@dfw.net>
- *   Michael Zucchi  <zucchi@zedzone.mmc.com.au>
+ * Copyright (C) 1999 Michael Zucchi
  *
- * This is licensed software, see the file COPYING for
- * details.
+ * Authors: Michael Zucchi <zucchi@zedzone.mmc.com.au>
+ *          Cody Russell <bratsche@dfw.net>
+ *         Federico Mena-Quintero <federico@gimp.org>
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
-#include <stdio.h>
-#include <string.h>
-#include <glib.h>
-#include <gmodule.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-drawable.h"
-
-
-#if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
-#define LITTLE
-#endif
-#define d(x)
-
-static unsigned long mask_table[] = {
-       0x00000000, 0x00000001, 0x00000003, 0x00000007,
-       0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f,
-       0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff,
-       0x00000fff, 0x00001fff, 0x00003fff, 0x00007fff,
-       0x0000ffff, 0x0001ffff, 0x0003ffff, 0x0007ffff,
-       0x000fffff, 0x001fffff, 0x003fffff, 0x007fffff,
-       0x00ffffff, 0x01ffffff, 0x03ffffff, 0x07ffffff,
-       0x0fffffff, 0x1fffffff, 0x3fffffff, 0x7fffffff,
-       0xffffffff
-};
-
-/*
-  convert 1 bits-pixel data
-  no alpha
-*/
-static void rgb1(GdkImage *image, art_u8 *pixels, int rowstride)
-{
-       int xx, yy;
-       int width, height;
-       int bpl;
-       unsigned char *s;
-       register unsigned char data;
-       unsigned char *o;
-       unsigned char *srow = image->mem, *orow = pixels;
-       GdkColormap *colormap;  
-
-       d (printf ("1 bits/pixel\n"));
-
-       /* convert upto 8 pixels/time */
-       /* its probably not worth trying to make this run very fast, who uses
-          1 bit displays anymore? */
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-       
-       colormap = gdk_rgb_get_cmap ();
-
-       for (yy = 0; yy < height; yy++) {
-               s = srow;
-               o = orow;
-               
-               for (xx = 0; xx < width; xx ++) {
-                       data = srow[xx>>3] >> (7 - (xx & 7)) & 1;
-                       *o++ = colormap->colors[data].red;
-                       *o++ = colormap->colors[data].green;
-                       *o++ = colormap->colors[data].blue;
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
-}
+#include "config.h"
 
-/*
-  convert 1 bits/pixel data
-  with alpha
-*/
-static void rgb1a(GdkImage *image, art_u8 *pixels, int rowstride)
-{
-       int xx, yy;
-       int width, height;
-       int bpl;
-       unsigned char *s;
-       register unsigned char data;
-       unsigned char *o;
-       unsigned char *srow = image->mem, *orow = pixels;
-       unsigned long remap[2];
-       GdkColormap *colormap;  
-
-       d (printf ("1 bits/pixel\n"));
-
-       /* convert upto 8 pixels/time */
-       /* its probably not worth trying to make this run very fast, who uses
-          1 bit displays anymore? */
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-       
-       colormap = gdk_rgb_get_cmap ();
-
-       for (xx=0;xx<2;xx++) {
-#ifdef LITTLE
-               remap[xx] = 0xff000000
-                       | colormap->colors[xx].blue<<16
-                       | colormap->colors[xx].green<<8
-                       | colormap->colors[xx].red;
-#else
-               remap[xx] = 0xff
-                       | colormap->colors[xx].red<<24
-                       | colormap->colors[xx].green<<16
-                       | colormap->colors[xx].red<<8;
-#endif
-       }
-
-       for (yy = 0; yy < height; yy++) {
-               s = srow;
-               o = orow;
-               
-               for (xx = 0; xx < width; xx ++) {
-                       data = srow[xx>>3] >> (7 - (xx & 7)) & 1;
-                       *o++ = remap[data];
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
-}
+#include "gdkpixbuf.h"
 
-/*
-  convert 8 bits/pixel data
-  no alpha
-*/
-static void rgb8(GdkImage *image, art_u8 *pixels, int rowstride)
-{
-       int xx, yy;
-       int width, height;
-       int bpl;
-       unsigned long mask;
-       register unsigned long data;
-       unsigned char *srow = image->mem, *orow = pixels;
-       register unsigned char *s;
-       register unsigned char *o;
-       GdkColormap *colormap;  
-       
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-
-       d(printf("8 bit, no alpha output\n"));
-       
-       colormap = gdk_rgb_get_cmap ();
-       mask = mask_table[image->depth];
-
-       for (yy = 0;yy < height; yy++) {
-               s = srow;
-               o = orow;
-               for (xx = 0; xx < width; xx++) {
-                       data = *s++ & mask;
-                       *o++ = colormap->colors[data].red;
-                       *o++ = colormap->colors[data].green;
-                       *o++ = colormap->colors[data].blue;
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
-}
+#include "gdkcolor.h"
+#include "gdkwindow.h"
+#include "gdkinternals.h"
 
-/*
-  convert 8 bits/pixel data
-  with alpha
-*/
-static void rgb8a(GdkImage *image, art_u8 *pixels, int rowstride)
-{
-       int xx, yy;
-       int width, height;
-       int bpl;
-       unsigned long mask;
-       register unsigned long data;
-       GdkColormap *colormap;
-       unsigned long remap[256];       
-       register unsigned char *s;      /* read 2 pixels at once */
-       register unsigned long *o;
-       unsigned char *srow = image->mem, *orow = pixels;
-       
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-
-       d(printf("8 bit, with alpha output\n"));
-       
-       colormap = gdk_rgb_get_cmap ();
-       mask = mask_table[image->depth];
-       
-       for (xx=0;xx<colormap->size;xx++) {
-#ifdef LITTLE
-               remap[xx] = 0xff000000
-                       | colormap->colors[xx].blue<<16
-                       | colormap->colors[xx].green<<8
-                       | colormap->colors[xx].red;
-#else
-               remap[xx] = 0xff
-                       | colormap->colors[xx].red<<24
-                       | colormap->colors[xx].green<<16
-                       | colormap->colors[xx].red<<8;
-#endif
-       }
-       
-       for (yy = 0;yy < height; yy++) {
-               s = srow;
-               o = (unsigned long *)orow;
-               for (xx = 0; xx < width; xx ++) {
-                       data = *s++ & mask;
-                       *o++ = remap[data];
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
-}
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
-/*
-  convert 16 bits/pixel data
-  no alpha
-  data in lsb format
-*/
-static void rgb565lsb(GdkImage *image, art_u8 *pixels, int rowstride)
-{
-       int xx, yy;
-       int width, height;
-       int bpl;
-       
-#ifdef LITTLE
-       register unsigned long *s;      /* read 2 pixels at once */
-#else
-       register unsigned char *s;      /* read 2 pixels at once */
-#endif
-       register unsigned short *o;
-       unsigned char *srow = image->mem, *orow = pixels;
-       
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-       
-       for (yy = 0;yy < height; yy++) {
-#ifdef LITTLE
-               s = (unsigned long *)srow;
-#else
-               s = (unsigned char *)srow;
-#endif
-               o = (unsigned short *)orow;
-               for (xx = 1; xx < width; xx += 2) {
-                       register unsigned long data;
-#ifdef LITTLE
-                       data = *s++;
-                       *o++ = (data & 0xf800) >> 8 | (data & 0x7e0) << 5;
-                       *o++ = (data & 0x1f) << 3 | (data & 0xf8000000) >> 16;
-                       *o++ = ((data & 0x7e00000) >> 19) | (data & 0x1f0000) >> 5;
-#else
-                       /* swap endianness first */
-                       data = s[0] | s[1]<<8 | s[2]<<16 | s[3]<<24;
-                       s+=4;
-                       *o++ = (data & 0xf800) | (data & 0x7e0) >> 3;
-                       *o++ = (data & 0x1f) << 11 | (data & 0xf8000000) >> 24;
-                       *o++ = ((data & 0x7e00000) >> 11) | (data & 0x1f0000) >> 13;
-#endif
-               }
-               /* check for last remaining pixel */
-               if (width & 1) {
-                       register unsigned short data;
-#ifdef LITTLE
-                       data = *((short *) s);
-#else
-                       data = *((short *) s);
-                       data = ((data >> 8) & 0xff) | ((data & 0xff) << 8);
-#endif
-                       ((char *) o)[0] = (data >> 8) & 0xf8;
-                       ((char *) o)[1] = (data >> 3) & 0xfc;
-                       ((char *) o)[2] = (data << 3) & 0xf8;
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
-}
+/**
+ * SECTION:pixbufs
+ * @Short_description: Functions for obtaining pixbufs
+ * @Title: Pixbufs
+ *
+ * Pixbufs are client-side images. For details on how to create
+ * and manipulate pixbufs, see the #GdkPixbuf API documentation.
+ *
+ * The functions described here allow to obtain pixbufs from
+ * #GdkWindows and cairo surfaces.
+ */
 
-/*
-  convert 16 bits/pixel data
-  no alpha
-  data in msb format
-*/
-static void rgb565msb(GdkImage *image, art_u8 *pixels, int rowstride)
-{
-       int xx, yy;
-       int width, height;
-       int bpl;
-       
-#ifdef LITTLE
-       register unsigned char *s;      /* need to swap data order */
-#else
-       register unsigned long *s;      /* read 2 pixels at once */
-#endif
-       register unsigned short *o;
-       unsigned char *srow = image->mem, *orow = pixels;
-       
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-       
-       for (yy = 0;yy < height; yy++) {
-#ifdef LITTLE
-               s = srow;
-#else
-               s = (unsigned long *)srow;
-#endif
-               o = (unsigned short *)orow;
-               for (xx = 1; xx < width; xx += 2) {
-                       register unsigned long data;
-#ifdef LITTLE
-                       /* swap endianness first */
-                       data = s[0] | s[1]<<8 | s[2]<<16 | s[3]<<24;
-                       s+=4;
-                       *o++ = (data & 0xf800) >> 8 | (data & 0x7e0) << 5;
-                       *o++ = (data & 0x1f) << 3 | (data & 0xf8000000) >> 16;
-                       *o++ = ((data & 0x7e00000) >> 19) | (data & 0x1f0000) >> 5;
-#else
-                       data = *s++;
-                       *o++ = (data & 0xf800) | (data & 0x7e0) >> 3;
-                       *o++ = (data & 0x1f) << 11 | (data & 0xf8000000) >> 24;
-                       *o++ = ((data & 0x7e00000) >> 11) | (data & 0x1f0000) >> 13;
-#endif
-               }
-               /* check for last remaining pixel */
-               if (width & 1) {
-                       register unsigned short data;
-#ifdef LITTLE
-                       data = *((short *) s);
-                       data = ((data >> 8) & 0xff) | ((data & 0xff) << 8);
-#else
-                       data = *((short *) s);
-#endif
-                       ((char *) o)[0] = (data >> 8) & 0xf8;
-                       ((char *) o)[1] = (data >> 3) & 0xfc;
-                       ((char *) o)[2] = (data << 3) & 0xf8;
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
-}
 
-/*
-  convert 16 bits/pixel data
-  with alpha
-  data in lsb format
-*/
-static void rgb565alsb(GdkImage *image, art_u8 *pixels, int rowstride)
+/**
+ * gdk_pixbuf_get_from_window:
+ * @window: Source window
+ * @src_x: Source X coordinate within @window
+ * @src_y: Source Y coordinate within @window
+ * @width: Width in pixels of region to get
+ * @height: Height in pixels of region to get
+ *
+ * Transfers image data from a #GdkWindow and converts it to an RGB(A)
+ * representation inside a #GdkPixbuf. In other words, copies
+ * image data from a server-side drawable to a client-side RGB(A) buffer.
+ * This allows you to efficiently read individual pixels on the client side.
+ *
+ * This function will create an RGB pixbuf with 8 bits per channel with
+ * the same size specified by the @width and @height arguments. The pixbuf
+ * will contain an alpha channel if the @window contains one.
+ *
+ * If the window is off the screen, then there is no image data in the
+ * obscured/offscreen regions to be placed in the pixbuf. The contents of
+ * portions of the pixbuf corresponding to the offscreen region are undefined.
+ *
+ * If the window you're obtaining data from is partially obscured by
+ * other windows, then the contents of the pixbuf areas corresponding
+ * to the obscured regions are undefined.
+ *
+ * If the window is not mapped (typically because it's iconified/minimized
+ * or not on the current workspace), then %NULL will be returned.
+ *
+ * If memory can't be allocated for the return value, %NULL will be returned
+ * instead.
+ *
+ * (In short, there are several ways this function can fail, and if it fails
+ *  it returns %NULL; so check the return value.)
+ *
+ * Return value: (transfer full): A newly-created pixbuf with a reference
+ *     count of 1, or %NULL on error
+ */
+GdkPixbuf *
+gdk_pixbuf_get_from_window (GdkWindow *src,
+                            gint       src_x,
+                            gint       src_y,
+                            gint       width,
+                            gint       height)
 {
-       int xx, yy;
-       int width, height;
-       int bpl;
-
-#ifdef LITTLE
-       register unsigned short *s;     /* read 1 pixels at once */
-#else
-       register unsigned char *s;
-#endif
-       register unsigned long *o;
-       
-       unsigned char *srow = image->mem, *orow = pixels;
-       
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-       
-       for (yy = 0;yy < height; yy++) {
-#ifdef LITTLE
-               s = (unsigned short *)srow;
-#else
-               s = (unsigned char *)srow;
-#endif
-               o = (unsigned long *)orow;
-               for (xx = 0; xx < width; xx ++) {
-                       register unsigned long data;
-                       /*  rrrrrggg gggbbbbb -> rrrrr000 gggggg00 bbbbb000 aaaaaaaa */
-                       /*  little endian: aaaaaaaa bbbbb000 gggggg00 rrrrr000 */
-#ifdef LITTLE
-                       data = *s++;
-                       *o++ = (data & 0xf800) >>8 | (data & 0x7e0) << 5
-                               | (data & 0x1f) << 19 | 0xff000000;
-#else
-                       /* swap endianness first */
-                       data = s[0] | s[1]<<8;
-                       s+=2;
-                       *o++ = (data & 0xf800) << 16 | (data & 0x7e0) << 13
-                               | (data & 0x1f) <<  11 | 0xff;
-#endif
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
-}
+  cairo_surface_t *surface;
+  GdkPixbuf *dest;
 
-/*
-  convert 16 bits/pixel data
-  with alpha
-  data in msb format
-*/
-static void rgb565amsb(GdkImage *image, art_u8 *pixels, int rowstride)
-{
-       int xx, yy;
-       int width, height;
-       int bpl;
-
-#ifdef LITTLE
-       register unsigned char *s;
-#else
-       register unsigned short *s;     /* read 1 pixels at once */
-#endif
-       register unsigned long *o;
-       
-       unsigned char *srow = image->mem, *orow = pixels;
-       
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-       
-       for (yy = 0;yy < height; yy++) {
-               s = srow;
-               o = (unsigned long *)orow;
-               for (xx = 0; xx < width; xx ++) {
-                       register unsigned long data;
-                       /*  rrrrrggg gggbbbbb -> rrrrr000 gggggg00 bbbbb000 aaaaaaaa */
-                       /*  little endian: aaaaaaaa bbbbb000 gggggg00 rrrrr000 */
-#ifdef LITTLE
-                       /* swap endianness first */
-                       data = s[0] | s[1]<<8;
-                       s+=2;
-                       *o++ = (data & 0xf800) >>8 | (data & 0x7e0) << 5
-                               | (data & 0x1f) << 19 | 0xff000000;
-#else
-                       data = *s++;
-                       *o++ = (data & 0xf800) << 16 | (data & 0x7e0) << 13
-                               | (data & 0x1f) <<  11 | 0xff;
-#endif
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
-}
+  g_return_val_if_fail (GDK_IS_WINDOW (src), NULL);
+  g_return_val_if_fail (gdk_window_is_viewable (src), NULL);
 
-/*
-  convert 15 bits/pixel data
-  no alpha
-  data in lsb format
-*/
-static void rgb555lsb(GdkImage *image, art_u8 *pixels, int rowstride)
-{
-       int xx, yy;
-       int width, height;
-       int bpl;
-       
-#ifdef LITTLE
-       register unsigned long *s;      /* read 2 pixels at once */
-#else
-       register unsigned char *s;      /* read 2 pixels at once */
-#endif
-       register unsigned short *o;
-       unsigned char *srow = image->mem, *orow = pixels;
-       
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-       
-       for (yy = 0;yy < height; yy++) {
-#ifdef LITTLE
-               s = (unsigned long *)srow;
-#else
-               s = srow;
-#endif
-               o = (unsigned short *)orow;
-               for (xx = 1; xx < width; xx += 2) {
-                       register unsigned long data;
-#ifdef LITTLE
-                       data = *s++;
-                       *o++ = (data & 0x7c00) >> 7 | (data & 0x3e0) << 6;
-                       *o++ = (data & 0x1f) << 3 | (data & 0x7c000000) >> 15;
-                       *o++ = ((data & 0x3e00000) >> 18) | (data & 0x1f0000) >> 5;
-#else
-                       /* swap endianness first */
-                       data = s[0] | s[1]<<8 | s[2]<<16 | s[3]<<24;
-                       s+=4;
-                       *o++ = (data & 0x7c00) << 1 | (data & 0x3e0) >> 2;
-                       *o++ = (data & 0x1f) << 11 | (data & 0x7c000000) >> 23;
-                       *o++ = ((data & 0x3e00000) >> 10) | (data & 0x1f0000) >> 13;
-#endif
-               }
-               /* check for last remaining pixel */
-               if (width & 1) {
-                       register unsigned short data;
-#ifdef LITTLE
-                       data = *((short *) s);
-#else
-                       data = *((short *) s);
-                       data = ((data >> 8) & 0xff) | ((data & 0xff) << 8);
-#endif
-                       ((char *) o)[0] = (data & 0x7c0) >> 7;
-                       ((char *) o)[1] = (data & 0x3e0) >> 2;
-                       ((char *) o)[2] = (data & 0x1f) << 3;
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
-}
+  surface = _gdk_window_ref_cairo_surface (src);
+  dest = gdk_pixbuf_get_from_surface (surface,
+                                      src_x, src_y,
+                                      width, height);
+  cairo_surface_destroy (surface);
 
-/*
-  convert 15 bits/pixel data
-  no alpha
-  data in msb format
-*/
-static void rgb555msb(GdkImage *image, art_u8 *pixels, int rowstride)
-{
-       int xx, yy;
-       int width, height;
-       int bpl;
-       
-#ifdef LITTLE
-       register unsigned char *s;      /* read 2 pixels at once */
-#else
-       register unsigned long *s;      /* read 2 pixels at once */
-#endif
-       register unsigned short *o;
-       unsigned char *srow = image->mem, *orow = pixels;
-       
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-       
-       for (yy = 0;yy < height; yy++) {
-               s = srow;
-               o = (unsigned short *)orow;
-               for (xx = 1; xx < width; xx += 2) {
-                       register unsigned long data;
-#ifdef LITTLE
-                       /* swap endianness first */
-                       data = s[0] | s[1]<<8 | s[2]<<16 | s[3]<<24;
-                       s+=4;
-                       *o++ = (data & 0x7c00) >> 7 | (data & 0x3e0) << 6;
-                       *o++ = (data & 0x1f) << 3 | (data & 0x7c000000) >> 15;
-                       *o++ = ((data & 0x3e00000) >> 18) | (data & 0x1f0000) >> 5;
-#else
-                       data = *s++;
-                       *o++ = (data & 0x7c00) << 1 | (data & 0x3e0) >> 2;
-                       *o++ = (data & 0x1f) << 11 | (data & 0x7c000000) >> 23;
-                       *o++ = ((data & 0x3e00000) >> 10) | (data & 0x1f0000) >> 13;
-#endif
-               }
-               /* check for last remaining pixel */
-               if (width & 1) {
-                       register unsigned short data;
-#ifdef LITTLE
-                       data = *((short *) s);
-                       data = ((data >> 8) & 0xff) | ((data & 0xff) << 8);
-#else
-                       data = *((short *) s);
-#endif
-                       ((char *) o)[0] = (data & 0x7c0) >> 7;
-                       ((char *) o)[1] = (data & 0x3e0) >> 2;
-                       ((char *) o)[2] = (data & 0x1f) << 3;
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
+  return dest;
 }
 
-/*
-  convert 15 bits/pixel data
-  with alpha
-  data in lsb format
-*/
-static void rgb555alsb(GdkImage *image, art_u8 *pixels, int rowstride)
+static cairo_format_t
+gdk_cairo_format_for_content (cairo_content_t content)
 {
-       int xx, yy;
-       int width, height;
-       int bpl;
-
-#ifdef LITTLE
-       register unsigned short *s;     /* read 1 pixels at once */
-#else
-       register unsigned char *s;
-#endif
-       register unsigned long *o;
-       
-       unsigned char *srow = image->mem, *orow = pixels;
-       
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-       
-       for (yy = 0;yy < height; yy++) {
-#ifdef LITTLE
-               s = (unsigned short *)srow;
-#else
-               s = srow;
-#endif
-               o = (unsigned long *)orow;
-               for (xx = 0; xx < width; xx++) {
-                       register unsigned long data;
-                       /*  rrrrrggg gggbbbbb -> rrrrr000 gggggg00 bbbbb000 aaaaaaaa */
-                       /*  little endian: aaaaaaaa bbbbb000 gggggg00 rrrrr000 */
-#ifdef LITTLE
-                       data = *s++;
-                       *o++ = (data & 0x7c00) >>7 | (data & 0x3e0) << 6
-                               | (data & 0x1f) << 19 | 0xff000000;
-#else
-                       /* swap endianness first */
-                       data = s[0] | s[1]<<8;
-                       s+=2;
-                       *o++ = (data & 0x7c00) << 17 | (data & 0x3e0) << 14
-                               | (data & 0x1f) <<  11 | 0xff;
-#endif
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
+  switch (content)
+    {
+    case CAIRO_CONTENT_COLOR:
+      return CAIRO_FORMAT_RGB24;
+    case CAIRO_CONTENT_ALPHA:
+      return CAIRO_FORMAT_A8;
+    case CAIRO_CONTENT_COLOR_ALPHA:
+    default:
+      return CAIRO_FORMAT_ARGB32;
+    }
 }
 
-/*
-  convert 15 bits/pixel data
-  with alpha
-  data in msb format
-*/
-static void rgb555amsb(GdkImage *image, art_u8 *pixels, int rowstride)
+static cairo_surface_t *
+gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface,
+                                   cairo_content_t  content,
+                                   int              src_x,
+                                   int              src_y,
+                                   int              width,
+                                   int              height)
 {
-       int xx, yy;
-       int width, height;
-       int bpl;
-
-#ifdef LITTLE
-       register unsigned short *s;     /* read 1 pixels at once */
-#else
-       register unsigned char *s;
-#endif
-       register unsigned long *o;
-       
-       unsigned char *srow = image->mem, *orow = pixels;
-       
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-       
-       for (yy = 0;yy < height; yy++) {
-#ifdef LITTLE
-               s = (unsigned short *)srow;
-#else
-               s = srow;
-#endif
-               o = (unsigned long *)orow;
-               for (xx = 0; xx < width; xx++) {
-                       register unsigned long data;
-                       /*  rrrrrggg gggbbbbb -> rrrrr000 gggggg00 bbbbb000 aaaaaaaa */
-                       /*  little endian: aaaaaaaa bbbbb000 gggggg00 rrrrr000 */
-#ifdef LITTLE
-                       /* swap endianness first */
-                       data = s[0] | s[1]<<8;
-                       s+=2;
-                       *o++ = (data & 0x7c00) >>7 | (data & 0x3e0) << 6
-                               | (data & 0x1f) << 19 | 0xff000000;
-#else
-                       data = *s++;
-                       *o++ = (data & 0x7c00) << 17 | (data & 0x3e0) << 14
-                               | (data & 0x1f) <<  11 | 0xff;
-#endif
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
-}
+  cairo_surface_t *copy;
+  cairo_t *cr;
 
+  copy = cairo_image_surface_create (gdk_cairo_format_for_content (content),
+                                     width,
+                                     height);
 
-static void rgb888alsb(GdkImage *image, art_u8 *pixels, int rowstride)
-{
-       int xx, yy;
-       int width, height;
-       int bpl;
-
-       unsigned char *s;       /* for byte order swapping */
-       unsigned char *o;
-       unsigned char *srow = image->mem, *orow = pixels;
-
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-       
-       d(printf ("32 bits/pixel with alpha\n"));
-       
-       /* lsb data */
-       for (yy = 0; yy < height; yy++) {
-               s = srow;
-               o = orow;
-               for (xx = 0; xx < width; xx++) {
-                       *o++ = s[2];
-                       *o++ = s[1];
-                       *o++ = s[0];
-                       *o++ = 0xff;
-                       s += 4;
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
-}
+  cr = cairo_create (copy);
+  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+  cairo_set_source_surface (cr, surface, -src_x, -src_y);
+  cairo_paint (cr);
+  cairo_destroy (cr);
 
-static void rgb888lsb(GdkImage *image, art_u8 *pixels, int rowstride)
-{
-       int xx, yy;
-       int width, height;
-       int bpl;
-
-       unsigned char *srow = image->mem, *orow = pixels;
-       unsigned char *o, *s;
-
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-
-       d(printf("32 bit, lsb, no alpha\n"));
-
-       for (yy = 0; yy < height; yy++) {
-               s = srow;
-               o = orow;
-               for (xx = 0; xx < width; xx++) {
-                       *o++ = s[2];
-                       *o++ = s[1];
-                       *o++ = s[0];
-                       s += 4;
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
+  return copy;
 }
 
-static void rgb888amsb(GdkImage *image, art_u8 *pixels, int rowstride)
+static void
+convert_alpha (guchar *dest_data,
+               int     dest_stride,
+               guchar *src_data,
+               int     src_stride,
+               int     src_x,
+               int     src_y,
+               int     width,
+               int     height)
 {
-       int xx, yy;
-       int width, height;
-       int bpl;
-
-       unsigned char *srow = image->mem, *orow = pixels;
-#ifdef LITTLE
-       unsigned long *o;
-       unsigned long *s;
-#else
-       unsigned char *s;       /* for byte order swapping */
-       unsigned char *o;
-#endif
-
-       d(printf("32 bit, msb, with alpha\n"));
-
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-
-       /* msb data */
-       for (yy = 0; yy < height; yy++) {
-#ifdef LITTLE
-               s = (unsigned long *)srow;
-               o = (unsigned long *)orow;
-#else
-               s = srow;
-               o = orow;
-#endif
-               for (xx = 0; xx < width; xx++) {
-#ifdef LITTLE
-                       *o++ = s[1];
-                       *o++ = s[2];
-                       *o++ = s[3];
-                       *o++ = 0xff;
-                       s += 4;
-#else
-                       *o++ = (*s <<8 ) | 0xff; /* untested */
-                       s++;
-#endif
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
+  int x, y;
+
+  src_data += src_stride * src_y + src_x * 4;
+
+  for (y = 0; y < height; y++) {
+    guint32 *src = (guint32 *) src_data;
+
+    for (x = 0; x < width; x++) {
+      guint alpha = src[x] >> 24;
+
+      if (alpha == 0)
+        {
+          dest_data[x * 4 + 0] = 0;
+          dest_data[x * 4 + 1] = 0;
+          dest_data[x * 4 + 2] = 0;
+        }
+      else
+        {
+          dest_data[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha;
+          dest_data[x * 4 + 1] = (((src[x] & 0x00ff00) >>  8) * 255 + alpha / 2) / alpha;
+          dest_data[x * 4 + 2] = (((src[x] & 0x0000ff) >>  0) * 255 + alpha / 2) / alpha;
+        }
+      dest_data[x * 4 + 3] = alpha;
+    }
+
+    src_data += src_stride;
+    dest_data += dest_stride;
+  }
 }
 
-static void rgb888msb(GdkImage *image, art_u8 *pixels, int rowstride)
+static void
+convert_no_alpha (guchar *dest_data,
+                  int     dest_stride,
+                  guchar *src_data,
+                  int     src_stride,
+                  int     src_x,
+                  int     src_y,
+                  int     width,
+                  int     height)
 {
-       int xx, yy;
-       int width, height;
-       int bpl;
-
-       unsigned char *srow = image->mem, *orow = pixels;
-       unsigned char *s;
-       unsigned char *o;
-
-       d(printf("32 bit, msb, no alpha\n"));
-
-       width = image->width;
-       height = image->height;
-       bpl = image->bpl;
-
-       for (yy = 0; yy < height; yy++) {
-               s = srow;
-               o = orow;
-               for (xx = 0; xx < width; xx++) {
-                       *o++ = s[1];
-                       *o++ = s[2];
-                       *o++ = s[3];
-                       s += 4;
-               }
-               srow += bpl;
-               orow += rowstride;
-       }
-}
+  int x, y;
 
-typedef void (*cfunc) (GdkImage *image, art_u8 *pixels, int rowstride);
+  src_data += src_stride * src_y + src_x * 4;
 
-static cfunc convert_map[] = {
-       rgb1,rgb1,rgb1a,rgb1a,
-       rgb8,rgb8,rgb8a,rgb8a,
-       rgb555lsb,rgb555msb,rgb555alsb,rgb555amsb,
-       rgb565lsb,rgb565msb,rgb565alsb,rgb565amsb,
-       rgb888lsb,rgb888msb,rgb888alsb,rgb888amsb
-};
+  for (y = 0; y < height; y++) {
+    guint32 *src = (guint32 *) src_data;
 
-/*
-  perform actual conversion
-*/
-static void rgbconvert(GdkImage *image, art_u8 *pixels, int rowstride, int alpha)
-{
-       int index = (image->byte_order == GDK_MSB_FIRST)
-               | (alpha!=0) << 1;
-       int bank=0;
-
-       switch (image->depth) {
-       case 1: bank = 0; break;
-       case 8: bank = 1; break;
-       case 15: bank = 2; break;
-       case 16: bank = 3; break;
-       case 24:
-       case 32: bank = 4; break;
-       }
-       index |= bank<<2;
-       convert_map[index](image, pixels, rowstride);
-}
+    for (x = 0; x < width; x++) {
+      dest_data[x * 3 + 0] = src[x] >> 16;
+      dest_data[x * 3 + 1] = src[x] >>  8;
+      dest_data[x * 3 + 2] = src[x];
+    }
 
-static GdkPixbuf *
-gdk_pixbuf_from_drawable_core (GdkPixmap * window, gint x, gint y, gint width,
-                              gint height, gint with_alpha)
-{
-       GdkImage *image;
-       ArtPixBuf *art_pixbuf;
-       art_u8 *buff;
-       art_u8 *pixels;
-       gint rowstride;
-       gint fatness;
-       gint screen_width, screen_height;
-       gint window_width, window_height, window_x, window_y;
-       int bpl;
-       
-       g_return_val_if_fail (window != NULL, NULL);
-       
-       /* always returns image in ZPixmap format ... */
-       image = gdk_image_get (window, x, y, width, height);
-       
-       fatness = with_alpha ? 4 : 3;
-       rowstride = width * fatness;
-       
-       buff = art_alloc (rowstride * height);
-       pixels = buff;
-
-#if 0
-       printf ("bpp = %d\n", image->bpp);
-       printf ("depth = %d\n", image->depth);
-       printf ("byte order = %d\n", image->byte_order);
-       printf ("bytes/line = %d\n", image->bpl);
-#endif
-       
-       bpl = image->bpl;
-       
-       rgbconvert(image, pixels, rowstride, with_alpha);
-       gdk_image_destroy (image);
-       
-       if (with_alpha)
-               art_pixbuf = art_pixbuf_new_rgba (buff, width, height, rowstride);
-       else
-               art_pixbuf = art_pixbuf_new_rgb (buff, width, height, rowstride);
-       
-       return gdk_pixbuf_new_from_art_pixbuf (art_pixbuf);
-}
-
-/* Public functions */
-GdkPixbuf *
-gdk_pixbuf_rgb_from_drawable (GdkWindow * window, gint x, gint y, gint width,
-                             gint height)
-{
-  return gdk_pixbuf_from_drawable_core (window, x, y, width, height, 0);
+    src_data += src_stride;
+    dest_data += dest_stride;
+  }
 }
 
+/**
+ * gdk_pixbuf_get_from_surface:
+ * @surface: surface to copy from
+ * @src_x: Source X coordinate within @surface
+ * @src_y: Source Y coordinate within @surface
+ * @width: Width in pixels of region to get
+ * @height: Height in pixels of region to get
+ *
+ * Transfers image data from a #cairo_surface_t and converts it to an RGB(A)
+ * representation inside a #GdkPixbuf. This allows you to efficiently read
+ * individual pixels from cairo surfaces. For #GdkWindows, use
+ * gdk_pixbuf_get_from_window() instead.
+ *
+ * This function will create an RGB pixbuf with 8 bits per channel.
+ * The pixbuf will contain an alpha channel if the @surface contains one.
+ *
+ * Return value: (transfer full): A newly-created pixbuf with a reference
+ *     count of 1, or %NULL on error
+ */
 GdkPixbuf *
-gdk_pixbuf_rgba_from_drawable (GdkWindow * window, gint x, gint y, gint width,
-                              gint height)
+gdk_pixbuf_get_from_surface  (cairo_surface_t *surface,
+                              gint             src_x,
+                              gint             src_y,
+                              gint             width,
+                              gint             height)
 {
-  return gdk_pixbuf_from_drawable_core (window, x, y, width, height, 1);
+  cairo_content_t content;
+  GdkPixbuf *dest;
+
+  /* General sanity checks */
+  g_return_val_if_fail (surface != NULL, NULL);
+  g_return_val_if_fail (width > 0 && height > 0, NULL);
+
+  content = cairo_surface_get_content (surface) | CAIRO_CONTENT_COLOR;
+  dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+                         !!(content & CAIRO_CONTENT_ALPHA),
+                         8,
+                         width, height);
+
+  surface = gdk_cairo_surface_coerce_to_image (surface, content,
+                                               src_x, src_y,
+                                               width, height);
+  cairo_surface_flush (surface);
+  if (cairo_surface_status (surface) || dest == NULL)
+    {
+      cairo_surface_destroy (surface);
+      return NULL;
+    }
+
+  if (gdk_pixbuf_get_has_alpha (dest))
+    convert_alpha (gdk_pixbuf_get_pixels (dest),
+                   gdk_pixbuf_get_rowstride (dest),
+                   cairo_image_surface_get_data (surface),
+                   cairo_image_surface_get_stride (surface),
+                   0, 0,
+                   width, height);
+  else
+    convert_no_alpha (gdk_pixbuf_get_pixels (dest),
+                      gdk_pixbuf_get_rowstride (dest),
+                      cairo_image_surface_get_data (surface),
+                      cairo_image_surface_get_stride (surface),
+                      0, 0,
+                      width, height);
+
+  cairo_surface_destroy (surface);
+  return dest;
 }
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */