Fri, 13 Nov 1998 18:54:13 +0100 Paolo Molaro <lupus@debian.org>

Fri, 13 Nov 1998 18:54:13 +0100 Paolo Molaro <lupus@debian.org> * gdk/Makefile.am: added poly.h to EXTRA_DIST. * gdk/gdkgc.c: support dashes in GdkGCPrivate * gdk/gdkprivate.h: move here GdkPsDrawable definition * gdk/gdkdrawable.c: gdk_drawable_register returns an int * gdk/gdkps.c: beginning support for pixmaps, better guessing of postscript font name, beginning of downloading function, better emulation of dashed lines, * gtk/testps.c: better example to show pixmaps, dashes, font size and a4 page size. There is some bug in the pixmap code: try to enable it in testps.c and enjoy a badmatch from XInternAtom:-):-) Anyone care to look into this? Thanks.
Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>
1998-11-13 17:54:36 +00:00 · 1998-10-21 17:30:13 +00:00 · 1998-10-21 17:14:31 +00:00 · 1998-10-20 16:22:48 +00:00
32 changed files with 5187 additions and 1641 deletions
--- a/46
+++ b/46
@@ -1,3 +1,49 @@
+Fri, 13 Nov 1998 18:54:13 +0100 Paolo Molaro <lupus@debian.org>
+
+	* gdk/Makefile.am: added poly.h to EXTRA_DIST.
+	* gdk/gdkgc.c: support dashes in GdkGCPrivate
+	* gdk/gdkprivate.h: move here GdkPsDrawable definition
+	* gdk/gdkdrawable.c: gdk_drawable_register returns an int
+	* gdk/gdkps.c: beginning support for pixmaps, better
+	guessing of postscript font name, beginning of downloading
+	function, better emulation of dashed lines,
+	* gtk/testps.c: better example to show pixmaps, dashes,
+	font size and a4 page size.
+
+Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: fixed silly error.
+	* gtk/testps.c: test for string length (X<->PS).
+	
+Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: better guessing of postscript font name.
+	* gtk/Makefile.am: compile testps.c
+
+Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkprivate.h: GdkGCPrivate now stores complete info
+	about color, clip-rectangles (not for bitmaps yet) and
+	dashes. 
+	GdkWindowPrivate now has a GdkDrawableClass member to allow
+	for customized draw operations.
+	* gdk/gdktypes.h: GdkFont now has a name member; new 
+	GDK_WINDOW_DRAWABLE type for GdkWindow; new structure
+	GdkDrawableClass.
+	* gdk/gdkdraw.c: use engine-specific functions to draw.
+	* gdk/gdkwindow.c: handle destroy of GDK_WINDOW_DRAWABLE.
+	* gdk/gdkps.[ch]: postscript drawable engine.
+	* gdk/gdkdrawable.c: drawable engine registration.
+	* gdk/gdk.h: include drawable engine headers and declare
+	engine registration function.
+	New function: gdk_region_get_rectangles().
+	* gdk/gdkfont.c: store the name of the font loaded (needs
+	work for fontset).
+	* gdk/gdkgc.c: handle changes to GdkGCPrivate.
+	* gdk/gdkregion.c: use our own functions for Region handling
+	(stolen from X 6.3: Region.c region.h poly.h PolyReg.c).
+	* gtk/testps.c: test postscript backend.
+
 Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>

 	* gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++.
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,49 @@
+Fri, 13 Nov 1998 18:54:13 +0100 Paolo Molaro <lupus@debian.org>
+
+	* gdk/Makefile.am: added poly.h to EXTRA_DIST.
+	* gdk/gdkgc.c: support dashes in GdkGCPrivate
+	* gdk/gdkprivate.h: move here GdkPsDrawable definition
+	* gdk/gdkdrawable.c: gdk_drawable_register returns an int
+	* gdk/gdkps.c: beginning support for pixmaps, better
+	guessing of postscript font name, beginning of downloading
+	function, better emulation of dashed lines,
+	* gtk/testps.c: better example to show pixmaps, dashes,
+	font size and a4 page size.
+
+Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: fixed silly error.
+	* gtk/testps.c: test for string length (X<->PS).
+	
+Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: better guessing of postscript font name.
+	* gtk/Makefile.am: compile testps.c
+
+Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkprivate.h: GdkGCPrivate now stores complete info
+	about color, clip-rectangles (not for bitmaps yet) and
+	dashes. 
+	GdkWindowPrivate now has a GdkDrawableClass member to allow
+	for customized draw operations.
+	* gdk/gdktypes.h: GdkFont now has a name member; new 
+	GDK_WINDOW_DRAWABLE type for GdkWindow; new structure
+	GdkDrawableClass.
+	* gdk/gdkdraw.c: use engine-specific functions to draw.
+	* gdk/gdkwindow.c: handle destroy of GDK_WINDOW_DRAWABLE.
+	* gdk/gdkps.[ch]: postscript drawable engine.
+	* gdk/gdkdrawable.c: drawable engine registration.
+	* gdk/gdk.h: include drawable engine headers and declare
+	engine registration function.
+	New function: gdk_region_get_rectangles().
+	* gdk/gdkfont.c: store the name of the font loaded (needs
+	work for fontset).
+	* gdk/gdkgc.c: handle changes to GdkGCPrivate.
+	* gdk/gdkregion.c: use our own functions for Region handling
+	(stolen from X 6.3: Region.c region.h poly.h PolyReg.c).
+	* gtk/testps.c: test postscript backend.
+
 Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>

 	* gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++.
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,49 @@
+Fri, 13 Nov 1998 18:54:13 +0100 Paolo Molaro <lupus@debian.org>
+
+	* gdk/Makefile.am: added poly.h to EXTRA_DIST.
+	* gdk/gdkgc.c: support dashes in GdkGCPrivate
+	* gdk/gdkprivate.h: move here GdkPsDrawable definition
+	* gdk/gdkdrawable.c: gdk_drawable_register returns an int
+	* gdk/gdkps.c: beginning support for pixmaps, better
+	guessing of postscript font name, beginning of downloading
+	function, better emulation of dashed lines,
+	* gtk/testps.c: better example to show pixmaps, dashes,
+	font size and a4 page size.
+
+Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: fixed silly error.
+	* gtk/testps.c: test for string length (X<->PS).
+	
+Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: better guessing of postscript font name.
+	* gtk/Makefile.am: compile testps.c
+
+Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkprivate.h: GdkGCPrivate now stores complete info
+	about color, clip-rectangles (not for bitmaps yet) and
+	dashes. 
+	GdkWindowPrivate now has a GdkDrawableClass member to allow
+	for customized draw operations.
+	* gdk/gdktypes.h: GdkFont now has a name member; new 
+	GDK_WINDOW_DRAWABLE type for GdkWindow; new structure
+	GdkDrawableClass.
+	* gdk/gdkdraw.c: use engine-specific functions to draw.
+	* gdk/gdkwindow.c: handle destroy of GDK_WINDOW_DRAWABLE.
+	* gdk/gdkps.[ch]: postscript drawable engine.
+	* gdk/gdkdrawable.c: drawable engine registration.
+	* gdk/gdk.h: include drawable engine headers and declare
+	engine registration function.
+	New function: gdk_region_get_rectangles().
+	* gdk/gdkfont.c: store the name of the font loaded (needs
+	work for fontset).
+	* gdk/gdkgc.c: handle changes to GdkGCPrivate.
+	* gdk/gdkregion.c: use our own functions for Region handling
+	(stolen from X 6.3: Region.c region.h poly.h PolyReg.c).
+	* gtk/testps.c: test postscript backend.
+
 Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>

 	* gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++.
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,49 @@
+Fri, 13 Nov 1998 18:54:13 +0100 Paolo Molaro <lupus@debian.org>
+
+	* gdk/Makefile.am: added poly.h to EXTRA_DIST.
+	* gdk/gdkgc.c: support dashes in GdkGCPrivate
+	* gdk/gdkprivate.h: move here GdkPsDrawable definition
+	* gdk/gdkdrawable.c: gdk_drawable_register returns an int
+	* gdk/gdkps.c: beginning support for pixmaps, better
+	guessing of postscript font name, beginning of downloading
+	function, better emulation of dashed lines,
+	* gtk/testps.c: better example to show pixmaps, dashes,
+	font size and a4 page size.
+
+Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: fixed silly error.
+	* gtk/testps.c: test for string length (X<->PS).
+	
+Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: better guessing of postscript font name.
+	* gtk/Makefile.am: compile testps.c
+
+Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkprivate.h: GdkGCPrivate now stores complete info
+	about color, clip-rectangles (not for bitmaps yet) and
+	dashes. 
+	GdkWindowPrivate now has a GdkDrawableClass member to allow
+	for customized draw operations.
+	* gdk/gdktypes.h: GdkFont now has a name member; new 
+	GDK_WINDOW_DRAWABLE type for GdkWindow; new structure
+	GdkDrawableClass.
+	* gdk/gdkdraw.c: use engine-specific functions to draw.
+	* gdk/gdkwindow.c: handle destroy of GDK_WINDOW_DRAWABLE.
+	* gdk/gdkps.[ch]: postscript drawable engine.
+	* gdk/gdkdrawable.c: drawable engine registration.
+	* gdk/gdk.h: include drawable engine headers and declare
+	engine registration function.
+	New function: gdk_region_get_rectangles().
+	* gdk/gdkfont.c: store the name of the font loaded (needs
+	work for fontset).
+	* gdk/gdkgc.c: handle changes to GdkGCPrivate.
+	* gdk/gdkregion.c: use our own functions for Region handling
+	(stolen from X 6.3: Region.c region.h poly.h PolyReg.c).
+	* gtk/testps.c: test postscript backend.
+
 Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>

 	* gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++.
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,49 @@
+Fri, 13 Nov 1998 18:54:13 +0100 Paolo Molaro <lupus@debian.org>
+
+	* gdk/Makefile.am: added poly.h to EXTRA_DIST.
+	* gdk/gdkgc.c: support dashes in GdkGCPrivate
+	* gdk/gdkprivate.h: move here GdkPsDrawable definition
+	* gdk/gdkdrawable.c: gdk_drawable_register returns an int
+	* gdk/gdkps.c: beginning support for pixmaps, better
+	guessing of postscript font name, beginning of downloading
+	function, better emulation of dashed lines,
+	* gtk/testps.c: better example to show pixmaps, dashes,
+	font size and a4 page size.
+
+Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: fixed silly error.
+	* gtk/testps.c: test for string length (X<->PS).
+	
+Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: better guessing of postscript font name.
+	* gtk/Makefile.am: compile testps.c
+
+Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkprivate.h: GdkGCPrivate now stores complete info
+	about color, clip-rectangles (not for bitmaps yet) and
+	dashes. 
+	GdkWindowPrivate now has a GdkDrawableClass member to allow
+	for customized draw operations.
+	* gdk/gdktypes.h: GdkFont now has a name member; new 
+	GDK_WINDOW_DRAWABLE type for GdkWindow; new structure
+	GdkDrawableClass.
+	* gdk/gdkdraw.c: use engine-specific functions to draw.
+	* gdk/gdkwindow.c: handle destroy of GDK_WINDOW_DRAWABLE.
+	* gdk/gdkps.[ch]: postscript drawable engine.
+	* gdk/gdkdrawable.c: drawable engine registration.
+	* gdk/gdk.h: include drawable engine headers and declare
+	engine registration function.
+	New function: gdk_region_get_rectangles().
+	* gdk/gdkfont.c: store the name of the font loaded (needs
+	work for fontset).
+	* gdk/gdkgc.c: handle changes to GdkGCPrivate.
+	* gdk/gdkregion.c: use our own functions for Region handling
+	(stolen from X 6.3: Region.c region.h poly.h PolyReg.c).
+	* gtk/testps.c: test postscript backend.
+
 Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>

 	* gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++.
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,49 @@
+Fri, 13 Nov 1998 18:54:13 +0100 Paolo Molaro <lupus@debian.org>
+
+	* gdk/Makefile.am: added poly.h to EXTRA_DIST.
+	* gdk/gdkgc.c: support dashes in GdkGCPrivate
+	* gdk/gdkprivate.h: move here GdkPsDrawable definition
+	* gdk/gdkdrawable.c: gdk_drawable_register returns an int
+	* gdk/gdkps.c: beginning support for pixmaps, better
+	guessing of postscript font name, beginning of downloading
+	function, better emulation of dashed lines,
+	* gtk/testps.c: better example to show pixmaps, dashes,
+	font size and a4 page size.
+
+Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: fixed silly error.
+	* gtk/testps.c: test for string length (X<->PS).
+	
+Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: better guessing of postscript font name.
+	* gtk/Makefile.am: compile testps.c
+
+Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkprivate.h: GdkGCPrivate now stores complete info
+	about color, clip-rectangles (not for bitmaps yet) and
+	dashes. 
+	GdkWindowPrivate now has a GdkDrawableClass member to allow
+	for customized draw operations.
+	* gdk/gdktypes.h: GdkFont now has a name member; new 
+	GDK_WINDOW_DRAWABLE type for GdkWindow; new structure
+	GdkDrawableClass.
+	* gdk/gdkdraw.c: use engine-specific functions to draw.
+	* gdk/gdkwindow.c: handle destroy of GDK_WINDOW_DRAWABLE.
+	* gdk/gdkps.[ch]: postscript drawable engine.
+	* gdk/gdkdrawable.c: drawable engine registration.
+	* gdk/gdk.h: include drawable engine headers and declare
+	engine registration function.
+	New function: gdk_region_get_rectangles().
+	* gdk/gdkfont.c: store the name of the font loaded (needs
+	work for fontset).
+	* gdk/gdkgc.c: handle changes to GdkGCPrivate.
+	* gdk/gdkregion.c: use our own functions for Region handling
+	(stolen from X 6.3: Region.c region.h poly.h PolyReg.c).
+	* gtk/testps.c: test postscript backend.
+
 Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>

 	* gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++.
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,49 @@
+Fri, 13 Nov 1998 18:54:13 +0100 Paolo Molaro <lupus@debian.org>
+
+	* gdk/Makefile.am: added poly.h to EXTRA_DIST.
+	* gdk/gdkgc.c: support dashes in GdkGCPrivate
+	* gdk/gdkprivate.h: move here GdkPsDrawable definition
+	* gdk/gdkdrawable.c: gdk_drawable_register returns an int
+	* gdk/gdkps.c: beginning support for pixmaps, better
+	guessing of postscript font name, beginning of downloading
+	function, better emulation of dashed lines,
+	* gtk/testps.c: better example to show pixmaps, dashes,
+	font size and a4 page size.
+
+Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: fixed silly error.
+	* gtk/testps.c: test for string length (X<->PS).
+	
+Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: better guessing of postscript font name.
+	* gtk/Makefile.am: compile testps.c
+
+Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkprivate.h: GdkGCPrivate now stores complete info
+	about color, clip-rectangles (not for bitmaps yet) and
+	dashes. 
+	GdkWindowPrivate now has a GdkDrawableClass member to allow
+	for customized draw operations.
+	* gdk/gdktypes.h: GdkFont now has a name member; new 
+	GDK_WINDOW_DRAWABLE type for GdkWindow; new structure
+	GdkDrawableClass.
+	* gdk/gdkdraw.c: use engine-specific functions to draw.
+	* gdk/gdkwindow.c: handle destroy of GDK_WINDOW_DRAWABLE.
+	* gdk/gdkps.[ch]: postscript drawable engine.
+	* gdk/gdkdrawable.c: drawable engine registration.
+	* gdk/gdk.h: include drawable engine headers and declare
+	engine registration function.
+	New function: gdk_region_get_rectangles().
+	* gdk/gdkfont.c: store the name of the font loaded (needs
+	work for fontset).
+	* gdk/gdkgc.c: handle changes to GdkGCPrivate.
+	* gdk/gdkregion.c: use our own functions for Region handling
+	(stolen from X 6.3: Region.c region.h poly.h PolyReg.c).
+	* gtk/testps.c: test postscript backend.
+
 Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>

 	* gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++.
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,501 +0,0 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DISTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-CC = @CC@
-GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@
-GTK_MICRO_VERSION = @GTK_MICRO_VERSION@
-GTK_MINOR_VERSION = @GTK_MINOR_VERSION@
-GTK_VERSION = @GTK_VERSION@
-LD = @LD@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NM = @NM@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-x_cflags = @x_cflags@
-x_includes = @x_includes@
-x_ldflags = @x_ldflags@
-x_libs = @x_libs@
-xinput_progs = @xinput_progs@
-
-SRC_SUBDIRS = glib gdk gtk
-SUBDIRS = $(SRC_SUBDIRS) docs
-
-bin_SCRIPTS = gtk-config
-
-EXTRA_DIST =	\
-	gtk+.spec	\
-        gtk.m4          \
-	makecopyright	\
-	TODO		\
-	NEWS.pre-1-0	\
-	ChangeLog.pre-1-0	\
-	examples/aspectframe/Makefile  \
-	examples/aspectframe/aspectframe.c  \
-	examples/buttons/Makefile  \
-	examples/buttons/buttons.c  \
-	examples/buttons/info.xpm  \
-	examples/entry/Makefile  \
-	examples/entry/entry.c  \
-	examples/eventbox/Makefile  \
-	examples/eventbox/eventbox.c  \
-	examples/filesel/Makefile  \
-	examples/filesel/filesel.c  \
-	examples/gtkdial/Makefile  \
-	examples/gtkdial/dial_test.c  \
-	examples/gtkdial/gtkdial.c  \
-	examples/gtkdial/gtkdial.h  \
-	examples/helloworld/Makefile  \
-	examples/helloworld/helloworld.c  \
-	examples/helloworld2/Makefile  \
-	examples/helloworld2/helloworld2.c  \
-	examples/list/Makefile  \
-	examples/list/list.c  \
-	examples/menu/Makefile  \
-	examples/menu/menu.c  \
-	examples/menu/menufactory.c  \
-	examples/menu/menufactory.h  \
-	examples/menu/mfmain.c  \
-	examples/menu/mfmain.h  \
-	examples/notebook/Makefile  \
-	examples/notebook/notebook.c  \
-	examples/packbox/Makefile  \
-	examples/packbox/packbox.c  \
-	examples/paned/Makefile  \
-	examples/paned/paned.c  \
-	examples/pixmap/Makefile  \
-	examples/pixmap/pixmap.c  \
-	examples/progressbar/Makefile  \
-	examples/progressbar/progressbar.c  \
-	examples/radiobuttons/Makefile  \
-	examples/radiobuttons/radiobuttons.c  \
-	examples/rulers/Makefile  \
-	examples/rulers/rulers.c  \
-	examples/scribble-simple/Makefile  \
-	examples/scribble-simple/scribble-simple.c  \
-	examples/scrolledwin/Makefile  \
-	examples/scrolledwin/scrolledwin.c  \
-	examples/selection/Makefile  \
-	examples/selection/gettargets.c  \
-	examples/selection/setselection.c  \
-	examples/statusbar/Makefile  \
-	examples/statusbar/statusbar.c  \
-	examples/table/Makefile  \
-	examples/table/table.c  \
-	examples/tictactoe/Makefile  \
-	examples/tictactoe/tictactoe.c  \
-	examples/tictactoe/tictactoe.h  \
-	examples/tictactoe/ttt_test.c  \
-	examples/wheelbarrow/Makefile  \
-	examples/wheelbarrow/wheelbarrow.c  \
-	examples/find-examples.sh
-
-m4datadir = $(datadir)/aclocal
-m4data_DATA = gtk.m4
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =  gtk-config
-SCRIPTS =  $(bin_SCRIPTS)
-
-DATA =  $(m4data_DATA)
-
-DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess config.h.in \
-config.sub configure configure.in gtk-config.in install-sh ltconfig \
-ltmain.sh missing mkinstalldirs stamp-h.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP = --best
-all: all-recursive-am all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINT@ configure.in 
-	cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINT@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-config.h: stamp-h
-	@:
-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
-	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h
-$(srcdir)/config.h.in: @MAINT@$(srcdir)/stamp-h.in
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f config.h
-
-maintainer-clean-hdr:
-gtk-config: $(top_builddir)/config.status gtk-config.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
-
-install-binSCRIPTS: $(bin_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
-	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-	  else if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
-	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-	  else :; fi; fi; \
-	done
-
-uninstall-binSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-	done
-
-install-m4dataDATA: $(m4data_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
-	@list='$(m4data_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-m4dataDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(m4data_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(m4datadir)/$$p; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  target=`echo $@ | sed s/-recursive//`; \
-	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	done; \
-	for subdir in $$rev; do \
-	  target=`echo $@ | sed s/-recursive//`; \
-	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) \
-	  && $(MAKE) dvi \
-	  && $(MAKE) check \
-	  && $(MAKE) install \
-	  && $(MAKE) installcheck \
-	  && $(MAKE) dist
-	-rm -rf $(distdir)
-	@echo "========================"; \
-	echo "$(distdir).tar.gz is ready for distribution"; \
-	echo "========================"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
-	$(mkinstalldirs) $(distdir)/examples $(distdir)/examples/aspectframe \
-	   $(distdir)/examples/buttons $(distdir)/examples/entry \
-	   $(distdir)/examples/eventbox $(distdir)/examples/filesel \
-	   $(distdir)/examples/gtkdial $(distdir)/examples/helloworld \
-	   $(distdir)/examples/helloworld2 $(distdir)/examples/list \
-	   $(distdir)/examples/menu $(distdir)/examples/notebook \
-	   $(distdir)/examples/packbox $(distdir)/examples/paned \
-	   $(distdir)/examples/pixmap $(distdir)/examples/progressbar \
-	   $(distdir)/examples/radiobuttons $(distdir)/examples/rulers \
-	   $(distdir)/examples/scribble-simple \
-	   $(distdir)/examples/scrolledwin \
-	   $(distdir)/examples/selection $(distdir)/examples/statusbar \
-	   $(distdir)/examples/table $(distdir)/examples/tictactoe \
-	   $(distdir)/examples/wheelbarrow
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  test -d $(distdir)/$$subdir \
-	  || mkdir $(distdir)/$$subdir \
-	  || exit 1; \
-	  chmod 777 $(distdir)/$$subdir; \
-	  (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-	    || exit 1; \
-	done
-info: info-recursive
-dvi: dvi-recursive
-check: all-am
-	$(MAKE) check-recursive
-installcheck: installcheck-recursive
-all-recursive-am: config.h
-	$(MAKE) all-recursive
-
-all-am: Makefile $(SCRIPTS) $(DATA) config.h
-
-install-exec-am: install-binSCRIPTS
-
-install-data-am: install-m4dataDATA
-
-uninstall-am: uninstall-binSCRIPTS uninstall-m4dataDATA
-
-install-exec: install-exec-recursive install-exec-am
-	@$(NORMAL_INSTALL)
-
-install-data: install-data-recursive install-data-am
-	@$(NORMAL_INSTALL)
-
-install: install-recursive install-exec-am install-data-am
-	@:
-
-uninstall: uninstall-recursive uninstall-am
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs: installdirs-recursive
-	$(mkinstalldirs)  $(DATADIR)$(bindir) $(DATADIR)$(m4datadir)
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
-
-clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
-
-distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
-
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-
-mostlyclean:  mostlyclean-recursive mostlyclean-am
-
-clean:  clean-recursive clean-am
-
-distclean:  distclean-recursive distclean-am
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f config.status
-
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-uninstall-binSCRIPTS install-binSCRIPTS uninstall-m4dataDATA \
-install-m4dataDATA install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
-installcheck all-recursive-am all-am install-exec-am install-data-am \
-uninstall-am install-exec install-data install uninstall all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-.PHONY: files populate checkin release
-
-files:
-	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
-	  echo $$p; \
-	done
-	@for subdir in $(SUBDIRS); do \
-	  files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \
-	  for file in $$files; do \
-	    echo $$subdir/$$file; \
-	  done; \
-	done
-
-populate:
-	@echo "populating project"
-	@files=`$(MAKE) files | grep -v "make\[[1-9]\]"`; prcs populate -d gtk+.prj $$files
-
-checkin: populate
-	@echo "checking in project"
-	@prcs checkin
-
-release:
-	$(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -1,387 +0,0 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DISTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-CC = @CC@
-GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@
-GTK_MICRO_VERSION = @GTK_MICRO_VERSION@
-GTK_MINOR_VERSION = @GTK_MINOR_VERSION@
-GTK_VERSION = @GTK_VERSION@
-LD = @LD@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NM = @NM@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-x_cflags = @x_cflags@
-x_includes = @x_includes@
-x_ldflags = @x_ldflags@
-x_libs = @x_libs@
-xinput_progs = @xinput_progs@
-
-info_TEXINFOS = gdk.texi gtk.texi glib.texi
-
-man_MANS = gtk-config.1
-
-EXTRA_DIST =	\
-	texinfo.tex 		\
-	macros.texi		\
-	Makefile.sgml		\
-	gtkdocs_fix		\
-	gtkfaq.sgml		\
-        gtk-config.txt          \
-	gtk_tut.sgml		\
-	gtk_tut_it.sgml		\
-	debugging.txt		\
-	developers.txt		\
-	refcounting.txt		\
-	styles.txt		\
-	text_widget.txt 	\
-	widget_system.txt 	\
-	gtk_tut_packbox1.gif 	\
-	gtk_tut_packbox2.gif 	\
-	gtk_tut_table.gif	\
-	gtk-config.1
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-TEXI2DVI = texi2dvi
-TEXINFO_TEX = $(srcdir)/texinfo.tex
-INFO_DEPS = gdk.info gtk.info glib.info
-DVIS = gdk.dvi gtk.dvi glib.dvi
-TEXINFOS = gdk.texi gtk.texi glib.texi
-man1dir = $(mandir)/man1
-MANS = $(man_MANS)
-
-NROFF = nroff
-DIST_COMMON =  Makefile.am Makefile.in texinfo.tex
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP = --best
-all: Makefile $(INFO_DEPS) $(MANS)
-
-.SUFFIXES:
-.SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-gdk.info: gdk.texi
-gdk.dvi: gdk.texi
-
-
-gtk.info: gtk.texi
-gtk.dvi: gtk.texi
-
-
-glib.info: glib.texi
-glib.dvi: glib.texi
-
-
-DVIPS = dvips
-
-.texi.info:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.texi.dvi:
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.texi:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.texinfo.info:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.texinfo:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.texinfo.dvi:
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.txi.info:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.txi.dvi:
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.txi:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-.dvi.ps:
-	$(DVIPS) $< -o $@
-
-install-info-am: $(INFO_DEPS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(infodir)
-	@for file in $(INFO_DEPS); do \
-	  d=$(srcdir); \
-	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-	    if test -f $$d/$$ifile; then \
-	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
-	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
-	    else : ; fi; \
-	  done; \
-	done
-	@$(POST_INSTALL)
-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-	  for file in $(INFO_DEPS); do \
-	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
-	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
-	  done; \
-	else : ; fi
-
-uninstall-info:
-	$(PRE_UNINSTALL)
-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-	  ii=yes; \
-	else ii=; fi; \
-	for file in $(INFO_DEPS); do \
-	  test -z "$ii" \
-	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
-	done
-	@$(NORMAL_UNINSTALL)
-	for file in $(INFO_DEPS); do \
-	  (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
-	done
-
-dist-info: $(INFO_DEPS)
-	for base in $(INFO_DEPS); do \
-	  d=$(srcdir); \
-	  for file in `cd $$d && eval echo $$base*`; do \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file; \
-	  done; \
-	done
-
-mostlyclean-aminfo:
-	-rm -f gdk.aux gdk.cp gdk.cps gdk.dvi gdk.fn gdk.fns gdk.ky gdk.kys \
-	  gdk.ps gdk.log gdk.pg gdk.toc gdk.tp gdk.tps gdk.vr gdk.vrs \
-	  gdk.op gdk.tr gdk.cv gdk.cn gtk.aux gtk.cp gtk.cps gtk.dvi \
-	  gtk.fn gtk.fns gtk.ky gtk.kys gtk.ps gtk.log gtk.pg gtk.toc \
-	  gtk.tp gtk.tps gtk.vr gtk.vrs gtk.op gtk.tr gtk.cv gtk.cn \
-	  glib.aux glib.cp glib.cps glib.dvi glib.fn glib.fns glib.ky \
-	  glib.kys glib.ps glib.log glib.pg glib.toc glib.tp glib.tps \
-	  glib.vr glib.vrs glib.op glib.tr glib.cv glib.cn
-
-clean-aminfo:
-
-distclean-aminfo:
-
-maintainer-clean-aminfo:
-	for i in $(INFO_DEPS); do \
-	  rm -f $$i; \
-	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
-	    rm -f $$i-[0-9]*; \
-	  fi; \
-	done
-
-install-man1:
-	$(mkinstalldirs) $(DESTDIR)$(man1dir)
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-	done
-
-uninstall-man1:
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
-	done
-install-man: $(MANS)
-	@$(NORMAL_INSTALL)
-	$(MAKE) install-man1
-uninstall-man:
-	@$(NORMAL_UNINSTALL)
-	$(MAKE) uninstall-man1
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-	$(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
-info: $(INFO_DEPS)
-dvi: $(DVIS)
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: install-info-am install-man
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: uninstall-info uninstall-man
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(infodir) $(DESTDIR)$(mandir)/man1
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-aminfo mostlyclean-generic
-
-clean:  clean-aminfo clean-generic mostlyclean
-
-distclean:  distclean-aminfo distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-aminfo maintainer-clean-generic \
-		distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: install-info-am uninstall-info mostlyclean-aminfo \
-distclean-aminfo clean-aminfo maintainer-clean-aminfo install-man1 \
-uninstall-man1 install-man uninstall-man tags distdir info dvi \
-installcheck install-exec install-data install uninstall all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-files:
-	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
-	  echo $$p; \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -12,6 +12,7 @@ libgdk_la_SOURCES = \
 	gdkcursor.c	\
 	gdkdnd.c	\
 	gdkdraw.c	\
+	gdkdrawable.c	\
 	gdkfont.c	\
 	gdkgc.c		\
 	gdkglobals.c	\
@@ -24,6 +25,7 @@ libgdk_la_SOURCES = \
 	gdkinputxfree.h	\
 	gdkpixmap.c	\
 	gdkproperty.c	\
+	gdkps.c	\
 	gdkrgb.c	\
 	gdkrectangle.c	\
 	gdkregion.c	\
@@ -47,6 +49,7 @@ gdkinclude_HEADERS = \
 	gdki18n.h	\
 	gdkkeysyms.h	\
 	gdkprivate.h	\
+	gdkps.h	\
 	gdktypes.h	\
 	gdkx.h

@@ -69,7 +72,7 @@ gxid_LDADD = \

 BUILT_SOURCES = gdkcursors.h gdkkeysyms.h

-EXTRA_DIST = makecursors.awk makekeysyms.awk
+EXTRA_DIST = makecursors.awk makekeysyms.awk PolyReg.c Region.c region.h poly.h

 gdkcursors.h:
 	awk -f $(srcdir)/makecursors.awk @x_includes@/X11/cursorfont.h > $@
--- a/gdk/PolyReg.c
+++ b/gdk/PolyReg.c
@@ -0,0 +1,629 @@
+/* $XConsortium: PolyReg.c,v 11.23 94/11/17 21:59:37 converse Exp $ */
+/************************************************************************
+
+Copyright (c) 1987  X Consortium
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the X Consortium.
+
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+************************************************************************/
+
+#define LARGE_COORDINATE 1000000
+#define SMALL_COORDINATE -LARGE_COORDINATE
+
+/*
+#include "Xlibint.h"
+#include "Xutil.h"
+#include "region.h"
+#include "poly.h"
+*/
+
+/*
+ *     InsertEdgeInET
+ *
+ *     Insert the given edge into the edge table.
+ *     First we must find the correct bucket in the
+ *     Edge table, then find the right slot in the
+ *     bucket.  Finally, we can insert it.
+ *
+ */
+static void
+InsertEdgeInET(ET, ETE, scanline, SLLBlock, iSLLBlock)
+    EdgeTable *ET;
+    EdgeTableEntry *ETE;
+    int scanline;
+    ScanLineListBlock **SLLBlock;
+    int *iSLLBlock;
+{
+    register EdgeTableEntry *start, *prev;
+    register ScanLineList *pSLL, *pPrevSLL;
+    ScanLineListBlock *tmpSLLBlock;
+
+    /*
+     * find the right bucket to put the edge into
+     */
+    pPrevSLL = &ET->scanlines;
+    pSLL = pPrevSLL->next;
+    while (pSLL && (pSLL->scanline < scanline)) 
+    {
+        pPrevSLL = pSLL;
+        pSLL = pSLL->next;
+    }
+
+    /*
+     * reassign pSLL (pointer to ScanLineList) if necessary
+     */
+    if ((!pSLL) || (pSLL->scanline > scanline)) 
+    {
+        if (*iSLLBlock > SLLSPERBLOCK-1) 
+        {
+            tmpSLLBlock = 
+		  (ScanLineListBlock *)Xmalloc(sizeof(ScanLineListBlock));
+            (*SLLBlock)->next = tmpSLLBlock;
+            tmpSLLBlock->next = (ScanLineListBlock *)NULL;
+            *SLLBlock = tmpSLLBlock;
+            *iSLLBlock = 0;
+        }
+        pSLL = &((*SLLBlock)->SLLs[(*iSLLBlock)++]);
+
+        pSLL->next = pPrevSLL->next;
+        pSLL->edgelist = (EdgeTableEntry *)NULL;
+        pPrevSLL->next = pSLL;
+    }
+    pSLL->scanline = scanline;
+
+    /*
+     * now insert the edge in the right bucket
+     */
+    prev = (EdgeTableEntry *)NULL;
+    start = pSLL->edgelist;
+    while (start && (start->bres.minor_axis < ETE->bres.minor_axis)) 
+    {
+        prev = start;
+        start = start->next;
+    }
+    ETE->next = start;
+
+    if (prev)
+        prev->next = ETE;
+    else
+        pSLL->edgelist = ETE;
+}
+
+/*
+ *     CreateEdgeTable
+ *
+ *     This routine creates the edge table for
+ *     scan converting polygons. 
+ *     The Edge Table (ET) looks like:
+ *
+ *    EdgeTable
+ *     --------
+ *    |  ymax  |        ScanLineLists
+ *    |scanline|-->------------>-------------->...
+ *     --------   |scanline|   |scanline|
+ *                |edgelist|   |edgelist|
+ *                ---------    ---------
+ *                    |             |
+ *                    |             |
+ *                    V             V
+ *              list of ETEs   list of ETEs
+ *
+ *     where ETE is an EdgeTableEntry data structure,
+ *     and there is one ScanLineList per scanline at
+ *     which an edge is initially entered.
+ *
+ */
+
+static void
+CreateETandAET(count, pts, ET, AET, pETEs, pSLLBlock)
+    register int count;
+    register XPoint *pts;
+    EdgeTable *ET;
+    EdgeTableEntry *AET;
+    register EdgeTableEntry *pETEs;
+    ScanLineListBlock   *pSLLBlock;
+{
+    register XPoint *top, *bottom;
+    register XPoint *PrevPt, *CurrPt;
+    int iSLLBlock = 0;
+    int dy;
+
+    if (count < 2)  return;
+
+    /*
+     *  initialize the Active Edge Table
+     */
+    AET->next = (EdgeTableEntry *)NULL;
+    AET->back = (EdgeTableEntry *)NULL;
+    AET->nextWETE = (EdgeTableEntry *)NULL;
+    AET->bres.minor_axis = SMALL_COORDINATE;
+
+    /*
+     *  initialize the Edge Table.
+     */
+    ET->scanlines.next = (ScanLineList *)NULL;
+    ET->ymax = SMALL_COORDINATE;
+    ET->ymin = LARGE_COORDINATE;
+    pSLLBlock->next = (ScanLineListBlock *)NULL;
+
+    PrevPt = &pts[count-1];
+
+    /*
+     *  for each vertex in the array of points.
+     *  In this loop we are dealing with two vertices at
+     *  a time -- these make up one edge of the polygon.
+     */
+    while (count--) 
+    {
+        CurrPt = pts++;
+
+        /*
+         *  find out which point is above and which is below.
+         */
+        if (PrevPt->y > CurrPt->y) 
+        {
+            bottom = PrevPt, top = CurrPt;
+            pETEs->ClockWise = 0;
+        }
+        else 
+        {
+            bottom = CurrPt, top = PrevPt;
+            pETEs->ClockWise = 1;
+        }
+
+        /*
+         * don't add horizontal edges to the Edge table.
+         */
+        if (bottom->y != top->y) 
+        {
+            pETEs->ymax = bottom->y-1;  /* -1 so we don't get last scanline */
+
+            /*
+             *  initialize integer edge algorithm
+             */
+            dy = bottom->y - top->y;
+            BRESINITPGONSTRUCT(dy, top->x, bottom->x, pETEs->bres);
+
+            InsertEdgeInET(ET, pETEs, top->y, &pSLLBlock, &iSLLBlock);
+
+	    if (PrevPt->y > ET->ymax)
+		ET->ymax = PrevPt->y;
+	    if (PrevPt->y < ET->ymin)
+		ET->ymin = PrevPt->y;
+            pETEs++;
+        }
+
+        PrevPt = CurrPt;
+    }
+}
+
+/*
+ *     loadAET
+ *
+ *     This routine moves EdgeTableEntries from the
+ *     EdgeTable into the Active Edge Table,
+ *     leaving them sorted by smaller x coordinate.
+ *
+ */
+
+static void
+loadAET(AET, ETEs)
+    register EdgeTableEntry *AET, *ETEs;
+{
+    register EdgeTableEntry *pPrevAET;
+    register EdgeTableEntry *tmp;
+
+    pPrevAET = AET;
+    AET = AET->next;
+    while (ETEs) 
+    {
+        while (AET && (AET->bres.minor_axis < ETEs->bres.minor_axis)) 
+        {
+            pPrevAET = AET;
+            AET = AET->next;
+        }
+        tmp = ETEs->next;
+        ETEs->next = AET;
+        if (AET)
+            AET->back = ETEs;
+        ETEs->back = pPrevAET;
+        pPrevAET->next = ETEs;
+        pPrevAET = ETEs;
+
+        ETEs = tmp;
+    }
+}
+
+/*
+ *     computeWAET
+ *
+ *     This routine links the AET by the
+ *     nextWETE (winding EdgeTableEntry) link for
+ *     use by the winding number rule.  The final 
+ *     Active Edge Table (AET) might look something
+ *     like:
+ *
+ *     AET
+ *     ----------  ---------   ---------
+ *     |ymax    |  |ymax    |  |ymax    | 
+ *     | ...    |  |...     |  |...     |
+ *     |next    |->|next    |->|next    |->...
+ *     |nextWETE|  |nextWETE|  |nextWETE|
+ *     ---------   ---------   ^--------
+ *         |                   |       |
+ *         V------------------->       V---> ...
+ *
+ */
+static void
+computeWAET(AET)
+    register EdgeTableEntry *AET;
+{
+    register EdgeTableEntry *pWETE;
+    register int inside = 1;
+    register int isInside = 0;
+
+    AET->nextWETE = (EdgeTableEntry *)NULL;
+    pWETE = AET;
+    AET = AET->next;
+    while (AET) 
+    {
+        if (AET->ClockWise)
+            isInside++;
+        else
+            isInside--;
+
+        if ((!inside && !isInside) ||
+            ( inside &&  isInside)) 
+        {
+            pWETE->nextWETE = AET;
+            pWETE = AET;
+            inside = !inside;
+        }
+        AET = AET->next;
+    }
+    pWETE->nextWETE = (EdgeTableEntry *)NULL;
+}
+
+/*
+ *     InsertionSort
+ *
+ *     Just a simple insertion sort using
+ *     pointers and back pointers to sort the Active
+ *     Edge Table.
+ *
+ */
+
+static int
+InsertionSort(AET)
+    register EdgeTableEntry *AET;
+{
+    register EdgeTableEntry *pETEchase;
+    register EdgeTableEntry *pETEinsert;
+    register EdgeTableEntry *pETEchaseBackTMP;
+    register int changed = 0;
+
+    AET = AET->next;
+    while (AET) 
+    {
+        pETEinsert = AET;
+        pETEchase = AET;
+        while (pETEchase->back->bres.minor_axis > AET->bres.minor_axis)
+            pETEchase = pETEchase->back;
+
+        AET = AET->next;
+        if (pETEchase != pETEinsert) 
+        {
+            pETEchaseBackTMP = pETEchase->back;
+            pETEinsert->back->next = AET;
+            if (AET)
+                AET->back = pETEinsert->back;
+            pETEinsert->next = pETEchase;
+            pETEchase->back->next = pETEinsert;
+            pETEchase->back = pETEinsert;
+            pETEinsert->back = pETEchaseBackTMP;
+            changed = 1;
+        }
+    }
+    return(changed);
+}
+
+/*
+ *     Clean up our act.
+ */
+static void
+FreeStorage(pSLLBlock)
+    register ScanLineListBlock   *pSLLBlock;
+{
+    register ScanLineListBlock   *tmpSLLBlock;
+
+    while (pSLLBlock) 
+    {
+        tmpSLLBlock = pSLLBlock->next;
+        Xfree((char *)pSLLBlock);
+        pSLLBlock = tmpSLLBlock;
+    }
+}
+
+/*
+ *     Create an array of rectangles from a list of points.
+ *     If indeed these things (POINTS, RECTS) are the same,
+ *     then this proc is still needed, because it allocates
+ *     storage for the array, which was allocated on the
+ *     stack by the calling procedure.
+ *
+ */
+static int PtsToRegion(numFullPtBlocks, iCurPtBlock, FirstPtBlock, reg)
+    register int  numFullPtBlocks, iCurPtBlock;
+    POINTBLOCK *FirstPtBlock;
+    REGION *reg;
+{
+    register BOX  *rects;
+    register XPoint *pts;
+    register POINTBLOCK *CurPtBlock;
+    register int i;
+    register BOX *extents;
+    register int numRects;
+ 
+    extents = &reg->extents;
+ 
+    numRects = ((numFullPtBlocks * NUMPTSTOBUFFER) + iCurPtBlock) >> 1;
+ 
+    if (!(reg->rects = (BOX *)Xrealloc((char *)reg->rects, 
+	    (unsigned) (sizeof(BOX) * numRects))))       return(0);
+ 
+    reg->size = numRects;
+    CurPtBlock = FirstPtBlock;
+    rects = reg->rects - 1;
+    numRects = 0;
+    extents->x1 = MAXSHORT,  extents->x2 = MINSHORT;
+ 
+    for ( ; numFullPtBlocks >= 0; numFullPtBlocks--) {
+	/* the loop uses 2 points per iteration */
+	i = NUMPTSTOBUFFER >> 1;
+	if (!numFullPtBlocks)
+	    i = iCurPtBlock >> 1;
+	for (pts = CurPtBlock->pts; i--; pts += 2) {
+	    if (pts->x == pts[1].x)
+		continue;
+	    if (numRects && pts->x == rects->x1 && pts->y == rects->y2 &&
+		pts[1].x == rects->x2 &&
+		(numRects == 1 || rects[-1].y1 != rects->y1) &&
+		(i && pts[2].y > pts[1].y)) {
+		rects->y2 = pts[1].y + 1;
+		continue;
+	    }
+	    numRects++;
+	    rects++;
+	    rects->x1 = pts->x;  rects->y1 = pts->y;
+	    rects->x2 = pts[1].x;  rects->y2 = pts[1].y + 1;
+	    if (rects->x1 < extents->x1)
+		extents->x1 = rects->x1;
+	    if (rects->x2 > extents->x2)
+		extents->x2 = rects->x2;
+        }
+	CurPtBlock = CurPtBlock->next;
+    }
+
+    if (numRects) {
+	extents->y1 = reg->rects->y1;
+	extents->y2 = rects->y2;
+    } else {
+	extents->x1 = 0;
+	extents->y1 = 0;
+	extents->x2 = 0;
+	extents->y2 = 0;
+    }
+    reg->numRects = numRects;
+ 
+    return(TRUE);
+}
+
+/*
+ *     polytoregion
+ *
+ *     Scan converts a polygon by returning a run-length
+ *     encoding of the resultant bitmap -- the run-length
+ *     encoding is in the form of an array of rectangles.
+ */
+static Region 
+GXPolygonRegion(Pts, Count, rule)
+    int       Count;                 /* number of pts           */
+    XPoint     *Pts;		     /* the pts                 */
+    int	rule;			     /* winding rule */
+{
+    Region region;
+    register EdgeTableEntry *pAET;   /* Active Edge Table       */
+    register int y;                  /* current scanline        */
+    register int iPts = 0;           /* number of pts in buffer */
+    register EdgeTableEntry *pWETE;  /* Winding Edge Table Entry*/
+    register ScanLineList *pSLL;     /* current scanLineList    */
+    register XPoint *pts;             /* output buffer           */
+    EdgeTableEntry *pPrevAET;        /* ptr to previous AET     */
+    EdgeTable ET;                    /* header node for ET      */
+    EdgeTableEntry AET;              /* header node for AET     */
+    EdgeTableEntry *pETEs;           /* EdgeTableEntries pool   */
+    ScanLineListBlock SLLBlock;      /* header for scanlinelist */
+    int fixWAET = FALSE;
+    POINTBLOCK FirstPtBlock, *curPtBlock; /* PtBlock buffers    */
+    POINTBLOCK *tmpPtBlock;
+    int numFullPtBlocks = 0;
+ 
+    if (! (region = GXCreateRegion())) return (Region) NULL;
+
+    /* special case a rectangle */
+    pts = Pts;
+    if (((Count == 4) ||
+	 ((Count == 5) && (pts[4].x == pts[0].x) && (pts[4].y == pts[0].y))) &&
+	(((pts[0].y == pts[1].y) &&
+	  (pts[1].x == pts[2].x) &&
+	  (pts[2].y == pts[3].y) &&
+	  (pts[3].x == pts[0].x)) ||
+	 ((pts[0].x == pts[1].x) &&
+	  (pts[1].y == pts[2].y) &&
+	  (pts[2].x == pts[3].x) &&
+	  (pts[3].y == pts[0].y)))) {
+	region->extents.x1 = MIN(pts[0].x, pts[2].x);
+	region->extents.y1 = MIN(pts[0].y, pts[2].y);
+	region->extents.x2 = MAX(pts[0].x, pts[2].x);
+	region->extents.y2 = MAX(pts[0].y, pts[2].y);
+	if ((region->extents.x1 != region->extents.x2) &&
+	    (region->extents.y1 != region->extents.y2)) {
+	    region->numRects = 1;
+	    *(region->rects) = region->extents;
+	}
+	return(region);
+    }
+
+    if (! (pETEs = (EdgeTableEntry *)
+	   Xmalloc((unsigned) (sizeof(EdgeTableEntry) * Count))))
+	return (Region) NULL;
+
+    pts = FirstPtBlock.pts;
+    CreateETandAET(Count, Pts, &ET, &AET, pETEs, &SLLBlock);
+    pSLL = ET.scanlines.next;
+    curPtBlock = &FirstPtBlock;
+ 
+    if (rule == EvenOddRule) {
+        /*
+         *  for each scanline
+         */
+        for (y = ET.ymin; y < ET.ymax; y++) {
+            /*
+             *  Add a new edge to the active edge table when we
+             *  get to the next edge.
+             */
+            if (pSLL != NULL && y == pSLL->scanline) {
+                loadAET(&AET, pSLL->edgelist);
+                pSLL = pSLL->next;
+            }
+            pPrevAET = &AET;
+            pAET = AET.next;
+ 
+            /*
+             *  for each active edge
+             */
+            while (pAET) {
+                pts->x = pAET->bres.minor_axis,  pts->y = y;
+                pts++, iPts++;
+ 
+                /*
+                 *  send out the buffer
+                 */
+                if (iPts == NUMPTSTOBUFFER) {
+                    tmpPtBlock = (POINTBLOCK *)Xmalloc(sizeof(POINTBLOCK));
+                    curPtBlock->next = tmpPtBlock;
+                    curPtBlock = tmpPtBlock;
+                    pts = curPtBlock->pts;
+                    numFullPtBlocks++;
+                    iPts = 0;
+                }
+                EVALUATEEDGEEVENODD(pAET, pPrevAET, y);
+            }
+            (void) InsertionSort(&AET);
+        }
+    }
+    else {
+        /*
+         *  for each scanline
+         */
+        for (y = ET.ymin; y < ET.ymax; y++) {
+            /*
+             *  Add a new edge to the active edge table when we
+             *  get to the next edge.
+             */
+            if (pSLL != NULL && y == pSLL->scanline) {
+                loadAET(&AET, pSLL->edgelist);
+                computeWAET(&AET);
+                pSLL = pSLL->next;
+            }
+            pPrevAET = &AET;
+            pAET = AET.next;
+            pWETE = pAET;
+ 
+            /*
+             *  for each active edge
+             */
+            while (pAET) {
+                /*
+                 *  add to the buffer only those edges that
+                 *  are in the Winding active edge table.
+                 */
+                if (pWETE == pAET) {
+                    pts->x = pAET->bres.minor_axis,  pts->y = y;
+                    pts++, iPts++;
+ 
+                    /*
+                     *  send out the buffer
+                     */
+                    if (iPts == NUMPTSTOBUFFER) {
+                        tmpPtBlock = (POINTBLOCK *)Xmalloc(sizeof(POINTBLOCK));
+                        curPtBlock->next = tmpPtBlock;
+                        curPtBlock = tmpPtBlock;
+                        pts = curPtBlock->pts;
+                        numFullPtBlocks++;    iPts = 0;
+                    }
+                    pWETE = pWETE->nextWETE;
+                }
+                EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET);
+            }
+ 
+            /*
+             *  recompute the winding active edge table if
+             *  we just resorted or have exited an edge.
+             */
+            if (InsertionSort(&AET) || fixWAET) {
+                computeWAET(&AET);
+                fixWAET = FALSE;
+            }
+        }
+    }
+    FreeStorage(SLLBlock.next);	
+    (void) PtsToRegion(numFullPtBlocks, iPts, &FirstPtBlock, region);
+    for (curPtBlock = FirstPtBlock.next; --numFullPtBlocks >= 0;) {
+	tmpPtBlock = curPtBlock->next;
+	Xfree((char *)curPtBlock);
+	curPtBlock = tmpPtBlock;
+    }
+    Xfree((char *)pETEs);
+    return(region);
+}
--- a/gdk/Region.c
+++ b/gdk/Region.c
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -849,6 +849,9 @@ void	       gdk_region_destroy   (GdkRegion	   *region);
 void	       gdk_region_get_clipbox(GdkRegion    *region,
 				      GdkRectangle *rectangle);

+GdkRectangle*  gdk_region_get_rectangles(GdkRegion    *region,
+				         gint         *nrects);
+
 gboolean       gdk_region_empty	    (GdkRegion	   *region);
 gboolean       gdk_region_equal	    (GdkRegion	   *region1,
 				     GdkRegion	   *region2);
@@ -904,7 +907,9 @@ guint    gdk_keyval_to_lower		  (guint	keyval);
 gboolean gdk_keyval_is_upper		  (guint	keyval);
 gboolean gdk_keyval_is_lower		  (guint	keyval);

+gint gdk_drawable_register (GdkDrawableClass* draw_class);

+#include <gdk/gdkps.h>
 #include <gdk/gdkrgb.h>

 #ifdef __cplusplus
--- a/gdk/gdkdraw.c
+++ b/gdk/gdkdraw.c
@@ -37,6 +37,11 @@ gdk_draw_point (GdkDrawable *drawable,
  drawable_private = (GdkWindowPrivate*) drawable;
  if (drawable_private->destroyed)
    return;
+
+  if (drawable_private->window_type == GDK_WINDOW_DRAWABLE) {
+    drawable_private->engine->draw_point(drawable, gc, x, y);
+    return;
+  }
  gc_private = (GdkGCPrivate*) gc;

  XDrawPoint (drawable_private->xdisplay, drawable_private->xwindow,
@@ -60,6 +65,10 @@ gdk_draw_line (GdkDrawable *drawable,
  drawable_private = (GdkWindowPrivate*) drawable;
  if (drawable_private->destroyed)
    return;
+  if (drawable_private->window_type == GDK_WINDOW_DRAWABLE) {
+    drawable_private->engine->draw_line(drawable, gc, x1, y1, x2, y2);
+    return;
+  }
  gc_private = (GdkGCPrivate*) gc;

  XDrawLine (drawable_private->xdisplay, drawable_private->xwindow,
@@ -91,6 +100,10 @@ gdk_draw_rectangle (GdkDrawable *drawable,
  if (height == -1)
    height = drawable_private->height;

+  if (drawable_private->window_type == GDK_WINDOW_DRAWABLE) {
+    drawable_private->engine->draw_rectangle(drawable, gc, filled, x, y, width, height);
+    return;
+  }
  if (filled)
    XFillRectangle (drawable_private->xdisplay, drawable_private->xwindow,
 		    gc_private->xgc, x, y, width, height);
@@ -126,6 +139,10 @@ gdk_draw_arc (GdkDrawable *drawable,
  if (height == -1)
    height = drawable_private->height;

+  if (drawable_private->window_type == GDK_WINDOW_DRAWABLE) {
+    drawable_private->engine->draw_arc(drawable, gc, filled, x, y, width, height, angle1, angle2);
+    return;
+  }
  if (filled)
    XFillArc (drawable_private->xdisplay, drawable_private->xwindow,
 	      gc_private->xgc, x, y, width, height, angle1, angle2);
@@ -153,6 +170,10 @@ gdk_draw_polygon (GdkDrawable *drawable,
  drawable_private = (GdkWindowPrivate*) drawable;
  if (drawable_private->destroyed)
    return;
+  if (drawable_private->window_type == GDK_WINDOW_DRAWABLE) {
+    drawable_private->engine->draw_polygon(drawable, gc, filled, points, npoints);
+    return;
+  }
  gc_private = (GdkGCPrivate*) gc;

  if (filled)
@@ -209,6 +230,10 @@ gdk_draw_string (GdkDrawable *drawable,
  drawable_private = (GdkWindowPrivate*) drawable;
  if (drawable_private->destroyed)
    return;
+  if (drawable_private->window_type == GDK_WINDOW_DRAWABLE) {
+    drawable_private->engine->draw_text(drawable, font, gc, x, y, string, strlen(string));
+    return;
+  }
  gc_private = (GdkGCPrivate*) gc;
  font_private = (GdkFontPrivate*) font;

@@ -265,6 +290,10 @@ gdk_draw_text (GdkDrawable *drawable,
  drawable_private = (GdkWindowPrivate*) drawable;
  if (drawable_private->destroyed)
    return;
+  if (drawable_private->window_type == GDK_WINDOW_DRAWABLE) {
+    drawable_private->engine->draw_text(drawable, font, gc, x, y, text, text_length);
+    return;
+  }
  gc_private = (GdkGCPrivate*) gc;
  font_private = (GdkFontPrivate*) font;

@@ -323,6 +352,10 @@ gdk_draw_pixmap (GdkDrawable *drawable,
  if (height == -1)
    height = src_private->height;

+  if (drawable_private->window_type == GDK_WINDOW_DRAWABLE) {
+    drawable_private->engine->draw_pixmap(drawable, gc, src, xsrc, ysrc, xdest, ydest, width, height);
+    return;
+  }
  XCopyArea (drawable_private->xdisplay,
 	     src_private->xwindow,
 	     drawable_private->xwindow,
@@ -344,12 +377,14 @@ gdk_draw_image (GdkDrawable *drawable,
 		gint         height)
 {
  GdkImagePrivate *image_private;
+  GdkWindowPrivate *drawable_private;

  g_return_if_fail (drawable != NULL);
  g_return_if_fail (image != NULL);
  g_return_if_fail (gc != NULL);

  image_private = (GdkImagePrivate*) image;
+  drawable_private = (GdkWindowPrivate*) drawable;

  g_return_if_fail (image_private->image_put != NULL);

@@ -358,6 +393,10 @@ gdk_draw_image (GdkDrawable *drawable,
  if (height == -1)
    height = image->height;

+  if (drawable_private->window_type == GDK_WINDOW_DRAWABLE) {
+    drawable_private->engine->draw_image(drawable, gc, image, xsrc, ysrc, xdest, ydest, width, height);
+    return;
+  }
  (* image_private->image_put) (drawable, gc, image, xsrc, ysrc,
 				xdest, ydest, width, height);
 }
@@ -378,6 +417,10 @@ gdk_draw_points (GdkDrawable *drawable,
  drawable_private = (GdkWindowPrivate*) drawable;
  if (drawable_private->destroyed)
    return;
+  if (drawable_private->window_type == GDK_WINDOW_DRAWABLE) {
+    drawable_private->engine->draw_points(drawable, gc, points, npoints);
+    return;
+  }
  gc_private = (GdkGCPrivate*) gc;

  XDrawPoints (drawable_private->xdisplay,
@@ -407,6 +450,10 @@ gdk_draw_segments (GdkDrawable *drawable,
  drawable_private = (GdkWindowPrivate*) drawable;
  if (drawable_private->destroyed)
    return;
+  if (drawable_private->window_type == GDK_WINDOW_DRAWABLE) {
+    drawable_private->engine->draw_segments(drawable, gc, segs, nsegs);
+    return;
+  }
  gc_private = (GdkGCPrivate*) gc;

  XDrawSegments (drawable_private->xdisplay,
@@ -433,6 +480,12 @@ gdk_draw_lines (GdkDrawable *drawable,
  g_return_if_fail (gc != NULL);

  drawable_private = (GdkWindowPrivate*) drawable;
+  if (drawable_private->destroyed)
+    return;
+  if (drawable_private->window_type == GDK_WINDOW_DRAWABLE) {
+    drawable_private->engine->draw_lines(drawable, gc, points, npoints);
+    return;
+  }
  gc_private = (GdkGCPrivate*) gc;

  XDrawLines (drawable_private->xdisplay,
--- a/gdk/gdkdrawable.c
+++ b/gdk/gdkdrawable.c
@@ -0,0 +1,40 @@
+/* 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
+ * 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"
+#include "gdktypes.h"
+
+
+static GList* engines = NULL;
+
+
+gint
+gdk_drawable_register(GdkDrawableClass* d_engine) 
+{
+  gint type = 0;
+  g_return_val_if_fail(d_engine != NULL, 0);
+
+  if ( d_engine->type )
+    return d_engine->type;
+  type = g_list_length(engines)+1;
+  d_engine->type = type;
+  engines = g_list_append(engines, d_engine);
+  return type;
+}
+
+
--- a/gdk/gdkfont.c
+++ b/gdk/gdkfont.c
@@ -26,6 +26,7 @@ gdk_font_load (const gchar *font_name)
 {
  GdkFont *font;
  GdkFontPrivate *private;
+  static Atom font_atom = None;

  private = g_new (GdkFontPrivate, 1);
  font = (GdkFont*) private;
@@ -33,6 +34,7 @@ gdk_font_load (const gchar *font_name)
  private->xdisplay = gdk_display;
  private->xfont = XLoadQueryFont (private->xdisplay, font_name);
  private->ref_count = 1;
+  font->name = NULL;

  if (!private->xfont)
    {
@@ -41,9 +43,23 @@ gdk_font_load (const gchar *font_name)
    }
  else
    {
+      gchar* xfd = NULL;
+      unsigned long value;
      font->type = GDK_FONT_FONT;
      font->ascent =  ((XFontStruct *) private->xfont)->ascent;
      font->descent = ((XFontStruct *) private->xfont)->descent;
+      if ( font_atom != None )
+	font_atom = XInternAtom(private->xdisplay, "FONT", True);
+      if ( font_atom != None ) {
+	if (XGetFontProperty(private->xfont, font_atom, &value))
+	  xfd = XGetAtomName(private->xdisplay, value);
+	if (xfd) {
+	  font->name = g_strdup(xfd);
+	  XFree(xfd);
+	}
+      }
+      if ( font->name == NULL )
+      	font->name = g_strdup(font_name);
    }

  gdk_xid_table_insert (&((XFontStruct *) private->xfont)->fid, font);
@@ -103,6 +119,7 @@ gdk_fontset_load (gchar *fontset_name)
 	  font->ascent = MAX (font->ascent, font_structs[i]->ascent);
 	  font->descent = MAX (font->descent, font_structs[i]->descent);
 	}
+      font->name = g_strdup(fontset_name);
    }
  return font;
 }
@@ -144,6 +161,7 @@ gdk_font_unref (GdkFont *font)
 	  g_error ("unknown font type.");
 	  break;
 	}
+      g_free(font->name);
      g_free (font);
    }
 }
--- a/gdk/gdkgc.c
+++ b/gdk/gdkgc.c
@@ -21,6 +21,21 @@
 #include "gdk.h"
 #include "gdkprivate.h"

+static void
+gc_set_dashes(GdkGCPrivate* gc, gint offset, gchar* dashes, gint n) 
+{
+  if ( gc->dash_list)
+    g_free(gc->dash_list);
+  if ( n ) {
+    gc->dash_num = n;
+    gc->dash_offset = offset;
+    gc->dash_list = g_new(gchar, n);
+    memcpy(gc->dash_list, dashes, n);
+  } else {
+    gc->dash_list = NULL;
+    gc->dash_num = gc->dash_offset = 0;
+  }
+}

 GdkGC*
 gdk_gc_new (GdkWindow *window)
@@ -52,6 +67,10 @@ gdk_gc_new_with_values (GdkWindow	*window,
  xwindow = window_private->xwindow;
  private->xdisplay = window_private->xdisplay;
  private->ref_count = 1;
+  private->nrects = 0;
+  private->rects = NULL;
+  private->dash_list = NULL;
+  private->dash_num = private->dash_offset = 0;

  xvalues.function = GXcopy;
  xvalues.fill_style = FillSolid;
@@ -64,12 +83,16 @@ gdk_gc_new_with_values (GdkWindow	*window,
    {
      xvalues.foreground = values->foreground.pixel;
      xvalues_mask |= GCForeground;
-    }
+      private->fg = values->foreground;
+    } else
+      private->fg.pixel = 0; /* FIXME */
  if (values_mask & GDK_GC_BACKGROUND)
    {
      xvalues.background = values->background.pixel;
      xvalues_mask |= GCBackground;
-    }
+      private->bg = values->background;
+    } else
+      private->bg.pixel = 0; /* FIXME */
  if ((values_mask & GDK_GC_FONT) && (values->font->type == GDK_FONT_FONT))
    {
      xvalues.font = ((XFontStruct *) ((GdkFontPrivate*) values->font)->xfont)->fid;
@@ -160,6 +183,7 @@ gdk_gc_new_with_values (GdkWindow	*window,
    {
      xvalues.clip_mask = ((GdkPixmapPrivate*) values->clip_mask)->xwindow;
      xvalues_mask |= GCClipMask;
+      /* FIXME: set clip rects... */
    }
  if (values_mask & GDK_GC_SUBWINDOW)
    {
@@ -204,12 +228,15 @@ gdk_gc_new_with_values (GdkWindow	*window,
 	{
 	case GDK_LINE_SOLID:
 	  xvalues.line_style = LineSolid;
+	  gc_set_dashes(private, 0, NULL, 0);
 	  break;
 	case GDK_LINE_ON_OFF_DASH:
 	  xvalues.line_style = LineOnOffDash;
+	  gc_set_dashes(private, 0, "\1\1", 2);
 	  break;
 	case GDK_LINE_DOUBLE_DASH:
 	  xvalues.line_style = LineDoubleDash;
+	  gc_set_dashes(private, 0, "\2\1", 2); /* FIXME: is this right? */
 	  break;
 	}
      xvalues_mask |= GCLineStyle;
@@ -284,6 +311,8 @@ gdk_gc_unref (GdkGC *gc)
  else
    {
      XFreeGC (private->xdisplay, private->xgc);
+      g_free(private->rects);
+      g_free(private->dash_list);
      memset (gc, 0, sizeof (GdkGCPrivate));
      g_free (gc);
    }
@@ -310,8 +339,8 @@ gdk_gc_get_values (GdkGC       *gc,
 		    GCLineWidth | GCLineStyle | GCCapStyle |
 		    GCFillStyle | GCJoinStyle, &xvalues))
    {
-      values->foreground.pixel = xvalues.foreground;
-      values->background.pixel = xvalues.background;
+      values->foreground = private->fg;
+      values->background = private->bg;
      values->font = gdk_font_lookup (xvalues.font);

      switch (xvalues.function)
@@ -449,6 +478,7 @@ gdk_gc_set_foreground (GdkGC	*gc,

  private = (GdkGCPrivate*) gc;
  XSetForeground (private->xdisplay, private->xgc, color->pixel);
+  private->fg = *color;
 }

 void
@@ -462,6 +492,7 @@ gdk_gc_set_background (GdkGC	*gc,

  private = (GdkGCPrivate*) gc;
  XSetBackground (private->xdisplay, private->xgc, color->pixel);
+  private->bg = *color;
 }

 void
@@ -667,6 +698,10 @@ gdk_gc_set_clip_mask (GdkGC	*gc,
  private = (GdkGCPrivate*) gc;

  XSetClipMask (private->xdisplay, private->xgc, xmask);
+  /* FIXME: set clip rects... */
+  g_free(private->rects);
+  private->rects = NULL;
+  private->nrects = 0;
 }


@@ -681,12 +716,20 @@ gdk_gc_set_clip_rectangle (GdkGC	*gc,

  private = (GdkGCPrivate*) gc;

+  g_free(private->rects);
+  private->rects = NULL;
+  private->nrects = 0;
+
  if (rectangle)
    {
      xrectangle.x = rectangle->x; 
      xrectangle.y = rectangle->y;
      xrectangle.width = rectangle->width;
      xrectangle.height = rectangle->height;
+
+      private->nrects = 1;
+      private->rects = g_new(GdkRectangle, 1);
+      private->rects[0] = *rectangle;
      
      XSetClipRectangles (private->xdisplay, private->xgc, 0, 0,
 			  &xrectangle, 1, Unsorted);
@@ -705,12 +748,17 @@ gdk_gc_set_clip_region (GdkGC		 *gc,

  private = (GdkGCPrivate*) gc;

+  g_free(private->rects);
+  private->rects = NULL;
+  private->nrects = 0;
+
  if (region)
    {
-      GdkRegionPrivate *region_private;
-
-      region_private = (GdkRegionPrivate*) region;
-      XSetRegion (private->xdisplay, private->xgc, region_private->xregion);
+      private->rects = gdk_region_get_rectangles(region, &private->nrects);
+      /* FIXME: handle GdkRectangle ~= Rectangle? */
+      if ( private->rects )
+        XSetClipRectangles (private->xdisplay, private->xgc, 0, 0,
+			  private->rects, private->nrects, YXBanded);
    }
  else
    XSetClipMask (private->xdisplay, private->xgc, None);
@@ -762,12 +810,15 @@ gdk_gc_set_line_attributes (GdkGC	*gc,
    {
    case GDK_LINE_SOLID:
      xline_style = LineSolid;
+      gc_set_dashes(private, 0, NULL, 0);
      break;
    case GDK_LINE_ON_OFF_DASH:
      xline_style = LineOnOffDash;
+      gc_set_dashes(private, 0, "\1\1", 2);
      break;
    case GDK_LINE_DOUBLE_DASH:
      xline_style = LineDoubleDash;
+      gc_set_dashes(private, 0, "\2\1", 2);
      break;
    default:
      xline_style = None;
@@ -824,6 +875,8 @@ gdk_gc_set_dashes (GdkGC *gc,
  private = (GdkGCPrivate*) gc;

  XSetDashes (private->xdisplay, private->xgc, dash_offset, dash_list, n);
+
+  gc_set_dashes(private, dash_offset, dash_list, n);
 }

 void
@@ -836,4 +889,16 @@ gdk_gc_copy (GdkGC *dst_gc, GdkGC *src_gc)

  XCopyGC (src_private->xdisplay, src_private->xgc, ~((~1) << GCLastBit),
 	   dst_private->xgc);
+  g_free(dst_private->rects);
+  dst_private->nrects = src_private->nrects;
+  if ( dst_private->nrects ) {
+    dst_private->rects = g_new(GdkRectangle, dst_private->nrects);
+    memcpy(dst_private->rects, src_private->rects, sizeof(GdkRectangle)*dst_private->nrects);
+  } else
+    dst_private->rects = NULL;
+
+  dst_private->fg = src_private->fg;
+  dst_private->bg = src_private->bg;
+
+  gc_set_dashes(dst_private, src_private->dash_offset, src_private->dash_list, src_private->dash_num);
 }
--- a/gdk/gdkprivate.h
+++ b/gdk/gdkprivate.h
@@ -49,6 +49,7 @@ typedef struct _GdkEventFilter	       GdkEventFilter;
 typedef struct _GdkClientFilter	       GdkClientFilter;
 typedef struct _GdkColorContextPrivate GdkColorContextPrivate;
 typedef struct _GdkRegionPrivate       GdkRegionPrivate;
+typedef struct _GdkPsDrawable          GdkPsDrawable;


 struct _GdkWindowPrivate
@@ -85,6 +86,7 @@ struct _GdkWindowPrivate
  GList *filters;
  GdkColormap *colormap;
  GList *children;
+  GdkDrawableClass *engine;
 };

 struct _GdkImagePrivate
@@ -111,6 +113,13 @@ struct _GdkGCPrivate
  GC xgc;
  Display *xdisplay;
  guint ref_count;
+  guint nrects;
+  GdkRectangle* rects;
+  GdkColor fg;
+  GdkColor bg;
+  gint dash_offset;
+  gint dash_num;
+  gchar *dash_list;
 };

 typedef enum {
@@ -225,6 +234,33 @@ struct _GdkRegionPrivate
  Region xregion;
 };

+struct _GdkPsDrawable { 
+	gint page;
+	gint fd;
+	gint width;
+	gint height;
+	GString *sbuf;
+	gint xoff;
+	gint yoff;
+	gint intile;
+	gint inframe;
+	GdkFont* font;
+	GdkColor fg;
+	GdkColor bg;
+	GdkCapStyle cap_style;
+	GdkJoinStyle join_style;
+	gint line_width;
+	gint valid;
+	gint valid_fg;
+	gint valid_bg;
+	gint nrects;
+	GdkRectangle *rects;
+	gint clipped;
+	gint dash_offset;
+	gint dash_num;
+	gchar* dash_list;
+};
+
 typedef enum {
  GDK_DEBUG_MISC          = 1 << 0,
  GDK_DEBUG_EVENTS        = 1 << 1,
--- a/gdk/gdkps.c
+++ b/gdk/gdkps.c
--- a/gdk/gdkps.h
+++ b/gdk/gdkps.h
@@ -0,0 +1,72 @@
+/* GTK - The GIMP Toolkit
+ * 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
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+#ifndef __GDK_PS_H__
+#define __GDK_PS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/*typedef struct _GdkPsDrawable GdkPsDrawable;*/
+
+
+typedef struct 
+{
+  gchar* name;
+  gchar* face;
+  gchar* family;
+  gint download;
+  gchar* afm;
+  gchar* pfa;
+} GdkPsFontInfo;
+
+void         gdk_ps_drawable_add_font_info(GdkPsFontInfo *info);
+
+GdkDrawable* gdk_ps_drawable_new (gint   fd, 
+				  gchar *title, 
+				  gchar *author);
+void         gdk_ps_drawable_draw_rgb (GdkDrawable *d,
+				       GdkGC       *gc,
+				       gchar       *data,
+				       gint         bpp,
+				       gint         x,
+				       gint         y,
+				       gint         width,
+				       gint         height);
+void	     gdk_ps_drawable_put_data (GdkDrawable *d,
+				       gchar       *data,
+				       guint        len);
+
+void	     gdk_ps_drawable_end (GdkDrawable *d);
+void         gdk_ps_drawable_page_start (GdkDrawable *d,
+					 gint         orientation,
+					 gint         count,
+					 gint         plex,
+					 gint         resolution,
+					 gint         width,
+					 gint         height);
+void         gdk_ps_drawable_page_end   (GdkDrawable *d);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* __GDK_PS_H__ */
--- a/gdk/gdkregion.c
+++ b/gdk/gdkregion.c
@@ -22,8 +22,16 @@
 #include "gdk.h"
 #include "gdkprivate.h"

+#define Xmalloc g_malloc
+#define Xfree g_free
+#define Xrealloc g_realloc

+#include "Region.c"
+#include "PolyReg.c"

+#undef Xmalloc
+#undef Xfree
+#undef Xrealloc

 GdkRegion*
 gdk_region_new (void)
@@ -32,7 +40,7 @@ gdk_region_new (void)
  GdkRegion *region;
  Region xregion;

-  xregion = XCreateRegion();
+  xregion = GXCreateRegion();
  private = g_new (GdkRegionPrivate, 1);
  private->xregion = xregion;
  region = (GdkRegion*) private;
@@ -49,7 +57,7 @@ gdk_region_destroy (GdkRegion *region)
  g_return_if_fail (region != NULL);

  private = (GdkRegionPrivate *) region;
-  XDestroyRegion (private->xregion);
+  GXDestroyRegion (private->xregion);

  g_free (private);
 }
@@ -63,7 +71,7 @@ gdk_region_empty (GdkRegion      *region)

  private = (GdkRegionPrivate *) region;
  
-  return XEmptyRegion (private->xregion);
+  return GXEmptyRegion (private->xregion);
 }

 gboolean
@@ -79,7 +87,7 @@ gdk_region_equal (GdkRegion      *region1,
  private1 = (GdkRegionPrivate *) region1;
  private2 = (GdkRegionPrivate *) region2;
  
-  return XEqualRegion (private1->xregion, private2->xregion);
+  return GXEqualRegion (private1->xregion, private2->xregion);
 }

 void
@@ -93,7 +101,7 @@ gdk_region_get_clipbox(GdkRegion    *region,
 	g_return_if_fail(rectangle != NULL);

 	rp = (GdkRegionPrivate *)region;
-	XClipBox(rp->xregion, &r);
+	GXClipBox(rp->xregion, &r);

 	rectangle->x = r.x;
 	rectangle->y = r.y;	
@@ -112,7 +120,7 @@ gdk_region_point_in (GdkRegion      *region,

  private = (GdkRegionPrivate *) region;
  
-  return XPointInRegion (private->xregion, x, y);
+  return GXPointInRegion (private->xregion, x, y);
 }

 GdkOverlapType
@@ -126,7 +134,7 @@ gdk_region_rect_in (GdkRegion      *region,

  private = (GdkRegionPrivate *) region;
  
-  res = XRectInRegion (private->xregion, rect->x, rect->y, rect->width, rect->height);
+  res = GXRectInRegion (private->xregion, rect->x, rect->y, rect->width, rect->height);
  
  switch (res)
  {
@@ -162,7 +170,7 @@ gdk_region_polygon (GdkPoint    *points,
      break;
    }

-  xregion = XPolygonRegion ((XPoint *) points, npoints, xfill_rule);
+  xregion = GXPolygonRegion ((XPoint *) points, npoints, xfill_rule);
  private = g_new (GdkRegionPrivate, 1);
  private->xregion = xregion;
  region = (GdkRegion *) private;
@@ -182,7 +190,7 @@ gdk_region_offset (GdkRegion      *region,

  private = (GdkRegionPrivate *) region;
  
-  XOffsetRegion (private->xregion, dx, dy);
+  GXOffsetRegion (private->xregion, dx, dy);
 }

 void
@@ -196,7 +204,7 @@ gdk_region_shrink (GdkRegion      *region,

  private = (GdkRegionPrivate *) region;
  
-  XShrinkRegion (private->xregion, dx, dy);
+  GXShrinkRegion (private->xregion, dx, dy);
 }

 GdkRegion*    
@@ -220,7 +228,7 @@ gdk_region_union_with_rect (GdkRegion      *region,
  res = gdk_region_new ();
  res_private = (GdkRegionPrivate *) res;
  
-  XUnionRectWithRegion (&xrect, private->xregion, res_private->xregion);
+  GXUnionRectWithRegion (&xrect, private->xregion, res_private->xregion);
  
  return res;
 }
@@ -243,7 +251,7 @@ gdk_regions_intersect (GdkRegion      *source1,
  res = gdk_region_new ();
  res_private = (GdkRegionPrivate *) res;
  
-  XIntersectRegion (private1->xregion, private2->xregion, res_private->xregion);
+  GXIntersectRegion (private1->xregion, private2->xregion, res_private->xregion);
  
  return res;
 }
@@ -266,7 +274,7 @@ gdk_regions_union (GdkRegion      *source1,
  res = gdk_region_new ();
  res_private = (GdkRegionPrivate *) res;
  
-  XUnionRegion (private1->xregion, private2->xregion, res_private->xregion);
+  GXUnionRegion (private1->xregion, private2->xregion, res_private->xregion);
  
  return res;
 }
@@ -289,7 +297,7 @@ gdk_regions_subtract (GdkRegion      *source1,
  res = gdk_region_new ();
  res_private = (GdkRegionPrivate *) res;
  
-  XSubtractRegion (private1->xregion, private2->xregion, res_private->xregion);
+  GXSubtractRegion (private1->xregion, private2->xregion, res_private->xregion);
  
  return res;
 }
@@ -312,10 +320,36 @@ gdk_regions_xor (GdkRegion      *source1,
  res = gdk_region_new ();
  res_private = (GdkRegionPrivate *) res;
  
-  XXorRegion (private1->xregion, private2->xregion, res_private->xregion);
+  GXXorRegion (private1->xregion, private2->xregion, res_private->xregion);
  
  return res;
 }


+GdkRectangle*
+gdk_region_get_rectangles(GdkRegion *region, gint *nrects) 
+{
+  GdkRectangle *result;
+  GdkRegionPrivate *private;
+  struct _XRegion *r;
+  gint i;
+
+  g_return_val_if_fail (region != NULL, NULL);
+
+  private = (GdkRegionPrivate *) region;
+  r = (struct _XRegion*) private->xregion;
+
+  if (nrects)
+    *nrects = r->numRects;
+  if (!r->numRects)
+  	return NULL;
+  result = g_new(GdkRectangle, r->numRects);
+  for ( i=0; i < r->numRects; ++i ) {
+    result[i].x = r->rects[i].x1;
+    result[i].y = r->rects[i].y1;
+    result[i].width = r->rects[i].x2 - r->rects[i].x1;
+    result[i].height = r->rects[i].y2 - r->rects[i].y1;
+  }
+  return result;
+}

--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -85,6 +85,7 @@ typedef struct _GdkDeviceKey	    GdkDeviceKey;
 typedef struct _GdkDeviceInfo	    GdkDeviceInfo;
 typedef struct _GdkTimeCoord	    GdkTimeCoord;
 typedef struct _GdkRegion	    GdkRegion;
+typedef struct _GdkDrawableClass    GdkDrawableClass;
 typedef gint (*GdkEventFunc) (GdkEvent *event,
 			      gpointer	data);

@@ -111,6 +112,8 @@ typedef void*			  GdkIM;
 *	     pixmap to any procedure which accepts a window with the
 *	     exception of the drawing functions).
 *   Foreign: A window that actually belongs to another application
+ *   Drawable: A drawable window with custom draw operations such as
+ *       GdkMetaFile and GdkPsDrawable.
 */
 typedef enum
 {
@@ -120,7 +123,8 @@ typedef enum
  GDK_WINDOW_DIALOG,
  GDK_WINDOW_TEMP,
  GDK_WINDOW_PIXMAP,
-  GDK_WINDOW_FOREIGN
+  GDK_WINDOW_FOREIGN,
+  GDK_WINDOW_DRAWABLE
 } GdkWindowType;

 /* Classes of windows.
@@ -840,6 +844,7 @@ struct _GdkFont
  GdkFontType type;
  gint ascent;
  gint descent;
+  gchar *name;
 };

 struct _GdkCursor
@@ -1164,6 +1169,30 @@ struct _GdkRegion
 };


+struct _GdkDrawableClass 
+{
+  guint	   type;
+  gchar*   name;
+  gchar*   description;
+  gpointer user_data;
+  /*
+  GList* functions;
+  int  (*function)(GdkDrawable* d, gchar* format, ...);
+  */
+  void (*destroy)        (GdkDrawable* d);
+  void (*draw_point)     (GdkDrawable* d, GdkGC* gc, gint x, gint y);
+  void (*draw_line)      (GdkDrawable* d, GdkGC* gc, gint x1, gint y1, gint x2, gint y2);
+  void (*draw_rectangle) (GdkDrawable* d, GdkGC* gc, gint filled, gint x, gint y, gint width, gint height);
+  void (*draw_arc)       (GdkDrawable* d, GdkGC* gc, gint filled, gint x, gint y, gint width, gint height, gint angle1, gint angle2);
+  void (*draw_polygon)   (GdkDrawable* d, GdkGC* gc, gint filled, GdkPoint* points, gint npoints);
+  void (*draw_text)      (GdkDrawable* d, GdkFont* font, GdkGC* gc, gint x, gint y, const gchar* text, gint length);
+  void (*draw_pixmap)    (GdkDrawable* d, GdkGC* gc, GdkDrawable* src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, gint height);
+  void (*draw_image)     (GdkDrawable* d, GdkGC* gc, GdkImage* src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, gint height);
+  void (*draw_points)    (GdkDrawable* d, GdkGC* gc, GdkPoint* points, gint npoints);
+  void (*draw_segments)  (GdkDrawable* d, GdkGC* gc, GdkSegment* segs, gint nsegs);
+  void (*draw_lines)     (GdkDrawable* d, GdkGC* gc, GdkPoint* points, gint npoints);
+};
+

 #ifdef __cplusplus
 }
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -374,6 +374,9 @@ gdk_window_new (GdkWindow     *parent,
 	case GDK_WINDOW_PIXMAP:
 	  g_error ("cannot make windows of type GDK_WINDOW_PIXMAP (use gdk_pixmap_new)");
 	  break;
+	case GDK_WINDOW_DRAWABLE:
+	  g_error ("cannot make windows of type GDK_WINDOW_DRAWABLE (use the drawable-specific functions)");
+	  break;
 	}
    }
  else
@@ -650,6 +653,11 @@ gdk_window_internal_destroy (GdkWindow *window, gboolean xdestroy,
    case GDK_WINDOW_PIXMAP:
      g_error ("called gdk_window_destroy on a pixmap (use gdk_pixmap_unref)");
      break;
+
+    case GDK_WINDOW_DRAWABLE:
+      if (private->engine->destroy)
+        private->engine->destroy(window);
+      break;
    }
 }

--- a/gdk/poly.h
+++ b/gdk/poly.h
@@ -0,0 +1,296 @@
+/* $XConsortium: poly.h,v 1.4 94/04/17 20:22:19 rws Exp $ */
+/************************************************************************
+
+Copyright (c) 1987  X Consortium
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the X Consortium.
+
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+************************************************************************/
+
+/*
+ *     This file contains a few macros to help track
+ *     the edge of a filled object.  The object is assumed
+ *     to be filled in scanline order, and thus the
+ *     algorithm used is an extension of Bresenham's line
+ *     drawing algorithm which assumes that y is always the
+ *     major axis.
+ *     Since these pieces of code are the same for any filled shape,
+ *     it is more convenient to gather the library in one
+ *     place, but since these pieces of code are also in
+ *     the inner loops of output primitives, procedure call
+ *     overhead is out of the question.
+ *     See the author for a derivation if needed.
+ */
+
+
+/*
+ *  In scan converting polygons, we want to choose those pixels
+ *  which are inside the polygon.  Thus, we add .5 to the starting
+ *  x coordinate for both left and right edges.  Now we choose the
+ *  first pixel which is inside the pgon for the left edge and the
+ *  first pixel which is outside the pgon for the right edge.
+ *  Draw the left pixel, but not the right.
+ *
+ *  How to add .5 to the starting x coordinate:
+ *      If the edge is moving to the right, then subtract dy from the
+ *  error term from the general form of the algorithm.
+ *      If the edge is moving to the left, then add dy to the error term.
+ *
+ *  The reason for the difference between edges moving to the left
+ *  and edges moving to the right is simple:  If an edge is moving
+ *  to the right, then we want the algorithm to flip immediately.
+ *  If it is moving to the left, then we don't want it to flip until
+ *  we traverse an entire pixel.
+ */
+#define BRESINITPGON(dy, x1, x2, xStart, d, m, m1, incr1, incr2) { \
+    int dx;      /* local storage */ \
+\
+    /* \
+     *  if the edge is horizontal, then it is ignored \
+     *  and assumed not to be processed.  Otherwise, do this stuff. \
+     */ \
+    if ((dy) != 0) { \
+        xStart = (x1); \
+        dx = (x2) - xStart; \
+        if (dx < 0) { \
+            m = dx / (dy); \
+            m1 = m - 1; \
+            incr1 = -2 * dx + 2 * (dy) * m1; \
+            incr2 = -2 * dx + 2 * (dy) * m; \
+            d = 2 * m * (dy) - 2 * dx - 2 * (dy); \
+        } else { \
+            m = dx / (dy); \
+            m1 = m + 1; \
+            incr1 = 2 * dx - 2 * (dy) * m1; \
+            incr2 = 2 * dx - 2 * (dy) * m; \
+            d = -2 * m * (dy) + 2 * dx; \
+        } \
+    } \
+}
+
+#define BRESINCRPGON(d, minval, m, m1, incr1, incr2) { \
+    if (m1 > 0) { \
+        if (d > 0) { \
+            minval += m1; \
+            d += incr1; \
+        } \
+        else { \
+            minval += m; \
+            d += incr2; \
+        } \
+    } else {\
+        if (d >= 0) { \
+            minval += m1; \
+            d += incr1; \
+        } \
+        else { \
+            minval += m; \
+            d += incr2; \
+        } \
+    } \
+}
+
+
+/*
+ *     This structure contains all of the information needed
+ *     to run the bresenham algorithm.
+ *     The variables may be hardcoded into the declarations
+ *     instead of using this structure to make use of
+ *     register declarations.
+ */
+typedef struct {
+    int minor_axis;	/* minor axis        */
+    int d;		/* decision variable */
+    int m, m1;		/* slope and slope+1 */
+    int incr1, incr2;	/* error increments */
+} BRESINFO;
+
+
+#define BRESINITPGONSTRUCT(dmaj, min1, min2, bres) \
+	BRESINITPGON(dmaj, min1, min2, bres.minor_axis, bres.d, \
+                     bres.m, bres.m1, bres.incr1, bres.incr2)
+
+#define BRESINCRPGONSTRUCT(bres) \
+        BRESINCRPGON(bres.d, bres.minor_axis, bres.m, bres.m1, bres.incr1, bres.incr2)
+
+
+
+/*
+ *     These are the data structures needed to scan
+ *     convert regions.  Two different scan conversion
+ *     methods are available -- the even-odd method, and
+ *     the winding number method.
+ *     The even-odd rule states that a point is inside
+ *     the polygon if a ray drawn from that point in any
+ *     direction will pass through an odd number of
+ *     path segments.
+ *     By the winding number rule, a point is decided
+ *     to be inside the polygon if a ray drawn from that
+ *     point in any direction passes through a different
+ *     number of clockwise and counter-clockwise path
+ *     segments.
+ *
+ *     These data structures are adapted somewhat from
+ *     the algorithm in (Foley/Van Dam) for scan converting
+ *     polygons.
+ *     The basic algorithm is to start at the top (smallest y)
+ *     of the polygon, stepping down to the bottom of
+ *     the polygon by incrementing the y coordinate.  We
+ *     keep a list of edges which the current scanline crosses,
+ *     sorted by x.  This list is called the Active Edge Table (AET)
+ *     As we change the y-coordinate, we update each entry in 
+ *     in the active edge table to reflect the edges new xcoord.
+ *     This list must be sorted at each scanline in case
+ *     two edges intersect.
+ *     We also keep a data structure known as the Edge Table (ET),
+ *     which keeps track of all the edges which the current
+ *     scanline has not yet reached.  The ET is basically a
+ *     list of ScanLineList structures containing a list of
+ *     edges which are entered at a given scanline.  There is one
+ *     ScanLineList per scanline at which an edge is entered.
+ *     When we enter a new edge, we move it from the ET to the AET.
+ *
+ *     From the AET, we can implement the even-odd rule as in
+ *     (Foley/Van Dam).
+ *     The winding number rule is a little trickier.  We also
+ *     keep the EdgeTableEntries in the AET linked by the
+ *     nextWETE (winding EdgeTableEntry) link.  This allows
+ *     the edges to be linked just as before for updating
+ *     purposes, but only uses the edges linked by the nextWETE
+ *     link as edges representing spans of the polygon to
+ *     drawn (as with the even-odd rule).
+ */
+
+/*
+ * for the winding number rule
+ */
+#define CLOCKWISE          1
+#define COUNTERCLOCKWISE  -1 
+
+typedef struct _EdgeTableEntry {
+     int ymax;             /* ycoord at which we exit this edge. */
+     BRESINFO bres;        /* Bresenham info to run the edge     */
+     struct _EdgeTableEntry *next;       /* next in the list     */
+     struct _EdgeTableEntry *back;       /* for insertion sort   */
+     struct _EdgeTableEntry *nextWETE;   /* for winding num rule */
+     int ClockWise;        /* flag for winding number rule       */
+} EdgeTableEntry;
+
+
+typedef struct _ScanLineList{
+     int scanline;              /* the scanline represented */
+     EdgeTableEntry *edgelist;  /* header node              */
+     struct _ScanLineList *next;  /* next in the list       */
+} ScanLineList;
+
+
+typedef struct {
+     int ymax;                 /* ymax for the polygon     */
+     int ymin;                 /* ymin for the polygon     */
+     ScanLineList scanlines;   /* header node              */
+} EdgeTable;
+
+
+/*
+ * Here is a struct to help with storage allocation
+ * so we can allocate a big chunk at a time, and then take
+ * pieces from this heap when we need to.
+ */
+#define SLLSPERBLOCK 25
+
+typedef struct _ScanLineListBlock {
+     ScanLineList SLLs[SLLSPERBLOCK];
+     struct _ScanLineListBlock *next;
+} ScanLineListBlock;
+
+
+
+/*
+ *
+ *     a few macros for the inner loops of the fill code where
+ *     performance considerations don't allow a procedure call.
+ *
+ *     Evaluate the given edge at the given scanline.
+ *     If the edge has expired, then we leave it and fix up
+ *     the active edge table; otherwise, we increment the
+ *     x value to be ready for the next scanline.
+ *     The winding number rule is in effect, so we must notify
+ *     the caller when the edge has been removed so he
+ *     can reorder the Winding Active Edge Table.
+ */
+#define EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET) { \
+   if (pAET->ymax == y) {          /* leaving this edge */ \
+      pPrevAET->next = pAET->next; \
+      pAET = pPrevAET->next; \
+      fixWAET = 1; \
+      if (pAET) \
+         pAET->back = pPrevAET; \
+   } \
+   else { \
+      BRESINCRPGONSTRUCT(pAET->bres); \
+      pPrevAET = pAET; \
+      pAET = pAET->next; \
+   } \
+}
+
+
+/*
+ *     Evaluate the given edge at the given scanline.
+ *     If the edge has expired, then we leave it and fix up
+ *     the active edge table; otherwise, we increment the
+ *     x value to be ready for the next scanline.
+ *     The even-odd rule is in effect.
+ */
+#define EVALUATEEDGEEVENODD(pAET, pPrevAET, y) { \
+   if (pAET->ymax == y) {          /* leaving this edge */ \
+      pPrevAET->next = pAET->next; \
+      pAET = pPrevAET->next; \
+      if (pAET) \
+         pAET->back = pPrevAET; \
+   } \
+   else { \
+      BRESINCRPGONSTRUCT(pAET->bres); \
+      pPrevAET = pAET; \
+      pAET = pAET->next; \
+   } \
+}
--- a/gdk/region.h
+++ b/gdk/region.h
@@ -0,0 +1,195 @@
+/* $XConsortium: region.h,v 11.14 94/04/17 20:22:20 rws Exp $ */
+/************************************************************************
+
+Copyright (c) 1987  X Consortium
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the X Consortium.
+
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+************************************************************************/
+
+#ifndef _XREGION_H
+#define _XREGION_H
+
+typedef struct {
+    short x1, x2, y1, y2;
+} Box, BOX, BoxRec, *BoxPtr;
+
+typedef struct {
+    short x, y, width, height;
+}RECTANGLE, RectangleRec, *RectanglePtr;
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
+#define MAXSHORT 32767
+#define MINSHORT -MAXSHORT
+#ifndef MAX
+#define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+#ifndef MIN
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
+
+/* 
+ *   clip region
+ */
+
+typedef struct _XRegion {
+    long size;
+    long numRects;
+    BOX *rects;
+    BOX extents;
+} REGION;
+
+/* Xutil.h contains the declaration: 
+ * typedef struct _XRegion *Region; 
+ */   
+
+/*  1 if two BOXs overlap.
+ *  0 if two BOXs do not overlap.
+ *  Remember, x2 and y2 are not in the region 
+ */
+#define EXTENTCHECK(r1, r2) \
+	((r1)->x2 > (r2)->x1 && \
+	 (r1)->x1 < (r2)->x2 && \
+	 (r1)->y2 > (r2)->y1 && \
+	 (r1)->y1 < (r2)->y2)
+
+/*
+ *  update region extents
+ */
+#define EXTENTS(r,idRect){\
+            if((r)->x1 < (idRect)->extents.x1)\
+              (idRect)->extents.x1 = (r)->x1;\
+            if((r)->y1 < (idRect)->extents.y1)\
+              (idRect)->extents.y1 = (r)->y1;\
+            if((r)->x2 > (idRect)->extents.x2)\
+              (idRect)->extents.x2 = (r)->x2;\
+            if((r)->y2 > (idRect)->extents.y2)\
+              (idRect)->extents.y2 = (r)->y2;\
+        }
+
+/*
+ *   Check to see if there is enough memory in the present region.
+ */
+#define MEMCHECK(reg, rect, firstrect){\
+        if ((reg)->numRects >= ((reg)->size - 1)){\
+          (firstrect) = (BOX *) Xrealloc \
+          ((char *)(firstrect), (unsigned) (2 * (sizeof(BOX)) * ((reg)->size)));\
+          if ((firstrect) == 0)\
+            return(0);\
+          (reg)->size *= 2;\
+          (rect) = &(firstrect)[(reg)->numRects];\
+         }\
+       }
+
+/*  this routine checks to see if the previous rectangle is the same
+ *  or subsumes the new rectangle to add.
+ */
+
+#define CHECK_PREVIOUS(Reg, R, Rx1, Ry1, Rx2, Ry2)\
+               (!(((Reg)->numRects > 0)&&\
+                  ((R-1)->y1 == (Ry1)) &&\
+                  ((R-1)->y2 == (Ry2)) &&\
+                  ((R-1)->x1 <= (Rx1)) &&\
+                  ((R-1)->x2 >= (Rx2))))
+
+/*  add a rectangle to the given Region */
+#define ADDRECT(reg, r, rx1, ry1, rx2, ry2){\
+    if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&\
+        CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\
+              (r)->x1 = (rx1);\
+              (r)->y1 = (ry1);\
+              (r)->x2 = (rx2);\
+              (r)->y2 = (ry2);\
+              EXTENTS((r), (reg));\
+              (reg)->numRects++;\
+              (r)++;\
+            }\
+        }
+
+
+
+/*  add a rectangle to the given Region */
+#define ADDRECTNOX(reg, r, rx1, ry1, rx2, ry2){\
+            if ((rx1 < rx2) && (ry1 < ry2) &&\
+                CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\
+              (r)->x1 = (rx1);\
+              (r)->y1 = (ry1);\
+              (r)->x2 = (rx2);\
+              (r)->y2 = (ry2);\
+              (reg)->numRects++;\
+              (r)++;\
+            }\
+        }
+
+#define EMPTY_REGION(pReg) pReg->numRects = 0
+
+#define REGION_NOT_EMPTY(pReg) pReg->numRects
+
+#define INBOX(r, x, y) \
+      ( ( ((r).x2 >  x)) && \
+        ( ((r).x1 <= x)) && \
+        ( ((r).y2 >  y)) && \
+        ( ((r).y1 <= y)) )
+
+/*
+ * number of points to buffer before sending them off
+ * to scanlines() :  Must be an even number
+ */
+#define NUMPTSTOBUFFER 200
+
+/*
+ * used to allocate buffers for points and link
+ * the buffers together
+ */
+typedef struct _POINTBLOCK {
+    XPoint pts[NUMPTSTOBUFFER];
+    struct _POINTBLOCK *next;
+} POINTBLOCK;
+
+#endif
--- a/gdk/x11/gdkfont-x11.c
+++ b/gdk/x11/gdkfont-x11.c
@@ -26,6 +26,7 @@ gdk_font_load (const gchar *font_name)
 {
  GdkFont *font;
  GdkFontPrivate *private;
+  static Atom font_atom = None;

  private = g_new (GdkFontPrivate, 1);
  font = (GdkFont*) private;
@@ -33,6 +34,7 @@ gdk_font_load (const gchar *font_name)
  private->xdisplay = gdk_display;
  private->xfont = XLoadQueryFont (private->xdisplay, font_name);
  private->ref_count = 1;
+  font->name = NULL;

  if (!private->xfont)
    {
@@ -41,9 +43,23 @@ gdk_font_load (const gchar *font_name)
    }
  else
    {
+      gchar* xfd = NULL;
+      unsigned long value;
      font->type = GDK_FONT_FONT;
      font->ascent =  ((XFontStruct *) private->xfont)->ascent;
      font->descent = ((XFontStruct *) private->xfont)->descent;
+      if ( font_atom != None )
+	font_atom = XInternAtom(private->xdisplay, "FONT", True);
+      if ( font_atom != None ) {
+	if (XGetFontProperty(private->xfont, font_atom, &value))
+	  xfd = XGetAtomName(private->xdisplay, value);
+	if (xfd) {
+	  font->name = g_strdup(xfd);
+	  XFree(xfd);
+	}
+      }
+      if ( font->name == NULL )
+      	font->name = g_strdup(font_name);
    }

  gdk_xid_table_insert (&((XFontStruct *) private->xfont)->fid, font);
@@ -103,6 +119,7 @@ gdk_fontset_load (gchar *fontset_name)
 	  font->ascent = MAX (font->ascent, font_structs[i]->ascent);
 	  font->descent = MAX (font->descent, font_structs[i]->descent);
 	}
+      font->name = g_strdup(fontset_name);
    }
  return font;
 }
@@ -144,6 +161,7 @@ gdk_font_unref (GdkFont *font)
 	  g_error ("unknown font type.");
 	  break;
 	}
+      g_free(font->name);
      g_free (font);
    }
 }
--- a/gdk/x11/gdkregion-x11.c
+++ b/gdk/x11/gdkregion-x11.c
@@ -22,8 +22,16 @@
 #include "gdk.h"
 #include "gdkprivate.h"

+#define Xmalloc g_malloc
+#define Xfree g_free
+#define Xrealloc g_realloc

+#include "Region.c"
+#include "PolyReg.c"

+#undef Xmalloc
+#undef Xfree
+#undef Xrealloc

 GdkRegion*
 gdk_region_new (void)
@@ -32,7 +40,7 @@ gdk_region_new (void)
  GdkRegion *region;
  Region xregion;

-  xregion = XCreateRegion();
+  xregion = GXCreateRegion();
  private = g_new (GdkRegionPrivate, 1);
  private->xregion = xregion;
  region = (GdkRegion*) private;
@@ -49,7 +57,7 @@ gdk_region_destroy (GdkRegion *region)
  g_return_if_fail (region != NULL);

  private = (GdkRegionPrivate *) region;
-  XDestroyRegion (private->xregion);
+  GXDestroyRegion (private->xregion);

  g_free (private);
 }
@@ -63,7 +71,7 @@ gdk_region_empty (GdkRegion      *region)

  private = (GdkRegionPrivate *) region;
  
-  return XEmptyRegion (private->xregion);
+  return GXEmptyRegion (private->xregion);
 }

 gboolean
@@ -79,7 +87,7 @@ gdk_region_equal (GdkRegion      *region1,
  private1 = (GdkRegionPrivate *) region1;
  private2 = (GdkRegionPrivate *) region2;
  
-  return XEqualRegion (private1->xregion, private2->xregion);
+  return GXEqualRegion (private1->xregion, private2->xregion);
 }

 void
@@ -93,7 +101,7 @@ gdk_region_get_clipbox(GdkRegion    *region,
 	g_return_if_fail(rectangle != NULL);

 	rp = (GdkRegionPrivate *)region;
-	XClipBox(rp->xregion, &r);
+	GXClipBox(rp->xregion, &r);

 	rectangle->x = r.x;
 	rectangle->y = r.y;	
@@ -112,7 +120,7 @@ gdk_region_point_in (GdkRegion      *region,

  private = (GdkRegionPrivate *) region;
  
-  return XPointInRegion (private->xregion, x, y);
+  return GXPointInRegion (private->xregion, x, y);
 }

 GdkOverlapType
@@ -126,7 +134,7 @@ gdk_region_rect_in (GdkRegion      *region,

  private = (GdkRegionPrivate *) region;
  
-  res = XRectInRegion (private->xregion, rect->x, rect->y, rect->width, rect->height);
+  res = GXRectInRegion (private->xregion, rect->x, rect->y, rect->width, rect->height);
  
  switch (res)
  {
@@ -162,7 +170,7 @@ gdk_region_polygon (GdkPoint    *points,
      break;
    }

-  xregion = XPolygonRegion ((XPoint *) points, npoints, xfill_rule);
+  xregion = GXPolygonRegion ((XPoint *) points, npoints, xfill_rule);
  private = g_new (GdkRegionPrivate, 1);
  private->xregion = xregion;
  region = (GdkRegion *) private;
@@ -182,7 +190,7 @@ gdk_region_offset (GdkRegion      *region,

  private = (GdkRegionPrivate *) region;
  
-  XOffsetRegion (private->xregion, dx, dy);
+  GXOffsetRegion (private->xregion, dx, dy);
 }

 void
@@ -196,7 +204,7 @@ gdk_region_shrink (GdkRegion      *region,

  private = (GdkRegionPrivate *) region;
  
-  XShrinkRegion (private->xregion, dx, dy);
+  GXShrinkRegion (private->xregion, dx, dy);
 }

 GdkRegion*    
@@ -220,7 +228,7 @@ gdk_region_union_with_rect (GdkRegion      *region,
  res = gdk_region_new ();
  res_private = (GdkRegionPrivate *) res;
  
-  XUnionRectWithRegion (&xrect, private->xregion, res_private->xregion);
+  GXUnionRectWithRegion (&xrect, private->xregion, res_private->xregion);
  
  return res;
 }
@@ -243,7 +251,7 @@ gdk_regions_intersect (GdkRegion      *source1,
  res = gdk_region_new ();
  res_private = (GdkRegionPrivate *) res;
  
-  XIntersectRegion (private1->xregion, private2->xregion, res_private->xregion);
+  GXIntersectRegion (private1->xregion, private2->xregion, res_private->xregion);
  
  return res;
 }
@@ -266,7 +274,7 @@ gdk_regions_union (GdkRegion      *source1,
  res = gdk_region_new ();
  res_private = (GdkRegionPrivate *) res;
  
-  XUnionRegion (private1->xregion, private2->xregion, res_private->xregion);
+  GXUnionRegion (private1->xregion, private2->xregion, res_private->xregion);
  
  return res;
 }
@@ -289,7 +297,7 @@ gdk_regions_subtract (GdkRegion      *source1,
  res = gdk_region_new ();
  res_private = (GdkRegionPrivate *) res;
  
-  XSubtractRegion (private1->xregion, private2->xregion, res_private->xregion);
+  GXSubtractRegion (private1->xregion, private2->xregion, res_private->xregion);
  
  return res;
 }
@@ -312,10 +320,36 @@ gdk_regions_xor (GdkRegion      *source1,
  res = gdk_region_new ();
  res_private = (GdkRegionPrivate *) res;
  
-  XXorRegion (private1->xregion, private2->xregion, res_private->xregion);
+  GXXorRegion (private1->xregion, private2->xregion, res_private->xregion);
  
  return res;
 }


+GdkRectangle*
+gdk_region_get_rectangles(GdkRegion *region, gint *nrects) 
+{
+  GdkRectangle *result;
+  GdkRegionPrivate *private;
+  struct _XRegion *r;
+  gint i;
+
+  g_return_val_if_fail (region != NULL, NULL);
+
+  private = (GdkRegionPrivate *) region;
+  r = (struct _XRegion*) private->xregion;
+
+  if (nrects)
+    *nrects = r->numRects;
+  if (!r->numRects)
+  	return NULL;
+  result = g_new(GdkRectangle, r->numRects);
+  for ( i=0; i < r->numRects; ++i ) {
+    result[i].x = r->rects[i].x1;
+    result[i].y = r->rects[i].y1;
+    result[i].width = r->rects[i].x2 - r->rects[i].x1;
+    result[i].height = r->rects[i].y2 - r->rects[i].y1;
+  }
+  return result;
+}

--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -374,6 +374,9 @@ gdk_window_new (GdkWindow     *parent,
 	case GDK_WINDOW_PIXMAP:
 	  g_error ("cannot make windows of type GDK_WINDOW_PIXMAP (use gdk_pixmap_new)");
 	  break;
+	case GDK_WINDOW_DRAWABLE:
+	  g_error ("cannot make windows of type GDK_WINDOW_DRAWABLE (use the drawable-specific functions)");
+	  break;
 	}
    }
  else
@@ -650,6 +653,11 @@ gdk_window_internal_destroy (GdkWindow *window, gboolean xdestroy,
    case GDK_WINDOW_PIXMAP:
      g_error ("called gdk_window_destroy on a pixmap (use gdk_pixmap_unref)");
      break;
+
+    case GDK_WINDOW_DRAWABLE:
+      if (private->engine->destroy)
+        private->engine->destroy(window);
+      break;
    }
 }

--- a/gtk/.cvsignore
+++ b/gtk/.cvsignore
@@ -9,6 +9,7 @@ testgtk
 testinput
 testselection
 testrgb
+testps
 simple
 testtree
 gtkfeatures.h
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -310,7 +310,7 @@ EXTRA_DIST = \

 INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@

-noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb testdnd simple 
+noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb testdnd simple testps

 # FIXME, we currently rely on linking against libglib-1.1

@@ -333,6 +333,7 @@ testselection_DEPENDENCIES = $(DEPS)
 testrgb_DEPENDENCIES = $(DEPS)
 testdnd_DEPENDENCIES = $(DEPS)
 simple_DEPENDENCIES = $(DEPS)
+testps_DEPENDENCIES = $(DEPS)

 testgtk_LDADD = $(LDADDS)
 testinput_LDADD = $(LDADDS)
@@ -341,6 +342,7 @@ testselection_LDADD = $(LDADDS)
 testrgb_LDADD = $(LDADDS)
 testdnd_LDADD = $(LDADDS)
 simple_LDADD = $(LDADDS)
+testps_LDADD = $(LDADDS)

 .PHONY: files test test-debug

--- a/gtk/Makefile.in
+++ b/gtk/Makefile.in
@@ -1,712 +0,0 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DISTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-CC = @CC@
-GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@
-GTK_MICRO_VERSION = @GTK_MICRO_VERSION@
-GTK_MINOR_VERSION = @GTK_MINOR_VERSION@
-GTK_VERSION = @GTK_VERSION@
-LD = @LD@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NM = @NM@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-x_cflags = @x_cflags@
-x_includes = @x_includes@
-x_ldflags = @x_ldflags@
-x_libs = @x_libs@
-xinput_progs = @xinput_progs@
-
-gtkincludedir = $(includedir)/gtk
-
-lib_LTLIBRARIES = libgtk-1.1.la
-
-libgtk_1_1_la_SOURCES = \
-	gtkaccelerator.c	\
-	gtkadjustment.c		\
-	gtkaspectframe.c	\
-	gtkalignment.c		\
-	gtkarrow.c		\
-	gtkbin.c		\
-	gtkbbox.c		\
-	gtkbox.c		\
-	gtkbutton.c		\
-	gtkcheckbutton.c	\
-	gtkcheckmenuitem.c	\
-	gtkclist.c		\
-	gtkcolorsel.c		\
-	gtkcombo.c		\
-	gtkcontainer.c		\
-	gtkctree.c		\
-	gtkcurve.c		\
-	gtkdata.c		\
-	gtkdialog.c		\
-	gtkdrawingarea.c	\
-	gtkeditable.c           \
-	gtkentry.c		\
-	gtkeventbox.c		\
-	gtkfilesel.c		\
-	gtkfixed.c		\
-	gtkframe.c		\
-	gtkgamma.c		\
-	gtkgc.c			\
-	gtkhandlebox.c		\
-	gtkhbbox.c		\
-	gtkhbox.c		\
-	gtkhpaned.c		\
-	gtkhruler.c		\
-	gtkhscale.c		\
-	gtkhscrollbar.c		\
-	gtkhseparator.c		\
-	gtkimage.c		\
-	gtkinputdialog.c	\
-	gtkitem.c		\
-	gtklabel.c		\
-	gtklist.c		\
-	gtklistitem.c		\
-	gtkmain.c		\
-	gtkmenu.c		\
-	gtkmenubar.c		\
-	gtkmenufactory.c	\
-	gtkmenuitem.c		\
-	gtkmenushell.c		\
-	gtkmisc.c		\
-	gtknotebook.c		\
-	gtkobject.c		\
-	gtkoptionmenu.c		\
-	gtkpaned.c		\
-	gtkpixmap.c		\
-	gtkpreview.c		\
-	gtkprogressbar.c	\
-	gtkradiobutton.c	\
-	gtkradiomenuitem.c	\
-	gtkrange.c		\
-	gtkrc.c			\
-	gtkruler.c		\
-	gtkscale.c		\
-	gtkscrollbar.c		\
-	gtkscrolledwindow.c	\
-	gtkselection.c		\
-	gtkseparator.c		\
-	gtksignal.c		\
-	gtkspinbutton.c		\
-	gtkstyle.c		\
-	gtkstatusbar.c		\
-	gtktable.c		\
-	gtktext.c		\
-	gtktipsquery.c		\
-	gtktogglebutton.c	\
-	gtktoolbar.c		\
-	gtktooltips.c		\
-	gtktree.c		\
-	gtktreeitem.c		\
-	gtktypeutils.c		\
-	gtkvbbox.c		\
-	gtkvbox.c		\
-	gtkviewport.c		\
-	gtkvpaned.c		\
-	gtkvruler.c		\
-	gtkvscale.c		\
-	gtkvscrollbar.c		\
-	gtkvseparator.c		\
-	gtkwidget.c		\
-	gtkwindow.c		\
-	fnmatch.c		\
-	fnmatch.h
-
-gtkinclude_HEADERS = \
-	gtk.h			\
-	gtkaccelerator.h	\
-	gtkadjustment.h		\
-	gtkaspectframe.h	\
-	gtkalignment.h		\
-	gtkarrow.h		\
-	gtkbin.h		\
-	gtkbbox.h		\
-	gtkbox.h		\
-	gtkbutton.h		\
-	gtkcheckbutton.h	\
-	gtkcheckmenuitem.h	\
-	gtkclist.h		\
-	gtkcolorsel.h		\
-	gtkcombo.h		\
-	gtkcontainer.h		\
-	gtkctree.h		\
-	gtkcurve.h		\
-	gtkdata.h		\
-	gtkdebug.h              \
-	gtkdialog.h		\
-	gtkdrawingarea.h	\
-	gtkeditable.h           \
-	gtkentry.h		\
-	gtkenums.h		\
-	gtkeventbox.h		\
-	gtkfeatures.h		\
-	gtkfilesel.h		\
-	gtkfixed.h		\
-	gtkframe.h		\
-	gtkgamma.h		\
-	gtkgc.h			\
-	gtkhandlebox.h		\
-	gtkhbbox.h		\
-	gtkhbox.h		\
-	gtkhpaned.h		\
-	gtkhruler.h		\
-	gtkhscale.h		\
-	gtkhscrollbar.h		\
-	gtkhseparator.h		\
-	gtkimage.h		\
-	gtkinputdialog.h	\
-	gtkitem.h		\
-	gtklabel.h		\
-	gtklist.h		\
-	gtklistitem.h		\
-	gtkmain.h		\
-	gtkmenu.h		\
-	gtkmenubar.h		\
-	gtkmenufactory.h	\
-	gtkmenuitem.h		\
-	gtkmenushell.h		\
-	gtkmisc.h		\
-	gtknotebook.h		\
-	gtkobject.h		\
-	gtkoptionmenu.h		\
-	gtkpaned.h		\
-	gtkpixmap.h		\
-	gtkpreview.h		\
-	gtkprivate.h		\
-	gtkprogressbar.h	\
-	gtkradiobutton.h	\
-	gtkradiomenuitem.h	\
-	gtkrange.h		\
-	gtkrc.h			\
-	gtkruler.h		\
-	gtkscale.h		\
-	gtkscrollbar.h		\
-	gtkscrolledwindow.h	\
-	gtkselection.h		\
-	gtkseparator.h		\
-	gtksignal.h		\
-	gtkspinbutton.h		\
-	gtkstyle.h		\
-	gtkstatusbar.h		\
-	gtktable.h		\
-	gtktext.h		\
-	gtktipsquery.h		\
-	gtktogglebutton.h	\
-	gtktoolbar.h		\
-	gtktooltips.h		\
-	gtktree.h		\
-	gtktreeitem.h		\
-	gtktypeutils.h		\
-	gtkvbbox.h		\
-	gtkvbox.h		\
-	gtkviewport.h		\
-	gtkvpaned.h		\
-	gtkvruler.h		\
-	gtkvscale.h		\
-	gtkvscrollbar.h		\
-	gtkvseparator.h		\
-	gtkwidget.h		\
-	gtkwindow.h             \
-	gtktypebuiltins.h
-
-libgtk_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
-EXTRA_DIST = \
-	line-arrow.xbm 		\
-	line-wrap.xbm 		\
-	testgtkrc 		\
-	testgtkrc2 		\
-	gtk.defs		\
-	gtkfeatures.h.in	\
-	runelisp 		\
-	gentypeinfo.el 		\
-	gtktypebuiltins.c	\
-	test.xpm		\
-	marble.xpm		\
-	3DRings.xpm		\
-	FilesQueue.xpm		\
-	Modeller.xpm		\
-	tree_plus.xpm		\
-	tree_minus.xpm		\
-	tree_plus.xbm		\
-	tree_minus.xbm          \
-        circles.xbm
-
-INCLUDES = -I$(top_srcdir) -I../glib -I$(top_srcdir)/glib @x_cflags@ 
-
-noinst_PROGRAMS = testgtk testinput testselection testthreads simple 
-
-# FIXME, we currently rely on linking against libglib-1.1
-
-DEPS =	\
-	libgtk-@LT_RELEASE@.la				\
-	$(top_builddir)/gdk/libgdk-@LT_RELEASE@.la	\
-	$(top_builddir)/glib/libglib-1.1.la
-LDADDS = \
-	libgtk-@LT_RELEASE@.la				\
-	$(top_builddir)/gdk/libgdk-@LT_RELEASE@.la	\
-	@x_ldflags@					\
-	@x_libs@					\
-	$(top_builddir)/glib/libglib-1.1.la		\
-	-lm
-
-testgtk_DEPENDENCIES = $(DEPS)
-testinput_DEPENDENCIES = $(DEPS)
-testthreads_DEPENDENCIES = $(DEPS)
-testselection_DEPENDENCIES = $(DEPS)
-simple_DEPENDENCIES = $(DEPS)
-
-testgtk_LDADD = $(LDADDS)
-testinput_LDADD = $(LDADDS)
-testthreads_LDADD = $(LDADDS)
-testselection_LDADD = $(LDADDS)
-simple_LDADD = $(LDADDS)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES =  gtkfeatures.h
-LTLIBRARIES =  $(lib_LTLIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-libgtk_1_1_la_LIBADD = 
-libgtk_1_1_la_OBJECTS =  gtkaccelerator.lo gtkadjustment.lo \
-gtkaspectframe.lo gtkalignment.lo gtkarrow.lo gtkbin.lo gtkbbox.lo \
-gtkbox.lo gtkbutton.lo gtkcheckbutton.lo gtkcheckmenuitem.lo \
-gtkclist.lo gtkcolorsel.lo gtkcombo.lo gtkcontainer.lo gtkctree.lo \
-gtkcurve.lo gtkdata.lo gtkdialog.lo gtkdrawingarea.lo gtkeditable.lo \
-gtkentry.lo gtkeventbox.lo gtkfilesel.lo gtkfixed.lo gtkframe.lo \
-gtkgamma.lo gtkgc.lo gtkhandlebox.lo gtkhbbox.lo gtkhbox.lo \
-gtkhpaned.lo gtkhruler.lo gtkhscale.lo gtkhscrollbar.lo \
-gtkhseparator.lo gtkimage.lo gtkinputdialog.lo gtkitem.lo gtklabel.lo \
-gtklist.lo gtklistitem.lo gtkmain.lo gtkmenu.lo gtkmenubar.lo \
-gtkmenufactory.lo gtkmenuitem.lo gtkmenushell.lo gtkmisc.lo \
-gtknotebook.lo gtkobject.lo gtkoptionmenu.lo gtkpaned.lo gtkpixmap.lo \
-gtkpreview.lo gtkprogressbar.lo gtkradiobutton.lo gtkradiomenuitem.lo \
-gtkrange.lo gtkrc.lo gtkruler.lo gtkscale.lo gtkscrollbar.lo \
-gtkscrolledwindow.lo gtkselection.lo gtkseparator.lo gtksignal.lo \
-gtkspinbutton.lo gtkstyle.lo gtkstatusbar.lo gtktable.lo gtktext.lo \
-gtktipsquery.lo gtktogglebutton.lo gtktoolbar.lo gtktooltips.lo \
-gtktree.lo gtktreeitem.lo gtktypeutils.lo gtkvbbox.lo gtkvbox.lo \
-gtkviewport.lo gtkvpaned.lo gtkvruler.lo gtkvscale.lo gtkvscrollbar.lo \
-gtkvseparator.lo gtkwidget.lo gtkwindow.lo fnmatch.lo
-PROGRAMS =  $(noinst_PROGRAMS)
-
-testgtk_SOURCES = testgtk.c
-testgtk_OBJECTS =  testgtk.o
-testgtk_LDFLAGS = 
-testinput_SOURCES = testinput.c
-testinput_OBJECTS =  testinput.o
-testinput_LDFLAGS = 
-testselection_SOURCES = testselection.c
-testselection_OBJECTS =  testselection.o
-testselection_LDFLAGS = 
-testthreads_SOURCES = testthreads.c
-testthreads_OBJECTS =  testthreads.o
-testthreads_LDFLAGS = 
-simple_SOURCES = simple.c
-simple_OBJECTS =  simple.o
-simple_LDFLAGS = 
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-HEADERS =  $(gtkinclude_HEADERS)
-
-DIST_COMMON =  Makefile.am Makefile.in gtkfeatures.h.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP = --best
-DEP_FILES =  .deps/fnmatch.P .deps/gtkaccelerator.P \
-.deps/gtkadjustment.P .deps/gtkalignment.P .deps/gtkarrow.P \
-.deps/gtkaspectframe.P .deps/gtkbbox.P .deps/gtkbin.P .deps/gtkbox.P \
-.deps/gtkbutton.P .deps/gtkcheckbutton.P .deps/gtkcheckmenuitem.P \
-.deps/gtkclist.P .deps/gtkcolorsel.P .deps/gtkcombo.P \
-.deps/gtkcontainer.P .deps/gtkctree.P .deps/gtkcurve.P .deps/gtkdata.P \
-.deps/gtkdialog.P .deps/gtkdrawingarea.P .deps/gtkeditable.P \
-.deps/gtkentry.P .deps/gtkeventbox.P .deps/gtkfilesel.P \
-.deps/gtkfixed.P .deps/gtkframe.P .deps/gtkgamma.P .deps/gtkgc.P \
-.deps/gtkhandlebox.P .deps/gtkhbbox.P .deps/gtkhbox.P .deps/gtkhpaned.P \
-.deps/gtkhruler.P .deps/gtkhscale.P .deps/gtkhscrollbar.P \
-.deps/gtkhseparator.P .deps/gtkimage.P .deps/gtkinputdialog.P \
-.deps/gtkitem.P .deps/gtklabel.P .deps/gtklist.P .deps/gtklistitem.P \
-.deps/gtkmain.P .deps/gtkmenu.P .deps/gtkmenubar.P \
-.deps/gtkmenufactory.P .deps/gtkmenuitem.P .deps/gtkmenushell.P \
-.deps/gtkmisc.P .deps/gtknotebook.P .deps/gtkobject.P \
-.deps/gtkoptionmenu.P .deps/gtkpaned.P .deps/gtkpixmap.P \
-.deps/gtkpreview.P .deps/gtkprogressbar.P .deps/gtkradiobutton.P \
-.deps/gtkradiomenuitem.P .deps/gtkrange.P .deps/gtkrc.P \
-.deps/gtkruler.P .deps/gtkscale.P .deps/gtkscrollbar.P \
-.deps/gtkscrolledwindow.P .deps/gtkselection.P .deps/gtkseparator.P \
-.deps/gtksignal.P .deps/gtkspinbutton.P .deps/gtkstatusbar.P \
-.deps/gtkstyle.P .deps/gtktable.P .deps/gtktext.P .deps/gtktipsquery.P \
-.deps/gtktogglebutton.P .deps/gtktoolbar.P .deps/gtktooltips.P \
-.deps/gtktree.P .deps/gtktreeitem.P .deps/gtktypeutils.P \
-.deps/gtkvbbox.P .deps/gtkvbox.P .deps/gtkviewport.P .deps/gtkvpaned.P \
-.deps/gtkvruler.P .deps/gtkvscale.P .deps/gtkvscrollbar.P \
-.deps/gtkvseparator.P .deps/gtkwidget.P .deps/gtkwindow.P \
-.deps/simple.P .deps/testgtk.P .deps/testinput.P .deps/testselection.P \
-.deps/testthreads.P
-SOURCES = $(libgtk_1_1_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c simple.c
-OBJECTS = $(libgtk_1_1_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o simple.o
-
-all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .s
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-gtkfeatures.h: $(top_builddir)/config.status gtkfeatures.h.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-
-mostlyclean-libLTLIBRARIES:
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-
-distclean-libLTLIBRARIES:
-
-maintainer-clean-libLTLIBRARIES:
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
-	done
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libgtk-1.1.la: $(libgtk_1_1_la_OBJECTS) $(libgtk_1_1_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libgtk_1_1_la_LDFLAGS) $(libgtk_1_1_la_OBJECTS) $(libgtk_1_1_la_LIBADD) $(LIBS)
-
-mostlyclean-noinstPROGRAMS:
-
-clean-noinstPROGRAMS:
-	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-
-distclean-noinstPROGRAMS:
-
-maintainer-clean-noinstPROGRAMS:
-
-testgtk: $(testgtk_OBJECTS) $(testgtk_DEPENDENCIES)
-	@rm -f testgtk
-	$(LINK) $(testgtk_LDFLAGS) $(testgtk_OBJECTS) $(testgtk_LDADD) $(LIBS)
-
-testinput: $(testinput_OBJECTS) $(testinput_DEPENDENCIES)
-	@rm -f testinput
-	$(LINK) $(testinput_LDFLAGS) $(testinput_OBJECTS) $(testinput_LDADD) $(LIBS)
-
-testselection: $(testselection_OBJECTS) $(testselection_DEPENDENCIES)
-	@rm -f testselection
-	$(LINK) $(testselection_LDFLAGS) $(testselection_OBJECTS) $(testselection_LDADD) $(LIBS)
-
-testthreads: $(testthreads_OBJECTS) $(testthreads_DEPENDENCIES)
-	@rm -f testthreads
-	$(LINK) $(testthreads_LDFLAGS) $(testthreads_OBJECTS) $(testthreads_LDADD) $(LIBS)
-
-simple: $(simple_OBJECTS) $(simple_DEPENDENCIES)
-	@rm -f simple
-	$(LINK) $(simple_LDFLAGS) $(simple_OBJECTS) $(simple_LDADD) $(LIBS)
-
-install-gtkincludeHEADERS: $(gtkinclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(gtkincludedir)
-	@list='$(gtkinclude_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gtkincludedir)/$$p"; \
-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gtkincludedir)/$$p; \
-	done
-
-uninstall-gtkincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	list='$(gtkinclude_HEADERS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(gtkincludedir)/$$p; \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = gtk
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gtk/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
-include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-
-maintainer-clean-depend:
-	-rm -rf .deps
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).P -c $<
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<
-	@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
-	  < .deps/$(*F).p > .deps/$(*F).P
-	@-rm -f .deps/$(*F).p
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: install-libLTLIBRARIES
-	@$(NORMAL_INSTALL)
-
-install-data: install-gtkincludeHEADERS
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: uninstall-libLTLIBRARIES uninstall-gtkincludeHEADERS
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-	$(mkinstalldirs)  $(DATADIR)$(libdir) $(DATADIR)$(gtkincludedir)
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
-		mostlyclean-tags mostlyclean-depend mostlyclean-generic
-
-clean:  clean-libLTLIBRARIES clean-compile clean-libtool \
-		clean-noinstPROGRAMS clean-tags clean-depend \
-		clean-generic mostlyclean
-
-distclean:  distclean-libLTLIBRARIES distclean-compile distclean-libtool \
-		distclean-noinstPROGRAMS distclean-tags \
-		distclean-depend distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-libLTLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
-		maintainer-clean-depend maintainer-clean-generic \
-		distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
-clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
-uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
-distclean-compile clean-compile maintainer-clean-compile \
-mostlyclean-libtool distclean-libtool clean-libtool \
-maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
-distclean-noinstPROGRAMS clean-noinstPROGRAMS \
-maintainer-clean-noinstPROGRAMS uninstall-gtkincludeHEADERS \
-install-gtkincludeHEADERS tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-distclean-depend clean-depend maintainer-clean-depend info dvi \
-installcheck install-exec install-data install uninstall all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-$(srcdir)/gtktypebuiltins.h: @MAINT@ $(srcdir)/gtk.defs $(srcdir)/gentypeinfo.el
-	$(SHELL) $(srcdir)/runelisp $(srcdir)/gentypeinfo.el idmac $< $@
-
-$(srcdir)/gtktypebuiltins.c: @MAINT@ $(srcdir)/gtk.defs $(srcdir)/gentypeinfo.el
-	$(SHELL) $(srcdir)/runelisp $(srcdir)/gentypeinfo.el id $< $@
-
-.PHONY: files test test-debug
-
-files:
-	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
-	  echo $$p; \
-	done
-
-test: testgtk
-	builddir=`pwd`; cd $(top_builddir); top_builddir=`pwd`; \
-	cd $$builddir; cd $(srcdir); \
-	$(SHELL) $$top_builddir/libtool --mode=execute $$builddir/testgtk
-
-test-debug: testgtk
-	builddir=`pwd`; cd $(top_builddir); top_builddir=`pwd`; \
-	cd $$builddir; cd $(srcdir); \
-	$(SHELL) $$top_builddir/libtool --mode=execute gdb $$builddir/testgtk
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
--- a/gtk/testps.c
+++ b/gtk/testps.c
@@ -0,0 +1,195 @@
+#include <gtk/gtk.h>
+
+#include <stdio.h>
+#include <unistd.h>
+#include <time.h>
+
+gint a4w = 595;
+gint a4h = 842;
+
+GdkColor red;
+GdkColor blue;
+GdkColor green;
+GdkColor white;
+GdkColor black;
+GdkGC *gc;
+GdkColormap* cmap;
+GdkFont *font;
+int fsize;
+GdkPoint poly[] = {{10, 20}, {37,50}, {15,90}, {60,20}, {70,30}};
+GtkWidget *win;
+GtkWidget *vb;
+GtkWidget *sw;
+GtkWidget *pix;
+GdkPixmap* bp;
+GdkPixmap* xpm;
+GdkBitmap* bitmap;
+gint xpm_w, xpm_h;
+gint depth;
+gchar dashes[] = {1,2,3,4,5};
+gint ndashes=5;
+
+void page1(GdkDrawable* d, int print) {
+	if (print)
+		gdk_ps_drawable_page_start(d, 0, 1, 0, 72, a4w, a4h);
+	else {
+		d = gdk_pixmap_new(win->window, 300, 300, depth);
+		gdk_gc_set_foreground(gc, &white);
+		gdk_draw_rectangle(d, gc, 1, 0, 0, -1, -1);
+	}
+	gdk_gc_set_foreground(gc, &black);
+	gdk_gc_set_line_attributes(gc, 1, -1, GDK_CAP_BUTT, -1);
+	gdk_draw_polygon(d, gc, 0, poly, 5);
+	gdk_draw_line(d, gc, 20, 20, 100, 20);
+	gdk_draw_text(d, font, gc, 120, 20, "default", 7);
+	gdk_gc_set_foreground(gc, &red);
+	gdk_gc_set_line_attributes(gc, 2, -1, GDK_CAP_BUTT, -1);
+	gdk_draw_line(d, gc, 20, 40, 100, 40);
+	gdk_draw_text(d, font, gc, 120, 40, "butt", 4);
+	gdk_gc_set_line_attributes(gc, 4, -1, GDK_CAP_ROUND, -1);
+	gdk_draw_line(d, gc, 20, 60, 100, 60);
+	gdk_draw_text(d, font, gc, 120, 60, "round", 5);
+	gdk_gc_set_foreground(gc, &blue);
+	gdk_gc_set_line_attributes(gc, 8, -1, GDK_CAP_PROJECTING, -1);
+	gdk_draw_line(d, gc, 20, 80, 100, 80);
+	gdk_draw_text(d, font, gc, 120, 80, "projecting", 10);
+	gdk_gc_set_line_attributes(gc, 16, -1, GDK_CAP_NOT_LAST, -1);
+	gdk_draw_line(d, gc, 20, 100, 100, 100);
+	gdk_draw_text(d, font, gc, 120, 100, "(not last)", 10);
+	/*gdk_draw_pixmap(d, gc, xpm, 0, 0, 160, 100, xpm_w, xpm_h);
+	gdk_draw_pixmap(d, gc, bitmap, 0, 0, 160, 140, xpm_w, xpm_h);
+	*/
+	if (print)
+		gdk_ps_drawable_page_end(d);
+	else {
+		pix = gtk_pixmap_new(d, NULL);
+		gtk_widget_show(pix);
+		gtk_container_add(GTK_CONTAINER(vb), pix);
+	}
+
+}
+
+void page2(GdkDrawable* d, int print) {
+	GdkRectangle clip = {30, 30, 320, 350};
+	if (print)
+		gdk_ps_drawable_page_start(d, 0, 1, 0, 72, a4w, a4h);
+	else {
+		d = gdk_pixmap_new(win->window, 350, 350, depth);
+		gdk_gc_set_foreground(gc, &white);
+		gdk_draw_rectangle(d, gc, 1, 0, 0, -1, -1);
+	}
+	gdk_gc_set_foreground(gc, &blue);
+	gdk_draw_points(d, gc, poly, 5);
+	gdk_gc_set_clip_rectangle(gc, &clip);
+	gdk_draw_rectangle(d, gc, 0, 200, 200, 100, 300);
+	gdk_draw_rectangle(d, gc, 1, 0, 0, 300, 100);
+	gdk_draw_arc(d, gc, 0, 20, 20, 100, 100, 0, 60*64);
+	gdk_gc_set_foreground(gc, &red);
+	gdk_draw_arc(d, gc, 1, 200, 200, 100, 300, 0, 60*64);
+	gdk_gc_set_clip_rectangle(gc, NULL);
+	if (print)
+		gdk_ps_drawable_page_end(d);
+	else {
+		pix = gtk_pixmap_new(d, NULL);
+		gtk_widget_show(pix);
+		gtk_container_add(GTK_CONTAINER(vb), pix);
+	}
+}
+
+void page3(GdkDrawable* d, int print) {
+	GdkRectangle clip1 = {30, 30, 200, 200};
+	GdkRectangle clip2 = {150, 150, 200, 100};
+	GdkRegion *region1;
+	GdkRegion *region2;
+	gint len;
+
+	region1 = gdk_region_new();
+	region2 = gdk_region_union_with_rect(region1, &clip1);
+	gdk_region_destroy(region1);
+	region1 = gdk_region_union_with_rect(region2, &clip2);
+	gdk_region_destroy(region2);
+	gdk_gc_set_clip_rectangle(gc, NULL);
+	if (print)
+		gdk_ps_drawable_page_start(d, 0, 1, 0, 72, a4w, a4h);
+	else {
+		d = gdk_pixmap_new(win->window, 300, 300, depth);
+		gdk_gc_set_foreground(gc, &white);
+		gdk_draw_rectangle(d, gc, 1, 0, 0, -1, -1);
+	}
+	gdk_gc_set_clip_region(gc, region1);
+	gdk_gc_set_line_attributes(gc, 2, -1, GDK_CAP_BUTT, -1);
+	gdk_gc_set_foreground(gc, &green);
+	gdk_draw_rectangle(d, gc, 1, 10, 10, 580, 1180);
+	gdk_gc_set_foreground(gc, &red);
+	gdk_draw_string(d, font, gc, 50, fsize, "First line");
+	gdk_draw_string(d, font, gc, 50, fsize*2, "Second line");
+	gdk_draw_string(d, font, gc, 50, fsize*3, "Third line");
+	gdk_draw_string(d, font, gc, 50, fsize*4, "Fourth line");
+	gdk_draw_string(d, font, gc, 50, fsize*5, "Fifth line");
+	len = gdk_string_width(font, "Fifth line");
+	gdk_draw_string(d, font, gc, 50+len, fsize*5, "This continues right after line");
+	gdk_gc_set_foreground(gc, &black);
+	gdk_draw_rectangle(d, gc, 0, 50, fsize*5-font->ascent, len, font->ascent+font->descent);
+	gdk_gc_set_line_attributes(gc, 1, GDK_LINE_DOUBLE_DASH, GDK_CAP_BUTT, -1);
+	gdk_draw_rectangle(d, gc, 0, 50, 10+fsize*6, len, font->ascent+font->descent);
+	gdk_gc_set_dashes(gc, 0, dashes, ndashes);
+	gdk_draw_rectangle(d, gc, 0, 50+10+len, 10+fsize*6, len, font->ascent+font->descent);
+	if (print)
+		gdk_ps_drawable_page_end(d);
+	else {
+		pix = gtk_pixmap_new(d, NULL);
+		gtk_widget_show(pix);
+		gtk_container_add(GTK_CONTAINER(vb), pix);
+	}
+	gdk_region_destroy(region1);
+}
+
+int main(int argc, char* argv[]) {
+	GdkDrawable *d;
+
+	gtk_init(&argc, &argv);
+	win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_widget_realize(win);
+	sw = gtk_scrolled_window_new(NULL, NULL);
+	gtk_container_add(GTK_CONTAINER(win), sw);
+	vb = gtk_vbox_new(5, 5);
+	gtk_container_add(GTK_CONTAINER(sw), vb);
+	gc = gdk_gc_new(win->window);
+	font = gdk_font_load(argc>1?argv[1]:"-adobe-helvetica-medium-r-*");
+	gdk_window_get_geometry(win->window, NULL, NULL, NULL, NULL, &depth);
+	gtk_signal_connect(GTK_OBJECT(win), "delete_event", 
+		(GtkSignalFunc)gtk_main_quit, NULL);
+	gtk_widget_set_usize(win, 350, 450);
+	if (!font)
+		g_error("Cannot load font: %s\n", argv[1]);
+	cmap = gdk_colormap_get_system();
+	gdk_color_parse("red", &red);
+	gdk_color_parse("blue", &blue);
+	gdk_color_parse("steelblue", &green);
+	gdk_color_parse("white", &white);
+	gdk_color_parse("black", &black);
+	gdk_color_alloc(cmap, &red);
+	gdk_color_alloc(cmap, &blue);
+	gdk_color_alloc(cmap, &green);
+	gdk_color_alloc(cmap, &white);
+	gdk_color_alloc(cmap, &black);
+
+	fsize = font->ascent+font->descent;
+
+	xpm = gdk_pixmap_create_from_xpm(win->window, &bitmap, &white, "test.xpm");
+	gdk_window_get_size(xpm, &xpm_w, &xpm_h);
+	
+	d = gdk_ps_drawable_new(1, "Test for GdkPs", "lupus");
+	page1(d, 1);
+	page1(NULL, 0);
+	page2(d, 1);
+	page2(NULL, 0);
+	page3(d, 1);
+	page3(NULL, 0);
+	gdk_ps_drawable_end(d);
+	gtk_widget_show_all(win);
+	gtk_main();
+	gdk_window_destroy(d);
+	return 0;
+}
+
Author	SHA1	Message	Date
Paolo Molaro	01f28e3fdf	Fri, 13 Nov 1998 18:54:13 +0100 Paolo Molaro <lupus@debian.org> Fri, 13 Nov 1998 18:54:13 +0100 Paolo Molaro <lupus@debian.org> * gdk/Makefile.am: added poly.h to EXTRA_DIST. * gdk/gdkgc.c: support dashes in GdkGCPrivate * gdk/gdkprivate.h: move here GdkPsDrawable definition * gdk/gdkdrawable.c: gdk_drawable_register returns an int * gdk/gdkps.c: beginning support for pixmaps, better guessing of postscript font name, beginning of downloading function, better emulation of dashed lines, * gtk/testps.c: better example to show pixmaps, dashes, font size and a4 page size. There is some bug in the pixmap code: try to enable it in testps.c and enjoy a badmatch from XInternAtom:-):-) Anyone care to look into this? Thanks.	1998-11-13 17:54:36 +00:00
Paolo Molaro	68d9165f5c	Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org> Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org> * gdk/gdkps.c: fixed silly error. * gtk/testps.c: test for string length (X<->PS).	1998-10-21 17:30:13 +00:00
Paolo Molaro	457984f991	Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org> Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org> * gdk/gdkps.c: better guessing of postscript font names and misc fixes. * gtk/Makefile.am: compile testps.c	1998-10-21 17:14:31 +00:00
Paolo Molaro	77336fd714	Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org> Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org> * gdk/gdkprivate.h: GdkGCPrivate now stores complete info about color, clip-rectangles (not for bitmaps yet) and dashes. GdkWindowPrivate now has a GdkDrawableClass member to allow for customized draw operations. * gdk/gdktypes.h: GdkFont now has a name member; new GDK_WINDOW_DRAWABLE type for GdkWindow; new structure GdkDrawableClass. * gdk/gdkdraw.c: use engine-specific functions to draw. * gdk/gdkwindow.c: handle destroy of GDK_WINDOW_DRAWABLE. * gdk/gdkps.[ch]: postscript drawable engine. * gdk/gdkdrawable.c: drawable engine registration. * gdk/gdk.h: include drawable engine headers and declare engine registration function. New function: gdk_region_get_rectangles(). * gdk/gdkfont.c: store the name of the font loaded (needs work for fontset). * gdk/gdkgc.c: handle changes to GdkGCPrivate. * gdk/gdkregion.c: use our own functions for Region handling (stolen from X 6.3: Region.c region.h poly.h PolyReg.c). * gtk/testps.c: test postscript backend.	1998-10-20 16:22:48 +00:00