86b5c82a97
2000-10-23 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c: Re-enable the "find" dialog
* gtk/testgtk.c: Add test for gdk_drawable_get_image
* gdk/gdkwindow.c (gdk_window_begin_paint_region): Fix bug where
the arguments to gdk_draw_drawable were in the wrong order
(gdk_window_paint_init_bg): This function was ignoring the
init_region, instead of clipping to it, so the entire backing
pixmap was cleared on every begin_paint()
(gdk_window_begin_paint_region): Hmm, the same list-walking bug
was in here again, the loop kept using the same GtkWindowPaint
over and over.
(gdk_window_begin_paint_region): Fix a bug where we had two
x_offset instead of x_offset and y_offset
* gdk/gdkdraw.c (gdk_drawable_get_image): get composite drawable
before we get the image.
(gdk_draw_drawable): get the composite before we draw the drawable.
(gdk_drawable_real_get_composite_drawable): default
get_composite_drawable implementation that returns the drawable
itself
* gdk/gdkdrawable.h (struct _GdkDrawableClass ): Add
get_composite_drawable virtual function
* gdk/gdkwindow.c (gdk_window_begin_paint_region): Fix a cheesy
list-walking bug
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_drawable): Add a hack to
make this work if the source drawable is a GdkDrawableImplX11
instead of a public drawable type. This is really broken; the
problem is that GdkDrawable needs a virtual method get_xid(), but
of course that doesn't work in practice. Enter RTTI.
Also, improve mismatched depth message.
* gdk/gdkpixmap.c (gdk_pixmap_get_image): Implement get_image for
GdkPixmap
* gdk/x11/gdkdrawable-x11.c (gdk_drawable_impl_x11_class_init):
install _gdk_x11_get_image as our implementation of get_image
* gdk/x11/gdkimage-x11.c (gdk_image_get): Rename to
_gdk_x11_get_image and export for use in gdkdrawable-x11.c
* gdk/gdkimage.c (gdk_image_get): Make this just a wrapper around
gdk_drawable_get_image
* gdk/gdkdraw.c (gdk_drawable_get_image): call virtual get_image
* gdk/gdkdrawable.h (struct _GdkDrawableClass ): Virtualize
get_image
* gtk/gtktreestore.c (gtk_tree_store_get_node): remove weird
trailing semicolon after for loop
525 lines
14 KiB
C
525 lines
14 KiB
C
/* GDK - The GIMP Drawing Kit
|
|
* 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 Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
/*
|
|
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
|
* file for a list of people on the GTK+ Team. See the ChangeLog
|
|
* files for a list of changes. These files are distributed with
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
|
*/
|
|
|
|
#include "gdkdrawable.h"
|
|
#include "gdkinternals.h"
|
|
#include "gdkwindow.h"
|
|
|
|
static GdkDrawable* gdk_drawable_real_get_composite_drawable (GdkDrawable *drawable,
|
|
gint x,
|
|
gint y,
|
|
gint width,
|
|
gint height,
|
|
gint *composite_x_offset,
|
|
gint *composite_y_offset);
|
|
|
|
static void gdk_drawable_class_init (GdkDrawableClass *klass);
|
|
|
|
GType
|
|
gdk_drawable_get_type (void)
|
|
{
|
|
static GType object_type = 0;
|
|
|
|
if (!object_type)
|
|
{
|
|
static const GTypeInfo object_info =
|
|
{
|
|
sizeof (GdkDrawableClass),
|
|
(GBaseInitFunc) NULL,
|
|
(GBaseFinalizeFunc) NULL,
|
|
(GClassInitFunc) gdk_drawable_class_init,
|
|
NULL, /* class_finalize */
|
|
NULL, /* class_data */
|
|
sizeof (GdkDrawable),
|
|
0, /* n_preallocs */
|
|
(GInstanceInitFunc) NULL,
|
|
};
|
|
|
|
object_type = g_type_register_static (G_TYPE_OBJECT,
|
|
"GdkDrawable",
|
|
&object_info);
|
|
}
|
|
|
|
return object_type;
|
|
}
|
|
|
|
static void
|
|
gdk_drawable_class_init (GdkDrawableClass *klass)
|
|
{
|
|
klass->get_composite_drawable = gdk_drawable_real_get_composite_drawable;
|
|
}
|
|
|
|
/* Manipulation of drawables
|
|
*/
|
|
|
|
void
|
|
gdk_drawable_set_data (GdkDrawable *drawable,
|
|
const gchar *key,
|
|
gpointer data,
|
|
GDestroyNotify destroy_func)
|
|
{
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
|
|
g_object_set_qdata_full (G_OBJECT (drawable),
|
|
g_quark_from_string (key),
|
|
data,
|
|
destroy_func);
|
|
}
|
|
|
|
gpointer
|
|
gdk_drawable_get_data (GdkDrawable *drawable,
|
|
const gchar *key)
|
|
{
|
|
g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
|
|
|
|
return g_object_get_qdata (G_OBJECT (drawable),
|
|
g_quark_try_string (key));
|
|
}
|
|
|
|
void
|
|
gdk_drawable_get_size (GdkDrawable *drawable,
|
|
gint *width,
|
|
gint *height)
|
|
{
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->get_size (drawable, width, height);
|
|
}
|
|
|
|
GdkVisual*
|
|
gdk_drawable_get_visual (GdkDrawable *drawable)
|
|
{
|
|
g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
|
|
|
|
return GDK_DRAWABLE_GET_CLASS (drawable)->get_visual (drawable);
|
|
}
|
|
|
|
gint
|
|
gdk_drawable_get_depth (GdkDrawable *drawable)
|
|
{
|
|
g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), 0);
|
|
|
|
return GDK_DRAWABLE_GET_CLASS (drawable)->get_depth (drawable);
|
|
}
|
|
|
|
void
|
|
gdk_drawable_set_colormap (GdkDrawable *drawable,
|
|
GdkColormap *cmap)
|
|
{
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->set_colormap (drawable, cmap);
|
|
}
|
|
|
|
GdkColormap*
|
|
gdk_drawable_get_colormap (GdkDrawable *drawable)
|
|
{
|
|
g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
|
|
|
|
return GDK_DRAWABLE_GET_CLASS (drawable)->get_colormap (drawable);
|
|
}
|
|
|
|
GdkDrawable*
|
|
gdk_drawable_ref (GdkDrawable *drawable)
|
|
{
|
|
return (GdkDrawable *) g_object_ref (G_OBJECT (drawable));
|
|
}
|
|
|
|
void
|
|
gdk_drawable_unref (GdkDrawable *drawable)
|
|
{
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
|
|
g_object_unref (G_OBJECT (drawable));
|
|
}
|
|
|
|
/* Drawing
|
|
*/
|
|
void
|
|
gdk_draw_point (GdkDrawable *drawable,
|
|
GdkGC *gc,
|
|
gint x,
|
|
gint y)
|
|
{
|
|
GdkPoint point;
|
|
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
g_return_if_fail (GDK_IS_GC (gc));
|
|
|
|
point.x = x;
|
|
point.y = y;
|
|
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->draw_points (drawable, gc, &point, 1);
|
|
}
|
|
|
|
void
|
|
gdk_draw_line (GdkDrawable *drawable,
|
|
GdkGC *gc,
|
|
gint x1,
|
|
gint y1,
|
|
gint x2,
|
|
gint y2)
|
|
{
|
|
GdkSegment segment;
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
g_return_if_fail (gc != NULL);
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
g_return_if_fail (GDK_IS_GC (gc));
|
|
|
|
segment.x1 = x1;
|
|
segment.y1 = y1;
|
|
segment.x2 = x2;
|
|
segment.y2 = y2;
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->draw_segments (drawable, gc, &segment, 1);
|
|
}
|
|
|
|
void
|
|
gdk_draw_rectangle (GdkDrawable *drawable,
|
|
GdkGC *gc,
|
|
gint filled,
|
|
gint x,
|
|
gint y,
|
|
gint width,
|
|
gint height)
|
|
{
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
g_return_if_fail (GDK_IS_GC (gc));
|
|
|
|
if (width < 0 || height < 0)
|
|
{
|
|
gint real_width;
|
|
gint real_height;
|
|
|
|
gdk_drawable_get_size (drawable, &real_width, &real_height);
|
|
|
|
if (width < 0)
|
|
width = real_width;
|
|
if (height < 0)
|
|
height = real_height;
|
|
}
|
|
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->draw_rectangle (drawable, gc, filled, x, y,
|
|
width, height);
|
|
}
|
|
|
|
void
|
|
gdk_draw_arc (GdkDrawable *drawable,
|
|
GdkGC *gc,
|
|
gint filled,
|
|
gint x,
|
|
gint y,
|
|
gint width,
|
|
gint height,
|
|
gint angle1,
|
|
gint angle2)
|
|
{
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
g_return_if_fail (GDK_IS_GC (gc));
|
|
|
|
if (width < 0 || height < 0)
|
|
{
|
|
gint real_width;
|
|
gint real_height;
|
|
|
|
gdk_drawable_get_size (drawable, &real_width, &real_height);
|
|
|
|
if (width < 0)
|
|
width = real_width;
|
|
if (height < 0)
|
|
height = real_height;
|
|
}
|
|
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->draw_arc (drawable, gc, filled,
|
|
x, y, width, height, angle1, angle2);
|
|
}
|
|
|
|
void
|
|
gdk_draw_polygon (GdkDrawable *drawable,
|
|
GdkGC *gc,
|
|
gint filled,
|
|
GdkPoint *points,
|
|
gint npoints)
|
|
{
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
g_return_if_fail (GDK_IS_GC (gc));
|
|
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->draw_polygon (drawable, gc, filled,
|
|
points, npoints);
|
|
}
|
|
|
|
/* gdk_draw_string
|
|
*
|
|
* Modified by Li-Da Lho to draw 16 bits and Multibyte strings
|
|
*
|
|
* Interface changed: add "GdkFont *font" to specify font or fontset explicitely
|
|
*/
|
|
void
|
|
gdk_draw_string (GdkDrawable *drawable,
|
|
GdkFont *font,
|
|
GdkGC *gc,
|
|
gint x,
|
|
gint y,
|
|
const gchar *string)
|
|
{
|
|
gdk_draw_text (drawable, font, gc, x, y, string, _gdk_font_strlen (font, string));
|
|
}
|
|
|
|
/* gdk_draw_text
|
|
*
|
|
* Modified by Li-Da Lho to draw 16 bits and Multibyte strings
|
|
*
|
|
* Interface changed: add "GdkFont *font" to specify font or fontset explicitely
|
|
*/
|
|
void
|
|
gdk_draw_text (GdkDrawable *drawable,
|
|
GdkFont *font,
|
|
GdkGC *gc,
|
|
gint x,
|
|
gint y,
|
|
const gchar *text,
|
|
gint text_length)
|
|
{
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
g_return_if_fail (font != NULL);
|
|
g_return_if_fail (GDK_IS_GC (gc));
|
|
g_return_if_fail (text != NULL);
|
|
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->draw_text (drawable, font, gc, x, y, text, text_length);
|
|
}
|
|
|
|
void
|
|
gdk_draw_text_wc (GdkDrawable *drawable,
|
|
GdkFont *font,
|
|
GdkGC *gc,
|
|
gint x,
|
|
gint y,
|
|
const GdkWChar *text,
|
|
gint text_length)
|
|
{
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
g_return_if_fail (font != NULL);
|
|
g_return_if_fail (GDK_IS_GC (gc));
|
|
g_return_if_fail (text != NULL);
|
|
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->draw_text_wc (drawable, font, gc, x, y, text, text_length);
|
|
}
|
|
|
|
void
|
|
gdk_draw_drawable (GdkDrawable *drawable,
|
|
GdkGC *gc,
|
|
GdkDrawable *src,
|
|
gint xsrc,
|
|
gint ysrc,
|
|
gint xdest,
|
|
gint ydest,
|
|
gint width,
|
|
gint height)
|
|
{
|
|
GdkDrawable *composite;
|
|
gint composite_x_offset = 0;
|
|
gint composite_y_offset = 0;
|
|
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
g_return_if_fail (src != NULL);
|
|
g_return_if_fail (GDK_IS_GC (gc));
|
|
|
|
if (width < 0 || height < 0)
|
|
{
|
|
gint real_width;
|
|
gint real_height;
|
|
|
|
gdk_drawable_get_size (src, &real_width, &real_height);
|
|
|
|
if (width < 0)
|
|
width = real_width;
|
|
if (height < 0)
|
|
height = real_height;
|
|
}
|
|
|
|
|
|
composite =
|
|
GDK_DRAWABLE_GET_CLASS (src)->get_composite_drawable (src,
|
|
xsrc, ysrc,
|
|
width, height,
|
|
&composite_x_offset,
|
|
&composite_y_offset);
|
|
|
|
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->draw_drawable (drawable, gc, composite,
|
|
xsrc - composite_x_offset,
|
|
ysrc - composite_y_offset,
|
|
xdest, ydest,
|
|
width, height);
|
|
|
|
g_object_unref (G_OBJECT (composite));
|
|
}
|
|
|
|
void
|
|
gdk_draw_image (GdkDrawable *drawable,
|
|
GdkGC *gc,
|
|
GdkImage *image,
|
|
gint xsrc,
|
|
gint ysrc,
|
|
gint xdest,
|
|
gint ydest,
|
|
gint width,
|
|
gint height)
|
|
{
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
g_return_if_fail (image != NULL);
|
|
g_return_if_fail (GDK_IS_GC (gc));
|
|
|
|
if (width == -1)
|
|
width = image->width;
|
|
if (height == -1)
|
|
height = image->height;
|
|
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->draw_image (drawable, gc, image, xsrc, ysrc,
|
|
xdest, ydest, width, height);
|
|
}
|
|
|
|
void
|
|
gdk_draw_points (GdkDrawable *drawable,
|
|
GdkGC *gc,
|
|
GdkPoint *points,
|
|
gint npoints)
|
|
{
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
g_return_if_fail ((points != NULL) && (npoints > 0));
|
|
g_return_if_fail (GDK_IS_GC (gc));
|
|
g_return_if_fail (npoints >= 0);
|
|
|
|
if (npoints == 0)
|
|
return;
|
|
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->draw_points (drawable, gc, points, npoints);
|
|
}
|
|
|
|
void
|
|
gdk_draw_segments (GdkDrawable *drawable,
|
|
GdkGC *gc,
|
|
GdkSegment *segs,
|
|
gint nsegs)
|
|
{
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
|
|
if (nsegs == 0)
|
|
return;
|
|
|
|
g_return_if_fail (segs != NULL);
|
|
g_return_if_fail (GDK_IS_GC (gc));
|
|
g_return_if_fail (nsegs >= 0);
|
|
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->draw_segments (drawable, gc, segs, nsegs);
|
|
}
|
|
|
|
void
|
|
gdk_draw_lines (GdkDrawable *drawable,
|
|
GdkGC *gc,
|
|
GdkPoint *points,
|
|
gint npoints)
|
|
{
|
|
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
g_return_if_fail (points != NULL);
|
|
g_return_if_fail (GDK_IS_GC (gc));
|
|
g_return_if_fail (npoints >= 0);
|
|
|
|
if (npoints == 0)
|
|
return;
|
|
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->draw_lines (drawable, gc, points, npoints);
|
|
}
|
|
|
|
void
|
|
gdk_draw_glyphs (GdkDrawable *drawable,
|
|
GdkGC *gc,
|
|
PangoFont *font,
|
|
gint x,
|
|
gint y,
|
|
PangoGlyphString *glyphs)
|
|
{
|
|
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
|
|
g_return_if_fail (GDK_IS_GC (gc));
|
|
|
|
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->draw_glyphs (drawable, gc, font, x, y, glyphs);
|
|
}
|
|
|
|
|
|
GdkImage*
|
|
gdk_drawable_get_image (GdkDrawable *drawable,
|
|
gint x,
|
|
gint y,
|
|
gint width,
|
|
gint height)
|
|
{
|
|
GdkDrawable *composite;
|
|
gint composite_x_offset = 0;
|
|
gint composite_y_offset = 0;
|
|
GdkImage *retval;
|
|
|
|
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);
|
|
|
|
composite =
|
|
GDK_DRAWABLE_GET_CLASS (drawable)->get_composite_drawable (drawable,
|
|
x, y,
|
|
width, height,
|
|
&composite_x_offset,
|
|
&composite_y_offset);
|
|
|
|
retval = GDK_DRAWABLE_GET_CLASS (composite)->get_image (composite,
|
|
x - composite_x_offset,
|
|
y - composite_y_offset,
|
|
width, height);
|
|
|
|
g_object_unref (G_OBJECT (composite));
|
|
|
|
return retval;
|
|
}
|
|
|
|
static GdkDrawable*
|
|
gdk_drawable_real_get_composite_drawable (GdkDrawable *drawable,
|
|
gint x,
|
|
gint y,
|
|
gint width,
|
|
gint height,
|
|
gint *composite_x_offset,
|
|
gint *composite_y_offset)
|
|
{
|
|
g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
|
|
|
|
*composite_x_offset = 0;
|
|
*composite_y_offset = 0;
|
|
|
|
return GDK_DRAWABLE (g_object_ref (G_OBJECT (drawable)));
|
|
}
|