* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * 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.
*/
-#include "config.h"
+
+/*
+ * 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 <stdlib.h>
#include <sys/types.h>
-#if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H)
-#define USE_SHM
-#endif
-
-#ifdef USE_SHM
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#endif /* USE_SHM */
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#ifdef USE_SHM
-#include <X11/extensions/XShm.h>
-#endif /* USE_SHM */
-
-#include "gdk.h"
+#include "gdk.h" /* For gdk_flush() */
+#include "gdkimage.h"
#include "gdkprivate.h"
+#include "gdkinternals.h" /* For scratch_image code */
+
+/**
+ * gdk_image_ref:
+ * @image: a #GdkImage
+ *
+ * Deprecated function; use g_object_ref() instead.
+ *
+ * Return value: the image
+ **/
+GdkImage *
+gdk_image_ref (GdkImage *image)
+{
+ return (GdkImage *) g_object_ref (image);
+}
-
-static void gdk_image_put_normal (GdkDrawable *drawable,
- GdkGC *gc,
- GdkImage *image,
- gint xsrc,
- gint ysrc,
- gint xdest,
- gint ydest,
- gint width,
- gint height);
-static void gdk_image_put_shared (GdkDrawable *drawable,
- GdkGC *gc,
- GdkImage *image,
- gint xsrc,
- gint ysrc,
- gint xdest,
- gint ydest,
- gint width,
- gint height);
-
-
-static GList *image_list = NULL;
-
-
+/**
+ * gdk_image_unref:
+ * @image: a #GdkImage
+ *
+ * Deprecated function; use g_object_unref() instead.
+ *
+ **/
void
-gdk_image_exit (void)
+gdk_image_unref (GdkImage *image)
{
- GdkImage *image;
+ g_return_if_fail (GDK_IS_IMAGE (image));
- while (image_list)
- {
- image = image_list->data;
- gdk_image_destroy (image);
- }
+ g_object_unref (image);
}
-GdkImage *
-gdk_image_new_bitmap(GdkVisual *visual, gpointer data, gint w, gint h)
-/*
- * Desc: create a new bitmap image
- */
-{
- Visual *xvisual;
- GdkImage *image;
- GdkImagePrivate *private;
- private = g_new(GdkImagePrivate, 1);
- image = (GdkImage *) private;
- private->xdisplay = gdk_display;
- private->image_put = gdk_image_put_normal;
- image->type = GDK_IMAGE_NORMAL;
- image->visual = visual;
- image->width = w;
- image->height = h;
- image->depth = 1;
- xvisual = ((GdkVisualPrivate*) visual)->xvisual;
- private->ximage = XCreateImage(private->xdisplay, xvisual, 1, XYBitmap,
- 0, 0, w ,h, 8, 0);
- private->ximage->data = data;
- private->ximage->bitmap_bit_order = MSBFirst;
- private->ximage->byte_order = MSBFirst;
- image->byte_order = MSBFirst;
- image->mem = private->ximage->data;
- image->bpl = private->ximage->bytes_per_line;
- image->bpp = 1;
- return(image);
-} /* gdk_image_new_bitmap() */
-
-static int
-gdk_image_check_xshm(Display *display)
-/*
- * Desc: query the server for support for the MIT_SHM extension
- * Return: 0 = not available
- * 1 = shared XImage support available
- * 2 = shared Pixmap support available also
- */
+/**
+ * gdk_image_get:
+ * @drawable: a #GdkDrawable
+ * @x: x coordinate in @window
+ * @y: y coordinate in @window
+ * @width: width of area in @window
+ * @height: height of area in @window
+ *
+ * This is a deprecated wrapper for gdk_drawable_get_image();
+ * gdk_drawable_get_image() should be used instead. Or even better: in
+ * most cases gdk_pixbuf_get_from_drawable() is the most convenient
+ * choice.
+ *
+ * Return value: a new #GdkImage or %NULL
+ **/
+GdkImage*
+gdk_image_get (GdkWindow *drawable,
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
-#ifdef USE_SHM
- int major, minor, ignore;
- Bool pixmaps;
+ g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
+ g_return_val_if_fail (x >= 0, NULL);
+ g_return_val_if_fail (y >= 0, NULL);
+ g_return_val_if_fail (width >= 0, NULL);
+ g_return_val_if_fail (height >= 0, NULL);
- if (XQueryExtension(display, "MIT-SHM", &ignore, &ignore, &ignore))
- {
- if (XShmQueryVersion(display, &major, &minor, &pixmaps )==True)
- {
- return (pixmaps==True) ? 2 : 1;
- }
- }
-#endif /* USE_SHM */
- return 0;
+ return gdk_drawable_get_image (drawable, x, y, width, height);
}
+/**
+ * gdk_image_set_colormap:
+ * @image: a #GdkImage
+ * @colormap: a #GdkColormap
+ *
+ * Sets the colormap for the image to the given colormap. Normally
+ * there's no need to use this function, images are created with the
+ * correct colormap if you get the image from a drawable. If you
+ * create the image from scratch, use the colormap of the drawable you
+ * intend to render the image to.
+ **/
void
-gdk_image_init (void)
+gdk_image_set_colormap (GdkImage *image,
+ GdkColormap *colormap)
{
- if (gdk_use_xshm)
+ g_return_if_fail (GDK_IS_IMAGE (image));
+ g_return_if_fail (GDK_IS_COLORMAP (colormap));
+
+ if (image->colormap != colormap)
{
- if (!gdk_image_check_xshm (gdk_display))
- {
- gdk_use_xshm = False;
- }
+ if (image->colormap)
+ g_object_unref (image->colormap);
+
+ image->colormap = colormap;
+ g_object_ref (image->colormap);
}
+
}
-GdkImage*
-gdk_image_new (GdkImageType type,
- GdkVisual *visual,
- gint width,
- gint height)
+/**
+ * gdk_image_get_colormap:
+ * @image: a #GdkImage
+ *
+ * Retrieves the colormap for a given image, if it exists. An image
+ * will have a colormap if the drawable from which it was created has
+ * a colormap, or if a colormap was set explicitely with
+ * gdk_image_set_colormap().
+ *
+ * Return value: colormap for the image
+ **/
+GdkColormap *
+gdk_image_get_colormap (GdkImage *image)
{
- GdkImage *image;
- GdkImagePrivate *private;
-#ifdef USE_SHM
- XShmSegmentInfo *x_shm_info;
-#endif /* USE_SHM */
- Visual *xvisual;
-
- switch (type)
- {
- case GDK_IMAGE_FASTEST:
- image = gdk_image_new (GDK_IMAGE_SHARED, visual, width, height);
-
- if (!image)
- image = gdk_image_new (GDK_IMAGE_NORMAL, visual, width, height);
- break;
+ g_return_val_if_fail (GDK_IS_IMAGE (image), NULL);
- default:
- private = g_new (GdkImagePrivate, 1);
- image = (GdkImage*) private;
-
- private->xdisplay = gdk_display;
- private->image_put = NULL;
-
- image->type = type;
- image->visual = visual;
- image->width = width;
- image->height = height;
- image->depth = visual->depth;
-
- xvisual = ((GdkVisualPrivate*) visual)->xvisual;
+ return image->colormap;
+}
- switch (type)
- {
- case GDK_IMAGE_SHARED:
-#ifdef USE_SHM
- if (gdk_use_xshm)
- {
- private->image_put = gdk_image_put_shared;
-
- private->x_shm_info = g_new (XShmSegmentInfo, 1);
- x_shm_info = private->x_shm_info;
-
- private->ximage = XShmCreateImage (private->xdisplay, xvisual, visual->depth,
- ZPixmap, NULL, x_shm_info, width, height);
- if (private->ximage == NULL)
- {
- g_warning ("XShmCreateImage failed");
-
- g_free (image);
- gdk_use_xshm = False;
- return NULL;
- }
-
- x_shm_info->shmid = shmget (IPC_PRIVATE,
- private->ximage->bytes_per_line * private->ximage->height,
- IPC_CREAT | 0777);
-
- if (x_shm_info->shmid == -1)
- {
- g_warning ("shmget failed!");
-
- XDestroyImage (private->ximage);
- g_free (private->x_shm_info);
- g_free (image);
-
- gdk_use_xshm = False;
- return NULL;
- }
-
- x_shm_info->readOnly = False;
- x_shm_info->shmaddr = shmat (x_shm_info->shmid, 0, 0);
- private->ximage->data = x_shm_info->shmaddr;
-
- if (x_shm_info->shmaddr == (char*) -1)
- {
- g_warning ("shmat failed!");
-
- XDestroyImage (private->ximage);
- shmctl (x_shm_info->shmid, IPC_RMID, 0);
-
- g_free (private->x_shm_info);
- g_free (image);
-
- return NULL;
- }
-
- gdk_error_code = 0;
- gdk_error_warnings = 0;
-
- XShmAttach (private->xdisplay, x_shm_info);
- XSync (private->xdisplay, False);
-
- gdk_error_warnings = 1;
- if (gdk_error_code == -1)
- {
- /* this is the common failure case so omit warning */
- XDestroyImage (private->ximage);
- shmdt (x_shm_info->shmaddr);
- shmctl (x_shm_info->shmid, IPC_RMID, 0);
-
- g_free (private->x_shm_info);
- g_free (image);
-
- gdk_use_xshm = False;
- return NULL;
- }
-
- /* We mark the segment as destroyed so that when
- * the last process detaches, it will be deleted.
- * There is a small possibility of leaking if
- * we die in XShmAttach. In theory, a signal handler
- * could be set up.
- */
- shmctl (x_shm_info->shmid, IPC_RMID, 0);
-
- if (image)
- image_list = g_list_prepend (image_list, image);
- }
- else
- {
- g_free (image);
- return NULL;
- }
- break;
-#else /* USE_SHM */
- g_free (image);
- return NULL;
-#endif /* USE_SHM */
- case GDK_IMAGE_NORMAL:
- private->image_put = gdk_image_put_normal;
-
- private->ximage = XCreateImage (private->xdisplay, xvisual, visual->depth,
- ZPixmap, 0, 0, width, height, 32, 0);
-
- /* Use malloc, not g_malloc here, because X will call free()
- * on this data
- */
- private->ximage->data = malloc (private->ximage->bytes_per_line *
- private->ximage->height);
- break;
+/* We have N_REGION GDK_SCRATCH_IMAGE_WIDTH x GDK_SCRATCH_IMAGE_HEIGHT regions divided
+ * up between n_images different images. possible_n_images gives
+ * various divisors of N_REGIONS. The reason for allowing this
+ * flexibility is that we want to create as few images as possible,
+ * but we want to deal with the abberant systems that have a SHMMAX
+ * limit less than
+ *
+ * GDK_SCRATCH_IMAGE_WIDTH * GDK_SCRATCH_IMAGE_HEIGHT * N_REGIONS * 4 (384k)
+ *
+ * (Are there any such?)
+ */
+#define N_REGIONS 6
+static const int possible_n_images[] = { 1, 2, 3, 6 };
- case GDK_IMAGE_FASTEST:
- g_assert_not_reached ();
- }
+/* We allocate one GdkScratchImageInfo structure for each
+ * depth where we are allocating scratch images. (Future: one
+ * per depth, per display)
+ */
+typedef struct _GdkScratchImageInfo GdkScratchImageInfo;
- if (image)
+struct _GdkScratchImageInfo {
+ gint depth;
+
+ gint n_images;
+ GdkImage *static_image[N_REGIONS];
+ gint static_image_idx;
+
+ /* In order to optimize filling fractions, we simultaneously fill in up
+ * to three regions of size GDK_SCRATCH_IMAGE_WIDTH * GDK_SCRATCH_IMAGE_HEIGHT: one
+ * for images that are taller than GDK_SCRATCH_IMAGE_HEIGHT / 2, and must
+ * be tiled horizontally. One for images that are wider than
+ * GDK_SCRATCH_IMAGE_WIDTH / 2 and must be tiled vertically, and a third
+ * for images smaller than GDK_SCRATCH_IMAGE_HEIGHT / 2 x GDK_SCRATCH_IMAGE_WIDTH x 2
+ * that we tile in horizontal rows.
+ */
+ gint horiz_idx;
+ gint horiz_y;
+ gint vert_idx;
+ gint vert_x;
+
+ /* tile_y1 and tile_y2 define the horizontal band into
+ * which we are tiling images. tile_x is the x extent to
+ * which that is filled
+ */
+ gint tile_idx;
+ gint tile_x;
+ gint tile_y1;
+ gint tile_y2;
+
+ GdkScreen *screen;
+};
+
+static GSList *scratch_image_infos = NULL;
+
+static gboolean
+allocate_scratch_images (GdkScratchImageInfo *info,
+ gint n_images,
+ gboolean shared)
+{
+ gint i;
+
+ for (i = 0; i < n_images; i++)
+ {
+ info->static_image[i] = _gdk_image_new_for_depth (info->screen,
+ shared ? GDK_IMAGE_SHARED : GDK_IMAGE_NORMAL,
+ NULL,
+ GDK_SCRATCH_IMAGE_WIDTH * (N_REGIONS / n_images),
+ GDK_SCRATCH_IMAGE_HEIGHT,
+ info->depth);
+
+ if (!info->static_image[i])
{
- image->byte_order = private->ximage->byte_order;
- image->mem = private->ximage->data;
- image->bpl = private->ximage->bytes_per_line;
-
- switch (private->ximage->bits_per_pixel)
- {
- case 8:
- image->bpp = 1;
- break;
- case 16:
- image->bpp = 2;
- break;
- case 24:
- image->bpp = 3;
- break;
- case 32:
- image->bpp = 4;
- break;
- }
+ gint j;
+
+ for (j = 0; j < i; j++)
+ g_object_unref (info->static_image[i]);
+
+ return FALSE;
}
}
-
- return image;
+
+ return TRUE;
}
-GdkImage*
-gdk_image_get (GdkWindow *window,
- gint x,
- gint y,
- gint width,
- gint height)
+static GdkScratchImageInfo *
+scratch_image_info_for_depth (GdkScreen *screen,
+ gint depth)
{
- GdkImage *image;
- GdkImagePrivate *private;
- GdkWindowPrivate *win_private;
-
- g_return_val_if_fail (window != NULL, NULL);
-
- win_private = (GdkWindowPrivate *) window;
- if (win_private->destroyed)
- return NULL;
+ GSList *tmp_list;
+ GdkScratchImageInfo *image_info;
+ gint i;
- private = g_new (GdkImagePrivate, 1);
- image = (GdkImage*) private;
-
- private->xdisplay = gdk_display;
- private->image_put = gdk_image_put_normal;
- private->ximage = XGetImage (private->xdisplay,
- win_private->xwindow,
- x, y, width, height,
- AllPlanes, ZPixmap);
+ tmp_list = scratch_image_infos;
+ while (tmp_list)
+ {
+ image_info = tmp_list->data;
+ if (image_info->depth == depth && image_info->screen == screen)
+ return image_info;
+
+ tmp_list = tmp_list->next;
+ }
- image->type = GDK_IMAGE_NORMAL;
- image->visual = gdk_window_get_visual (window);
- image->width = width;
- image->height = height;
- image->depth = private->ximage->depth;
+ image_info = g_new (GdkScratchImageInfo, 1);
- image->mem = private->ximage->data;
- image->bpl = private->ximage->bytes_per_line;
- image->bpp = private->ximage->bits_per_pixel;
- image->byte_order = private->ximage->byte_order;
+ image_info->depth = depth;
+ image_info->screen = screen;
- return image;
-}
+ /* Try to allocate as few possible shared images */
+ for (i=0; i < G_N_ELEMENTS (possible_n_images); i++)
+ {
+ if (allocate_scratch_images (image_info, possible_n_images[i], TRUE))
+ {
+ image_info->n_images = possible_n_images[i];
+ break;
+ }
+ }
-guint32
-gdk_image_get_pixel (GdkImage *image,
- gint x,
- gint y)
-{
- guint32 pixel;
- GdkImagePrivate *private;
+ /* If that fails, just allocate N_REGIONS normal images */
+ if (i == G_N_ELEMENTS (possible_n_images))
+ {
+ allocate_scratch_images (image_info, N_REGIONS, FALSE);
+ image_info->n_images = N_REGIONS;
+ }
- g_return_val_if_fail (image != NULL, 0);
+ image_info->static_image_idx = 0;
- private = (GdkImagePrivate *) image;
+ image_info->horiz_y = GDK_SCRATCH_IMAGE_HEIGHT;
+ image_info->vert_x = GDK_SCRATCH_IMAGE_WIDTH;
+ image_info->tile_x = GDK_SCRATCH_IMAGE_WIDTH;
+ image_info->tile_y1 = image_info->tile_y2 = GDK_SCRATCH_IMAGE_HEIGHT;
- pixel = XGetPixel (private->ximage, x, y);
+ scratch_image_infos = g_slist_prepend (scratch_image_infos, image_info);
- return pixel;
+ return image_info;
}
-void
-gdk_image_put_pixel (GdkImage *image,
- gint x,
- gint y,
- guint32 pixel)
-{
- GdkImagePrivate *private;
+/* Defining NO_FLUSH can cause inconsistent screen updates, but is useful
+ for performance evaluation. */
- g_return_if_fail (image != NULL);
+#undef NO_FLUSH
- private = (GdkImagePrivate *) image;
-
- pixel = XPutPixel (private->ximage, x, y, pixel);
-}
+#ifdef VERBOSE
+static gint sincelast;
+#endif
-void
-gdk_image_destroy (GdkImage *image)
+static gint
+alloc_scratch_image (GdkScratchImageInfo *image_info)
{
- GdkImagePrivate *private;
-#ifdef USE_SHM
- XShmSegmentInfo *x_shm_info;
-#endif /* USE_SHM */
-
- g_return_if_fail (image != NULL);
-
- private = (GdkImagePrivate*) image;
- switch (image->type)
+ if (image_info->static_image_idx == N_REGIONS)
{
- case GDK_IMAGE_NORMAL:
- XDestroyImage (private->ximage);
- break;
-
- case GDK_IMAGE_SHARED:
-#ifdef USE_SHM
- gdk_flush();
-
- XShmDetach (private->xdisplay, private->x_shm_info);
- XDestroyImage (private->ximage);
-
- x_shm_info = private->x_shm_info;
- shmdt (x_shm_info->shmaddr);
-
- g_free (private->x_shm_info);
-
- image_list = g_list_remove (image_list, image);
-#else /* USE_SHM */
- g_error ("trying to destroy shared memory image when gdk was compiled without shared memory support");
-#endif /* USE_SHM */
- break;
-
- case GDK_IMAGE_FASTEST:
- g_assert_not_reached ();
+#ifndef NO_FLUSH
+ gdk_flush ();
+#endif
+#ifdef VERBOSE
+ g_print ("flush, %d puts since last flush\n", sincelast);
+ sincelast = 0;
+#endif
+ image_info->static_image_idx = 0;
+
+ /* Mark all regions that we might be filling in as completely
+ * full, to force new tiles to be allocated for subsequent
+ * images
+ */
+ image_info->horiz_y = GDK_SCRATCH_IMAGE_HEIGHT;
+ image_info->vert_x = GDK_SCRATCH_IMAGE_WIDTH;
+ image_info->tile_x = GDK_SCRATCH_IMAGE_WIDTH;
+ image_info->tile_y1 = image_info->tile_y2 = GDK_SCRATCH_IMAGE_HEIGHT;
}
-
- g_free (image);
+ return image_info->static_image_idx++;
}
-static void
-gdk_image_put_normal (GdkDrawable *drawable,
- GdkGC *gc,
- GdkImage *image,
- gint xsrc,
- gint ysrc,
- gint xdest,
- gint ydest,
- gint width,
- gint height)
+/**
+ * _gdk_image_get_scratch:
+ * @screen: a #GdkScreen
+ * @width: desired width
+ * @height: desired height
+ * @depth: depth of image
+ * @x: X location within returned image of scratch image
+ * @y: Y location within returned image of scratch image
+ *
+ * Allocates an image of size width/height, up to a maximum
+ * of GDK_SCRATCH_IMAGE_WIDTHxGDK_SCRATCH_IMAGE_HEIGHT that is
+ * suitable to use on @screen.
+ *
+ * Return value: a scratch image. This must be used by a
+ * call to gdk_image_put() before any other calls to
+ * _gdk_image_get_scratch()
+ **/
+GdkImage *
+_gdk_image_get_scratch (GdkScreen *screen,
+ gint width,
+ gint height,
+ gint depth,
+ gint *x,
+ gint *y)
{
- GdkWindowPrivate *drawable_private;
- GdkImagePrivate *image_private;
- GdkGCPrivate *gc_private;
-
- g_return_if_fail (drawable != NULL);
- g_return_if_fail (image != NULL);
- g_return_if_fail (gc != NULL);
-
- drawable_private = (GdkWindowPrivate*) drawable;
- if (drawable_private->destroyed)
- return;
- image_private = (GdkImagePrivate*) image;
- gc_private = (GdkGCPrivate*) gc;
+ GdkScratchImageInfo *image_info;
+ GdkImage *image;
+ gint idx;
+
+ g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
- g_return_if_fail (image->type == GDK_IMAGE_NORMAL);
+ image_info = scratch_image_info_for_depth (screen, depth);
- XPutImage (drawable_private->xdisplay, drawable_private->xwindow,
- gc_private->xgc, image_private->ximage,
- xsrc, ysrc, xdest, ydest, width, height);
+ if (width >= (GDK_SCRATCH_IMAGE_WIDTH >> 1))
+ {
+ if (height >= (GDK_SCRATCH_IMAGE_HEIGHT >> 1))
+ {
+ idx = alloc_scratch_image (image_info);
+ *x = 0;
+ *y = 0;
+ }
+ else
+ {
+ if (height + image_info->horiz_y > GDK_SCRATCH_IMAGE_HEIGHT)
+ {
+ image_info->horiz_idx = alloc_scratch_image (image_info);
+ image_info->horiz_y = 0;
+ }
+ idx = image_info->horiz_idx;
+ *x = 0;
+ *y = image_info->horiz_y;
+ image_info->horiz_y += height;
+ }
+ }
+ else
+ {
+ if (height >= (GDK_SCRATCH_IMAGE_HEIGHT >> 1))
+ {
+ if (width + image_info->vert_x > GDK_SCRATCH_IMAGE_WIDTH)
+ {
+ image_info->vert_idx = alloc_scratch_image (image_info);
+ image_info->vert_x = 0;
+ }
+ idx = image_info->vert_idx;
+ *x = image_info->vert_x;
+ *y = 0;
+ /* using 3 and -4 would be slightly more efficient on 32-bit machines
+ with > 1bpp displays */
+ image_info->vert_x += (width + 7) & -8;
+ }
+ else
+ {
+ if (width + image_info->tile_x > GDK_SCRATCH_IMAGE_WIDTH)
+ {
+ image_info->tile_y1 = image_info->tile_y2;
+ image_info->tile_x = 0;
+ }
+ if (height + image_info->tile_y1 > GDK_SCRATCH_IMAGE_HEIGHT)
+ {
+ image_info->tile_idx = alloc_scratch_image (image_info);
+ image_info->tile_x = 0;
+ image_info->tile_y1 = 0;
+ image_info->tile_y2 = 0;
+ }
+ if (height + image_info->tile_y1 > image_info->tile_y2)
+ image_info->tile_y2 = height + image_info->tile_y1;
+ idx = image_info->tile_idx;
+ *x = image_info->tile_x;
+ *y = image_info->tile_y1;
+ image_info->tile_x += (width + 7) & -8;
+ }
+ }
+ image = image_info->static_image[idx * image_info->n_images / N_REGIONS];
+ *x += GDK_SCRATCH_IMAGE_WIDTH * (idx % (N_REGIONS / image_info->n_images));
+#ifdef VERBOSE
+ g_print ("index %d, x %d, y %d (%d x %d)\n", idx, *x, *y, width, height);
+ sincelast++;
+#endif
+ return image;
}
-static void
-gdk_image_put_shared (GdkDrawable *drawable,
- GdkGC *gc,
- GdkImage *image,
- gint xsrc,
- gint ysrc,
- gint xdest,
- gint ydest,
- gint width,
- gint height)
+GdkImage*
+gdk_image_new (GdkImageType type,
+ GdkVisual *visual,
+ gint width,
+ gint height)
{
-#ifdef USE_SHM
- GdkWindowPrivate *drawable_private;
- GdkImagePrivate *image_private;
- GdkGCPrivate *gc_private;
-
- g_return_if_fail (drawable != NULL);
- g_return_if_fail (image != NULL);
- g_return_if_fail (gc != NULL);
-
- drawable_private = (GdkWindowPrivate*) drawable;
- if (drawable_private->destroyed)
- return;
- image_private = (GdkImagePrivate*) image;
- gc_private = (GdkGCPrivate*) gc;
-
- g_return_if_fail (image->type == GDK_IMAGE_SHARED);
-
- XShmPutImage (drawable_private->xdisplay, drawable_private->xwindow,
- gc_private->xgc, image_private->ximage,
- xsrc, ysrc, xdest, ydest, width, height, False);
-#else /* USE_SHM */
- g_error ("trying to draw shared memory image when gdk was compiled without shared memory support");
-#endif /* USE_SHM */
+ return _gdk_image_new_for_depth (gdk_visual_get_screen (visual), type,
+ visual, width, height, -1);
}
projects / ~andy / gtk / blobdiff