1997-11-24 22:37:52 +00:00
|
|
|
/* 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 Library 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.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU Library General Public
|
1998-04-13 02:02:47 +00:00
|
|
|
* License along with this library; if not, write to the
|
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
* Boston, MA 02111-1307, USA.
|
1997-11-24 22:37:52 +00:00
|
|
|
*/
|
1999-02-24 07:37:18 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Modified by the GTK+ Team and others 1997-1999. 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/.
|
|
|
|
|
*/
|
|
|
|
|
|
1999-10-01 23:18:30 +00:00
|
|
|
#include "gdkdrawable.h"
|
2000-03-28 01:40:57 +00:00
|
|
|
#include "gdkinternals.h"
|
1999-10-03 22:12:41 +00:00
|
|
|
#include "gdkwindow.h"
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1999-10-03 22:12:41 +00:00
|
|
|
/* Manipulation of drawables
|
|
|
|
|
*/
|
1999-11-08 20:14:59 +00:00
|
|
|
GdkDrawable *
|
|
|
|
|
gdk_drawable_alloc (void)
|
|
|
|
|
{
|
|
|
|
|
GdkDrawablePrivate *private = g_new (GdkDrawablePrivate, 1);
|
|
|
|
|
GdkDrawable *drawable = (GdkDrawable*) private;
|
|
|
|
|
|
|
|
|
|
drawable->user_data = NULL;
|
|
|
|
|
|
|
|
|
|
private->ref_count = 1;
|
|
|
|
|
private->destroyed = FALSE;
|
|
|
|
|
private->klass = NULL;
|
|
|
|
|
private->klass_data = NULL;
|
|
|
|
|
private->window_type = GDK_WINDOW_CHILD;
|
|
|
|
|
|
|
|
|
|
private->width = 1;
|
|
|
|
|
private->height = 1;
|
|
|
|
|
|
2000-03-28 01:24:44 +00:00
|
|
|
private->depth = 0;
|
|
|
|
|
|
1999-11-08 20:14:59 +00:00
|
|
|
private->colormap = NULL;
|
|
|
|
|
|
|
|
|
|
return drawable;
|
|
|
|
|
}
|
|
|
|
|
|
1999-10-03 22:12:41 +00:00
|
|
|
void
|
|
|
|
|
gdk_drawable_set_data (GdkDrawable *drawable,
|
|
|
|
|
const gchar *key,
|
|
|
|
|
gpointer data,
|
|
|
|
|
GDestroyNotify destroy_func)
|
|
|
|
|
{
|
|
|
|
|
g_dataset_set_data_full (drawable, key, data, destroy_func);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gdk_drawable_get_data (GdkDrawable *drawable,
|
|
|
|
|
const gchar *key)
|
|
|
|
|
{
|
|
|
|
|
g_dataset_get_data (drawable, key);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
GdkDrawableType
|
|
|
|
|
gdk_drawable_get_type (GdkDrawable *drawable)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (drawable != NULL, (GdkDrawableType) -1);
|
|
|
|
|
|
|
|
|
|
return GDK_DRAWABLE_TYPE (drawable);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gdk_drawable_get_size (GdkDrawable *drawable,
|
|
|
|
|
gint *width,
|
|
|
|
|
gint *height)
|
|
|
|
|
{
|
|
|
|
|
GdkDrawablePrivate *drawable_private;
|
|
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
|
|
|
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
|
|
|
|
|
|
|
|
|
if (width)
|
|
|
|
|
*width = drawable_private->width;
|
|
|
|
|
if (height)
|
|
|
|
|
*height = drawable_private->height;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
GdkVisual*
|
|
|
|
|
gdk_drawable_get_visual (GdkDrawable *drawable)
|
|
|
|
|
{
|
|
|
|
|
GdkColormap *colormap;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (drawable != NULL, NULL);
|
|
|
|
|
|
|
|
|
|
colormap = gdk_drawable_get_colormap (drawable);
|
|
|
|
|
return colormap ? gdk_colormap_get_visual (colormap) : NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2000-03-28 01:24:44 +00:00
|
|
|
gint
|
|
|
|
|
gdk_drawable_get_depth (GdkDrawable *drawable)
|
|
|
|
|
{
|
|
|
|
|
GdkDrawablePrivate *private = (GdkDrawablePrivate *)drawable;
|
|
|
|
|
g_return_val_if_fail (drawable != NULL, 0);
|
|
|
|
|
|
|
|
|
|
return private->depth;
|
|
|
|
|
}
|
|
|
|
|
|
1999-11-08 20:14:59 +00:00
|
|
|
GdkDrawable*
|
|
|
|
|
gdk_drawable_ref (GdkDrawable *drawable)
|
|
|
|
|
{
|
|
|
|
|
GdkDrawablePrivate *private = (GdkDrawablePrivate *)drawable;
|
|
|
|
|
g_return_val_if_fail (drawable != NULL, NULL);
|
|
|
|
|
|
|
|
|
|
private->ref_count += 1;
|
|
|
|
|
return drawable;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gdk_drawable_unref (GdkDrawable *drawable)
|
|
|
|
|
{
|
|
|
|
|
GdkDrawablePrivate *private = (GdkDrawablePrivate *)drawable;
|
|
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
|
g_return_if_fail (private->ref_count > 0);
|
|
|
|
|
|
|
|
|
|
private->ref_count -= 1;
|
|
|
|
|
if (private->ref_count == 0)
|
|
|
|
|
{
|
|
|
|
|
private->klass->destroy (drawable);
|
|
|
|
|
g_dataset_destroy (drawable);
|
|
|
|
|
g_free (drawable);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-10-03 22:12:41 +00:00
|
|
|
/* Drawing
|
|
|
|
|
*/
|
1997-11-24 22:37:52 +00:00
|
|
|
void
|
|
|
|
|
gdk_draw_point (GdkDrawable *drawable,
|
|
|
|
|
GdkGC *gc,
|
|
|
|
|
gint x,
|
|
|
|
|
gint y)
|
|
|
|
|
{
|
|
|
|
|
GdkGCPrivate *gc_private;
|
1999-11-08 20:14:59 +00:00
|
|
|
GdkPoint point;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
|
1999-10-03 22:12:41 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1998-01-26 01:20:14 +00:00
|
|
|
return;
|
1997-11-24 22:37:52 +00:00
|
|
|
gc_private = (GdkGCPrivate*) gc;
|
|
|
|
|
|
1999-11-08 20:14:59 +00:00
|
|
|
point.x = x;
|
|
|
|
|
point.y = y;
|
|
|
|
|
|
|
|
|
|
((GdkDrawablePrivate *)drawable)->klass->draw_points (drawable, gc, &point, 1);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gdk_draw_line (GdkDrawable *drawable,
|
|
|
|
|
GdkGC *gc,
|
|
|
|
|
gint x1,
|
|
|
|
|
gint y1,
|
|
|
|
|
gint x2,
|
|
|
|
|
gint y2)
|
|
|
|
|
{
|
|
|
|
|
GdkGCPrivate *gc_private;
|
1999-11-08 20:14:59 +00:00
|
|
|
GdkSegment segment;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
|
1999-10-03 22:12:41 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1998-01-26 01:20:14 +00:00
|
|
|
return;
|
1997-11-24 22:37:52 +00:00
|
|
|
gc_private = (GdkGCPrivate*) gc;
|
|
|
|
|
|
1999-11-08 20:14:59 +00:00
|
|
|
segment.x1 = x1;
|
|
|
|
|
segment.y1 = y1;
|
|
|
|
|
segment.x2 = x2;
|
|
|
|
|
segment.y2 = y2;
|
|
|
|
|
((GdkDrawablePrivate *)drawable)->klass->draw_segments (drawable, gc, &segment, 1);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gdk_draw_rectangle (GdkDrawable *drawable,
|
|
|
|
|
GdkGC *gc,
|
|
|
|
|
gint filled,
|
|
|
|
|
gint x,
|
|
|
|
|
gint y,
|
|
|
|
|
gint width,
|
|
|
|
|
gint height)
|
|
|
|
|
{
|
1999-10-03 22:12:41 +00:00
|
|
|
GdkDrawablePrivate *drawable_private;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
|
1999-10-03 22:12:41 +00:00
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
|
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1998-01-26 01:20:14 +00:00
|
|
|
return;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1999-11-08 20:14:59 +00:00
|
|
|
if (width < 0)
|
1997-11-24 22:37:52 +00:00
|
|
|
width = drawable_private->width;
|
1999-11-08 20:14:59 +00:00
|
|
|
if (height < 0)
|
1997-11-24 22:37:52 +00:00
|
|
|
height = drawable_private->height;
|
|
|
|
|
|
1999-11-08 20:14:59 +00:00
|
|
|
((GdkDrawablePrivate *)drawable)->klass->draw_rectangle (drawable, gc, filled, x, y,
|
|
|
|
|
width, height);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gdk_draw_arc (GdkDrawable *drawable,
|
|
|
|
|
GdkGC *gc,
|
|
|
|
|
gint filled,
|
|
|
|
|
gint x,
|
|
|
|
|
gint y,
|
|
|
|
|
gint width,
|
|
|
|
|
gint height,
|
|
|
|
|
gint angle1,
|
|
|
|
|
gint angle2)
|
|
|
|
|
{
|
1999-10-03 22:12:41 +00:00
|
|
|
GdkDrawablePrivate *drawable_private;
|
1997-11-24 22:37:52 +00:00
|
|
|
GdkGCPrivate *gc_private;
|
|
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
|
1999-10-03 22:12:41 +00:00
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
|
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1998-01-26 01:20:14 +00:00
|
|
|
return;
|
1997-11-24 22:37:52 +00:00
|
|
|
gc_private = (GdkGCPrivate*) gc;
|
|
|
|
|
|
1999-11-08 20:14:59 +00:00
|
|
|
if (width < 0)
|
1997-11-24 22:37:52 +00:00
|
|
|
width = drawable_private->width;
|
1999-11-08 20:14:59 +00:00
|
|
|
if (height < 0)
|
1997-11-24 22:37:52 +00:00
|
|
|
height = drawable_private->height;
|
|
|
|
|
|
1999-11-08 20:14:59 +00:00
|
|
|
((GdkDrawablePrivate *)drawable)->klass->draw_arc (drawable, gc, filled,
|
|
|
|
|
x, y, width, height, angle1, angle2);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gdk_draw_polygon (GdkDrawable *drawable,
|
|
|
|
|
GdkGC *gc,
|
|
|
|
|
gint filled,
|
|
|
|
|
GdkPoint *points,
|
|
|
|
|
gint npoints)
|
|
|
|
|
{
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
|
1999-10-03 22:12:41 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1998-01-26 01:20:14 +00:00
|
|
|
return;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1999-11-08 20:14:59 +00:00
|
|
|
((GdkDrawablePrivate *)drawable)->klass->draw_polygon (drawable, gc, filled,
|
|
|
|
|
points, npoints);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 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)
|
|
|
|
|
{
|
1999-11-08 20:14:59 +00:00
|
|
|
gdk_draw_text (drawable, font, gc, x, y, string, _gdk_font_strlen (font, string));
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 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 (drawable != NULL);
|
|
|
|
|
g_return_if_fail (font != NULL);
|
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
g_return_if_fail (text != NULL);
|
|
|
|
|
|
1999-11-08 20:14:59 +00:00
|
|
|
((GdkDrawablePrivate *)drawable)->klass->draw_text (drawable, font, gc, x, y, text, text_length);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
Destroy widgets _after_ propagating unrealize signals through the widget
Mon Dec 7 10:27:09 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Destroy widgets _after_ propagating unrealize
signals through the widget heirarchy. This is unpleasant, as it
causes more X traffic, but is necessary, because we have to clean
up our Input Contexts before destroying the X windows.
(from matsu-981109-0.patch)
Mon Dec 7 10:18:18 1998 Owen Taylor <otaylor@redhat.com>
Applied gtk-a-higuti-981202-0 :
[ a-higuti@math.sci.hokudai.ac.jp (Akira Higuchi) ]
* gdk/gdk.h gdk/gdk.c
(gdk_mbstowcs): New function. Nearly equals to mbstowcs, but
implemented by a combination of Xlib functions, so
it works even with X_LOCALE.
(gdk_wcstombs): New function.
(g_mbtowc): Removed. No longer needed.
* gdk/gdk.h gdk/gdkfont.c gdk/gdkdraw.c:
Added _wc() variants to gdk_text_width(),
gdk_char_width(), gdk_draw_text(),
* gdk/gdki18n.h
(mblen, mbtowc, wctomb, mbstowcs, wcstombs,
wcslen, wcscpy, wcsncpy):
Removed. No longer needed.
(iswalnum): Removed.
(gdk_iswalnum): New macro.
(gdk_iswspace): New macro.
* gdk/gdktype.h
(GdkWChar): New typedef.
* gtk/gtkentry.h, gtk/gtkentry.c
There are many changes according to the change of the
internal representation of text, from multibyte string
to wide characters.
* gtk/gtkprivate.h, gtk/gtkmain.c
Removed the variable gtk_use_mb and related codes.
* gtk/gtkspinbutton.c
Some changes according to the change of type of entry->text.
* gtk/gtktext.h, gtk/gtktext.c
Changed the internal representation of text. We use GdkWchar
if a fontset is supplied. If not, we use guchar to save
memory.
1998-12-09 06:36:57 +00:00
|
|
|
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 (drawable != NULL);
|
|
|
|
|
g_return_if_fail (font != NULL);
|
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
g_return_if_fail (text != NULL);
|
|
|
|
|
|
1999-11-08 20:14:59 +00:00
|
|
|
((GdkDrawablePrivate *)drawable)->klass->draw_text_wc (drawable, font, gc, x, y, text, text_length);
|
Destroy widgets _after_ propagating unrealize signals through the widget
Mon Dec 7 10:27:09 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Destroy widgets _after_ propagating unrealize
signals through the widget heirarchy. This is unpleasant, as it
causes more X traffic, but is necessary, because we have to clean
up our Input Contexts before destroying the X windows.
(from matsu-981109-0.patch)
Mon Dec 7 10:18:18 1998 Owen Taylor <otaylor@redhat.com>
Applied gtk-a-higuti-981202-0 :
[ a-higuti@math.sci.hokudai.ac.jp (Akira Higuchi) ]
* gdk/gdk.h gdk/gdk.c
(gdk_mbstowcs): New function. Nearly equals to mbstowcs, but
implemented by a combination of Xlib functions, so
it works even with X_LOCALE.
(gdk_wcstombs): New function.
(g_mbtowc): Removed. No longer needed.
* gdk/gdk.h gdk/gdkfont.c gdk/gdkdraw.c:
Added _wc() variants to gdk_text_width(),
gdk_char_width(), gdk_draw_text(),
* gdk/gdki18n.h
(mblen, mbtowc, wctomb, mbstowcs, wcstombs,
wcslen, wcscpy, wcsncpy):
Removed. No longer needed.
(iswalnum): Removed.
(gdk_iswalnum): New macro.
(gdk_iswspace): New macro.
* gdk/gdktype.h
(GdkWChar): New typedef.
* gtk/gtkentry.h, gtk/gtkentry.c
There are many changes according to the change of the
internal representation of text, from multibyte string
to wide characters.
* gtk/gtkprivate.h, gtk/gtkmain.c
Removed the variable gtk_use_mb and related codes.
* gtk/gtkspinbutton.c
Some changes according to the change of type of entry->text.
* gtk/gtktext.h, gtk/gtktext.c
Changed the internal representation of text. We use GdkWchar
if a fontset is supplied. If not, we use guchar to save
memory.
1998-12-09 06:36:57 +00:00
|
|
|
}
|
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
void
|
1999-11-08 20:14:59 +00:00
|
|
|
gdk_draw_drawable (GdkDrawable *drawable,
|
|
|
|
|
GdkGC *gc,
|
|
|
|
|
GdkDrawable *src,
|
|
|
|
|
gint xsrc,
|
|
|
|
|
gint ysrc,
|
|
|
|
|
gint xdest,
|
|
|
|
|
gint ydest,
|
|
|
|
|
gint width,
|
|
|
|
|
gint height)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
|
g_return_if_fail (src != NULL);
|
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
|
1999-10-03 22:12:41 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable) || GDK_DRAWABLE_DESTROYED (src))
|
1998-01-26 01:20:14 +00:00
|
|
|
return;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
|
if (width == -1)
|
1999-10-03 22:12:41 +00:00
|
|
|
width = ((GdkDrawablePrivate *)src)->width;
|
1997-11-24 22:37:52 +00:00
|
|
|
if (height == -1)
|
1999-10-03 22:12:41 +00:00
|
|
|
height = ((GdkDrawablePrivate *)src)->height;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1999-11-08 20:14:59 +00:00
|
|
|
((GdkDrawablePrivate *)drawable)->klass->draw_drawable (drawable, gc, src,
|
|
|
|
|
xsrc, ysrc, xdest, ydest,
|
|
|
|
|
width, height);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gdk_draw_image (GdkDrawable *drawable,
|
|
|
|
|
GdkGC *gc,
|
|
|
|
|
GdkImage *image,
|
|
|
|
|
gint xsrc,
|
|
|
|
|
gint ysrc,
|
|
|
|
|
gint xdest,
|
|
|
|
|
gint ydest,
|
|
|
|
|
gint width,
|
|
|
|
|
gint height)
|
|
|
|
|
{
|
|
|
|
|
GdkImagePrivate *image_private;
|
|
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
|
g_return_if_fail (image != NULL);
|
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
|
|
|
|
|
image_private = (GdkImagePrivate*) image;
|
|
|
|
|
|
|
|
|
|
if (width == -1)
|
|
|
|
|
width = image->width;
|
|
|
|
|
if (height == -1)
|
|
|
|
|
height = image->height;
|
|
|
|
|
|
1999-11-08 20:14:59 +00:00
|
|
|
|
2000-03-28 01:24:44 +00:00
|
|
|
if (GDK_IS_WINDOW (drawable))
|
|
|
|
|
_gdk_window_draw_image (drawable, gc, image, xsrc, ysrc,
|
|
|
|
|
xdest, ydest, width, height);
|
|
|
|
|
else
|
|
|
|
|
image_private->klass->image_put (image, drawable, gc, xsrc, ysrc,
|
|
|
|
|
xdest, ydest, width, height);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gdk_draw_points (GdkDrawable *drawable,
|
|
|
|
|
GdkGC *gc,
|
|
|
|
|
GdkPoint *points,
|
|
|
|
|
gint npoints)
|
|
|
|
|
{
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
|
g_return_if_fail ((points != NULL) && (npoints > 0));
|
|
|
|
|
g_return_if_fail (gc != NULL);
|
1999-11-08 20:14:59 +00:00
|
|
|
g_return_if_fail (npoints >= 0);
|
|
|
|
|
|
|
|
|
|
if (npoints == 0)
|
|
|
|
|
return;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1999-10-03 22:12:41 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1998-01-26 01:20:14 +00:00
|
|
|
return;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1999-11-08 20:14:59 +00:00
|
|
|
((GdkDrawablePrivate *)drawable)->klass->draw_points (drawable, gc, points, npoints);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gdk_draw_segments (GdkDrawable *drawable,
|
|
|
|
|
GdkGC *gc,
|
|
|
|
|
GdkSegment *segs,
|
|
|
|
|
gint nsegs)
|
|
|
|
|
{
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
1999-11-08 20:14:59 +00:00
|
|
|
|
|
|
|
|
if (nsegs == 0)
|
|
|
|
|
return;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2000-02-13 23:19:23 +00:00
|
|
|
g_return_if_fail (segs != NULL);
|
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
g_return_if_fail (nsegs >= 0);
|
|
|
|
|
|
1999-10-03 22:12:41 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1998-01-26 01:20:14 +00:00
|
|
|
return;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1999-11-08 20:14:59 +00:00
|
|
|
((GdkDrawablePrivate *)drawable)->klass->draw_segments (drawable, gc, segs, nsegs);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1998-03-02 00:32:52 +00:00
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gdk_draw_lines (GdkDrawable *drawable,
|
1999-11-08 20:14:59 +00:00
|
|
|
GdkGC *gc,
|
|
|
|
|
GdkPoint *points,
|
|
|
|
|
gint npoints)
|
1998-03-02 00:32:52 +00:00
|
|
|
{
|
|
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
|
g_return_if_fail (points != NULL);
|
|
|
|
|
g_return_if_fail (gc != NULL);
|
1999-11-08 20:14:59 +00:00
|
|
|
g_return_if_fail (npoints >= 0);
|
|
|
|
|
|
|
|
|
|
if (npoints == 0)
|
|
|
|
|
return;
|
1998-03-02 00:32:52 +00:00
|
|
|
|
1999-10-03 22:12:41 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
[ Merges from gtk-1-2 ]
Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org>
* configure.in: fixed "GNU Make" check to pass with new make version
3.77.95.
Fri Sep 3 16:04:41 1999 Tim Janik <timj@gtk.org>
* gtk-config.in (--version): don't echo @GTK_VERSION@, but
@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@, so the
AM_PATH_GTK() macros don't get confused by the -pre1.
Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com>
* configure.in (REBUILD): Change check for perl5
to check explicitely for v >= 5.002. (5.001
does not work with our scripts.)
Wed Aug 25 15:45:46 1999 Tim Janik <timj@gtk.org>
* configure.in: evaluate $PERL for the perl version check. added
--disable-rebuilds to give the user an option to completely disable
any source autogeneration rules.
Mon Aug 23 23:16:14 1999 Tim Janik <timj@gtk.org>
* configure.in: evaluate $ac_make when checking for GNU Make.
Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org>
* docs/Makefile.am: added generation.txt.
* Makefile.am: require automake 1.4, build README from README.in and
INSTALL from INSTALL.in in dist-hook.
* README.in:
* INSTALL.in: new files to autogenerate README and INSTALL from.
* configure.in: figure whether we have GNU Make
* docs/generation.txt: minor additions/corrections.
Wed Aug 11 13:38:26 BST 1999 Tony Gale <gale@gtk.org>
* docs/gtkfaq.sgml: FAQ Update
July 30, 1999 Elliot Lee <sopwith@redhat.com>
* configure.in: Fix autoconf warnings about cross compilation by
trying to provide sane defaults for AC_TRY_RUN.
Fri Jul 16 22:20:21 PDT 1999 Manish Singh <yosh@gimp.org>
* ltconfig
* ltmain.sh: upgrade to libtool 1.3.3
Thu Jul 8 11:30:18 1999 Owen Taylor <otaylor@redhat.com>
* INSTALL: Indicate that the --with-glib= configure
time flag is unsupported.
Mon Jul 5 20:36:03 1999 Owen Taylor <otaylor@redhat.com>
* docs/generation.txt: Added a file that gives
documenation about the autogeneration process for
various autogenerated files.
Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com>
* configure.in (LIBS): Look for libgmodule in the
right location.
Thu Jun 17 13:57:31 1999 Owen Taylor <otaylor@redhat.com>
* docs/gtk_tut.sgml: Removed references to
code examples in my directory on gtk.org as
they should all be in the tutorial now.
* docs/gtk_tut.sgml: Added sources for dial-test
and scribble-xinput programs that were previously
missing.
Fri Jun 4 00:08:59 1999 Owen Taylor <otaylor@redhat.com>
* TODO: Added entry about menu keyboard navigation, removed
some finished items.
Mon May 31 00:11:24 1999 Owen Taylor <otaylor@redhat.com>
* acinclude.m4: Standardize on func_dgettext
not func_gettext, so that the checks for dgettext
actually are paid attention to.
Wed May 5 10:47:54 1999 Owen Taylor <otaylor@redhat.com>
* configure.in (LIBS): Add $INTLLIBS into $LIBS
directly, rather than repeating the checks for
gettext.
* INSTALL: Added information about gettext and
NLS support.
* acinclude.m4 (LIBM): Check for dgettext, not
just gettext. This should hopefully fix things wrt
systems with old versions of GNU gettext installed.
Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com>
* configure.in (LIBS): Look for libgmodule in the
right location.
Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org>
* autogen.sh: add --enable-maintainer-mode
* configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
Wed Mar 24 23:03:49 CST 1999 Shawn T. Amundson <amundson@gtk.org>
* docs/gtk-config.1.in:
docs/Makefile.am:
configure.in: gtk-config is now generated.
* docs/gtk-config.1: Removed, now generated.
Thu Sep 23 17:59:59 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_translate): grr, even if Gdk doesn't
handle CreateNotify itself, still put out a debuging message for
--gdk-debug=events. made the ReparentNotify debugging message more
verbose.
wrap xcoords translation for ConfigureEvents into an error trap,
a destroy event may already be pending, and in that case, the
actuall coordinate values are not at all critical.
Sat Sep 18 22:24:15 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkcc.c: Stop leaking the color_hash all over
the place. Simplify and improve the logic.
Fri Sep 17 09:57:15 1999 Tim Janik <timj@gtk.org>
* gdk/gdk.h, gdk/gdkcolor.c: make return types (gint or gboolean)
for prototypes and function implementations consistent (reported
by Tomas Ogren).
Tue Sep 14 18:23:01 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_translate): tell if expose events have
send_event set in debugging output.
(gdk_compress_exposures): default initialize the event so we don't
operate on bogus values (namely send_event).
Thu Sep 2 16:33:59 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c: When we receive an unexpected
destroy notify on one of our windows, don't just
warn about it, also mark our windows as destroyed.
Sun Sep 5 08:10:53 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.c (gdk_font_hash_insert): Add
name => font and name => fontset hashes. The
name => fontset hash is a _big_ win since we
weren't previously caching fontsets at all and loading
fontsets is expensive. The name => font hash
is less of a win, but it does save us from doing
repeated XQueryFont calls on the same font.
* gdk/gdkprivate.h (struct _GdkFontPrivate): Add a names
list so we can remove font/fontset from hash.
Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkproperty.c (gdk_atom_intern): Remove useless
and slightly confusing test. [ XInternAtom (,,TRUE)
will never return None ].
Sat Sep 4 08:39:26 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_geometry_hints)
gdk/gdkwindow.c (gdk_window_set_hints):
Don't omit setting the properties if flags == 0 -
there may be an existing set of properties there
already. (Very old bug. Would it be better to
delete the property instead?)
* gdk/gdkselection.c (gdk_selection_property_get): Fix
spelling error in comment.
Wed Sep 1 14:05:30 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Use gdk_error_trap_push()
to avoid stomping over gdk_error_warnings.
* gdk/gdkimage.c (gdk_image_new): compute image->bpp
as (bits_per_pixel + 7) / 8. This gives the same
result as before for multiples of 8, but actually
a "reasonable" value for 1bit or 4bit displays.
Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org>
* gdk/Makefile.am: minor cleanups, strip spaces on build rules for
GNU Make.
Tue Aug 17 07:43:04 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_translate): give a debugging note when
discarding configure events.
1999-08-18 Federico Mena Quintero <federico@redhat.com>
* gdk/gdkpixmap.c (gdk_pixmap_unref): g_return_if_fail() the
refcount is greater than zero.
* gdk/gdkwindow.c (gdk_window_unref): Likewise.
* gdk/gdkfont.c (gdk_font_unref): Likewise.
* gdk/gdkgc.c (gdk_gc_unref): Likewise.
* gdk/gdkdnd.c (gdk_drag_context_unref): Likewise.
Wed Aug 11 01:04:57 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkproperty.c (gdk_property_get): Fix assumption
that format 32 => sizeof(item) == 4. It really is
sizeof(long).
Tue Jun 29 23:02:42 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_x_error / gdk_x_io_error): Don't
core dump at all on X IO errors, only core dump
if --enable-debug for X errors.
Thu Jun 24 17:06:23 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_translate): removed old ""Got event for
unknown window:" message. disabled ConfigureNotify discarding code,
because it led to events being processed out of order.
Thu Jun 24 12:22:02 1999 Tim Janik <timj@gtk.org>
* gdk/gdkglobals.c: preinitialize gdk_error_code to 0.
* gdk/gdkevents.c (gdk_event_send_client_message_to_all_recurse): since
we export this function, supress error warnings and don't reset the
error code in the first half of this function.
* gdk/gdk.c (gdk_x_error): set gdk_error_code to the actuall X error
code (instead of just -1) so gdk_error_trap_pop() reveals something
actually informative about the error that happened.
* gdk/*.c:
don't rely on gdk_error_code being -1 if an error occoured, but just
gdk_error_code != 0.
Thu Jun 24 11:50:07 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_apply_filters): advance the filter list
pointer *before* invoking the filter function, so we at least don't
crash if a filter is removed that is currently executed. window filters
*really* need to be made truely reentrant at some point.
Mon Jun 14 11:10:15 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_translate): print the atom name in the
PropertyNotify debug messages.
Wed May 5 22:51:06 1999 Owen Taylor <otaylor@redhat.com>
Patch from Sung-Hyun Nam <namsh@lgic.co.kr>
* gdk/gdkim.c: Fix cut-and-paste errors for
x/y and PreeditAttributes/StatusAttributes.
Wed May 5 22:24:21 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_geometry_hints): Change
G_MAXINT to 2^16 to alleviate overflow problems in
various window managers.
Wed Apr 21 00:42:08 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.c (gdk_text_measure): Fix the return value
for fontsets.
Wed May 5 12:42:01 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_geometry_hints):
Initialize size_hints.x and size_hints.y because kwm
brokenly pays attention to them.
(Bug #1181 - Lars Heete <hel@admin.de>)
Wed May 5 11:38:56 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.c (gdk_rgb_choose_visual): Free the
return value of gdk_list_visuals().
(Bug #1193 - Morten Welinder <terra@diku.dk>)
Tue May 4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org>
* gdk/gdkim.c (gdk_im_real_open): cast the return value of
XSetIMValues to (void *) when comparing to NULL, to workaround
the problem of some compilers barfing since older X headers don't
have the prototype for it.
Mon Apr 19 10:11:12 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkcolor.c (gdk_colormap_new): Fix memory leak
for pseudocolor where colormap->colors was double
allocated.
* gdk/gdkcolor.c (gdk_colormap_alloc1): Store the
color value in the hash table with the pixel filled
in so when we do later hash table lookups, the color
value is correct.
Sun May 2 15:29:45 PDT 1999 Manish Singh <yosh@gimp.org>
* gdk/gdkdraw.c (gdk_draw_lines): check private->destroyed before
making the call
Tue Apr 27 11:17:35 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdnd.c (xdnd_set_{targets,actions}): Fix leak
pointed out by Morten Welinder <terra@diku.dk>.
Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com>
* gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the
default filter from the list
Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com>
* gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the
default filter from the list
Fri Apr 16 20:41:43 PDT 1999 Manish Singh <yosh@gimp.org>
* gdk/gdk.c: #include "gdkkeysyms.h" for gdk_XConvertCase #defines
* gtk/gtkfontsel.c (gtk_font_selection_create_xlfd): use
g_strdup_printf instead of calcing the length separately
Tue Apr 13 02:49:33 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c: removed some silly #ifdef HAVE_CONFIG
that we don't do in many other places. (Fixing duplicate
#include of config.h)
* gdk/gdkevents.c: include gdkinput.h _after_ config.h.
Otherwise, #ifndef XINPUT_NONE check in the latter
doesn't work. (Bug #546)
Sun Apr 11 14:38:03 1999 Tim Janik <timj@gtk.org>
* gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color
"None" case insensitive.
Tue Apr 6 16:38:51 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkselection.c:
Add error traps so if the other end of the connection
dies, we survive.
Tue Apr 6 12:24:21 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdnd.c (gdk_drag_motion): Separate out the
dest_xid field into two fields - one for the window
to send in messages, one to indicate the last looked
up window for caching purposes. This is needed, so
that Leave messages get the correct window.
Mon Apr 5 13:21:30 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkevents.c (gdk_event_check, gdk_event_prepare):
Fix warning created by people mucking around
with the gsource API.
* gdk/gdkevents.c (gdk_io_invoke, gdk_input_add_full):
Change mapping between GIOCondition and GdkInputCondition
to match the way the Linux kernel does it. This should
fix problems where closed pipes were no longer signalling
GDK_INPUT_READ on systems with a native poll().
Mon Apr 5 17:11:57 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): Check
explicitly for the string "None" - it is in the XPM
spec and some servers treat unknown colors in odd ways
(like asking the user!)
Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org>
* gdk/gdkevents.c: made "->" into a "." of previous change so
it compiles
Thu Apr 1 18:41:25 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkevents.c (gdk_compress_exposures): Set the
window field of the event structure before calling
user filters.
1999-03-31 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gdk/gdk.c (gdk_init_check): Use False as the last argument to
XInternAtom() here. This is a particularly Old And Nasty(tm) bug.
Mon Mar 29 17:31:52 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkim.c (gdk_mbstowcs): Free the value of the
intermediate text property - prevents major memory
leak when gdk_use_mb.
gtk-d3august-990311-0: Bj|rn Augustsson <d3august@dtek.chalmers.se>
Mon Mar 29 17:02:58 1999 Owen Taylor <otaylor@redhat.com>
Patches from Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp>
gtk-a-higuti-990322-[0-3]
* gdk/gdkfont.c (gdk_text_extents_wc): Make work when
sizeof(wchar_t) != sizeof (GdkWChar)
* configure.in: Fix confusion between GTK_LOCALE_[C]FLAGS
that was causing -DX_LOCALE not to work.
* gtk/gtkrc.c (gtk_rc_init):
X_LOCALE will never have LC_MESSAGES defined
* gdk/gdk.c (gdk_init_check):
Remove --xim-preedit and --xim-status from argv properly.
* gdk/gdkim.c (gdk_ic_real_new): Add a gdk_flush() so
that the client window is present on the X server
before we pass it to the input method.
Tue Mar 9 10:46:49 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdnd.c (motif_find_drag_window): Fix bug where
if --display is specified on the command line, than
the drag window will not be created on that display.
Tue Mar 9 10:38:24 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkproperty.c (gdk_atom_intern): Fixed bug where
lookups with only_if_exists == TRUE were inserting
bogus values into the atom cache.
Wed Mar 17 09:00:00 1999 Tim Janik <timj@gtk.org>
* gdk/gdkselection.c (gdk_selection_property_get): first XFree(t),
then reset it to NULL.
* gdk/gdkcolor.c:
(gdk_colors_free):
(gdk_colormap_free_colors): use colormap->colors[in_pixels[i]] as the
key for g_hash_table_remove() in both functions, this prevents us
from accessing possibly uninitialized portions of a GdkColor structure
where we are only interested in its pixel value.
Tue Mar 9 01:01:28 1999 Tim Janik <timj@gtk.org>
* gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our
font hash table, if we have a GdkFontPrivate entry for this font
already, simply increment its reference count, provided by Olaf Dietsche
<olaf.dietsche+list.gtk@netcologne.de>.
1999-09-21 Tor Lillqvist <tml@iki.fi>
1999-09-28 20:19:13 +00:00
|
|
|
return;
|
1998-03-02 00:32:52 +00:00
|
|
|
|
2000-01-05 17:05:30 +00:00
|
|
|
((GdkDrawablePrivate *)drawable)->klass->draw_lines (drawable, gc, points, npoints);
|
1998-03-02 00:32:52 +00:00
|
|
|
}
|
