Initial import of gdk-pixbuf-based engine

By order of jrb:
	const patch for various bits,
	io-gif.c fixup for animations.

.cvsignore

@@ -1,6 +1,7 @@
 *.lo
 config.log
 config.h
+config.h.in
 libtool
 config.status
 stamp-h
@@ -10,4 +11,10 @@ aclocal.m4
 configure
 gtk-config
 config.cache
-
+ABOUT-NLS
+intl
+stamp-h.in
+gtk+.spec
+missing
+install-sh
+mkinstalldirs

AUTHORS

@@ -4,20 +4,26 @@ Peter Mattis      <petm@xcf.berkeley.edu>
 Spencer Kimball   <spencer@xcf.berkeley.edu>
 Josh MacDonald    <jmacd@xcf.berkeley.edu>
 
+Please do not mail the original authors asking questions about this 
+version of GTK+.
 
 The GTK+ Team (in alphabetical order)
 -------------------------------------
 Shawn T. Amundson <amundson@gtk.org>
-Jerome Bolliet    <bolliet@in2p3.fr>
+Jerome Bolliet    <bolliet@gtk.org>
+Damon Chaplin     <damon@gtk.org>
 Tony Gale         <gale@gtk.org>
+Jeff Garzik       <jgarzik@gtk.org>
 Lars Hamann       <lars@gtk.org>
+Raja R Harinath   <harinath@gtk.org>
+Carsten Haitzler  <raster@gtk.org>
 Tim Janik         <timj@gtk.org>
 Stefan Jeske      <stefan@gtk.org>
 Elliot Lee        <sopwith@gtk.org>
 Raph Levien       <raph@gtk.org>
 Ian Main          <imain@gtk.org>
-Fedrerico Mena    <quartic@gtk.org>
-Paolo Molaro      <lupus@lettere.unipd.it>
+Federico Mena     <quartic@gtk.org>
+Paolo Molaro      <lupus@gtk.org>
 Jay Painter       <jpaint@gtk.org>
 Manish Singh      <manish@gtk.org>
 Owen Taylor       <otaylor@gtk.org>

HACKING

@@ -1,11 +1,13 @@
 If you want to hack on the Gtk+ project, it will make you life easier
 to have the following packages installed:
 
-	- GNU autoconf 2.12
-	- GNU automake 1.3
+	- GNU autoconf 2.13
+	- GNU automake 1.4
 	        (Beta releases are at ftp://ftp.cygnus.com/pub/tromey)
-	- GNU libtool 1.2b
+	- GNU libtool 1.2d
 	- indent (GNU indent 1.9.1 is known good)
+	- GNU gettext 10.35
+		Available in ftp://alpha.gnu.org/gnu
 
 These should be available by ftp from ftp.gnu.org or any of the
 fine GNU mirrors.  Beta software can be found at alpha.gnu.org.

INSTALL

@@ -7,12 +7,12 @@ you got this package.
 Simple install procedure
 ========================
 
-  % gzip -cd gtk+-1.1.2.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-1.1.2                          # change to the toplevel directory
-  % ./configure                            # run the `configure' script
-  % make                                   # build GTK
+  % gzip -cd gtk+-1.2.5.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-1.2.5			   # change to the toplevel directory
+  % ./configure				   # run the `configure' script
+  % make				   # build GTK
   [ Become root if necessary ]
-  % make install                           # install GTK
+  % make install			   # install GTK
 
 The Nitty-Gritty
 ================
@@ -43,6 +43,13 @@ which form of support to use:
 
 For more information, follow the link from http://www.gtk.org
 
+*  --disable-nls           do not use Native Language Support
+
+If this flag is not specified, GTK+ will try to find
+and use the gettext() set of functions to provide translations
+of the strings in the standard dialogs into the
+user's native language.
+
 *  --enable-xim            support XIM [default=yes]
 
 Specifying --disable-xim will disable support for entering
@@ -50,7 +57,7 @@ internationalized text using X Input Methods. This will give some
 slight savings in speed and memory use and might be necessary
 with older versions of X.
 
-*  --with-locale=LOCALE   locale name you want to use
+*  --with-locale=LOCALE    locale name you want to use
 
 The --with-locale options is used to determine if your operating
 system has support for the locale you will be using. If not, X's
@@ -84,19 +91,43 @@ or,
 
  setenv CFLAGS -O2 ; ./configure  # csh and variants
 
+Native-Language Support and gettext()
+=====================================
 
-Using an uninstalled copy of GLIB
-=================================
+To provide native-language support (NLS) GTK+ uses the
+gettext() set of functions. These functions are found
+in the C library on many systems, such as the Solaris
+C library and the GNU C Library, version 2.
+
+If your C library does not provide the necessary functionality,
+you may wish to install the GNU gettext package. You'll
+need version 0.10.35 or better. Version 0.10.35 is
+available from ftp://alpha.gnu.org/pub/gnu
+
+Generally, GTK+ will properly detect what is installed
+on your system and enable or disable NLS as appropriate.
+However, in rare cases, it may be necessary to disable
+NLS manually to get GTK+ to compile. You can do this
+by specifying the --disable-nls flag when configuring
+GTK+.
+
+Using an uninstalled copy of GLIB [ Unsupported ]
+=================================================
 
 You can compile GTK+ against a copy of GLIB that you have not
 yet installed. To do this, give the --with-glib=DIR options
 to ./configure. For instance:
 
- ./configure --with-glib=../glib-1.1.3
+ ./configure --with-glib=../glib-1.2.5
 
 This, however, will not work if you built GLIB with different
 source and build directories.
 
+It is recommended that you install GLIB before compiling
+GTK+. The --with-glib option is not regularly tested
+and may not function correctly. In addition, 
+inter-library dependencies won't be generated when
+using --with-glib=.
 
 Installation directories
 ========================
@@ -126,7 +157,7 @@ For complete details, see the file docs/gtk-config.txt
 Notes for using XIM support for Japanese input
 ==============================================
 
-* There is a bug in older versions of kinput2 that will cause GTK
+* There is a bug in older versions of kinput2 that will cause GTK+
 to hang when destroying a text entry. The latest versions of
 kinput is available from:
 

INSTALL.in

@@ -0,0 +1,187 @@
+Prerequisites
+=============
+
+GTK+ requires the GLIB library, available at the same location as
+you got this package.
+
+Simple install procedure
+========================
+
+  % gzip -cd gtk+-@GTK_VERSION@.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-@GTK_VERSION@			   # change to the toplevel directory
+  % ./configure				   # run the `configure' script
+  % make				   # build GTK
+  [ Become root if necessary ]
+  % make install			   # install GTK
+
+The Nitty-Gritty
+================
+
+The 'configure' script can be given a number of options to enable
+and disable various features. For a complete list, type:
+
+  ./configure --help
+
+A few of the more important ones:
+
+*  --prefix=PREFIX         install architecture-independent files in PREFIX
+                           [ Defaults to /usr/local ]
+
+*  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                           [ Defaults to the value given to --prefix ]
+
+*  --with-xinput=[no/gxi/xfree] support XInput [default=no]
+
+The --with-xinput flag specifies whether to compile with support
+for the XInput extension (mainly used for graphics tablets), and
+which form of support to use:
+
+  no    : no support 
+  gxi   : Use generic XInput support
+  xfree : Use special features in the Wacom drivers in XFree86 3.3.1
+          and later.
+
+For more information, follow the link from http://www.gtk.org
+
+*  --disable-nls           do not use Native Language Support
+
+If this flag is not specified, GTK+ will try to find
+and use the gettext() set of functions to provide translations
+of the strings in the standard dialogs into the
+user's native language.
+
+*  --enable-xim            support XIM [default=yes]
+
+Specifying --disable-xim will disable support for entering
+internationalized text using X Input Methods. This will give some
+slight savings in speed and memory use and might be necessary
+with older versions of X.
+
+*  --with-locale=LOCALE    locale name you want to use
+
+The --with-locale options is used to determine if your operating
+system has support for the locale you will be using. If not, X's
+built in locale support will be used.
+
+Because of bugs in autoconf, it is necessary to specify this
+option even if your LANG environment variable is correctly set.
+
+This option does not determine which locale GTK will use at
+runtime. That will be determined from the usual environment
+variables.  If you will be using multiple locales with GTK,
+specify the one for which your operating system has the worst
+support for the --with-locale option.
+
+
+Options can be given to the compiler and linker by setting
+environment variables before running configure. A few of the more
+important ones:
+
+ CC       : The C compiler to use
+ CPPFLAGS : Flags for the C preprocesser such as -I and -D
+ CFLAGS   : C compiler flags
+
+The most important use of this is to set the
+optimization/debugging flags. For instance, to compile with no
+debugging information at all, run configure as:
+
+ CFLAGS=-O2 ./configure           # Bourne compatible shells (sh/bash/zsh)
+
+or,
+
+ setenv CFLAGS -O2 ; ./configure  # csh and variants
+
+Native-Language Support and gettext()
+=====================================
+
+To provide native-language support (NLS) GTK+ uses the
+gettext() set of functions. These functions are found
+in the C library on many systems, such as the Solaris
+C library and the GNU C Library, version 2.
+
+If your C library does not provide the necessary functionality,
+you may wish to install the GNU gettext package. You'll
+need version 0.10.35 or better. Version 0.10.35 is
+available from ftp://alpha.gnu.org/pub/gnu
+
+Generally, GTK+ will properly detect what is installed
+on your system and enable or disable NLS as appropriate.
+However, in rare cases, it may be necessary to disable
+NLS manually to get GTK+ to compile. You can do this
+by specifying the --disable-nls flag when configuring
+GTK+.
+
+Using an uninstalled copy of GLIB [ Unsupported ]
+=================================================
+
+You can compile GTK+ against a copy of GLIB that you have not
+yet installed. To do this, give the --with-glib=DIR options
+to ./configure. For instance:
+
+ ./configure --with-glib=../glib-@GTK_VERSION@
+
+This, however, will not work if you built GLIB with different
+source and build directories.
+
+It is recommended that you install GLIB before compiling
+GTK+. The --with-glib option is not regularly tested
+and may not function correctly. In addition, 
+inter-library dependencies won't be generated when
+using --with-glib=.
+
+Installation directories
+========================
+
+The location of the installed files is determined by the --prefix
+and --exec-prefix options given to configure. There are also more
+detailed flags to control individual directories. However, the
+use of these flags is not tested.
+
+One particular detail to note, is that the architecture-dependent
+include file glibconfig.h is installed in:
+
+  $exec_pref/lib/glib/include/
+
+if you have a version in $prefix/include, this is out of date
+and should be deleted.
+
+A shell script gtk-config is created during the configure
+process, and installed in the bin/ directory
+($exec_prefix/bin). This is used to determine the location of GTK
+when building applications.  If you move GTK after installation,
+it will be necessary to edit this file.
+
+For complete details, see the file docs/gtk-config.txt
+
+
+Notes for using XIM support for Japanese input
+==============================================
+
+* There is a bug in older versions of kinput2 that will cause GTK+
+to hang when destroying a text entry. The latest versions of
+kinput is available from:
+
+  ftp://ftp.sra.co.jp/pub/x11/kinput2
+
+* The locale information file for the ja_JP EUC locale
+distributed with some recent versions of X11 specifies to use the
+C library multibyte functions. Unless your C library has support
+for Japanese locales, this is incorrect, and will cause problems
+for GTK's internationalization.
+
+(In particular, this occurs with GNU libc 2.0 in which
+the multibyte functions always translate to and from UTF-8; but
+the problem may occur for other C libraries, and other operating
+systems as well.)
+
+To fix this, change the line:
+
+use_stdc_env		True
+
+to 
+
+use_stdc_env		False
+
+in the file /usr/X11R6/lib/X11/locale/ja_JP/XLC_LOCALE.
+
+

Makefile.am

@@ -1,28 +1,40 @@
-## Process this file with automake to produce Makefile.in
+## Makefile.am for GTK+
 
 SRC_SUBDIRS = gdk gtk
-SUBDIRS = $(SRC_SUBDIRS) docs
+SUBDIRS = po $(SRC_SUBDIRS) docs
 
 bin_SCRIPTS = gtk-config
 
+# require automake 1.4
+AUTOMAKE_OPTIONS = 1.4
+
 EXTRA_DIST =	\
 	HACKING		\
-	gtk+.spec	\
+	gtk+.spec.in	\
         gtk.m4          \
 	makecopyright	\
 	TODO		\
 	NEWS.pre-1-0	\
 	ChangeLog.pre-1-0	\
 	README.cvs-commits	\
-	examples/README.1ST	\
-	examples/extract.awk	\
-	examples/extract.sh	\
+	README.win32	\
+	intl/libgettext.h	\
+	intl/po2tbl.sed.in	\
 	examples/aspectframe/Makefile  \
 	examples/aspectframe/aspectframe.c  \
+	examples/Makefile  \
+	examples/README.1ST  \
+	examples/extract.awk  \
+	examples/extract.sh  \
+	examples/base/Makefile  \
+	examples/base/base.c  \
 	examples/buttons/Makefile  \
 	examples/buttons/buttons.c  \
 	examples/buttons/info.xpm  \
-	examples/clist/clist.c \
+	examples/calendar/Makefile  \
+	examples/calendar/gcalendar.c  \
+	examples/clist/Makefile  \
+	examples/clist/clist.c  \
 	examples/entry/Makefile  \
 	examples/entry/entry.c  \
 	examples/eventbox/Makefile  \
@@ -41,16 +53,13 @@ EXTRA_DIST =	\
 	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/menu/itemfactory.c  \
 	examples/notebook/Makefile  \
 	examples/notebook/notebook.c  \
-	examples/packer/Makefile  \
-	examples/packer/pack.c \
 	examples/packbox/Makefile  \
 	examples/packbox/packbox.c  \
+	examples/packer/Makefile  \
+	examples/packer/pack.c  \
 	examples/paned/Makefile  \
 	examples/paned/paned.c  \
 	examples/pixmap/Makefile  \
@@ -59,6 +68,8 @@ EXTRA_DIST =	\
 	examples/progressbar/progressbar.c  \
 	examples/radiobuttons/Makefile  \
 	examples/radiobuttons/radiobuttons.c  \
+	examples/rangewidgets/Makefile  \
+	examples/rangewidgets/rangewidgets.c  \
 	examples/rulers/Makefile  \
 	examples/rulers/rulers.c  \
 	examples/scribble-simple/Makefile  \
@@ -72,19 +83,37 @@ EXTRA_DIST =	\
 	examples/statusbar/statusbar.c  \
 	examples/table/Makefile  \
 	examples/table/table.c  \
+	examples/text/Makefile  \
+	examples/text/text.c  \
 	examples/tictactoe/Makefile  \
 	examples/tictactoe/tictactoe.c  \
 	examples/tictactoe/tictactoe.h  \
 	examples/tictactoe/ttt_test.c  \
+	examples/tree/Makefile  \
+	examples/tree/tree.c  \
 	examples/wheelbarrow/Makefile  \
 	examples/wheelbarrow/wheelbarrow.c  \
+	examples/fixed/fixed.c  \
+	examples/fixed/Makefile  \
+	examples/frame/frame.c  \
+	examples/frame/Makefile  \
+	examples/spinbutton/spinbutton.c  \
+	examples/spinbutton/Makefile  \
 	examples/find-examples.sh
 
+dist-hook: gtk+.spec
+	if test -e $(srcdir)/INSTALL.in && test -e $(srcdir)/README.in ; then \
+	     CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
+	     CONFIG_HEADERS= \
+	     $(SHELL) config.status \
+	     && cp INSTALL README $(distdir) ; \
+	fi \
+	&& cp gtk+.spec $(distdir)
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = gtk.m4
 
-.PHONY: files populate checkin release
+.PHONY: files release sanity snapshot
 
 files:
 	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
@@ -97,13 +126,13 @@ files:
 	  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:
+	rm -rf .deps */.deps
+	$(MAKE) distcheck
+
+sanity:
+	./sanity_check $(VERSION)
+
+
+snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`

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:

NEWS

@@ -1,3 +1,323 @@
+Overview of Changes in GTK+ 1.2.6:
+
+* container queue_resize fixes
+* gtk[vh]scale: minor fixups
+* rename idle to idle_id in testgtk to avoid conflicts with 
+  broken libs
+* More consistant naming of gtkrc files
+* Added language support: ro, uk
+
+Overview of Changes in GTK+ 1.2.5:
+
+* more GtkCTree and GtkWindow bug fixes.
+* more redraw/resize queue fixes, better expose event
+  discarding code.
+* more miscellaneous bugs fixed
+* new configure.in option --disable-rebuilds to completely disable
+  rebuilds of autogenerated sources.
+* check for 5.002 now, to avoid failing autogeneration build rules due
+  to old perl versions.
+* fonts (and fontsets) are cached now.
+* more autogeneration make rules and dependancy fixups, we should be
+  save with autogeneration up to make -j12 now ;)
+* new window position GTK_WIN_POS_CENTER_ALWAYS, which will recenter the
+  GtkWindow on every size change.
+* major rework of window manager hints handling code, fixed a bunch of
+  races with the new resizing code.
+* the new wm hints and resizing code is absolutely perfect and bug free now,
+  it only lacks testing ;)
+* fixed up various rc style memory prolems.
+* gtk_widget_modify_style() now properly changes the style of realized widgets
+  and references the style passed into it. if people worked around this bug,
+  this will introduce a slight memory leak in their code.
+  The code should typically look like:
+            GtkRcStyle *rc_style = gtk_rc_style_new ();
+            [...]
+            gtk_widget_modify_style (widget, rc_style);
+            gtk_rc_style_unref (rc_style);
+* fix problems with positioning menus offscreen.
+* GtkText fixes for some crashes and drawing errors.
+* Better handling for unexpected window destroys in GDK and GTK+.
+  This should make it possible to use a GtkPlug and catch the
+  case where its parent socket is randomly killed.
+* FAQ updates.
+* FileSelection i18n patches, RadioButton fixups.
+* many translation improvements.
+* miscellaneous other bugs fixed.
+
+Overview of Changes in GTK+ 1.2.4:
+
+* DnD improvements (drags can be canceled with Esc now).
+* suppressed configure event reordering in Gdk.
+* rewrite of Gtk's configure event handling.
+* major improvements for the object argument system (Elena Devdariani).
+* major bugfixes for threading, GtkNotebook, GtkItemFactory, GtkCList and
+  GtkCTree.
+* tutorial/FAQ updates, new file generation.txt on autogenerated sources.
+* configure's --with-glib= is "officially" unsupported.
+* upgrade to libtool 1.3.3.
+* various buglets fixed.
+
+Overview of Changes in GTK+ 1.2.3:
+
+* Upgrade to libtool 1.3
+* Check for dgettext (for systems with old versions of GNU Gettext)
+* Many bug fixes (see ChangeLog for details)
+
+Overview of Changes in GTK+ 1.2.2:
+
+* Improved Dnd behaviour with Motif applications.
+* Bug fixes for the Gtk selection code.
+* Minor bug fixes to the Gdk Atom cache and Dnd code (with --display option).
+* Bug fixes and leak plugs for the Gdk IM code.
+* Added gtk_object_get() facility to retrive object arguments easily.
+  The var args list expects ("arg-name", &value) pairs.
+* Fixed mapping for GdkInputCondition<->GIOCondition, this should fix
+  problems where closed pipes were no longer signalling GDK_INPUT_READ on
+  systems with a native poll().
+* Some cleanups to GtkLabel's memory allocation code (shouldn't leak memory
+  anymore).
+* We don't attempt to lookup xpm color "None" anymore, this should prevent
+  eXodus (commercial X windows server) from popping up a color dialog every
+  time a transparent pixmap is created.
+* Fixed bug where Gtk timout/idle handlers would execute without the global
+  Gdk lock being held.
+* Other minor bug fixes.
+
+Overview of Changes in GTK+ 1.2.1:
+
+* Many Bug fixes have been applied to the menu and accelerator code.
+* GtkItemFactory can "adopt" foreign menu items now and manage their
+  accelerator installation. This is often required to get GtkItemFactory
+  like accelerator propagation between different windows with the same
+  menu heirarchy and for centralized parsing and saving of accelerators.
+* GtkCList/GtkCTree buttons should always display correctly now.
+* Miscellaneous other bug fixes.
+
+What's New in GTK+ 1.2.0 (since 1.0.x):
+
+* New widgets: GtkFontSelector, GtkPacker, GtkItemFactory, GtkCTree,
+  GtkInvisible, GtkCalendar, GtkLayout, GtkPlug, GtkSocket
+* Many new features and robustness for existing widgets
+* Theme support
+* New DND implementation
+* Internationalization of standard dialogs
+* New key binding system
+* Tearoff menus and menu accelerators
+* Wide character support for entry and text
+* Resizing code has been overhauled
+* Queued redraws of partial areas
+* Far better support for object arguments
+* Speed optimizations
+* Runtime loading of dynamic modules
+* Support for GLib log domains
+* Tutorial improvements
+* A bug fix or two
+
+Overview of Changes in GTK+ 1.1.16:
+
+* Major fixes and improvements for handlebox
+* A change to the way widget->requisition works. Now,
+  widget->requisition is always what the widget requested,
+  unmodified by the usize. See Changes-1.2.txt for details.
+  This correct various bugs with gtk_widget_set_usize().
+* Fixes for XIM on X11R5 systems
+* Don't allow cut-and-paste of text in password-style entries
+* --enable-debug is now on by default for the development releaes.
+  (When compiling for "production", use --enable-debug=minimum)
+* Handle systems where Helvetica is not present more gracefully
+* Fixes for memory leaks
+* CList and CTree fixes
+* Bug fixes for drawing problems. 
+* Miscellaneous bug fixes to GtkLabel, GtkCList, GtkCTree,
+  GtkColorsel, Focusing, DND
+* Tutorial improvements
+
+Overview of Changes in GTK+ 1.1.15:
+
+* Tutorial Updates
+* Added --libs gthread to gtk-config 
+* Bug fixes
+
+What is new in GTK+ 1.1.14:
+
+* Additions to docs/Changes-1.2.txt
+* Just warn when loading theme engine fails
+* CLAMP GtkScale digits to a meaningful range
+* GTK_LOCALDIR is now defined in a better fashion
+* New functions (feature freeze, we know...):
+    gtk_menu_set_title()
+    gtk_toggle_button_get_active()
+* Some locale fixups in gtkrc code
+* Fixes to make gtk_radio_button_set_group() keep only
+  one radio button in the group active
+* Foreign windows are now always treated as viewable; this fixes
+  a problem where updating didn't occure properly in GtkPlug
+* DND fixes for 64 bit architectures, and for specifying operations 
+  with modifier keys.
+* Major revisions to GtkLayout: avoid having to create window
+  for NO_WINDOW children, adjust allocations of children as 
+  scrolled so queued draws work, and a resize is queued instead
+  of allocating directly in a put() or move()
+
+What is new in GTK+ 1.1.13:
+
+* Dnd and selection bug fixes and memory purification.
+* Widget sensitivity fixups.
+* Tooltips windows are now named "gtk-tooltips" so rc file rules
+  can match tooltips windows. Fixed interaction of tooltips and NO_WINDOW
+  widgets.
+* Spin buttons now update their values upon value retrival.
+* Overhaul of the resizing vs. redrawing logic to reduce redrawing needs
+  a lot. Gtk makes full use of the draw_area coalescing code now, which
+  got minorly improved as well.
+* Containers map their Gdk windows after their children now to reduce
+  expose event generation.
+* Gdk event queue fixups, this solves the double-click problems people were
+  recently having.
+* Account for the fact that GSource's are only properly reentrant from
+  within dispatch(), thus we don't do Gdk event processing from within
+  check() or prepare() anymore.
+* Rc files feature a bg_pixmap value of "<none>" now.
+* Improved session management support in Gdk.  
+* Automatic disabling of NLS if no gettext is found should work now.
+* Removed deprecated functions, docs/Changes-1.2.txt gives an overview.
+* Gtk+ development now requires GNU autoconf 2.13, GNU automake 1.4
+  and GNU libtool 1.2d.
+* More bug fixes all over the place.
+
+What is new in GTK+ 1.1.12:
+
+* Korean translation added
+* Fixed memory leaks
+* A few other bug fixes
+
+What is new in GTK+ 1.1.11:
+
+* Dutch, Japanese, Swedish, Polish, and Norwegian translations
+* Removed deprecated _interp variants: gtk_container_foreach_interp, 
+  gtk_idle_add_interp, gtk_timeout_add_interp, gtk_signal_connect_interp
+* Lots of cast corrections
+* Many fixes 
+
+What is new in GTK+ 1.1.9:
+
+* Check for broken glibc 2.0 mb functions and avoid them
+* Label and Entry display fixes 
+* Move main thread back to GDK, for locking when translating events
+* Bug fixes
+
+What is new in GTK+ 1.1.8:
+
+* Added support for gettext and the localization of the standard
+  dialogs.
+* Added line-wrapping for the label, and JUSTIFY_FILL
+* Support reordering via drag and drop in  CList and CTree.
+* Replaced GtkDrawWindow widget with a GTK_USER_DRAW flag
+* Extended gtkpaned API to support minimum sizes and proportional
+  resizing.
+* Changed the handling of shared memory segments so as to 
+  remove the need for GTK+ to set up signal handlers.
+* Re-implemented event loop in terms of the event loop
+  that has been added to GLib 1.1.8
+* Added 'grab_focus' signal to allow keyboard accelerators
+  for entries.
+* Load locale specific RC files if present.
+* Bug fixes.
+
+What is new in GTK+ 1.1.7:
+
+* Fixed memory mis-allocation in default files code
+* Various event handling fixes
+* Wide character support for entry and text
+* Destroy widgets _after_ propagating unrealize signals through 
+  widget heirarchy
+* Only build XIM-support if available
+* Tutorial and examples updates
+* Added gtk_drag_source_unset()
+
+What is new in GTK+ 1.1.6:
+
+* The signal system now features emission hooks whith special semantics,
+  refer to the ChangeLog for this.
+* Minor? speedups and memory reductions to the emission handling of the
+  signal system.
+* _interp() function variants are deprecated now. the corresponding *_full()
+  variants are provided for a long time now.
+* Dnd abort timeout increased to 10 minutes.
+* GtkScrolledWindow inherits from GtkBin now.
+* GTK_POLICY_NEVER is implemented for scrolled windows now.
+* Lots of API clean ups.
+* Incremental freezing abilities.
+* Integrated widgets from the GNOME tree: GtkLayout, GtkPlug and GtkSocket.
+* New window functions for transient relationship, default size, and 
+  geometry hints
+* Default rc files are now read in (<sysconfdir/etc/gtkrc and ~/.gtkrc)
+  GTK_RC_FILES environment variable and functions are provided to configure
+  this behavior
+* Read doc/Changes-1.2.txt to properly adapt your code.
+* Bug Fixes.
+
+What is new in GTK+ 1.1.5:
+
+* Theme integration
+* Widget style modification is now handled through GtkRcStyles
+* GtkPixmaps now grey out pixmaps when insensitive
+* Notebook enhancements
+* Shadow configurability for menubars and handleboxes
+* DND enhancements
+* gtkfilesel now supports automounters better
+* Implementation of expose compression
+* Queued redraws of partial areas
+* Scrolledwindow (+Viewport) source incompatibilities, children that are added
+  to a scrolled window don't get an automatic viewport anymore. a convenience
+  function gtk_scrolled_window_add_with_viewport() is suplied for this task
+* Deprecated functions will now issue a message, informing the programmer about
+  the use of this function. These functions will get removed in future versions
+* Non-functional functions got removed entirely
+* gtk_widget_new() and gtk_object_new() will now auto-construct new objects.
+  A new function gtk_object_default_construct() is provided now which should
+  be called after every gtk_type_new() to perfom the auto-construction
+* Improved argument support of several widgets
+* Bug Fixes
+
+What is new in GTK+ 1.1.3:
+
+* GtkCList/GtkCTree now have the ability to:
+    - hide/show individual columns
+    - disable/enable column resizing
+    - set min and max for column widths
+    - set expander style of the ctree
+    - set/get row and cell styles
+    - set spacing between tree expander and cell contents in ctree
+    - toggle auto_resize for columns
+* Must enhanced DND support, removed old DND code
+* Idle functions are now implemented via GHook, giving a slight speed
+  improvement
+* An environment variable GTK_MODULES which takes a colon seperated
+  list of module names GTK+ will now automatically load at gtk_init() startup
+* GtkFontSel now has support for an extra 'base' filter
+* New function gdk_window_set_root_origin to get the real geometry taking
+  into account window manager offsets
+* New function gtk_text_set_line_wrap to toggle line wrapping
+* New function gtk_widget_add_events which safely adds additional
+  events to a widget's event mask
+* New function gdk_event_get_time to get the timestamp from a generic
+  event
+* New widget GtkCalendar
+* New widget GtkInvisible - InputOnly offscreen windows used for reliable
+  pointer grabs and selection handling in DND code
+* New functions gtk_object_remove_no_notify[_by_id] to remove a certain
+  data portion without invokation of its destroy notifier 
+* gtk_spin_button_construct is now deprecated, use gtk_spin_button_configure
+  instead 
+* gtk_clist_set_border is now deprecated, use gtk_clist_set_shadow_type 
+  instead
+* Removed functions gtk_object_set_data_destroy[_by_id] 
+* Documentation additions/updates 
+* HTML and plain text files are now included in the distribution
+* Bug fixes, typeness corrections, and general fixups
+
 What is new in GTK+ 1.1.2:
 
 * Gtk+ is now featuring runtime loading of dynamic modules via the

README

@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is GTK+ version 1.1.2.   GTK+, which stands for the Gimp ToolKit, 
+This is GTK+ version 1.2.0.   GTK+, which stands for the Gimp ToolKit, 
 is a library for creating graphical user interfaces for the X Window 
 System. It is designed to be small, efficient, and flexible. GTK+ is 
 written in C with a very object-oriented approach.
@@ -26,13 +26,23 @@ See the file 'INSTALL'
 How to report bugs
 ==================
 
-To report a bug, send mail either to gtk-list, as mentioned
-above, or to gtk-bugs@gtk.org. If you send mail to gtk-list, you
-must be subscribed yourself.
+Bugs should be reported to the GNOME bug tracking
+system. (http://bugs.gnome.org). To report a problem
+about GTK+, send mail to submit@bugs.gnome.org.
 
-In the mail include:
+The subject of the mail should describe your problem.
+In the body of the mail, you should first include
+a "pseudo-header" that gives the package and 
+version number. This should be separated by a blank
+line from the actual headers.
 
-* The version of GTK
+ Package: gtk+
+ Version: 1.2.0
+
+[ Please substitute 1.2.0 with the version of GTK+ that
+  you have installed ]
+
+Then describe the bug. Include:
 
 * Information about your system. For instance:
 
@@ -64,6 +74,22 @@ In the mail include:
   is produced running the test program with the --sync command
   line option.
 
+An example of a bug report:
+
+====
+To: submit@bugs.gnome.org
+From: yourname@your.address.org
+Subject: handlebox test in testgtk is misnamed.
+
+Package: gtk+
+Version: 1.2.0
+
+When I run gtk/testgtk, the button "handle box"
+is misnamed. There are multiple handle boxes in
+the demo, so it should be "handle boxes", to
+be like "buttons" or "check buttons".
+===
+
 Patches
 =======
 

README.cvs-commits

@@ -43,6 +43,17 @@ Notes:
 * If you are going to be changing many files in an experimental fashion,
   it probably is a good idea to create a separate branch for your changes.
 
+* The ChangeLog entries should preferrably match in date format
+  with the existing entries. You can set how emacs does this
+  by using customize mode:
+
+  - M-x customize
+  - set Programming/Tools/ChangeLog/Add Log Time Format to
+    'Old Format'
+
+ Or, set the add-log-time-format to 'current-time-string in
+ your .emacs file.
+
 Owen Taylor
 13 Aug 1998
 

README.in

@@ -0,0 +1,101 @@
+General Information
+===================
+
+This is GTK+ version @GTK_VERSION@. GTK+, which stands for the Gimp ToolKit, 
+is a library for creating graphical user interfaces for the X Window 
+System. It is designed to be small, efficient, and flexible. GTK+ is 
+written in C with a very object-oriented approach.
+
+The official ftp site is:
+  ftp://ftp.gtk.org/pub/gtk
+
+The official web site is:
+  http://www.gtk.org/
+
+A mailing list is located at:
+  gtk-list@redhat.com
+
+To subscribe: mail -s subscribe gtk-list-request@redhat.com < /dev/null
+(Send mail to gtk-list-request@redhat.com with the subject "subscribe")
+
+Installation
+============
+
+See the file 'INSTALL'
+
+How to report bugs
+==================
+
+Bugs should be reported to the GNOME bug tracking
+system. (http://bugs.gnome.org). To report a problem
+about GTK+, send mail to submit@bugs.gnome.org.
+
+The subject of the mail should describe your problem.
+In the body of the mail, you should first include
+a "pseudo-header" that gives the package and 
+version number. This should be separated by a blank
+line from the actual headers.
+
+ Package: gtk+
+ Version: @GTK_VERSION@
+
+[ Please substitute @GTK_VERSION@ with the version of GTK+ that
+  you have installed ]
+
+Then describe the bug. Include:
+
+* Information about your system. For instance:
+
+   - What operating system and version
+   - What version of X
+   - For Linux, what version of the C library
+
+  And anything else you think is relevant.
+
+* How to reproduce the bug. 
+
+  If you can reproduce it with the testgtk program that is built 
+  in the gtk/ subdirectory, that will be most convenient.  Otherwise, 
+  please include a short test program that exhibits the behavior. 
+  As a last resort, you can also provide a pointer to a larger piece 
+  of software that can be downloaded.
+
+  (Bugs that can be reproduced within the  GIMP are almost as good 
+  as bugs that can be reproduced in testgtk. If you are reporting a 
+  bug found with the GIMP, please include the version number of the GIMP 
+  you are using)
+
+* If the bug was a crash, the exact text that was printed out
+  when the crash occured.
+
+* Further information such as stack traces may be useful, but
+  is not necessary. If you do send a stack trace, and the error
+  is an X error, it will be more useful if the stacktrace
+  is produced running the test program with the --sync command
+  line option.
+
+An example of a bug report:
+
+====
+To: submit@bugs.gnome.org
+From: yourname@your.address.org
+Subject: handlebox test in testgtk is misnamed.
+
+Package: gtk+
+Version: @GTK_VERSION@
+
+When I run gtk/testgtk, the button "handle box"
+is misnamed. There are multiple handle boxes in
+the demo, so it should be "handle boxes", to
+be like "buttons" or "check buttons".
+===
+
+Patches
+=======
+
+Patches can be uploaded to the incoming/ directory on
+ftp.gtk.org.  Please follow the instructions there, and include
+your name and email address in the README file.
+
+If the patch fixes a bug, it is usually a good idea to include
+all the information described in "How to Report Bugs".

README.win32

@@ -0,0 +1,39 @@
+The Win32 port of GTk+ is a work in progress, and not as stable or
+correct as the Unix/X11 version. For more information about the Win32
+port, see http://www.gimp.org/tml/gimp/win32/ or
+http://www.iki.fi/tml/gimp/win32/ .
+
+To build GTk+ on Win32, you need either the Microsoft compiler and
+tools, or gcc-2.95 or later running under cygwin-b20.1 or
+later. Compile in gdk\win32 and gtk with `nmake -f makefile.msc` or
+`make -f makefile.cygwin`. Before doing a install, check the BIN
+definition in gdk\win32\makefile.msc (or makefile.cygwin) and
+gtk\makefile.msc (or makefile.cygwin).
+
+See the README.win32 file in the GLib distribution for instructions
+how to build with gcc.
+
+To use GTk+ on Win32, you also need either of the above mentioned
+compilers. Other compilers might work, but don't count on it.  The
+same instructions on how to set up a correct version of gcc should
+also be followed if you want to build applications that use GTk+ with
+gcc.
+
+The tablet support uses the Wintab API. The Wintab development kit can
+be downloaded from http://www.pointing.com. If you don't care for
+that, undefine HAVE_WINTAB in config.h.win32 and remove references to
+the wntab32x library from the makefile before building.
+
+GTk+ wants to be built with the GNU "intl" library for
+internationalisation (i18n). Get the version ported to Win32 (not a
+very big deal) from tml's web site mentioned above. We build the
+"intl" library as a DLL called gnu-intl.dll (the "gnu" prefix is used
+to reduce name clash risks). If you don't want any i18n stuff,
+undefine ENABLE_NLS, HAVE_GETTEXT and HAVE_LIBINTL in the
+config.h.win32 file, and remove references to the gnu-intl library
+from the makefiles.
+
+Note that while the GNU gettext package is under the GPL, the "intl"
+part of it as distributed with GNU libc is under the LGPL (like GTk+
+or GLib). We want the LGPL one, even if they are the same, more or
+less.

TODO

@@ -1,129 +1,25 @@
-For 1.2.0 release:
--	remove deprecated functions from *.[hc] files, especially the
-	non-functional ones.
-	
-Bugs:
- * Widget redrawing when the window resizes sometimes messes up.
-   GtkLabels sometimes redraw without clearing up the underlying background on
-   window resizes.
 
- * Change bitfields to guints from enums, or vice versa?
-
- * MappingNotify events produce warnings.
-
- * gtk_widget_set_uposition can't handle negative x,y coordinates!
- 
- * the type system (gtktypeutils.c) has to handle creations of fundamental
-   types seperatedly from derived types, so we don't screw foreign
-   fundamental types with an already extensively increased seqno.
- 
- * Expose events aren't being generated correctly for DND demo
-
- * delay dnd settings to take effect once a widget is realized, this is
-   to avoid force realizations. i think this goes along with owens dnd
-   changes?
-    -timj
-   The way DND data types are set in GtkWidget really needs to be fixed.
-   This is pretty high on my priority list, and I'll get to it as soon as
-   the column list widget is done.  The correct way dnd data needs to be set
-   is to have a additional keyed data type with GtkWidget, which is applied to
-   the widget's window upon realize.
-   There also needs to be a way to set dnd-data on widget windows which are
-   not the main window (for widgets that create more than one window).
-    -Jay Painter
-   DnD seems to work for me, but yes, there needs to be some sort of
-   gtk_widget layer that makes it easier... Also, adding support for drop
-   zones might be nice.
-    -Elliot
-   This one is reproducabel for me:
-   testgtk --sync
-   popup colorselection
-   drag/drop works
-   start up preview color
-   drag works but not dropping
-   end preview color
-   drag/drop works
-   start up prewiev color
-   segfault in malloc
-    -timj
-
-Additions:
- * implement keyboard navigation in menus
+Outstanding items:
 
  * focus handling for GtkOptionMenu (needs the previous)
 
- * GScanner: it might be good to ues stdio and getch() instead of 1-character
-   reads. so one can take advantage of buffering. Currently each read() takes
-   a separate syscall.
-   
  * implement gtk_default_draw_oval and other missing things in gtkstyle.c.
  
- * Lists should scroll to center the recently selected item if it isn't
-   visible.
-
  * enforce invariants on *_RESIZE* and *_REDRAW* flags.
 
- * asure that child widgets are really get gtk_widget_destroy()ed in their
-   parents destroy handler, and not just unparented or somesuch.
-
- * GtkToolTips:
-   allocate GtkTooltipsData from memchunks
-   look into incorporation of outdated/gtk-dairiki-971208-[01].patch.gz
+ * GtkToolTips: allocate GtkTooltipsData from memchunks
                           
- * Change gtk_widget_propagate_default_style() mechanism to
-   void gtk_rc_string_export (const gchar *rc_additions,
-                              gboolean     override_rc_styles);
-
  * Make all widget attributes configurable after the widget is created (timj).
  
- * Widgets dervied from GtkButton need to be able to override
-   GtkButtonClass.paint. e.g. redrawing of GtkToggleButton with CAN_DEFAULT
-   is messed up otheriwse. This does in fact not only apply to (toggle)buttons,
-   we should introduce a common paint member for the GtkWidgetClass.
- 
- * Radio buttons need to display CAN/HAS_DEFAULT correctly.
+ * Radio buttons need to display CAN/HAS_DEFAULT correctly, if draw_inidicator
+   is TRUE. (Radio buttons do not need to CAN_DEFAULT! OWT)
 
- * GtkCList improvements. (Jay Painter)
+ * More dialogs: Print, maybe others...
 
- * Seperate GtkObject, type and signaling system from Gdk dependancies,
-   by moving them into a seperate libgtkobj.
- * move *_input_add (wrappers for select(2)) mechanism into glib.
-
- * Make sure a widget added to a list is a list item and a widget added
-   to a menu is a menu item, etc. GTK_BASIC was a first attempt at this,
-   but it fails with subsequent container_add()s. maybe have another
-   GTK_PARENT_BASIC (similar to GTK_PARENT_SENSITIVE) flag, to prevent
-   tree iterations upon every container addition.
-
- * gdk_expose_compress: ala-Xt, this would really help for opaque moves and
-   such
-
- * Entry should have a password mode (and it should show stars
-   for user feedback).
-
- * Entry should allow set_usize to work better, and should compute
-   a different width when a maximum length is used.
-
- * More dialogs: Print, GtkFontSelector, maybe others...
-
- * Multiple document interface (MDI)?
-
- * Support another widget style? Should be possible using GtkStyle's, but
-   there may be some work needed to remove any style dependencies in widget
-   code. Maybe GtkStyle's should have 'draw_push_button', 'draw_check_button',
-   etc, functions to draw the various widgets.
-   This will be covered by upcoming themability, raster is working on it.
- 
  * make the gtk_main callbacks consistent in their add/remove behaviour.
  
- * More work on Documentation
-
  * Check return values on all calls to XIC[Get/Set]Values
 
- * Rewrite the interface to the i18n stuff so GTK widgets don't need to
-   retrieve X values, and so they don't have to know the value of the
-   XNxxx character constants.
-
  * The "--geometry" option should be supported
 
   - Having gdk_init() parse the geometry option. (putting it into
@@ -146,68 +42,31 @@ Additions:
     ( You'd have to extend gdk_window_set_hints to accept the
       window gravity option to get it right. )
 
- ? Allow moving the separator for paned widgets by dragging 
+ * Allow moving the separator for paned widgets by dragging 
    it directly instead of using the handle. 
 
- ? Mark public use of gtk_tree_remove_item as deprecated - it should be used
-   as:
-         gtk_container_remove (GTK_CONTAINER(tree), widget);
-
- * Standardize that all strings should be passed as gchar *, not 
-   guchar *. But what about non-string data? (gdk_property_change,
-   gtk_selection_data_set) X makes these sort of things guchar...
-
  * Check into XAddConnectionWatch - is this needed for XIM?
 
  * Places where a _full variant is needed:
 
-    gtk_clist_set_row_data
     gtk_init_add
     gtk_menu_popup
     gtk_toolbar_prepend_element
     gtk_toolbar_insert_element
-    gtk_widget_dnd_data_set (should be guchar * with a copy?
-                             shouldn't be there at all...)
-    ??? GtkDrawingarea.draw_data
  
- * gtk_rc_add_[name/class]_style are broken for bg pixmaps, because
-   styles are broken for bg pixmaps, and RC styles only hack around
-   that.
-
  * Try to rationally deal with someone else deleting one of our
    windows??? This would mean keeping track of our window heirarchy
    ourselves, for one thing, and will never be safe, because of
    race conditions.
 
- * --g-fatal-warnings flag that does 
-        g_set_warning_handler ((GWarningHandler)g_error);
-
- * If a window spontaneously resizes itself N times before any
-   ConfigureNotify events are received, then due to the interaction
-   of the ConfigureNotify compression code in GDK and the resize
-   count used for the window, the window will be size_allocated
-   the next N-1 times it is moved.
-
-   Fix: Only send GDK_EVENT_CONFIGURE when the window is resized,
-   create a new event type for toplevel motion. (GDK_EVENT_REPOSITION?)
-   and eliminate the resize count in GtkWindow.
-
- * Generic ScrolledWindow interface, which provide automatic scrollbar
-   capability to Viewport, Text, and CList widgets.
-
- * GTK_POLICY_NEVER for scrolled windows.
-
- * Consider caching more state in GdkWindowPrivate. Currently, 
-   every widget realization involves a XGetGeometry and a
-   XGetWindowAttributes. And every GdkWindow destruction
-   involves a XQueryTree.
-
  * Should all the default handlers really return FALSE? This can
    cause confusing presses to be sent to containers that actually
    want to get events on themselves.
 
- * New signals to handle accelerators: accel_before and accel_after (or
-   somesuch) to pre and post process accelerator calls. [Yosh]
+ * The menu code should skip separators during keyboard navigation,
+   whether they are sensitive or insensitive.
+
+ * OwnerButtonPressGrab needs to go!
 
 Text/Edit widget:
 
@@ -218,7 +77,7 @@ Text/Edit widget:
   Improvements:
 
   - Unify the key binding support in some fashion between the
-    Entry and Text widget widgets (???)
+    Entry and Text widget widgets, use GtkBindings for this.
 
   - Figure out a way not to recompute the geometry on insertions/deletions
     which are large, but not a significant fraction of the
@@ -282,9 +141,33 @@ Text/Edit widget:
 
   - Delete IC in editable->unrealize, not editable->finalize?
 
+Themes
+======
+
+ - When a scale gets shown/hidden only queue a redraw on the
+   non-window portion, not the whole area.
+
+ - In various places, to avoid shaping windows excessively,
+   we set parent relative backgrounds. This is an ugly
+   hack and needs a better solution. Plus, I don't think
+   these parent-relative backgrounds always persist to
+   when they are actually needed.
+
+   Such calls exist in: GtkButton, GtkHandeBox, GtkItem,
+   GtkListItem, GtkMenu, GtkMenuItem, GtkMisc, 
+   GtkNoteBook, GtkOptionMenu, GtkPaned, GtkPreview,
+   GtkSpinButton and GtkTreeItem.
+
+ - For menus and for GtkWindow's, the realize() function
+   calls paint(), so that background pixmaps can be set
+   ahead of time, and prevent flashing when the window is
+   shown. This is an ugly hack and needs a better solution.
+
+=======
+
 Calendar Widget:
 
- - The widget should be nicely resizeable vertical to.
+ - The widget should be nicely resizeable vertical too.
 
  - CALENDAR_MARGIN should be removed, uses INNER_BORDER and
    style->class->[xy]thickness insted.

acconfig.h

@@ -15,27 +15,29 @@
 
 
 /* Other stuff */
+#undef ENABLE_NLS
 #undef GTK_COMPILED_WITH_DEBUGGING
 
+#undef HAVE_CATGETS
+#undef HAVE_DIRENT_H
+#undef HAVE_GETTEXT
 #undef HAVE_IPC_H
+#undef HAVE_LC_MESSAGES
+#undef HAVE_PWD_H
 #undef HAVE_SHM_H
+#undef HAVE_STPCPY
 #undef HAVE_XSHM_H
 #undef HAVE_SHAPE_EXT
 #undef HAVE_SYS_SELECT_H
+#undef HAVE_SYS_TIME_H
 #undef HAVE_XCONVERTCASE
 
-/* some systems do not allow to ipcrm pages prior to
- * actual usage, namely: OSF1 V3.2, SunOS 4.1.1, 5.5, 5.5.1, 5.6,
- * IRIX 5.2 and 6.2.
- */
-#undef IPC_RMID_DEFERRED_RELEASE
-
 #undef NO_FD_SET
 
 #undef RESOURCE_BASE
 
-/* Define to enable POSIX threading awareness */
-#undef USE_PTHREADS
+/* Define to use X11R6 additions to XIM */
+#undef USE_X11R6_XIM
 
 #undef XINPUT_NONE
 #undef XINPUT_GXI

acinclude.m4

@@ -1,6 +1,6 @@
 ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
-## Copyright (C) 1996-1998 Free Software Foundation, Inc.
-## Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+## Copyright (C) 1996-1999 Free Software Foundation, Inc.
+## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -21,28 +21,66 @@
 ## configuration script generated by Autoconf, you may include it under
 ## the same distribution terms that you use for the rest of that program.
 
-# serial 24 AM_PROG_LIBTOOL
-AC_DEFUN(AM_PROG_LIBTOOL,
-[AC_REQUIRE([AM_ENABLE_SHARED])dnl
-AC_REQUIRE([AM_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_RANLIB])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AM_PROG_LD])dnl
-AC_REQUIRE([AM_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-dnl
+# serial 40 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+
+# Save cache, so that ltconfig can load it
+AC_CACHE_SAVE
+
+# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+|| AC_MSG_ERROR([libtool configure failed])
+
+# Reload cache, that may have been modified by ltconfig
+AC_CACHE_LOAD
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 AC_SUBST(LIBTOOL)dnl
 
+# Redirect the config.log output again, so that the ltconfig log is not
+# clobbered by the next message.
+exec 5>>./config.log
+])
+
+AC_DEFUN(AC_LIBTOOL_SETUP,
+[AC_PREREQ(2.13)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+dnl
+
 # Check for any special flags to pass to ltconfig.
-libtool_flags=
+libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
+test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
 test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
 test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
+[libtool_flags="$libtool_flags --enable-dlopen"])
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+[libtool_flags="$libtool_flags --enable-win32-dll"])
+AC_ARG_ENABLE(libtool-lock,
+  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
+test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
@@ -68,30 +106,42 @@ case "$host" in
 
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
   ;;
-esac
 
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw*)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+])
+esac
 ])
 
-# AM_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AM_ENABLE_SHARED[(DEFAULT)]
+# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+
+# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+
+# AC_ENABLE_SHARED - implement the --enable-shared flag
+# Usage: AC_ENABLE_SHARED[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN(AM_ENABLE_SHARED,
-[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
 changequote(<<, >>)dnl
-<<  --enable-shared         build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT]
+<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
 changequote([, ])dnl
-[  --enable-shared=PKGS    only build shared libraries if the current package
-                          appears as an element in the PKGS list],
 [p=${PACKAGE-default}
 case "$enableval" in
 yes) enable_shared=yes ;;
@@ -108,29 +158,23 @@ no) enable_shared=no ;;
   IFS="$ac_save_ifs"
   ;;
 esac],
-enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl
+enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
 ])
 
-# AM_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN(AM_DISABLE_SHARED,
-[AM_ENABLE_SHARED(no)])
+# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)])
 
-# AM_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AM_DISABLE_STATIC,
-[AM_ENABLE_STATIC(no)])
-
-# AM_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AM_ENABLE_STATIC[(DEFAULT)]
+# AC_ENABLE_STATIC - implement the --enable-static flag
+# Usage: AC_ENABLE_STATIC[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN(AM_ENABLE_STATIC,
-[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
 changequote(<<, >>)dnl
-<<  --enable-static         build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT]
+<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
 changequote([, ])dnl
-[  --enable-static=PKGS    only build shared libraries if the current package
-                          appears as an element in the PKGS list],
 [p=${PACKAGE-default}
 case "$enableval" in
 yes) enable_static=yes ;;
@@ -147,26 +191,73 @@ no) enable_static=no ;;
   IFS="$ac_save_ifs"
   ;;
 esac],
-enable_static=AM_ENABLE_STATIC_DEFAULT)dnl
+enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
 ])
 
+# AC_DISABLE_STATIC - set the default static flag to --disable-static
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)])
 
-# AM_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN(AM_PROG_LD,
+
+# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
+# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+#   `yes'.
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(fast-install,
+changequote(<<, >>)dnl
+<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_fast_install=yes ;;
+no) enable_fast_install=no ;;
+*)
+  enable_fast_install=no
+  # Look at the argument we got.  We use all the common list separators.
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+  for pkg in $enableval; do
+    if test "X$pkg" = "X$p"; then
+      enable_fast_install=yes
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac],
+enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
+])
+
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)])
+
+# AC_PROG_LD - find the path to the GNU or non-GNU linker
+AC_DEFUN(AC_PROG_LD,
 [AC_ARG_WITH(gnu-ld,
 [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 ac_prog=ld
 if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   AC_MSG_CHECKING([for ld used by GCC])
   ac_prog=`($CC -print-prog-name=ld) 2>&5`
   case "$ac_prog" in
-  # Accept absolute paths.
-  /* | [A-Za-z]:\\*)
-    test -z "$LD" && LD="$ac_prog"
-    ;;
+    # Accept absolute paths.
+changequote(,)dnl
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+changequote([,])dnl
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
   "")
     # If it fails, then pretend we aren't using GCC.
     ac_prog=ld
@@ -183,10 +274,10 @@ else
 fi
 AC_CACHE_VAL(ac_cv_path_LD,
 [if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog"; then
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
@@ -194,7 +285,7 @@ AC_CACHE_VAL(ac_cv_path_LD,
       if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
-        test "$with_gnu_ld" != yes && break
+	test "$with_gnu_ld" != yes && break
       fi
     fi
   done
@@ -210,10 +301,10 @@ else
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_SUBST(LD)
-AM_PROG_LD_GNU
+AC_PROG_LD_GNU
 ])
 
-AC_DEFUN(AM_PROG_LD_GNU,
+AC_DEFUN(AC_PROG_LD_GNU,
 [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -223,37 +314,448 @@ else
 fi])
 ])
 
-# AM_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN(AM_PROG_NM,
+# AC_PROG_NM - find the path to a BSD-compatible name lister
+AC_DEFUN(AC_PROG_NM,
 [AC_MSG_CHECKING([for BSD-compatible nm])
 AC_CACHE_VAL(ac_cv_path_NM,
-[case "$NM" in
-/* | [A-Za-z]:\\*)
-  ac_cv_path_NM="$NM" # Let the user override the test with a path.
-  ;;
-*)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
+[if test -n "$NM"; then
+  # Let the user override the test.
+  ac_cv_path_NM="$NM"
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
       if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -B"
+	ac_cv_path_NM="$ac_dir/nm -B"
+	break
       elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -p"
+	ac_cv_path_NM="$ac_dir/nm -p"
+	break
       else
-        ac_cv_path_NM="$ac_dir/nm"
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+	continue # so that we can try to find one that supports BSD flags
       fi
-      break
     fi
   done
   IFS="$ac_save_ifs"
   test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-  ;;
-esac])
+fi])
 NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])
 AC_SUBST(NM)
 ])
+
+# AC_CHECK_LIBM - check for math library
+AC_DEFUN(AC_CHECK_LIBM,
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case "$host" in
+*-*-beos* | *-*-cygwin*)
+  # These system don't have libm
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, main, LIBM="-lm")
+  ;;
+esac
+])
+
+# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case "$enable_ltdl_convenience" in
+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+  "") enable_ltdl_convenience=yes
+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+  esac
+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
+])
+
+# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  AC_CHECK_LIB(ltdl, main,
+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+  [if test x"$enable_ltdl_install" = xno; then
+     AC_MSG_WARN([libltdl not installed, but installation disabled])
+   else
+     enable_ltdl_install=yes
+   fi
+  ])
+  if test x"$enable_ltdl_install" = x"yes"; then
+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
+  else
+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+    LIBLTDL="-lltdl"
+    INCLTDL=
+  fi
+])
+
+dnl old names
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
+
+dnl This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])dnl
+
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# Modified to never use included libintl. 
+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
+#
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 5
+
+AC_DEFUN(AM_GTK_WITH_NLS,
+  [AC_MSG_CHECKING([whether NLS is requested])
+    dnl Default is enabled NLS
+    AC_ARG_ENABLE(nls,
+      [  --disable-nls           do not use Native Language Support],
+      USE_NLS=$enableval, USE_NLS=yes)
+    AC_MSG_RESULT($USE_NLS)
+    AC_SUBST(USE_NLS)
+
+    USE_INCLUDED_LIBINTL=no
+
+    dnl If we use NLS figure out what method
+    if test "$USE_NLS" = "yes"; then
+#      AC_DEFINE(ENABLE_NLS)
+#      AC_MSG_CHECKING([whether included gettext is requested])
+#      AC_ARG_WITH(included-gettext,
+#        [  --with-included-gettext use the GNU gettext library included here],
+#        nls_cv_force_use_gnu_gettext=$withval,
+#        nls_cv_force_use_gnu_gettext=no)
+#      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+      nls_cv_force_use_gnu_gettext="no"
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If gettext or catgets are available (in this order) we
+        dnl use this.  Else we have to fall back to GNU NLS library.
+	dnl catgets is only used if permitted by option --with-catgets.
+	nls_cv_header_intl=
+	nls_cv_header_libgt=
+	CATOBJEXT=NONE
+
+	AC_CHECK_HEADER(libintl.h,
+	  [AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+	    [AC_TRY_LINK([#include <libintl.h>], [return (int) dgettext ("","")],
+	       gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no)])
+
+	   if test "$gt_cv_func_dgettext_libc" != "yes"; then
+	     AC_CHECK_LIB(intl, bindtextdomain,
+	       [AC_CACHE_CHECK([for dgettext in libintl],
+		 gt_cv_func_dgettext_libintl,
+		 [AC_CHECK_LIB(intl, dgettext,
+		  gt_cv_func_dgettext_libintl=yes,
+		  gt_cv_func_dgettext_libintl=no)],
+		 gt_cv_func_dgettext_libintl=no)])
+	   fi
+
+	   if test "$gt_cv_func_dgettext_libc" = "yes" \
+	      || test "$gt_cv_func_dgettext_libintl" = "yes"; then
+	      AC_DEFINE(HAVE_GETTEXT)
+	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+	      if test "$MSGFMT" != "no"; then
+		AC_CHECK_FUNCS(dcgettext)
+		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+		AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+			       return _nl_msg_cat_cntr],
+		  [CATOBJEXT=.gmo
+		   DATADIRNAME=share],
+		  [CATOBJEXT=.mo
+		   DATADIRNAME=lib])
+		INSTOBJEXT=.mo
+	      fi
+	    fi
+
+	    # Added by Martin Baulig 12/15/98 for libc5 systems
+	    if test "$gt_cv_func_dgettext_libc" != "yes" \
+	       && test "$gt_cv_func_dgettext_libintl" = "yes"; then
+	       INTLLIBS=-lintl
+	       LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+	    fi
+	])
+
+        if test "$CATOBJEXT" = "NONE"; then
+	  AC_MSG_CHECKING([whether catgets can be used])
+	  AC_ARG_WITH(catgets,
+	    [  --with-catgets          use catgets functions if available],
+	    nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
+	  AC_MSG_RESULT($nls_cv_use_catgets)
+
+	  if test "$nls_cv_use_catgets" = "yes"; then
+	    dnl No gettext in C library.  Try catgets next.
+	    AC_CHECK_LIB(i, main)
+	    AC_CHECK_FUNC(catgets,
+	      [AC_DEFINE(HAVE_CATGETS)
+	       INTLOBJS="\$(CATOBJS)"
+	       AC_PATH_PROG(GENCAT, gencat, no)dnl
+#	       if test "$GENCAT" != "no"; then
+#		 AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
+#		 if test "$GMSGFMT" = "no"; then
+#		   AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
+#		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+#		 fi
+#		 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+#		   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+#		 USE_INCLUDED_LIBINTL=yes
+#		 CATOBJEXT=.cat
+#		 INSTOBJEXT=.cat
+#		 DATADIRNAME=lib
+#		 INTLDEPS='$(top_builddir)/intl/libintl.a'
+#		 INTLLIBS=$INTLDEPS
+#		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+#		 nls_cv_header_intl=intl/libintl.h
+#		 nls_cv_header_libgt=intl/libgettext.h
+#              fi
+            ])
+	  fi
+        fi
+
+        if test "$CATOBJEXT" = "NONE"; then
+	  dnl Neither gettext nor catgets in included in the C library.
+	  dnl Fall back on GNU gettext library.
+	  nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" != "yes"; then
+        AC_DEFINE(ENABLE_NLS)
+      else
+         # Unset this variable since we use the non-zero value as a flag.
+         CATOBJEXT=
+#        dnl Mark actions used to generate GNU NLS library.
+#        INTLOBJS="\$(GETTOBJS)"
+#        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+#	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+#        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+#        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+#	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+#        AC_SUBST(MSGFMT)
+#	USE_INCLUDED_LIBINTL=yes
+#        CATOBJEXT=.gmo
+#        INSTOBJEXT=.mo
+#        DATADIRNAME=share
+#	INTLDEPS='$(top_builddir)/intl/libintl.a'
+#	INTLLIBS=$INTLDEPS
+#	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+#        nls_cv_header_intl=intl/libintl.h
+#        nls_cv_header_libgt=intl/libgettext.h
+      fi
+
+      dnl Test whether we really found GNU xgettext.
+      if test "$XGETTEXT" != ":"; then
+	dnl If it is no GNU xgettext we define it as : so that the
+	dnl Makefiles still can work.
+	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+	  : ;
+	else
+	  AC_MSG_RESULT(
+	    [found xgettext program is not GNU xgettext; ignore it])
+	  XGETTEXT=":"
+	fi
+      fi
+
+      # We need to process the po/ directory.
+      POSUB=po
+    else
+      DATADIRNAME=share
+      nls_cv_header_intl=intl/libintl.h
+      nls_cv_header_libgt=intl/libgettext.h
+    fi
+    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+    AC_OUTPUT_COMMANDS(
+     [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])
+
+
+#    # If this is used in GNU gettext we have to set USE_NLS to `yes'
+#    # because some of the sources are only built for this goal.
+#    if test "$PACKAGE" = gettext; then
+#      USE_NLS=yes
+#      USE_INCLUDED_LIBINTL=yes
+#    fi
+
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.in.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(USE_INCLUDED_LIBINTL)
+    AC_SUBST(CATALOGS)
+    AC_SUBST(CATOBJEXT)
+    AC_SUBST(DATADIRNAME)
+    AC_SUBST(GMOFILES)
+    AC_SUBST(INSTOBJEXT)
+    AC_SUBST(INTLDEPS)
+    AC_SUBST(INTLLIBS)
+    AC_SUBST(INTLOBJS)
+    AC_SUBST(POFILES)
+    AC_SUBST(POSUB)
+  ])
+
+AC_DEFUN(AM_GTK_GNU_GETTEXT,
+  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+   AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_PROG_RANLIB])dnl
+   AC_REQUIRE([AC_ISC_POSIX])dnl
+   AC_REQUIRE([AC_HEADER_STDC])dnl
+   AC_REQUIRE([AC_C_CONST])dnl
+   AC_REQUIRE([AC_C_INLINE])dnl
+   AC_REQUIRE([AC_TYPE_OFF_T])dnl
+   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+   AC_REQUIRE([AC_FUNC_MMAP])dnl
+
+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
+unistd.h sys/param.h])
+   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
+strdup __argz_count __argz_stringify __argz_next])
+
+   if test "${ac_cv_func_stpcpy+set}" != "set"; then
+     AC_CHECK_FUNCS(stpcpy)
+   fi
+   if test "${ac_cv_func_stpcpy}" = "yes"; then
+     AC_DEFINE(HAVE_STPCPY)
+   fi
+
+   AM_LC_MESSAGES
+   AM_GTK_WITH_NLS
+
+   if test "x$CATOBJEXT" != "x"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for lang in ${LINGUAS=$ALL_LINGUAS}; do
+         case "$ALL_LINGUAS" in
+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+         esac
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+   dnl The reference to <locale.h> in the installed <libintl.h> file
+   dnl must be resolved because we cannot expect the users of this
+   dnl to define HAVE_LOCALE_H.
+   if test $ac_cv_header_locale_h = yes; then
+     INCLUDE_LOCALE_H="#include <locale.h>"
+   else
+     INCLUDE_LOCALE_H="\
+/* The system does not provide the header <locale.h>.  Take care yourself.  */"
+   fi
+   AC_SUBST(INCLUDE_LOCALE_H)
+
+   dnl Determine which catalog format we have (if any is needed)
+   dnl For now we know about two different formats:
+   dnl   Linux libc-5 and the normal X/Open format
+   test -d intl || mkdir intl
+   if test "$CATOBJEXT" = ".cat"; then
+     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
+
+     dnl Transform the SED scripts while copying because some dumb SEDs
+     dnl cannot handle comments.
+     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
+   fi
+   dnl po2tbl.sed is always needed.
+   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
+     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+
+   dnl In the intl/Makefile.in we have a special dependency which makes
+   dnl only sense for gettext.  We comment this out for non-gettext
+   dnl packages.
+   if test "$PACKAGE" = "gettext"; then
+     GT_NO="#NO#"
+     GT_YES=
+   else
+     GT_NO=
+     GT_YES="#YES#"
+   fi
+   AC_SUBST(GT_NO)
+   AC_SUBST(GT_YES)
+
+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+   dnl Try to locate is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   dnl *** For now the libtool support in intl/Makefile is not for real.
+   l=
+   AC_SUBST(l)
+
+   dnl Generate list of files to be processed by xgettext which will
+   dnl be included in po/Makefile.
+   test -d po || mkdir po
+   if test "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
+   fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
+  ])
+

autogen.sh

@@ -1,6 +1,11 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
 PROJECT=Gtk+
 TEST_TYPE=-d
 FILE=gdk
@@ -15,14 +20,6 @@ DIE=0
 	DIE=1
 }
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have libtool installed to compile $PROJECT."
-	echo "Get ftp://alpha.gnu.org/gnu/libtool-1.2b.tar.gz"
-	echo "(or a newer version if it is available)"
-	DIE=1
-}
-
 (automake --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have automake installed to compile $PROJECT."
@@ -46,18 +43,44 @@ if test -z "$*"; then
 fi
 
 case $CC in
-xlc | *lcc | *lcc\ *) am_opt=--include-deps;;
+*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
 esac
 
+if test -z "$ACLOCAL_FLAGS"; then
+
+	acdir=`aclocal --print-ac-dir`
+        m4list="glib.m4 gettext.m4"
+
+	for file in $m4list
+	do
+		if [ ! -f "$acdir/$file" ]; then
+			echo "WARNING: aclocal's directory is $acdir, but..."
+			echo "         no file $acdir/$file"
+			echo "         You may see fatal macro warnings below."
+			echo "         If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
+			echo "         environment variable to \"-I /some/dir\", or install"
+			echo "         $acdir/$file."
+			echo ""
+		fi
+	done
+fi
+
+echo "Running gettextize...  Ignore non-fatal messages."
+# Hmm, we specify --force here, since otherwise things dont'
+# get added reliably, but we don't want to overwrite intl
+# while making dist.
+echo "no" | gettextize --copy --force
+
 aclocal $ACLOCAL_FLAGS
 
 # optionally feature autoheader
 (autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
 
-automake $am_opt
+automake -a $am_opt
 autoconf
+cd $ORIGDIR
 
-./configure "$@"
+$srcdir/configure --enable-maintainer-mode "$@"
 
 echo 
 echo "Now type 'make' to compile $PROJECT."

config.guess

@@ -1,6 +1,7 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
+#   Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -23,6 +24,7 @@
 
 # Written by Per Bothner <bothner@cygnus.com>.
 # The master version of this file is at the FSF in /home/gd/gnu/lib.
+# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -35,6 +37,20 @@
 # (but try to keep the structure clean).
 #
 
+# Use $HOST_CC if defined. $CC may point to a cross-compiler
+if test x"$CC_FOR_BUILD" = x; then
+  if test x"$HOST_CC" != x; then
+    CC_FOR_BUILD="$HOST_CC"
+  else
+    if test x"$CC" != x; then
+      CC_FOR_BUILD="$CC"
+    else
+      CC_FOR_BUILD=cc
+    fi
+  fi
+fi
+
+
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 8/24/94.)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
@@ -46,7 +62,8 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
 
 # Note: order is significant - the case branches are not exclusive.
 
@@ -59,7 +76,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >dummy.s
+	cat <<EOF >$dummy.s
 	.globl main
 	.ent main
 main:
@@ -76,9 +93,9 @@ main:
 	ret \$31,(\$26),1
 	.end main
 EOF
-	${CC-cc} dummy.s -o dummy 2>/dev/null
+	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
-		./dummy
+		./$dummy
 		case "$?" in
 			7)
 				UNAME_MACHINE="alpha"
@@ -97,8 +114,14 @@ EOF
 				;;
 		esac
 	fi
-	rm -f dummy.s dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
+	rm -f $dummy.s $dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
 	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
@@ -112,6 +135,9 @@ EOF
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit 0 ;;
     arc64:OpenBSD:*:*)
 	echo mips64el-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -139,7 +165,7 @@ EOF
     SR2?01:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
 		echo pyramid-pyramid-sysv3
@@ -147,9 +173,12 @@ EOF
 		echo pyramid-pyramid-bsd
 	fi
 	exit 0 ;;
-    NILE:*:*:dcosx)
+    NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
@@ -195,6 +224,32 @@ EOF
     atari*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor 
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
     sun3*:NetBSD:*:*)
 	echo m68k-sun-netbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -216,6 +271,9 @@ EOF
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
+    macppc:NetBSD:*:*)
+        echo powerpc-apple-netbsd${UNAME_RELEASE}
+        exit 0 ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
 	exit 0 ;;
@@ -225,12 +283,16 @@ EOF
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
-    2020:CLIX:*:*)
+    2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-	sed 's/^	//' << EOF >dummy.c
-	int main (argc, argv) int argc; char **argv; {
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
 	#if defined (host_mips) && defined (MIPSEB)
 	#if defined (SYSTYPE_SYSV)
 	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
@@ -245,10 +307,10 @@ EOF
 	  exit (-1);
 	}
 EOF
-	${CC-cc} dummy.c -o dummy \
-	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
+	$CC_FOR_BUILD $dummy.c -o $dummy \
+	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
@@ -300,7 +362,7 @@ EOF
 	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		sed 's/^		//' << EOF >dummy.c
+		sed 's/^		//' << EOF >$dummy.c
 		#include <sys/systemcfg.h>
 
 		main()
@@ -311,8 +373,8 @@ EOF
 			exit(0);
 			}
 EOF
-		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-		rm -f dummy.c dummy
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -321,7 +383,8 @@ EOF
 	fi
 	exit 0 ;;
     *:AIX:*:4)
-	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
@@ -354,18 +417,50 @@ EOF
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
 	exit 0 ;;
-    9000/[3478]??:HP-UX:*:*)
+    9000/[34678]??:HP-UX:*:*)
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
-	    9000/8?? )            HP_ARCH=hppa1.0 ;;
+	    9000/[678][0-9][0-9])
+              sed 's/^              //' << EOF >$dummy.c
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+	($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	rm -f $dummy.c $dummy
 	esac
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     3050*:HI-UX:*:*)
-	sed 's/^	//' << EOF >dummy.c
+	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
 	main ()
@@ -390,8 +485,8 @@ EOF
 	  exit (0);
 	}
 EOF
-	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -400,6 +495,9 @@ EOF
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
+    *9??*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
 	exit 0 ;;
@@ -416,6 +514,9 @@ EOF
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
+    hppa*:OpenBSD:*:*)
+	echo hppa-unknown-openbsd
+	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
         exit 0 ;;
@@ -448,11 +549,14 @@ EOF
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE}
 	exit 0 ;;
+    CRAY*T3E:*:*:*)
+	echo t3e-cray-unicosmk${UNAME_RELEASE}
+	exit 0 ;;
     CRAY-2:*:*:*)
 	echo cray2-cray-unicos
         exit 0 ;;
     F300:UNIX_System_V:*:*)
-        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
@@ -465,10 +569,22 @@ EOF
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    i?86:BSD/386:*:* | *:BSD/OS:*:*)
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
     *:FreeBSD:*:*)
+	if test -x /usr/bin/objformat; then
+	    if test "elf" = "`/usr/bin/objformat`"; then
+		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+		exit 0
+	    fi
+	fi
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
     *:NetBSD:*:*)
@@ -478,13 +594,22 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
     i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin32
+	echo ${UNAME_MACHINE}-pc-cygwin
 	exit 0 ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i386-pc-interix
+	exit 0 ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit 0 ;;
     p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin32
+	echo powerpcle-unknown-cygwin
 	exit 0 ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -496,12 +621,14 @@ EOF
 	# uname on the ARM produces all sorts of strangeness, and we need to
 	# filter it out.
 	case "$UNAME_MACHINE" in
+	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
 	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
 	esac
 
 	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us.
-	ld_help_string=`ld --help 2>&1`
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	ld_help_string=`cd /; ld --help 2>&1`
 	ld_supported_emulations=`echo $ld_help_string \
 			 | sed -ne '/supported emulations:/!d
 				    s/[ 	][ 	]*/ /g
@@ -514,11 +641,40 @@ EOF
 	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
 	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
 	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+	  elf32ppc)
+		# Determine Lib Version
+		cat >$dummy.c <<EOF
+#include <features.h>
+#if defined(__GLIBC__)
+extern char __libc_version[];
+extern char __libc_release[];
+#endif
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#if defined(__GLIBC__)
+  printf("%s %s\n", __libc_version, __libc_release);
+#else
+  printf("unkown\n");
+#endif
+  return 0;
+}
+EOF
+		LIBC=""
+		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./$dummy | grep 1\.99 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi	
+		rm -f $dummy.c $dummy
+		echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
 	esac
 
 	if test "${UNAME_MACHINE}" = "alpha" ; then
-		sed 's/^	//'  <<EOF >dummy.s
+		sed 's/^	//'  <<EOF >$dummy.s
 		.globl main
 		.ent main
 	main:
@@ -536,9 +692,9 @@ EOF
 		.end main
 EOF
 		LIBC=""
-		${CC-cc} dummy.s -o dummy 2>/dev/null
+		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 		if test "$?" = 0 ; then
-			./dummy
+			./$dummy
 			case "$?" in
 			7)
 				UNAME_MACHINE="alpha"
@@ -555,22 +711,23 @@ EOF
 			16)
 				UNAME_MACHINE="alphaev6"
 				;;
-			esac	
+			esac
 
-			objdump --private-headers dummy | \
+			objdump --private-headers $dummy | \
 			  grep ld.so.1 > /dev/null
 			if test "$?" = 0 ; then
 				LIBC="libc1"
 			fi
-		fi	
-		rm -f dummy.s dummy
+		fi
+		rm -f $dummy.s $dummy
 		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
 	elif test "${UNAME_MACHINE}" = "mips" ; then
-	  cat >dummy.c <<EOF
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
+	  cat >$dummy.c <<EOF
+#ifdef __cplusplus
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
 #ifdef __MIPSEB__
   printf ("%s-unknown-linux-gnu\n", argv[1]);
 #endif
@@ -580,8 +737,8 @@ main(argc, argv)
   return 0;
 }
 EOF
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-	  rm -f dummy.c dummy
+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
 	else
 	  # Either a pre-BFD a.out linker (linux-gnuoldld)
 	  # or one that does not give us useful --help.
@@ -600,12 +757,13 @@ EOF
 	    ;;
 	  esac
 	  # Determine whether the default compiler is a.out or elf
-	  cat >dummy.c <<EOF
+	  cat >$dummy.c <<EOF
 #include <features.h>
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
+#ifdef __cplusplus
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2
@@ -622,8 +780,8 @@ main(argc, argv)
   return 0;
 }
 EOF
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-	  rm -f dummy.c dummy
+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
 	fi ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 # are messed up and put the nodename in both sysname and nodename.
@@ -645,6 +803,14 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
 	fi
 	exit 0 ;;
+    i?86:*:5:7*)
+	UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+	(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+	(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
+	(/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
+	(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
+	exit 0 ;;
     i?86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -654,6 +820,10 @@ EOF
 		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
 		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
+		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
@@ -700,7 +870,7 @@ EOF
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
-    i?86:LynxOS:2.*:*)
+    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
@@ -712,6 +882,9 @@ EOF
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
 	exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
 	exit 0 ;;
@@ -742,19 +915,40 @@ EOF
     news*:NEWS-OS:*:6*)
 	echo mips-sony-newsos6
 	exit 0 ;;
-    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
         exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
-cat >dummy.c <<EOF
+cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
 # include <sys/utsname.h>
@@ -792,7 +986,10 @@ main ()
 #endif
   int version;
   version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
   exit (0);
 #endif
 
@@ -852,8 +1049,8 @@ main ()
 }
 EOF
 
-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
-rm -f dummy.c dummy
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
 

config.h.in

@@ -1,56 +0,0 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define to empty if the keyword does not work.  */
-#undef const
-
-/* Define if you have a working `mmap' system call.  */
-#undef HAVE_MMAP
-
-/* Define as the return type of signal handlers (int or void).  */
-#undef RETSIGTYPE
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define if your processor stores words with the most significant
-   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-#undef WORDS_BIGENDIAN
-
-/* Define if the X Window System is missing or not being used.  */
-#undef X_DISPLAY_MISSING
-
-/* Other stuff */
-#undef GTK_COMPILED_WITH_DEBUGGING
-
-#undef HAVE_IPC_H
-#undef HAVE_SHM_H
-#undef HAVE_XSHM_H
-#undef HAVE_SHAPE_EXT
-#undef HAVE_SYS_SELECT_H
-#undef HAVE_XCONVERTCASE
-
-/* some systems do not allow to ipcrm pages prior to
- * actual usage, namely: OSF1 V3.2, SunOS 4.1.1, 5.5, 5.5.1, 5.6,
- * IRIX 5.2 and 6.2.
- */
-#undef IPC_RMID_DEFERRED_RELEASE
-
-#undef NO_FD_SET
-
-#undef RESOURCE_BASE
-
-/* Define to enable POSIX threading awareness */
-#undef USE_PTHREADS
-
-#undef XINPUT_NONE
-#undef XINPUT_GXI
-#undef XINPUT_XFREE
-
-/* Define as the return type of signal handlers (int or void).  */
-#undef RETSIGTYPE
-
-/* Define if you have the getpagesize function.  */
-#undef HAVE_GETPAGESIZE
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H

config.h.win32

@@ -0,0 +1,192 @@
+/* config.h.win32.  Handcrafted for Microsoft C and gcc -mno-cygwin */
+
+#if ! (defined(_MSC_VER) || defined(__GNUC__))
+#error Unrecognized Win32 compiler, edit config.h.win32 by hand
+#endif
+
+/* Define if using alloca.c.  */
+/* #undef C_ALLOCA */
+
+/* Define to empty if the keyword does not work.  */
+/* #undef const */
+
+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
+   This function is required for alloca.c support on those systems.  */
+/* #undef CRAY_STACKSEG_END */
+
+/* Define if you have alloca, as a function or macro.  */
+#define HAVE_ALLOCA 1
+#ifdef _MSC_VER
+#define alloca _alloca
+#elif defined (__GNUC__)
+#define alloca __builtin_alloca
+#endif
+
+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define if you have a working `mmap' system call.  */
+/* #undef HAVE_MMAP */
+
+/* Define to empty, or __inline if that's what your compiler wants.  */
+#define inline __inline
+
+/* Define to `long' if <sys/types.h> doesn't define.  */
+/* #undef off_t */
+
+/* Define if you need to in order for stat and other things to work.  */
+/* #undef _POSIX_SOURCE*/
+
+/* Define as the return type of signal handlers (int or void).  */
+#define RETSIGTYPE void
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+/* #undef size_t */
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown
+ */
+/* #undef STACK_DIRECTION */
+
+/* Define if you have the ANSI C header files.  */
+#define STDC_HEADERS 1
+
+/* Other stuff */
+#define ENABLE_NLS 1
+#define GTK_COMPILED_WITH_DEBUGGING "minimum"
+
+/* #undef HAVE_CATGETS */
+/* #undef HAVE_DIRENT_H */
+#define HAVE_GETTEXT 1
+/* #undef HAVE_IPC_H */
+/* #undef HAVE_LC_MESSAGES */
+/* #undef HAVE_PWD_H */
+/* #undef HAVE_SHM_H */
+/* #undef HAVE_STPCPY */
+/* #undef HAVE_XSHM_H */
+#define HAVE_SHAPE_EXT 1
+/* #undef HAVE_SYS_SELECT_H */
+/* #undef HAVE_SYS_TIME_H */
+/* #undef HAVE_XCONVERTCASE */
+
+/* #undef NO_FD_SET */
+
+/* #undef XINPUT_NONE */
+/* #undef XINPUT_GXI */
+/* #undef XINPUT_XFREE */
+#define XINPUT_WIN32 1
+
+/* Define as the return type of signal handlers (int or void).  */
+#define RETSIGTYPE void
+
+/* Define if you have the __argz_count function.  */
+/* #undef HAVE___ARGZ_COUNT */
+
+/* Define if you have the __argz_next function.  */
+/* #undef HAVE___ARGZ_NEXT */
+
+/* Define if you have the __argz_stringify function.  */
+/* #undef HAVE___ARGZ_STRINGIFY */
+
+/* Define if you have the broken_wctype function.  */
+/* #undef HAVE_BROKEN_WCTYPE */
+
+/* Define if you have the dcgettext function.  */
+/* #undef HAVE_DCGETTEXT */
+
+/* Define if you have the getcwd function.  */
+#define HAVE_GETCWD 1
+
+/* Define if you have the getpagesize function.  */
+#define HAVE_GETPAGESIZE 1
+
+/* Define if you have the lstat function.  */
+/* #undef HAVE_LSTAT */
+
+/* Define if you have the munmap function.  */
+/* #undef HAVE_MUNMAP */
+
+/* Define if you have the putenv function.  */
+#define HAVE_PUTENV 1
+#define putenv _putenv
+
+/* Define if you have the setenv function.  */
+/* #undef HAVE_SETENV */
+
+/* Define if you have the setlocale function.  */
+#define HAVE_SETLOCALE 1
+
+/* Define if you have the stpcpy function.  */
+/* #undef HAVE_STPCPY */
+
+/* Define if you have the strcasecmp function.  */
+#define HAVE_STRCASECMP 1
+#define strcasecmp _stricmp
+
+/* Define if you have the strchr function.  */
+#define HAVE_STRCHR 1
+
+/* Define if you have the strdup function.  */
+#define HAVE_STRDUP 1
+
+/* Define if you have the <argz.h> header file.  */
+/* #undef HAVE_ARGZ_H */
+
+/* Define if you have the <dirent.h> header file.  */
+/* #undef HAVE_DIRENT_H */
+
+/* Define if you have the <limits.h> header file.  */
+#define HAVE_LIMITS_H 1
+
+/* Define if you have the <locale.h> header file.  */
+#define HAVE_LOCALE_H 1
+
+/* Define if you have the <malloc.h> header file.  */
+#define HAVE_MALLOC_H 1
+
+/* Define if you have the <nl_types.h> header file.  */
+/* #undef HAVE_NL_TYPES_H */
+
+/* Define if you have the <pwd.h> header file.  */
+/* #undef HAVE_PWD_H */
+
+/* Define if you have the <string.h> header file.  */
+#define HAVE_STRING_H 1
+
+/* Define if you have the <sys/param.h> header file.  */
+/* #undef HAVE_SYS_PARAM_H */
+
+/* Define if you have the <sys/time.h> header file.  */
+/* #undef HAVE_SYS_TIME_H */
+
+/* Define if you have the <unistd.h> header file.  */
+/* #undef HAVE_UNISTD_H */
+
+/* Define if you have the <wchar.h> header file.  */
+#define HAVE_WCHAR_H 1
+
+/* Define if you have the <wctype.h> header file.  */
+#ifdef _MSC_VER
+#define HAVE_WCTYPE_H 1
+#endif /* _MSC_VER */
+
+/* Define if you have the i library (-li).  */
+/* #undef HAVE_LIBI */
+
+/* Define if you have the intl library (-lintl).  */
+#define HAVE_LIBINTL 1
+
+/* define if compiled symbols have a leading underscore */
+/* #undef WITH_SYMBOL_UNDERSCORE */
+
+/* Define if you have the Wintab programmer's kit */
+#define HAVE_WINTAB 1
+
+/* Define if you have the <dimm.h> header file
+ * (available in the Platform SDK)
+*/
+/* #define HAVE_DIMM_H 1 */

config.sub

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -98,11 +98,21 @@ case $os in
 		os=
 		basic_machine=$1
 		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=vxworks
+		basic_machine=$1
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
 	-sco5)
-		os=sco3.2v5
+		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
@@ -121,6 +131,9 @@ case $os in
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-isc)
 		os=-isc2.2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -150,15 +163,22 @@ case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
 	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
-		| arme[lb] | pyramid | mn10200 | mn10300 \
-		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
-		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
-		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
-		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-		| mipstx39 | mipstx39el \
-		| sparc | sparclet | sparclite | sparc64 | v850)
+		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+		| 580 | i960 | h8300 \
+		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+		| mips64vr5000 | miprs64vr5000el \
+		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+		| thumb | d10v)
 		basic_machine=$basic_machine-unknown
 		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -174,24 +194,41 @@ case $basic_machine in
 	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
-	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
-	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
-	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+	      | xmp-* | ymp-* \
+	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
+	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+	      | clipper-* | orion-* \
 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-* \
+	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
 	      | mipstx39-* | mipstx39el-* \
-	      | f301-*)
+	      | f301-* | armv*-* | t3e-* \
+	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
 		basic_machine=m68000-att
 		;;
 	3b*)
 		basic_machine=we32k-att
 		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
 	alliant | fx80)
 		basic_machine=fx80-alliant
 		;;
@@ -221,6 +258,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-sysv
 		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -297,6 +338,10 @@ case $basic_machine in
 	encore | umax | mmax)
 		basic_machine=ns32k-encore
 		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
 	fx2800)
 		basic_machine=i860-alliant
 		;;
@@ -315,6 +360,14 @@ case $basic_machine in
 		basic_machine=h8300-hitachi
 		os=-hms
 		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
 	harris)
 		basic_machine=m88k-harris
 		os=-sysv3
@@ -330,13 +383,30 @@ case $basic_machine in
 		basic_machine=m68k-hp
 		os=-hpux
 		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
 	hp9k2[0-9][0-9] | hp9k31[0-9])
 		basic_machine=m68000-hp
 		;;
 	hp9k3[2-9][0-9])
 		basic_machine=m68k-hp
 		;;
-	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
 		basic_machine=hppa1.1-hp
 		;;
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
@@ -345,6 +415,14 @@ case $basic_machine in
 	hppa-next)
 		os=-nextstep3
 		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -366,6 +444,22 @@ case $basic_machine in
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	i386-go32 | go32)
+		basic_machine=i386-unknown
+		os=-go32
+		;;
+	i386-mingw32 | mingw32)
+		basic_machine=i386-unknown
+		os=-mingw32
+		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -394,6 +488,10 @@ case $basic_machine in
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
+	*mint | *MiNT)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
 	mipsel*-linux*)
 		basic_machine=mipsel-unknown
 		os=-linux-gnu
@@ -408,10 +506,26 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	msdos)
+		basic_machine=i386-unknown
+		os=-msdos
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
 		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-corel
+		os=-linux
+		;;
 	news | news700 | news800 | news900)
 		basic_machine=m68k-sony
 		os=-newsos
@@ -424,6 +538,10 @@ case $basic_machine in
 		basic_machine=mips-sony
 		os=-newsos
 		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
 	next | m*-next )
 		basic_machine=m68k-next
 		case $os in
@@ -449,9 +567,25 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-nindy
 		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
 	np1)
 		basic_machine=np1-gould
 		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
 	pa-hitachi)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -469,19 +603,19 @@ case $basic_machine in
         pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | nexen)
+	pentium | p5 | k5 | k6 | nexen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | k6 | 6x86)
+	pentiumpro | p6 | 6x86)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
 		basic_machine=i786-pc
 		;;
-	pentium-* | p5-* | k5-* | nexen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | k6-* | 6x86-*)
+	pentiumpro-* | p6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
@@ -505,12 +639,20 @@ case $basic_machine in
 	ps2)
 		basic_machine=i386-ibm
 		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
 	rm[46]00)
 		basic_machine=mips-siemens
 		;;
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -518,6 +660,10 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sparclite-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
 	sps7)
 		basic_machine=m68k-bull
 		os=-sysv2
@@ -525,6 +671,13 @@ case $basic_machine in
 	spur)
 		basic_machine=spur-unknown
 		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -569,6 +722,10 @@ case $basic_machine in
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
+	t3e)
+		basic_machine=t3e-cray
+		os=-unicos
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -586,6 +743,10 @@ case $basic_machine in
 		basic_machine=a29k-nyu
 		os=-sym1
 		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
 	vaxv)
 		basic_machine=vax-dec
 		os=-sysv
@@ -609,6 +770,14 @@ case $basic_machine in
 		basic_machine=a29k-wrs
 		os=-vxworks
 		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
 	xmp)
 		basic_machine=xmp-cray
 		os=-unicos
@@ -616,6 +785,10 @@ case $basic_machine in
         xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -623,6 +796,15 @@ case $basic_machine in
 
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
 	mips)
 		if [ x$os = x-linux-gnu ]; then
 			basic_machine=mips-unknown
@@ -645,7 +827,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sparc)
+	sparc | sparcv9)
 		basic_machine=sparc-sun
 		;;
         cydra)
@@ -657,6 +839,16 @@ case $basic_machine in
 	orion105)
 		basic_machine=clipper-highlevel
 		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	c4x*)
+		basic_machine=c4x-none
+		os=-coff
+		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -710,13 +902,21 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv*)
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -741,6 +941,9 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
+	-386bsd)
+		os=-bsd
+		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
@@ -772,9 +975,18 @@ case $os in
 	# This must come after -sysvr4.
 	-sysv*)
 		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
 	-xenix)
 		os=-xenix
 		;;
+        -*mint | -*MiNT)
+	        os=-mint
+		;;
 	-none)
 		;;
 	*)
@@ -800,6 +1012,9 @@ case $basic_machine in
 	*-acorn)
 		os=-riscix1.2
 		;;
+	arm*-corel)
+		os=-linux
+		;;
 	arm*-semi)
 		os=-aout
 		;;
@@ -821,15 +1036,36 @@ case $basic_machine in
 		# default.
 		# os=-sunos4
 		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
+	*-be)
+		os=-beos
+		;;
 	*-ibm)
 		os=-aix
 		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
 	*-hp)
 		os=-hpux
 		;;
@@ -893,6 +1129,18 @@ case $basic_machine in
 	f301-fujitsu)
 		os=-uxpv
 		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
 	*)
 		os=-none
 		;;
@@ -914,9 +1162,15 @@ case $basic_machine in
 			-aix*)
 				vendor=ibm
 				;;
+			-beos*)
+				vendor=be
+				;;
 			-hpux*)
 				vendor=hp
 				;;
+			-mpeix*)
+				vendor=hp
+				;;
 			-hiux*)
 				vendor=hitachi
 				;;
@@ -944,6 +1198,15 @@ case $basic_machine in
 			-aux*)
 				vendor=apple
 				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -*MiNT)
+				vendor=atari
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;

configure.in

@@ -1,9 +1,24 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT(gdk/gdktypes.h)
 
+# In the following, there are a the following variants
+# of GLib cflags and libs variables
+#
+# GLIB_CFLAGS:  cflags for compiling libraries and example progs
+# GLIB_LIBS:    libraries for linking example programs
+# GLIB_DEPLIBS: libraries for linking libraries against
+# glib_cflags:  cflags to store in gtk-config
+# glib_libs:    libs to store in gtk-config
+# glib_thread_cflags: cflags to store in gtk-config for gtk-config gthread
+# glib_thread_libs:   libs to store in gtk-config for gtk-config gthread
+
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 
+dnl we to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
+dnl are available for $ac_help expansion (don't we all *love* autoconf?)
+AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+#
 # Making releases:
 #   GTK_MICRO_VERSION += 1;
 #   GTK_INTERFACE_AGE += 1;
@@ -13,11 +28,14 @@ cflags_set=${CFLAGS+set}
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 #
 GTK_MAJOR_VERSION=1
-GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=3
+GTK_MINOR_VERSION=3
+GTK_MICRO_VERSION=0
 GTK_INTERFACE_AGE=0
 GTK_BINARY_AGE=0
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
+dnl
+AC_DIVERT_POP()dnl
+
 AC_SUBST(GTK_MAJOR_VERSION)
 AC_SUBST(GTK_MINOR_VERSION)
 AC_SUBST(GTK_MICRO_VERSION)
@@ -56,27 +74,40 @@ AM_MAINTAINER_MODE
 
 AC_CANONICAL_HOST
 
+dnl figure debugging default, prior to $ac_help setup
+dnl
+AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+if test `expr $GTK_MINOR_VERSION \% 2` = 1 ; then
+        debug_default=yes
+else
+        debug_default=minimum
+fi
+AC_DIVERT_POP()dnl
+
+dnl declare --enable-* args and collect ac_help strings
+AC_ARG_ENABLE(debug, [  --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
 AC_ARG_ENABLE(shm, [  --enable-shm            support shared memory if available [default=yes]],
 		   echo $enable_shm, enable_shm="yes")
-AC_ARG_ENABLE(debug, [  --enable-debug=[no/minimum/yes] turn on debugging [default=minimum]],,enable_debug=minimum)
 AC_ARG_ENABLE(ansi, [  --enable-ansi           turn on strict ansi [default=no]],
 		    , enable_ansi=no)
 AC_ARG_WITH(glib, [  --with-glib=DIR         Use uninstalled copy of glib])
 AC_ARG_ENABLE(xim, [  --enable-xim            support XIM [default=yes]],
-			echo $enable_xim, enable_xim="yes")
+			, enable_xim="yes")
+AC_ARG_ENABLE(xim_inst, [  --disable-xim-inst      does not use xim instantiate callback],
+			, enable_xim_inst="maybe")
+AC_ARG_ENABLE(rebuilds, [  --disable-rebuilds      disable all source autogeneration rules],,enable_rebuilds=yes)
 AC_ARG_WITH(locale, [  --with-locale=LOCALE    locale name you want to use ])
 
 AC_ARG_WITH(xinput, [  --with-xinput=[no/gxi/xfree] support XInput ])
-AC_ARG_WITH(threads, [  --with-threads=[posix] support threading ])
 
 if test "x$enable_debug" = "xyes"; then
   test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-  CFLAGS="$CFLAGS -DG_ENABLE_DEBUG"
+  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
 else
   if test "x$enable_debug" = "xno"; then
-    CFLAGS="$CFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DGTK_NO_CHECK_CASTS"
+    GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DGTK_NO_CHECK_CASTS"
   else
-    CFLAGS="$CFLAGS -DGTK_NO_CHECK_CASTS"
+    GTK_DEBUG_FLAGS="-DGTK_NO_CHECK_CASTS"
   fi
 fi
 
@@ -87,25 +118,34 @@ AM_SANITY_CHECK
 
 # Checks for programs.
 AC_PROG_CC
+AC_ISC_POSIX
 AM_PROG_CC_STDC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
+changequote(,)dnl
 if test "x$GCC" = "xyes"; then
-  if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
-    CFLAGS="$CFLAGS -Wall"
-  fi
+  case " $CFLAGS " in
+  *[\ \	]-Wall[\ \	]*) ;;
+  *) CFLAGS="$CFLAGS -Wall" ;;
+  esac
 
   if test "x$enable_ansi" = "xyes"; then
-    if test -z "`echo "$CFLAGS" | grep "\-ansi" 2> /dev/null`" ; then
-      CFLAGS="$CFLAGS -ansi"
-    fi
+    case " $CFLAGS " in
+    *[\ \	]-ansi[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -ansi" ;;
+    esac
 
-    if test -z "`echo "$CFLAGS" | grep "\-pedantic" 2> /dev/null`" ; then
-      CFLAGS="$CFLAGS -pedantic"
-    fi
+    case " $CFLAGS " in
+    *[\ \	]-pedantic[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -pedantic" ;;
+    esac
   fi
 fi
+changequote([,])dnl
+
+# Honor aclocal flags
+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
 # define a MAINT-like variable REBUILD which is set if Perl
 # and awk are found, so autogenerated sources can be rebuilt
@@ -117,13 +157,39 @@ AC_CHECK_PROGS(PERL, perl5 perl)
 AC_CHECK_PROG(INDENT, indent, indent)
 
 REBUILD=\#
-if test -n "$PERL" && perl -v | grep 'version 5.' > /dev/null ; then
-  if test -n "$AWK" ; then 
-    REBUILD=
-  fi
+if test "x$enable_rebuilds" = "xyes" && \
+     test -n "$PERL" && \
+     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
+     test -n "$AWK" ; then
+  REBUILD=
 fi
 AC_SUBST(REBUILD)
 
+AC_CHECK_FUNCS(lstat)
+
+AC_MSG_CHECKING(whether make is GNU Make)
+STRIP_BEGIN=
+STRIP_END=
+if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
+	STRIP_BEGIN='$(strip'
+	STRIP_END=')'
+	AC_MSG_RESULT(yes)
+else
+	AC_MSG_RESULT(no)
+fi
+AC_SUBST(STRIP_BEGIN)
+AC_SUBST(STRIP_END)
+
+# i18n stuff
+ALL_LINGUAS="ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl no pl pt pt_BR ru sk sl sv tr uk wa zh_TW.Big5 zh_CN.GB2312"
+AM_GTK_GNU_GETTEXT
+LIBS="$LIBS $INTLLIBS"
+
+# AM_GTK_GNU_GETTEXT above substs $DATADIRNAME
+# this is the directory where the *.{mo,gmo} files are installed
+gtklocaledir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(gtklocaledir)
+
 dnl The DU4 header files don't provide library prototypes unless 
 dnl -std1 is given to the native cc.
 AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
@@ -141,11 +207,29 @@ AC_TRY_RUN([#include <math.h>
          AC_MSG_RESULT()
          CFLAGS=$gtk_save_CFLAGS
          AC_MSG_WARN(
-                [No ANSI prototypes found in library. (-std1 didn't work.)])
-     )
+                [No ANSI prototypes found in library. (-std1 didn't work.)]),
+	 true
+     ),
+     AC_MSG_RESULT(none needed)
 )
 LIBS=$gtk_save_LIBS
 
+MATH_LIB=-lm
+GTK_LIBS_EXTRA=
+AC_MSG_CHECKING(for the BeOS)
+case $host in
+  *-*-beos*)
+    AC_MSG_RESULT(yes)
+    GTK_LIBS_EXTRA="-L\$(top_builddir_full)/gdk/.libs -lgdk"
+    MATH_LIB=
+  ;;
+  *)
+    AC_MSG_RESULT(no)
+  ;;
+esac
+AC_SUBST(MATH_LIB)
+AC_SUBST(GTK_LIBS_EXTRA)
+
 dnl NeXTStep cc seems to need this
 AC_MSG_CHECKING([for extra flags for POSIX compliance])
 AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
@@ -158,10 +242,6 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
     CFLAGS=$gtk_save_CFLAGS
     AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
 
-if test "x$enable_xim" = "xyes"; then
-  CFLAGS="$CFLAGS -DUSE_XIM"
-fi
-
 if test x$with_glib = xyes ; then
   AC_MSG_ERROR([
 *** Directory must be specified for --with-glib])
@@ -170,28 +250,36 @@ fi
 if test x$with_glib = x ; then 
   # Look for separately installed glib
 
-  AM_PATH_GLIB(1.1.3,,
+  AM_PATH_GLIB(1.3.0,,
     AC_MSG_ERROR([
-*** GLIB 1.1.3 or better is required. The latest version of GLIB
-*** is always available from ftp://ftp.gtk.org.]),
-    gmodule)
+*** GLIB 1.3.0 or better is required. The latest version of GLIB
+*** is always available from ftp://ftp.gtk.org/.]),
+    gmodule gthread)
 
-  glib_cflags=$GLIB_CFLAGS
-  glib_libs=$GLIB_LIBS
+  # we do not want to make all gtk progs to link to thread libraries.
+  glib_cflags=`$GLIB_CONFIG glib gmodule --cflags`
+  glib_thread_cflags="$GLIB_CFLAGS"
+  glib_libs=`$GLIB_CONFIG glib gmodule --libs`
+  glib_thread_libs="$GLIB_LIBS"
+  GLIB_LIBS="$glib_libs"
+  GLIB_DEPLIBS="$glib_libs"
 else
   # Use uninstalled glib (assume they got the version right)
 
-  if test -x $with_glib/glib-config ; then 
+  GLIB_CONFIG=$with_glib/glib-config
+  if test -x $GLIB_CONFIG ; then 
     :
   else
     AC_MSG_ERROR([GLIB directory ($with_glib) not present or not configured])
   fi
 
   # For use in gtk-config
-  glib_cflags=`$with_glib/glib-config --cflags`
-  glib_libs=`$with_glib/glib-config --libs`
+  glib_cflags=`$GLIB_CONFIG --cflags gmodule`
+  glib_thread_cflags=`$GLIB_CONFIG --cflags gmodule gthread`
+  glib_libs=`$GLIB_CONFIG --libs gmodule`
+  glib_thread_libs=`$GLIB_CONFIG --libs gmodule gthread`
 
-  glib_release=`$with_glib/glib-config --version | sed 's%\\.[[0-9]]*$%%'`
+  glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'`
 
   # canonicalize relative paths
   case $with_glib in 
@@ -203,8 +291,9 @@ else
       ;;
   esac
 
-  GLIB_CFLAGS="-I$glib_dir"
-  GLIB_LIBS=$glib_dir/libglib-$glib_release.la
+  GLIB_CFLAGS="-I$glib_dir -I$glib_dir/gmodule"
+  GLIB_LIBS="$glib_dir/libglib.la $glib_dir/gmodule/libgmodule.la"
+  GLIB_DEPLIBS=
 
   AC_SUBST(GLIB_CFLAGS)
   AC_SUBST(GLIB_LIBS)
@@ -212,6 +301,13 @@ fi
 
 AC_SUBST(glib_cflags)
 AC_SUBST(glib_libs)
+AC_SUBST(glib_thread_cflags)
+AC_SUBST(glib_thread_libs)
+AC_SUBST(GLIB_DEPLIBS)
+
+AC_CHECK_HEADERS(dirent.h, AC_DEFINE(HAVE_DIRENT_H))
+AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H))
+AC_CHECK_HEADERS(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H))
 
 # Find the X11 include and library directories
 AC_PATH_X
@@ -267,6 +363,35 @@ AC_CHECK_LIB(X11, XConvertCase,
       ,
       $x_libs)
 
+# Check for XIM support.
+
+AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,
+	    : ,
+	    enable_xim_inst="no",
+	    $x_libs)
+
+# On Solaris, calling XRegisterIMInstantiateCallback seems to
+# cause an immediate segfault, so we disable it, unless
+# the user specifically forces it to be on.
+
+if test x$enable_xim_inst = xmaybe ; then
+  case host in
+	*-*-solaris*)
+            enable_xim_inst="no"
+            ;;
+	*)
+	    enable_xim_inst="yes"
+	    ;;
+  esac
+fi
+
+if test "x$enable_xim" = "xyes"; then
+  GTK_XIM_FLAGS="-DUSE_XIM"
+  if test "x$enable_xim_inst" = "xyes"; then
+    AC_DEFINE(USE_X11R6_XIM)
+  fi
+fi
+
 x_cflags="$X_CFLAGS"
 x_ldflags="$X_LDFLAGS $X_LIBS"
 
@@ -283,14 +408,11 @@ else
   AC_DEFINE(XINPUT_NONE)
 fi
 
-# Threads
+AM_CONDITIONAL(XINPUT_GXI, test x$with_xinput = xgxi)
+AM_CONDITIONAL(XINPUT_XFREE, test x$with_xinput = xxfree)
 
-if test "x$with_threads" = "xposix" || test "x$with_threads" = "xyes"; then
-  AC_CHECK_LIB(pthread, pthread_attr_init, 
-    AC_DEFINE(USE_PTHREADS)
-    x_libs="$x_libs -lpthread"
-    CFLAGS="$CFLAGS -D_REENTRANT") 
-fi
+CFLAGS="$saved_cflags"
+LDFLAGS="$saved_ldflags"
 
 AC_SUBST(x_cflags)
 AC_SUBST(x_includes)
@@ -298,46 +420,11 @@ AC_SUBST(x_ldflags)
 AC_SUBST(x_libs)
 AC_SUBST(xinput_progs)
 
-CFLAGS="$saved_cflags"
-LDFLAGS="$saved_ldflags"
-
 if test "x$enable_shm" = "xyes"; then
   # Check for shared memory
   AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc=yes)
   AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm=yes)
 
-  # Check whether shmctl IPC_RMID allowes subsequent attaches
-  if test "$ac_cv_header_sys_shm_h" = "yes"; then
-    AC_MSG_CHECKING(whether shmctl IPC_RMID allowes subsequent attaches)
-    AC_TRY_RUN([
-          #include <sys/types.h>
-          #include <sys/ipc.h>
-          #include <sys/shm.h>
-          int main()
-          {
-            int id;
-            char *shmaddr;
-          id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0777);
-          if (id == -1)
-            exit (2);
-            shmaddr = shmat (id, 0, 0);
-            shmctl (id, IPC_RMID, 0);
-            if ((char*) shmat (id, 0, 0) == (char*) -1)
-            {
-              shmdt (shmaddr);
-              exit (1);
-            }
-            shmdt (shmaddr);
-            shmdt (shmaddr);
-            exit (0);
-          }
-      ],
-      AC_DEFINE(IPC_RMID_DEFERRED_RELEASE)
-        AC_MSG_RESULT(yes),
-      AC_MSG_RESULT(no),
-      AC_MSG_RESULT(assuming no))
-  fi
-
   # Check for the X shared memory extension header file
   AC_MSG_CHECKING(X11/extensions/XShm.h)
   if test "x$no_xext_lib" = "xyes"; then
@@ -354,27 +441,6 @@ if test "x$enable_shm" = "xyes"; then
   fi
 fi
 
-# Check for private display resource base variable
-AC_MSG_CHECKING(resource base field in XDisplay)
-AC_CACHE_VAL(gtk_cv_display_resource_base,
-[AC_TRY_RUN([
-#define XLIB_ILLEGAL_ACCESS
-#include <X11/Xlib.h>
-
-int
-main ()
-{
-  Display *display;
-
-  return 0;
-
-  display->resource_base;
-}],
-gtk_cv_display_resource_base="resource_base",
-gtk_cv_display_resource_base="private3")])
-AC_MSG_RESULT($gtk_cv_display_resource_base)
-AC_DEFINE_UNQUOTED(RESOURCE_BASE, gdk_display->$gtk_cv_display_resource_base)
-
 # Check if X_LOCALE definition is necessary
 
 AC_MSG_CHECKING(need -DX_LOCALE)
@@ -389,11 +455,12 @@ main ()
   return setlocale (LC_ALL, "${with_locale}") == NULL;
 }],
 need_x_locale=no,
-need_x_locale=yes)
+need_x_locale=yes,
+need_x_locale=no)
 AC_MSG_RESULT($need_x_locale)
 
 if test $need_x_locale = yes; then
-  CFLAGS="$CFLAGS -DX_LOCALE"
+  GTK_LOCALE_FLAGS="-DX_LOCALE"
 fi
 
 # Checks for header files.
@@ -402,9 +469,6 @@ AC_HEADER_STDC
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
-# Checks for endianness (needed by GdkRgb).
-AC_C_BIGENDIAN
-
 # Checks for library functions.
 AC_TYPE_SIGNAL
 AC_FUNC_MMAP
@@ -426,11 +490,145 @@ else
     fi
 fi
 
+# `widechar' tests for gdki18n.h
+AC_MSG_CHECKING(for wchar.h)
+AC_TRY_CPP([#include <wchar.h>], gdk_wchar_h=yes, gdk_wchar_h=no)
+if test $gdk_wchar_h = yes; then
+   AC_DEFINE(HAVE_WCHAR_H,1,[Have wchar.h include file])
+fi
+AC_MSG_RESULT($gdk_wchar_h)
+
+# Check for wctype.h (for iswalnum)
+AC_MSG_CHECKING(for wctype.h)
+AC_TRY_CPP([#include <wctype.h>], gdk_wctype_h=yes, gdk_wctype_h=no)
+if test $gdk_wctype_h = yes; then
+   AC_DEFINE(HAVE_WCTYPE_H,1,[Have wctype.h include file])
+fi
+AC_MSG_RESULT($gdk_wctype_h)
+
+# in Solaris 2.5, `iswalnum' is in -lw
+GDK_WLIBS=
+AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS=-lw)])
+
+oLIBS="$LIBS"
+LIBS="$LIBS $GDK_WLIBS"
+# The following is necessary for Linux libc-5.4.38
+AC_MSG_CHECKING(if iswalnum() and friends are properly defined)
+AC_TRY_LINK([#include <stdlib.h>],[
+#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
+#  ifdef HAVE_WCTYPE_H
+#    include <wctype.h>
+#  else
+#    ifdef HAVE_WCHAR_H
+#      include <wchar.h>
+#    endif
+#  endif
+#else
+#  define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
+#endif
+iswalnum((wchar_t) 0);
+], gdk_working_wctype=yes, gdk_working_wctype=no)
+LIBS="$oLIBS"
+
+if test $gdk_working_wctype = no; then
+   AC_DEFINE(HAVE_BROKEN_WCTYPE,1,[Is the wctype implementation broken])
+   GDK_WLIBS=
+fi
+AC_MSG_RESULT($gdk_working_wctype)
+AC_SUBST(GDK_WLIBS)
+
+AC_SUBST(GTK_DEBUG_FLAGS)
+AC_SUBST(GTK_XIM_FLAGS)
+AC_SUBST(GTK_LOCALE_FLAGS)
+
+AC_OUTPUT_COMMANDS([
+
+## Generate `gdk/gdkconfig.h' in two cases
+## 1. `config.status' is run either explicitly, or via configure.
+##     Esp. not when it is run in `Makefile' to generate makefiles and
+##     config.h
+## 2. CONFIG_OTHER is set explicitly
+##
+## Case 1 is difficult.  We know that `automake' sets one of
+## CONFIG_FILES or CONFIG_HEADERS to empty.  This heuristic works
+## only when AM_CONFIG_HEADER is set, however.
+
+if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
+  # Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
+  CONFIG_OTHER=${CONFIG_OTHER:-gdk/gdkconfig.h}
+fi
+case "$CONFIG_OTHER" in
+*gdk/gdkconfig.h*)
+	echo creating gdk/gdkconfig.h
+	outfile=gdkconfig.h-tmp
+	cat > $outfile <<\_______EOF
+/* gdkconfig.h
+ *
+ * This is a generated file.  Please modify `configure.in'
+ */
+
+#ifndef GDKCONFIG_H
+#define GDKCONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+_______EOF
+
+	cat >>$outfile <<_______EOF
+$gdk_windowing
+$gdk_wc
+_______EOF
+
+	cat >>$outfile <<_______EOF
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* GDKCONFIG_H */
+_______EOF
+
+
+	if cmp -s $outfile gdk/gdkconfig.h; then
+	  echo gdk/gdkconfig.h is unchanged
+	  rm -f $outfile
+	else
+	  mv $outfile gdk/gdkconfig.h
+	fi ;;
+esac
+],[
+# Currently we always use X11 on those systems where we run configure...
+gdk_windowing='
+#define GDK_WINDOWING_X11'
+if test x$gdk_wchar_h = xyes; then
+  gdk_wc='
+#define GDK_HAVE_WCHAR_H 1'
+fi
+if test x$gdk_wctype_h = xyes; then
+  gdk_wc="\$gdk_wc
+#define GDK_HAVE_WCTYPE_H 1"
+fi
+if test x$gdk_working_wctype = xno; then
+  gdk_wc="\$gdk_wc
+#define GDK_HAVE_BROKEN_WCTYPE 1"
+fi
+
+
+])
+
 AC_OUTPUT([
+gtk+.spec
+docs/gtk-config.1
 Makefile
 gtk-config
+po/Makefile.in
 docs/Makefile
 gdk/Makefile
+gdk/x11/Makefile
+gdk/win32/Makefile
 gtk/Makefile
 gtk/gtkfeatures.h
+gtk/gtkcompat.h
 ], [chmod +x gtk-config])

debian/build

@@ -0,0 +1,62 @@
+#!/usr/bin/perl -w
+
+				# Adjust debian/changelog and build a new
+				# Debian package of a CVS archive.
+
+				# Written 17 November 1998 by Ben Gertzfield
+				# <che@debian.org>
+
+				# This work is released under the GNU
+				# General Public License, version 2 or
+				# later.
+
+use strict;
+use diagnostics;
+use File::Copy;
+
+my $maintainer = 'Ben Gertzfield <che@debian.org>';
+
+my @date = localtime;
+
+my $datestr = sprintf("%d%.2d%.2d", $date[5] + 1900, $date[4] + 1, $date[3]);
+my $revision = '01';
+
+open (CHANGELOG, 'debian/changelog') or die "Couldn't open debian/changelog: $!\n";
+
+$_ = <CHANGELOG>;
+chomp;
+
+close CHANGELOG;
+
+my ($package, $last_date, $last_revision) = /^(.*?) \((.*?)\.(.*)?\)/;
+
+if ($last_date eq $datestr) {
+  $revision = sprintf("%.2d", $last_revision + 1);
+}
+
+my $new_version = "$datestr.$revision";
+
+copy('debian/changelog', 'debian/changelog.old') or die "Couldn't copy debian/changelog to debian/changelog.old: $!\n";
+
+open(NEWCHANGELOG, ">debian/changelog") or die "Couldn't open debian/changelog for writing: $!\n";
+
+print NEWCHANGELOG "$package ($new_version) unstable; urgency=low\n\n  * CVS snapshot build at " . scalar localtime() . "\n\n -- $maintainer  " . `date -R` . "\n";
+
+open(OLDCHANGELOG, "debian/changelog.old") or die "Couldn't open debian/changelog.old: $!\n";
+
+while (<OLDCHANGELOG>) {
+  print NEWCHANGELOG;
+}
+
+close OLDCHANGELOG;
+close NEWCHANGELOG;
+
+unlink('debian/changelog.old') or die "Couldn't unlink debian/changelog.old: $!\n";
+
+open(NEWVERSION, '>debian/version') or die "Couldn't open debian/version for writing: $!\n";
+print NEWVERSION "$new_version\n";
+close NEWVERSION;
+
+system('dpkg-buildpackage -b -rfakeroot -us -uc');
+unlink 'debian/version' or die "Couldn't unlink debian/version: $!\n";
+

debian/changelog

@@ -1,167 +1,8 @@
-gtk+ (1:0.99.8-1) unstable; urgency=low
+gtk+-cvs (19981116.01) unstable; urgency=low
 
-  * New upstream version.
-  * New file included in libgtk-dev: /usr/share/aclocal/gtk.m4,
-    to help autoconf/automake developers use gtk and gtk-config
-    more easily.
-  * New file included in libgtk-doc: /usr/doc/libgtk-doc/gtk-config.txt
-    Please refer to this doc when developing for gtk or compiling
-    and running into odd path-related errors.
-    
- -- Ben Gertzfield <che@debian.org>  Thu, 19 Mar 1998 19:58:53 -0800
+  * First test build from CVS
 
-gtk+ (1:0.99.7-4) frozen unstable; urgency=low
-
-  * Rebuild with native Debian libtool to have libraries properly
-    linked with libc and libX et al.
-
- -- Ben Gertzfield <che@debian.org>  Tue, 17 Mar 1998 16:05:13 -0800
-
-gtk+ (1:0.99.7-3) frozen unstable; urgency=low
-
-  * Accidentally included all the html docs in /usr/doc/libgtk-doc/faq-html;
-    moved the tutorial into /usr/doc/libgtk-doc/tutorial-html.
-  * Included the Italian Gtk+ Tutorial in 
-    /usr/doc/libgtk-doc/italian-tutorial-html.
-
- -- Ben Gertzfield <che@debian.org>  Mon, 16 Mar 1998 22:39:57 -0800
-
-gtk+ (1:0.99.7-2) unstable; urgency=low
-
-  * Upstream source added a /usr/lib/glib/ directory that I didn't
-    notice; included this directory in libgtk-dev.
-  * Realized that Xinput support was broken because I was doing
-    ./configure --enable-xinput=xfree instead of ./configure
-    --with-xinput=xfree. Fixed.
-
- -- Ben Gertzfield <che@debian.org>  Sun, 15 Mar 1998 19:17:05 -0800
-
-gtk+ (1:0.99.7-1) unstable; urgency=low
-
-  * New upstream release -- THIS IS INCOMPATIBLE WITH OLDER RELEASES!
-    All Gtk-using packages *will* need patches to work with this Gtk!
-  * Upstream release includes 'gtk-config' script to check installed
-    version of Gtk; included said script in libgtk-dev in /usr/bin.
-
- -- Ben Gertzfield <che@debian.org>  Sun, 15 Mar 1998 11:03:03 -0800
-
-gtk+ (1:0.99.5-2) unstable; urgency=low
-
-  * Modified libgtk-doc to Replace: libgtk-dev (<< 1:0.99.4) to
-    deal with both packages including the same .info files.
-    Fixes bug #19533.
-  * Also noticed that libgtk-dev depended on libgtk1 without
-    an epoch! Fixed.
-
- -- Ben Gertzfield <che@debian.org>  Thu, 12 Mar 1998 13:37:11 -0800
-
-gtk+ (1:0.99.5-1) unstable; urgency=low
-
-  * Wow, that was quick, a new upstream version.
-
- -- Ben Gertzfield <che@debian.org>  Mon,  9 Mar 1998 22:08:08 -0800
-
-gtk+ (1:0.99.4-3) unstable; urgency=low
-
-  * Recompiled with --enable-xinput=xfree to enable Wacom pads
-    and other physical input devices.
-
- -- Ben Gertzfield <che@debian.org>  Mon,  9 Mar 1998 21:26:07 -0800
-
-gtk+ (1:0.99.4-2) unstable; urgency=MEDIUM
-
-  * Ack! The shlibs file makes things depend on libgtk1 (>= 0.99.4)
-    rather than (>= 1:0.99.4)! Fixes bug #19134.
-
- -- Ben Gertzfield <che@debian.org>  Sat,  7 Mar 1998 23:57:33 -0800
-
-gtk+ (1:0.99.4-1) unstable; urgency=low
-
-  * New upstream version.
-  * Recompiled with new debhelper to remove du warnings.
-  * Upstream source is named gtk+, not libgtk1. Changed source name.
-  * Removed --disable-xim in hopes that xim is no longer broken.
-  * Removed testgtk at the behest of the Gtk developers until I can
-    come up with a better solution, probably related to:
-  * the new libgtk-doc package! :) libgtk-doc contains the Gtk FAQ,
-    the Gtk Tutorial, and the Gtk info files.
-
- -- Ben Gertzfield <che@debian.org>  Tue,  3 Mar 1998 22:23:47 -0800
-
-libgtk1 (1:0.99.3-2) unstable; urgency=low
-
-  * Created manpage for testgtk program.
-  * Fixed copyright mention to LGPL.gz to be just LGPL.
-  * This fixes all known lintian errors.
-
- -- Ben Gertzfield <che@debian.org>  Wed, 11 Feb 1998 14:07:17 -0800
-
-libgtk1 (1:0.99.3-1) unstable; urgency=low
-
-  * New upstream version.
-  * Include the testgtk binary in libgtk-dev.
-
- -- Ben Gertzfield <che@debian.org>  Sat, 24 Jan 1998 15:30:09 -0800
-
-libgtk1 (1:0.99.2-2) unstable; urgency=low
-
-  * Fixed shlibs file to specify version >=1:0.99.2.
-  * Renamed debian/postinst.libgtk1 to debian/postinst, so debhelper
-    would actually install it.
-
- -- Ben Gertzfield <che@debian.org>  Mon,  5 Jan 1998 12:22:46 -0800
-
-libgtk1 (1:0.99.2-1) unstable; urgency=low
-
-  * New upstream version.
-
- -- Ben Gertzfield <che@debian.org>  Sun,  4 Jan 1998 00:21:21 -0800
-
-libgtk1 (1:0.99.0-1) unstable; urgency=medium
-
-  * New upstream version with new numbering scheme, went to epoch :1
-    correspondingly.
-  * Hopefully fixed entry-field bug.
-  * Converted to use debhelper.
-
- -- Ben Gertzfield <che@debian.org>  Mon, 15 Dec 1997 12:02:25 -0800
-
-libgtk1 (971201-1) unstable; urgency=low
-
-  * New upstream version.
-  * Fixed copyright to say LGPL, not GPL. (bug #14867)
-  * Re-added postinst ldconfig call. (bug #14213)
-  * Info files should be correct now. (bugs #14773, #15143)
-
- -- Ben Gertzfield <che@debian.org>  Mon,  1 Dec 1997 16:41:50 -0800
-
-libgtk1 (971109-1) unstable; urgency=low
-
-  * New upstream version.
-  * Name is really 'GIMP Tool Kit', not 'General Tool Kit'.
-
- -- Ben Gertzfield <che@debian.org>  Mon, 10 Nov 1997 16:15:27 -0800
-
-libgtk1 (970925-3) unstable; urgency=low
-
-  * Moved the include files to /usr/include/{gtk,gdk}.
-  * Removed postinst/postrm ldconfig calls, fixes old gimp bug #13773.
-
- -- Ben Gertzfield <che@debian.org>  Fri, 17 Oct 1997 17:06:10 -0700
-
-libgtk1 (970925-2) unstable; urgency=low
-
-  * Added the shlibs file.
-  * Removed the postinst/postrm calls to ldconfig, fixes bug #13733.
-
- -- Ben Gertzfield <che@debian.org>  Fri, 10 Oct 1997 17:55:39 -0700
-
-libgtk1 (970925-1) unstable; urgency=low
-
-  * New upstream version.
-  * Split off source tree from gimp's source tree.
-
- -- Ben Gertzfield <che@debian.org>  Mon, 29 Sep 1997 13:14:45 -0700
+ -- Ben Gertzfield <che@debian.org>  Tue, 17 Nov 1998 12:02:13 -0800
 
 Local variables:
 mode: debian-changelog

debian/control

@@ -1,41 +1,81 @@
-Source: gtk+
-Priority: optional
+Source: gtk+-cvs
+Priority: extra
 Section: libs
 Maintainer: Ben Gertzfield <che@debian.org>
 Standards-Version: 2.4.0.0
 
-Package: libgtk1
+Package: libgtk-cvs-1.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Description: The GIMP Toolkit set of widgets for X
+Conflicts: libgtk-dev (<< 1:1.0.2), libgtk1.1
+Description: CVS build of the GIMP Toolkit set of widgets for X
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ . 
  The GIMP Toolkit is a freely available set of widgets for X.
  GTK is easy to use, and has been implemented in such projects as
  The GNU Image Manipulation Program (The GIMP), GNOME, a GNU
  desktop set of utilities for X, and gzilla, a GNU web-browser.
+ .
+ This is the unstable 1.1 branch of GTK. It is not intended for use
+ with stable projects!
 
-Package: libgtk-dev
+Package: libgtk-cvs-dev
 Architecture: any
 Section: devel
-Depends: libgtk1 (>= 1:0.99.8)
-Suggests: libgtk-doc
-Replaces: libgtk1 (<= 0.99.7)
-Description: Header files and static libraries for the GIMP Toolkit
+Depends: libgtk-cvs-1.1 (=${Source-Version}), libglib-cvs-dev
+Suggests: libgtk-cvs-doc
+Provides: libgtk1.1-dev
+Replaces: libgtk1.1-dev
+Conflicts: libgtk-dev, libgtk1 (<< 1:1.0.4), libgtk1.1-dev
+Description: CVS build of development files for the GIMP Toolkit
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ .
  This package contains the header files and static libraries for the
  GIMP Toolkit set of widgets for X. 
  .
+ This is the unstable, 1.1 branch of GTK+. This is not intended for
+ use with stable releases of programs! 
+ .
  Install this package if you wish to develop your own X programs using
- the GIMP Toolkit, or if you wish to compile your own plug-ins for
+ the GIMP Toolkit 1.1, or if you wish to compile your own plug-ins for
  The GIMP.
 
-Package: libgtk-doc
+Package: libgtk-cvs-doc
 Architecture: all
-Section: docs
-Replaces: libgtk-dev (<< 1:0.99.4)
-Description: Documentation and example code for the GIMP Toolkit
+Section: doc
+Conflicts: libgtk-dev (<< 1:0.99.4), libgtk-doc, libgtk1.1-doc
+Description: CVS build of documentation for the GIMP Toolkit
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ .
  This package contains lots of info-files, HTML docs, FAQs, and
  other handy documentation about the GIMP Toolkit set of widgets
- for X.
+ for X. 
  .
+ This package documents the unstable 1.1 release of the GIMP Toolkit.
+ . 
  Install this package if you want to have lots of info about the
  GIMP toolkit when you're programming.
+
+Package: libgtk-cvs-dbg
+Architecture: any
+Section: devel
+Depends: libgtk-cvs-1.1 (= ${Source-Version}), libgtk-cvs-dev (= ${Source-Version})
+Suggests: libgtk-cvs-doc
+Conflicts: libgtk1.1-dbg
+Description: CVS build of debugging files for the GIMP Toolkit
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ .
+ This package contains the debugging static libraries for the
+ GIMP Toolkit set of widgets for X. 
+ .
+ This is the unstable, 1.1 branch of GTK+. This is not intended for
+ use with stable releases of programs! 
+ .
+ Install this package if you wish to debug your own X programs using
+ the GIMP Toolkit 1.1, or if you wish to debug your own plug-ins for
+ The GIMP.

debian/copyright

@@ -1,7 +1,7 @@
-This package was debianized by Ben Gertzfield che@imsa.edu on
-Tue, 22 Jul 1997 20:53:20 -0500
+This package was debianized by Ben Gertzfield <che@debian.org> on
+Tue, 17 Nov 1998 12:07:17 -0800
 
-It was downloaded from ftp.gimp.org.
+It was produced from the CVS repository at cvs.gimp.org.
 
 It may be redistributed under the terms of the GNU LGPL, Version 2 or
 later, found on Debian systems in the file /usr/doc/copyright/LGPL.

debian/libgtk-cvs-dev.files

@@ -0,0 +1,9 @@
+usr/lib/libgdk.so
+usr/lib/libgdk.a
+usr/lib/libgtk.so
+usr/lib/libgtk.a
+usr/include/gdk/
+usr/include/gtk/
+usr/bin/gtk-config
+usr/man/man1/gtk-config.1
+usr/share/aclocal/gtk.m4

debian/libgtk-cvs-dev.postinst

@@ -2,6 +2,4 @@
 
 set -e
 
-ldconfig
-
 #DEBHELPER#

debian/libgtk-cvs-doc.files

@@ -0,0 +1,8 @@
+usr/info/gdk.info
+usr/info/gtk.info
+usr/info/gtk.info-1
+usr/info/gtk.info-2
+usr/info/gtk.info-3
+usr/info/gtk.info-4
+usr/info/gtk.info-5
+

debian/libgtk-cvs-doc.postinst

@@ -8,7 +8,4 @@ install-info --quiet --description="The GIMP Toolkit." \
 install-info --quiet --description="The GIMP Drawing Kit." \
  --section "The GIMP" "The GIMP" /usr/info/gdk.info.gz
 
-install-info --quiet --description="The GIMP Library." \
- --section "The GIMP" "The GIMP" /usr/info/glib.info.gz
-
 #DEBHELPER#

debian/libgtk-cvs-doc.prerm

@@ -2,7 +2,6 @@
 
 set -e
 install-info --quiet --remove gtk
-install-info --quiet --remove glib
 install-info --quiet --remove gdk
 
 #DEBHELPER#

debian/rules

@@ -1,27 +1,50 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# debian/rules file for gtk+ Debian package
+# written April 1998 by Ben Gertzfield <che@debian.org
 
 build: build-stamp
 build-stamp:
 	dh_testdir
-	# Add here commands to compile the package.
-	./configure --prefix=/usr --with-xinput=xfree
+	./autogen.sh --prefix=/usr --with-xinput=xfree
 	$(MAKE)
-	cd docs && make -f Makefile.sgml
+	cd docs && make distdocs
 	cd ..
 	touch build-stamp
 
+build-dbg: build-dbg-stamp
+build-dbg-stamp:
+	dh_testdir
+	./configure --prefix=/usr --with-xinput=xfree --enable-debug=yes
+	$(MAKE)
+	touch build-dbg-stamp
+
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f build-stamp build-dbg-stamp install-stamp install-dbg-stamp
 	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+	cd docs 
+	-$(MAKE) maintainer-clean
+	cd ..
 	-$(MAKE) distclean
-	-rm docs/*.html
+	find . -name '*.o' -o -name '_libs' -o -name '*.lo' -o -name '*.a' -o -name '.deps' | xargs rm -rf
 	dh_clean
 
+clean-dbg:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp build-dbg-stamp install-stamp install-dbg-stamp
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+	cd docs
+	-$(MAKE) maintainer-clean
+	cd ..
+	-$(MAKE) distclean
+	find . -name '*.o' -o -name '_libs' -o -name '*.lo' -o -name '*.a' -o -name '.deps' | xargs rm -rf
+	dh_clean -k
+
 install: install-stamp
 install-stamp: build
 	dh_testdir
@@ -30,88 +53,105 @@ install-stamp: build
 	$(MAKE) prefix=`pwd`/debian/tmp/usr install
 	touch install-stamp
 
+install-dbg: install-dbg-stamp
+install-dbg-stamp: build-dbg
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	$(MAKE) prefix=`pwd`/debian/libgtk-cvs-dbg/usr install
+	touch install-dbg-stamp
+
 # Build architecture-independent files here.
-binary-indep: build install libgtk-doc
+binary-indep: build install libgtk-cvs-doc
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
-binary-arch: build install libgtk-dev libgtk1
+binary-arch: build install libgtk-cvs-dev libgtk-cvs-1.1 libgtk-cvs-dbg
 
-libgtk1: build
-	dh_testdir -plibgtk1 
-	dh_testroot -plibgtk1
-#	dh_clean -plibgtk1
-	dh_installdirs -plibgtk1
+libgtk-cvs-1.1: build
+	dh_testdir -plibgtk-cvs-1.1 
+	dh_testroot -plibgtk-cvs-1.1
+	dh_installdirs -plibgtk-cvs-1.1
 	# Add here commands to install the files into debian/tmp
-	rm -rf debian/tmp/usr/bin debian/tmp/usr/include debian/tmp/usr/info debian/tmp/usr/lib/glib debian/tmp/usr/share
-#	dh_movefiles -plibgtk1
-#	$(MAKE) prefix=`pwd`/debian/tmp/usr install
-#	rmdir debian/tmp/usr/bin
-#	rm debian/tmp/usr/lib/*.{so,la,a}
-#	rm -rf debian/tmp/usr/{include,info}
-	dh_installdocs -plibgtk1
-	dh_installchangelogs -plibgtk1
-	dh_strip -plibgtk1
-	dh_compress -plibgtk1
-	dh_fixperms -plibgtk1
-	dh_installdeb -plibgtk1
-	dh_shlibdeps -plibgtk1
-	dh_gencontrol -plibgtk1
-	dh_makeshlibs -plibgtk1 -V 'libgtk1 (>= 1:0.99.7)'
-#	echo "libglib 1 libgtk1 (>=0.99.4)" >> debian/tmp/DEBIAN/shlibs
-#	echo "libgtk 1 libgtk1 (>=0.99.4)" >> debian/tmp/DEBIAN/shlibs
-#	echo "libgdk 1 libgtk1 (>=0.99.4)" >> debian/tmp/DEBIAN/shlibs
-	dh_md5sums -plibgtk1
-	dh_builddeb -plibgtk1
+	rm -rf debian/tmp/usr/bin debian/tmp/usr/include debian/tmp/usr/info debian/tmp/usr/lib/glib debian/tmp/usr/share/aclocal debian/tmp/usr/man debian/tmp/usr/lib/*.la
+	dh_installdocs -plibgtk-cvs-1.1
+	dh_installchangelogs -plibgtk-cvs-1.1
+	dh_strip -plibgtk-cvs-1.1
+	dh_compress -plibgtk-cvs-1.1
+	dh_fixperms -plibgtk-cvs-1.1
+	dh_installdeb -plibgtk-cvs-1.1
+	dh_shlibdeps -plibgtk-cvs-1.1
+	dh_gencontrol -plibgtk-cvs-1.1
+	dh_makeshlibs -plibgtk-cvs-1.1 -V 'libgtk-cvs-1.1 (='`cat debian/version`')'
+	dh_md5sums -plibgtk-cvs-1.1
+	dh_builddeb -plibgtk-cvs-1.1
 
-libgtk-dev: build
-	dh_testdir -plibgtk-dev
-	dh_testroot -plibgtk-dev
-	dh_clean -plibgtk-dev -k
-	dh_installdirs -plibgtk-dev
+libgtk-cvs-dev: build
+	dh_testdir -plibgtk-cvs-dev
+	dh_testroot -plibgtk-cvs-dev
+	dh_clean -plibgtk-cvs-dev -k
+	dh_installdirs -plibgtk-cvs-dev
 	# Add here commands to install the files into debian/tmp
-	dh_movefiles -plibgtk-dev
+	dh_movefiles -plibgtk-cvs-dev
 	cp gtk-config debian/tmp/usr/bin
-#	$(MAKE) prefix=`pwd`/debian/libgtk-dev/usr install
-#	find debian/libgtk-dev/usr/lib \( -type f -or -type l \) -and ! \( -name \*.so -or -name \*.a \) | xargs rm
-#	cp gtk/.libs/testgtk debian/libgtk-dev/usr/bin
-#	cp debian/testgtk.1 debian/libgtk-dev/usr/man/man1
-	dh_installdocs -plibgtk-dev 
-	dh_installchangelogs -plibgtk-dev
-	dh_strip -plibgtk-dev
-	dh_compress -plibgtk-dev
-	dh_fixperms -plibgtk-dev
-	dh_installdeb -plibgtk-dev
-	dh_shlibdeps -plibgtk-dev
-	dh_gencontrol -plibgtk-dev
-	dh_makeshlibs -plibgtk-dev
-	dh_md5sums -plibgtk-dev
-	dh_builddeb -plibgtk-dev
+	dh_installdocs -plibgtk-cvs-dev 
+	dh_installchangelogs -plibgtk-cvs-dev
+	dh_strip -plibgtk-cvs-dev
+	dh_compress -plibgtk-cvs-dev
+	dh_fixperms -plibgtk-cvs-dev
+	dh_installdeb -plibgtk-cvs-dev
+	dh_shlibdeps -plibgtk-cvs-dev
+	dh_gencontrol -plibgtk-cvs-dev
+	dh_md5sums -plibgtk-cvs-dev
+	dh_builddeb -plibgtk-cvs-dev
 
-libgtk-doc:
-	dh_testdir -plibgtk-doc
-	dh_testroot -plibgtk-doc
-	dh_clean -plibgtk-doc -k
-	dh_installdirs -plibgtk-doc usr/doc/libgtk-doc/faq-html \
-	  usr/doc/libgtk-doc/tutorial-html usr/doc/libgtk-doc/italian-tutorial-html
-	# Add here commands to install the files into debian/tmp
-	dh_movefiles -plibgtk-doc
-	cp docs/gtkfaq*.html debian/libgtk-doc/usr/doc/libgtk-doc/faq-html
-	cp docs/gtk_tut-*.html debian/libgtk-doc/usr/doc/libgtk-doc/tutorial-html
-	cp docs/gtk_tut.html debian/libgtk-doc/usr/doc/libgtk-doc/tutorial-html
-	cp docs/gtk_tut_it*.html debian/libgtk-doc/usr/doc/libgtk-doc/italian-tutorial-html
-	dh_installdocs -plibgtk-doc docs/{debugging,developers,styles,text_widget,widget_system,gtk-config}.txt ChangeLog TODO NEWS
-	dh_installchangelogs -plibgtk-doc
-	dh_strip -plibgtk-doc
-	dh_compress -plibgtk-doc
-	dh_fixperms -plibgtk-doc
-	dh_installdeb -plibgtk-doc
-	dh_shlibdeps -plibgtk-doc
-	dh_gencontrol -plibgtk-doc
-	dh_makeshlibs -plibgtk-doc
-	dh_md5sums -plibgtk-doc
-	dh_builddeb -plibgtk-doc
+libgtk-cvs-doc:
+	dh_testdir -plibgtk-cvs-doc
+	dh_testroot -plibgtk-cvs-doc
+	dh_clean -plibgtk-cvs-doc -k
+	dh_installdirs -plibgtk-cvs-doc usr/doc/libgtk-cvs-doc/faq-html \
+	  usr/doc/libgtk-cvs-doc/tutorial-html usr/doc/libgtk-cvs-doc/italian-tutorial-html usr/doc/libgtk-cvs-doc/french-tutorial-html usr/doc/libgtk-cvs-doc/gdk-html
+	dh_movefiles -plibgtk-cvs-doc
+	cp docs/html/gtkfaq*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/faq-html
+	cp docs/html/gtk_tut-*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
+	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
+	cp docs/html/gtk_tut.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
+	cp docs/html/gtk_tut_it*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/italian-tutorial-html
+	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/italian-tutorial-html
+	cp docs/html/gtk_tut_fr*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/french-tutorial-html
+	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/french-tutorial-html
+	cp docs/html/gdk* debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/gdk-html
+	cp docs/text/*.txt debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/
 
+	dh_installdocs -plibgtk-cvs-doc docs/{debugging,developers,styles,text_widget,widget_system,gtk-config,refcounting}.txt TODO NEWS
+	dh_installchangelogs -plibgtk-cvs-doc
+	dh_strip -plibgtk-cvs-doc
+	dh_compress -plibgtk-cvs-doc
+	dh_fixperms -plibgtk-cvs-doc
+	dh_installdeb -plibgtk-cvs-doc
+	dh_shlibdeps -plibgtk-cvs-doc
+	dh_gencontrol -plibgtk-cvs-doc
+	dh_md5sums -plibgtk-cvs-doc
+	dh_builddeb -plibgtk-cvs-doc
+
+libgtk-cvs-dbg: clean-dbg install-dbg
+	dh_testdir -plibgtk-cvs-dbg
+	dh_testroot -plibgtk-cvs-dbg
+	dh_installdirs -plibgtk-cvs-dbg
+	# Add here commands to install the files into debian/libgtk-cvs-dbg
+	rm -rf debian/libgtk-cvs-dbg/usr/bin debian/libgtk-cvs-dbg/usr/include debian/libgtk-cvs-dbg/usr/info debian/libgtk-cvs-dbg/usr/lib/glib debian/libgtk-cvs-dbg/usr/man debian/libgtk-cvs-dbg/usr/share debian/libgtk-cvs-dbg/usr/lib/*.{la,so*}
+	for file in `find debian/libgtk-cvs-dbg/usr/lib -name '*.a'` ; do \
+	  mv $$file debian/libgtk-cvs-dbg/usr/lib/`basename $$file .a`_g.a; \
+        done
+	dh_installdocs -plibgtk-cvs-dbg
+	dh_installchangelogs -plibgtk-cvs-dbg
+	dh_compress -plibgtk-cvs-dbg
+	dh_fixperms -plibgtk-cvs-dbg
+	dh_installdeb -plibgtk-cvs-dbg
+	dh_shlibdeps -plibgtk-cvs-dbg
+	dh_gencontrol -plibgtk-cvs-dbg
+	dh_md5sums -plibgtk-cvs-dbg
+	dh_builddeb -plibgtk-cvs-dbg
 
 source diff:                                                                  
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false

demos/testanimation.c

@@ -0,0 +1,462 @@
+
+/* testpixbuf -- test program for gdk-pixbuf code
+ * Copyright (C) 1999 Mark Crichton, Larry Ewing
+ *
+ * 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 <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <gtk/gtk.h>
+#include "gdk-pixbuf.h"
+#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf-loader.h"
+
+typedef struct {
+	FILE             *imagefile;
+	GdkPixbufLoader  *loader;
+	GtkWidget        **rgbwin;
+	guchar           *buf;
+	guint            timeout;
+	guint            readlen;
+
+} ProgressFileStatus;
+
+
+#define DEFAULT_WIDTH  24
+#define DEFAULT_HEIGHT 24
+
+static const unsigned char default_image[] = {
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xae, 0xb3, 0xb3, 0xc6, 0xc9, 0xcd, 0xd7, 0xd4, 0xdf,
+	0xec, 0xde, 0xf3, 0xe7, 0xcb, 0xe9, 0xd9, 0xb5, 0xd3, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xb1, 0xb7, 0xa5,
+	0xb0, 0xb8, 0xad, 0xb3, 0xb9, 0xb6, 0xc1, 0xc6, 0xc8, 0xd5, 0xd3, 0xdc,
+	0xec, 0xde, 0xf3, 0xe5, 0xca, 0xe6, 0xe0, 0xbb, 0xd7, 0xe1, 0xad, 0xc2,
+	0xe3, 0xac, 0xa3, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xca, 0xc1, 0xa4, 0xc5, 0xc7, 0xac,
+	0xb7, 0xbe, 0xaf, 0xad, 0xb4, 0xaf, 0xbd, 0xc2, 0xc3, 0xd1, 0xd0, 0xd8,
+	0xec, 0xde, 0xf3, 0xe5, 0xc7, 0xe4, 0xe0, 0xb6, 0xd1, 0xe7, 0xa9, 0xb4,
+	0xed, 0xcd, 0xb6, 0xd6, 0xcf, 0xae, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0x00, 0x00, 0x00, 0xdf, 0xa7, 0x9f, 0xdd, 0xbf, 0xaa, 0xcf, 0xc5, 0xa9,
+	0xc1, 0xc4, 0xac, 0xb2, 0xba, 0xaf, 0xb6, 0xbb, 0xbb, 0xcd, 0xce, 0xd4,
+	0xec, 0xde, 0xf3, 0xe4, 0xc4, 0xe1, 0xe0, 0xaf, 0xc7, 0xea, 0xbc, 0xae,
+	0xe1, 0xd6, 0xb6, 0xc7, 0xcc, 0xae, 0xa2, 0xab, 0x9a, 0x00, 0x00, 0x00,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0x00, 0x00, 0x00, 0xe3, 0xab, 0xc0, 0xe6, 0xa3, 0xa7, 0xdf, 0xba, 0xa8,
+	0xcf, 0xc5, 0xa9, 0xbd, 0xc2, 0xae, 0xad, 0xb4, 0xaf, 0xc6, 0xc9, 0xcd,
+	0xec, 0xde, 0xf3, 0xe2, 0xbf, 0xdc, 0xe7, 0xa9, 0xb4, 0xe7, 0xd6, 0xb8,
+	0xc7, 0xcc, 0xae, 0xac, 0xb6, 0xa6, 0x9d, 0xa8, 0x9f, 0x00, 0x00, 0x00,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xd9, 0xaf, 0xcf, 0xe1, 0xb4, 0xd2, 0xe2, 0xb0, 0xcb, 0xe4, 0xa9, 0xbb,
+	0xe2, 0xb2, 0xa6, 0xcf, 0xc5, 0xa9, 0x6a, 0x6a, 0x6a, 0x0d, 0x0d, 0x0d,
+	0x0d, 0x0d, 0x0d, 0x6a, 0x6a, 0x6a, 0xed, 0xcd, 0xb6, 0xc7, 0xcc, 0xae,
+	0xa6, 0xb1, 0xa3, 0x98, 0xa2, 0x9c, 0x8f, 0x97, 0x96, 0x7e, 0x84, 0x85,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xe8, 0xc6, 0xe7, 0xe5, 0xc2, 0xe3, 0xe3, 0xbd, 0xdd, 0xe1, 0xb6, 0xd5,
+	0xe2, 0xb0, 0xcb, 0x6a, 0x6a, 0x6a, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x6a, 0x6a, 0x6a, 0x9d, 0xa8, 0x9f,
+	0x8f, 0x97, 0x96, 0x8b, 0x90, 0x92, 0x97, 0x9e, 0xa2, 0xa0, 0xa7, 0xae,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xe7, 0xd3, 0xed, 0xe8, 0xd1, 0xed, 0xe8, 0xce, 0xec, 0xe9, 0xcc, 0xeb,
+	0xe8, 0xc6, 0xe7, 0x0d, 0x0d, 0x0d, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x0d, 0x0d, 0x0d, 0x97, 0x9e, 0xa2,
+	0xa7, 0xae, 0xb7, 0xb2, 0xb6, 0xc5, 0xba, 0xbc, 0xce, 0xbf, 0xbe, 0xd3,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xe9, 0xdf, 0xf0, 0xe9, 0xdf, 0xf0, 0xe9, 0xdf, 0xf0, 0xe9, 0xdf, 0xf0,
+	0xe9, 0xdf, 0xf0, 0x0d, 0x0d, 0x0d, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x0d, 0x0d, 0x0d, 0xe1, 0xd2, 0xf7,
+	0xe1, 0xd2, 0xf7, 0xe1, 0xd2, 0xf7, 0xe1, 0xd2, 0xf7, 0xe1, 0xd2, 0xf7,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xca, 0xc7, 0xd2, 0xc5, 0xc4, 0xcd, 0xbf, 0xbf, 0xc7, 0xb8, 0xb9, 0xc0,
+	0xae, 0xaf, 0xb6, 0x6a, 0x6a, 0x6a, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x6a, 0x6a, 0x6a, 0xd5, 0xa8, 0xe1,
+	0xd8, 0xb2, 0xe9, 0xd9, 0xb8, 0xed, 0xdb, 0xbd, 0xf0, 0xdc, 0xbf, 0xf1,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xa4, 0xa6, 0xac, 0xa8, 0xaa, 0xaf, 0xa0, 0xa6, 0xa8, 0x98, 0x9e, 0x9c,
+	0xa1, 0xa8, 0x9e, 0xb1, 0xb6, 0xa1, 0x6a, 0x6a, 0x6a, 0x0d, 0x0d, 0x0d,
+	0x0d, 0x0d, 0x0d, 0x6a, 0x6a, 0x6a, 0xc0, 0x8c, 0xad, 0xcc, 0x90, 0xb5,
+	0xd3, 0x94, 0xca, 0xd6, 0xa2, 0xdb, 0xd5, 0xa8, 0xe1, 0xcf, 0xa7, 0xdf,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0x00, 0x00, 0x00, 0x98, 0x9f, 0x9b, 0xa1, 0xa8, 0x9e, 0xac, 0xb3, 0xa0,
+	0xb9, 0xb9, 0xa4, 0xd0, 0xb8, 0xa8, 0xc5, 0xb5, 0xb8, 0xb6, 0xbb, 0xad,
+	0xe3, 0xd7, 0xb5, 0xdd, 0xb4, 0xa9, 0xcb, 0x89, 0xac, 0xc0, 0x8c, 0xad,
+	0xc8, 0x91, 0xb5, 0xd1, 0x8d, 0xb7, 0xd3, 0x94, 0xca, 0x00, 0x00, 0x00,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0x00, 0x00, 0x00, 0xa1, 0xa7, 0x98, 0xb1, 0xb6, 0xa1, 0xbd, 0xb9, 0xa5,
+	0xd0, 0xb8, 0xa8, 0xca, 0xb5, 0xb7, 0xb8, 0xb1, 0xb1, 0xc2, 0xc8, 0xb2,
+	0xe3, 0xd7, 0xb5, 0xe1, 0xbf, 0xaf, 0xdb, 0x92, 0x9a, 0xbe, 0x82, 0xa6,
+	0xc0, 0x8c, 0xad, 0xc8, 0x91, 0xb4, 0xc7, 0x8b, 0xb0, 0x00, 0x00, 0x00,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xbc, 0xb6, 0xa1, 0xd0, 0xb8, 0xa8,
+	0xcd, 0xb6, 0xb7, 0xc0, 0xb4, 0xb5, 0xb1, 0xb1, 0xaa, 0xca, 0xd1, 0xb4,
+	0xe3, 0xd7, 0xb5, 0xe2, 0xc1, 0xb0, 0xdb, 0xa8, 0xa3, 0xd2, 0x8a, 0xa9,
+	0xb7, 0x7e, 0xa2, 0xbd, 0x89, 0xa9, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xc9, 0xaf, 0xaf,
+	0xc5, 0xb5, 0xb8, 0xb8, 0xb1, 0xb1, 0xb6, 0xbb, 0xad, 0xd0, 0xd6, 0xb5,
+	0xe3, 0xd7, 0xb5, 0xe2, 0xbf, 0xaf, 0xdd, 0xb4, 0xa9, 0xdb, 0x92, 0x9a,
+	0xc6, 0x84, 0xa7, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xac, 0xaa, 0xa6, 0xbd, 0xc3, 0xb0, 0xd2, 0xd7, 0xb5,
+	0xe3, 0xd7, 0xb5, 0xe2, 0xbf, 0xae, 0xdb, 0xb6, 0xa8, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff
+};
+
+static void
+quit_func (GtkWidget *widget, gpointer dummy)
+{
+	gtk_main_quit ();
+}
+
+static void
+expose_func (GtkWidget *drawing_area, GdkEventExpose *event, gpointer data)
+{
+	GdkPixbuf *pixbuf;
+
+	pixbuf = (GdkPixbuf *)gtk_object_get_data(GTK_OBJECT(drawing_area), "pixbuf");
+
+	if (!pixbuf->art_pixbuf) {
+		g_warning ("art_pixbuf is NULL in expose_func!!\n");
+		return;
+	}
+
+	if (pixbuf->art_pixbuf->has_alpha) {
+		gdk_draw_rgb_32_image (drawing_area->window,
+				       drawing_area->style->black_gc,
+				       event->area.x, event->area.y, 
+				       event->area.width, 
+				       event->area.height,
+				       GDK_RGB_DITHER_MAX, 
+				       pixbuf->art_pixbuf->pixels 
+				       + (event->area.y * pixbuf->art_pixbuf->rowstride) 
+				       + (event->area.x * pixbuf->art_pixbuf->n_channels),
+				       pixbuf->art_pixbuf->rowstride);
+	} else {
+		gdk_draw_rgb_image (drawing_area->window,
+				    drawing_area->style->white_gc,
+				    event->area.x, event->area.y, 
+				    event->area.width, 
+				    event->area.height,
+				    GDK_RGB_DITHER_NORMAL,
+				    pixbuf->art_pixbuf->pixels 
+				    + (event->area.y * pixbuf->art_pixbuf->rowstride) 
+				    + (event->area.x * pixbuf->art_pixbuf->n_channels),
+				    pixbuf->art_pixbuf->rowstride);
+	}
+}
+
+static void
+config_func (GtkWidget *drawing_area, GdkEventConfigure *event, gpointer data)
+{
+	GdkPixbuf *pixbuf;
+    
+	pixbuf = (GdkPixbuf *)gtk_object_get_data(GTK_OBJECT(drawing_area), "pixbuf");
+
+	g_print("X:%d Y:%d\n", event->width, event->height);
+
+#if 0
+	if (((event->width) != (pixbuf->art_pixbuf->width)) ||
+	    ((event->height) != (pixbuf->art_pixbuf->height))) 
+		gdk_pixbuf_scale(pixbuf, event->width, event->height);
+#endif
+}
+
+static GtkWidget*
+new_testrgb_window (GdkPixbuf *pixbuf, gchar *title)
+{
+	GtkWidget *window;
+	GtkWidget *vbox;
+	GtkWidget *temp_box;
+	GtkWidget *button;
+	GtkWidget *drawing_area;
+	gint w, h;
+ 
+	w = pixbuf->art_pixbuf->width;
+	h = pixbuf->art_pixbuf->height;
+
+	window = gtk_widget_new (gtk_window_get_type (),
+				 "GtkObject::user_data", NULL,
+				 "GtkWindow::type", GTK_WINDOW_TOPLEVEL,
+				 "GtkWindow::title", "testrgb",
+				 "GtkWindow::allow_shrink", TRUE,
+				 NULL);
+	gtk_signal_connect (GTK_OBJECT (window), "destroy",
+			    (GtkSignalFunc) quit_func, NULL);
+
+	vbox = gtk_vbox_new (FALSE, 0);
+
+	if (title)
+		gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (title),
+				    TRUE, TRUE, 0);
+
+	drawing_area = gtk_drawing_area_new ();
+
+	temp_box = gtk_hbox_new (FALSE, 0);
+	gtk_drawing_area_size (GTK_DRAWING_AREA(drawing_area), w, h);
+	gtk_box_pack_start (GTK_BOX (temp_box), drawing_area, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), temp_box, FALSE, FALSE, 0);
+	
+
+	gtk_signal_connect (GTK_OBJECT(drawing_area), "expose_event",
+			    GTK_SIGNAL_FUNC(expose_func), NULL);
+	gtk_signal_connect (GTK_OBJECT(drawing_area), "configure_event",
+			    GTK_SIGNAL_FUNC (config_func), NULL);
+
+	gtk_object_set_data (GTK_OBJECT(drawing_area), "pixbuf", pixbuf);
+
+	gtk_widget_show (drawing_area);
+
+	button = gtk_button_new_with_label ("Quit");
+	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+	gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
+				   (GtkSignalFunc) gtk_widget_destroy,
+				   GTK_OBJECT (window));
+
+	gtk_widget_show (button);
+
+	gtk_container_add (GTK_CONTAINER (window), vbox);
+	gtk_widget_show_all (vbox);
+
+	gtk_widget_show (window);
+
+        return window;
+}
+
+
+static gint
+update_timeout(gpointer data)
+{
+        ProgressFileStatus *status = data;
+	gboolean done;
+
+	done = TRUE;
+	if (!feof(status->imagefile)) {
+		gint nbytes;
+
+		nbytes = fread(status->buf, 1, status->readlen, 
+			       status->imagefile);
+
+		done = !gdk_pixbuf_loader_write (GDK_PIXBUF_LOADER (status->loader), status->buf, nbytes);
+			
+	}
+
+	if (done) {
+                gtk_widget_queue_draw(*status->rgbwin);
+		gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader));
+		gtk_object_destroy (GTK_OBJECT(status->loader));
+		fclose (status->imagefile);
+		g_free (status->buf);
+	}
+
+	return !done;
+}
+
+
+static void
+progressive_prepared_callback(GdkPixbufLoader* loader, gpointer data)
+{
+        GtkWidget** retloc = data;
+        GdkPixbuf* pixbuf;
+
+        pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
+        g_assert(pixbuf != NULL);
+
+        gdk_pixbuf_ref(pixbuf); /* for the RGB window */
+
+        *retloc = new_testrgb_window(pixbuf, "Progressive");
+
+        return;
+}
+
+
+static void
+progressive_updated_callback(GdkPixbufLoader* loader, guint x, guint y, guint width, guint height, gpointer data)
+{
+        GtkWidget** window_loc = data;
+
+/*  	g_print ("progressive_updated_callback:\n\t%d\t%d\t%d\t%d\n", x, y, width, height); */
+
+        if (*window_loc != NULL)
+                gtk_widget_queue_draw_area(*window_loc,
+					   x, y, width, height);
+
+        return;
+}
+
+static int readlen = 4096;
+
+int
+main (int argc, char **argv)
+{
+	int i;
+	int found_valid = FALSE;
+
+	GdkPixbufAnimation *animation;
+	GdkPixbufLoader *pixbuf_loader;
+
+	gtk_init (&argc, &argv);
+
+	gdk_rgb_set_verbose (TRUE);
+
+	gdk_rgb_init ();
+
+	gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
+	gtk_widget_set_default_visual (gdk_rgb_get_visual ());
+
+	{
+		char *tbf_readlen = getenv("TBF_READLEN");
+		if(tbf_readlen) readlen = atoi(tbf_readlen);
+	}
+
+	{
+		char *tbf_bps = getenv("TBF_KBPS");
+		guint bps;
+
+		if (tbf_bps) {
+			bps = atoi(tbf_bps);
+			g_print ("Simulating %d kBytes/sec\n", bps);
+			readlen = (bps*1024)/10;
+		}
+	}
+
+	i = 1;
+	if (argc == 1) {
+		g_print ("USAGE:  testanimation FILE1 ...\n");
+		return 0;
+	} else {
+		for (i = 1; i < argc; i++) {
+
+			animation = gdk_pixbuf_animation_new_from_file (argv[i]);
+
+			if (animation) {
+				GList *listptr;
+				for (listptr = animation->frames; listptr; listptr = listptr->next){
+					g_print ("in a frame\n");
+					new_testrgb_window (((GdkPixbufFrame *)listptr->data)->pixbuf, "File");
+				}
+				found_valid = TRUE;
+			}
+		}
+#if 0
+                {
+                        GtkWidget* rgb_window = NULL;
+			ProgressFileStatus   status;
+
+                        pixbuf_loader = gdk_pixbuf_loader_new ();
+			status.loader = pixbuf_loader;
+
+			status.rgbwin = &rgb_window;
+
+			status.buf = g_malloc (readlen);
+                        gtk_signal_connect(GTK_OBJECT(pixbuf_loader),
+                                           "area_prepared",
+                                           GTK_SIGNAL_FUNC(progressive_prepared_callback),
+                                           &rgb_window);
+
+                        gtk_signal_connect(GTK_OBJECT(pixbuf_loader),
+                                           "area_updated",
+                                           GTK_SIGNAL_FUNC(progressive_updated_callback),
+                                           &rgb_window);
+
+			
+                        status.imagefile = fopen (argv[1], "r");
+                        g_assert (status.imagefile != NULL);
+
+			status.readlen = readlen;
+
+                        status.timeout = gtk_timeout_add(100, update_timeout, &status);
+                }
+#endif
+	}
+
+	if (found_valid)
+		gtk_main ();
+
+	return 0;
+}

demos/testpixbuf-drawable.c

@@ -0,0 +1,113 @@
+#include <config.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include "gdk-pixbuf.h"
+
+int close_app(GtkWidget *widget, gpointer data)
+{
+   gtk_main_quit();
+   return TRUE;
+}
+
+int expose_cb(GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data)
+{
+   GdkPixbuf *pixbuf;
+         
+   pixbuf = (GdkPixbuf *) gtk_object_get_data(GTK_OBJECT(drawing_area),
+                                              "pixbuf");
+   if(pixbuf->art_pixbuf->has_alpha)
+   {
+      gdk_draw_rgb_32_image(drawing_area->window,
+                            drawing_area->style->black_gc,
+                            evt->area.x, evt->area.y,
+                            evt->area.width,
+                            evt->area.height,
+                            GDK_RGB_DITHER_MAX,
+                            pixbuf->art_pixbuf->pixels +
+                              (evt->area.y * pixbuf->art_pixbuf->rowstride) +
+                              (evt->area.x *  pixbuf->art_pixbuf->n_channels),
+                            pixbuf->art_pixbuf->rowstride);
+   }
+   else
+   {
+      gdk_draw_rgb_image(drawing_area->window, 
+			 drawing_area->style->black_gc, 
+			 evt->area.x, evt->area.y,
+			 evt->area.width,
+			 evt->area.height,  
+			 GDK_RGB_DITHER_NORMAL,
+			 pixbuf->art_pixbuf->pixels +
+			 (evt->area.y * pixbuf->art_pixbuf->rowstride) +
+			 (evt->area.x * pixbuf->art_pixbuf->n_channels),
+			 pixbuf->art_pixbuf->rowstride);
+   }
+   return FALSE;
+}
+
+int configure_cb(GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
+{
+   GdkPixbuf *pixbuf;
+                           
+   pixbuf = (GdkPixbuf *) gtk_object_get_data(GTK_OBJECT(drawing_area),   
+                                              "pixbuf");
+    
+   g_print("X:%d Y:%d\n", evt->width, evt->height);
+   if(evt->width != pixbuf->art_pixbuf->width || evt->height != pixbuf->art_pixbuf->height)
+   {
+      GdkWindow *root;
+      GdkPixbuf *new_pixbuf;
+
+      root = GDK_ROOT_PARENT();
+      new_pixbuf = gdk_pixbuf_get_from_drawable(NULL, root, NULL,
+						0, 0, 0, 0, evt->width, evt->height);
+      gtk_object_set_data(GTK_OBJECT(drawing_area), "pixbuf", new_pixbuf);
+      gdk_pixbuf_unref(pixbuf);
+   }
+
+   return FALSE;
+}
+
+int main(int argc, char **argv)
+{   
+   GdkWindow     *root;
+   GtkWidget     *window;
+   GtkWidget     *vbox;
+   GtkWidget     *drawing_area;
+   GdkPixbuf     *pixbuf;    
+   
+   gtk_init(&argc, &argv);   
+   gdk_rgb_set_verbose(TRUE);
+   gdk_rgb_init();
+
+   gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
+   gtk_widget_set_default_visual(gdk_rgb_get_visual());
+
+   root = GDK_ROOT_PARENT();
+   pixbuf = gdk_pixbuf_get_from_drawable(NULL, root, NULL,
+					 0, 0, 0, 0, 150, 160);
+   
+   window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+   gtk_signal_connect(GTK_OBJECT(window), "delete_event",
+                      GTK_SIGNAL_FUNC(close_app), NULL);
+   gtk_signal_connect(GTK_OBJECT(window), "destroy",   
+                      GTK_SIGNAL_FUNC(close_app), NULL);
+   
+   vbox = gtk_vbox_new(FALSE, 0);
+   gtk_container_add(GTK_CONTAINER(window), vbox);  
+   
+   drawing_area = gtk_drawing_area_new();
+   gtk_drawing_area_size(GTK_DRAWING_AREA(drawing_area),
+                         pixbuf->art_pixbuf->width,
+                         pixbuf->art_pixbuf->height);
+   gtk_signal_connect(GTK_OBJECT(drawing_area), "expose_event",
+                      GTK_SIGNAL_FUNC(expose_cb), NULL);
+
+   gtk_signal_connect(GTK_OBJECT(drawing_area), "configure_event",
+                      GTK_SIGNAL_FUNC(configure_cb), NULL);
+   gtk_object_set_data(GTK_OBJECT(drawing_area), "pixbuf", pixbuf);
+   gtk_box_pack_start(GTK_BOX(vbox), drawing_area, TRUE, TRUE, 0);
+   
+   gtk_widget_show_all(window);
+   gtk_main();
+   return 0;
+}

demos/testpixbuf-scale.c

@@ -0,0 +1,156 @@
+#include <gtk/gtk.h>
+#include "gdk-pixbuf.h"
+
+#include <stdio.h>
+
+ArtFilterLevel filter_level = ART_FILTER_BILINEAR;
+int overall_alpha = 255;
+GdkPixbuf *pixbuf;
+GtkWidget *darea;
+  
+void
+set_filter_level (GtkWidget *widget, gpointer data)
+{
+  filter_level = GPOINTER_TO_UINT (data);
+  gtk_widget_queue_draw (darea);
+}
+
+void
+overall_changed_cb (GtkAdjustment *adjustment, gpointer data)
+{
+  if (adjustment->value != overall_alpha)
+    {
+      overall_alpha = adjustment->value;
+      gtk_widget_queue_draw (darea);
+    }
+}
+
+gboolean
+expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+{
+  GdkPixbuf *dest;
+
+  gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
+  
+  dest = gdk_pixbuf_new (ART_PIX_RGB, FALSE, 8, event->area.width, event->area.height);
+
+  gdk_pixbuf_composite_color (pixbuf, dest,
+			      0, 0, event->area.width, event->area.height,
+			      -event->area.x, -event->area.y,
+			      (double) widget->allocation.width / pixbuf->art_pixbuf->width,
+			      (double) widget->allocation.height / pixbuf->art_pixbuf->height,
+			      filter_level, overall_alpha,
+			      event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);
+
+  gdk_pixbuf_render_to_drawable (dest, widget->window, widget->style->fg_gc[GTK_STATE_NORMAL],
+				 0, 0, event->area.x, event->area.y,
+				 event->area.width, event->area.height,
+				 GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
+  
+  gdk_pixbuf_unref (dest);
+  
+  return TRUE;
+}
+
+int
+main(int argc, char **argv)
+{
+	GtkWidget *window, *vbox;
+	GtkWidget *menuitem, *optionmenu, *menu;
+	GtkWidget *alignment;
+	GtkWidget *hbox, *label, *hscale;
+	GtkAdjustment *adjustment;
+	GtkRequisition scratch_requisition;
+
+	gtk_init (&argc, &argv);
+	gdk_rgb_init ();
+
+	if (argc != 2) {
+		fprintf (stderr, "Usage: testpixbuf-scale FILE\n");
+		exit (1);
+	}
+
+	pixbuf = gdk_pixbuf_new_from_file (argv[1]);
+	if (!pixbuf) {
+		fprintf (stderr, "Cannot load %s\n", argv[1]);
+		exit(1);
+	}
+
+	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	gtk_signal_connect (GTK_OBJECT (window), "destroy",
+			    GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+	
+	vbox = gtk_vbox_new (FALSE, 0);
+	gtk_container_add (GTK_CONTAINER (window), vbox);
+
+	menu = gtk_menu_new ();
+	
+	menuitem = gtk_menu_item_new_with_label ("NEAREST");
+	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
+			    GTK_SIGNAL_FUNC (set_filter_level),
+			    GUINT_TO_POINTER (ART_FILTER_NEAREST));
+	gtk_widget_show (menuitem);
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+	
+	menuitem = gtk_menu_item_new_with_label ("BILINEAR");
+	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
+			    GTK_SIGNAL_FUNC (set_filter_level),
+			    GUINT_TO_POINTER (ART_FILTER_BILINEAR));
+	gtk_widget_show (menuitem);
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+	
+	menuitem = gtk_menu_item_new_with_label ("TILES");
+	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
+			    GTK_SIGNAL_FUNC (set_filter_level),
+			    GUINT_TO_POINTER (ART_FILTER_TILES));
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+
+	menuitem = gtk_menu_item_new_with_label ("HYPER");
+	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
+			    GTK_SIGNAL_FUNC (set_filter_level),
+			    GUINT_TO_POINTER (ART_FILTER_HYPER));
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+
+	optionmenu = gtk_option_menu_new ();
+	gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
+	gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), 1);
+	
+	alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.5);
+	gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
+
+	hbox = gtk_hbox_new (FALSE, 4);
+	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+
+	label = gtk_label_new ("Overall Alpha:");
+	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+	adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (overall_alpha, 0, 255, 1, 10, 0));
+	gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
+			    GTK_SIGNAL_FUNC (overall_changed_cb), NULL);
+	
+	hscale = gtk_hscale_new (adjustment);
+	gtk_scale_set_digits (GTK_SCALE (hscale), 0);
+	gtk_box_pack_start (GTK_BOX (hbox), hscale, TRUE, TRUE, 0);
+
+	gtk_container_add (GTK_CONTAINER (alignment), optionmenu);
+	gtk_widget_show_all (vbox);
+
+	/* Compute the size without the drawing area, so we know how big to make the default size */
+	gtk_widget_size_request (vbox, &scratch_requisition);
+
+	darea = gtk_drawing_area_new ();
+	gtk_box_pack_start (GTK_BOX (vbox), darea, TRUE, TRUE, 0);
+
+	gtk_signal_connect (GTK_OBJECT (darea), "expose_event",
+			    GTK_SIGNAL_FUNC (expose_cb), NULL);
+
+	gtk_window_set_default_size (GTK_WINDOW (window),
+				     pixbuf->art_pixbuf->width,
+				     scratch_requisition.height + pixbuf->art_pixbuf->height);
+	
+	gtk_widget_show_all (window);
+
+	gtk_main ();
+
+	return 0;
+}

demos/testpixbuf.c

@@ -0,0 +1,594 @@
+
+/* testpixbuf -- test program for gdk-pixbuf code
+ * Copyright (C) 1999 Mark Crichton, Larry Ewing
+ *
+ * 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 <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <gtk/gtk.h>
+#include "gdk-pixbuf.h"
+#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf-loader.h"
+
+typedef struct {
+	FILE             *imagefile;
+	GdkPixbufLoader  *loader;
+	GtkWidget        **rgbwin;
+	guchar           *buf;
+	guint            timeout;
+	guint            readlen;
+
+} ProgressFileStatus;
+
+
+#define DEFAULT_WIDTH  24
+#define DEFAULT_HEIGHT 24
+
+static const unsigned char default_image[] = {
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xae, 0xb3, 0xb3, 0xc6, 0xc9, 0xcd, 0xd7, 0xd4, 0xdf,
+	0xec, 0xde, 0xf3, 0xe7, 0xcb, 0xe9, 0xd9, 0xb5, 0xd3, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xb1, 0xb7, 0xa5,
+	0xb0, 0xb8, 0xad, 0xb3, 0xb9, 0xb6, 0xc1, 0xc6, 0xc8, 0xd5, 0xd3, 0xdc,
+	0xec, 0xde, 0xf3, 0xe5, 0xca, 0xe6, 0xe0, 0xbb, 0xd7, 0xe1, 0xad, 0xc2,
+	0xe3, 0xac, 0xa3, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xca, 0xc1, 0xa4, 0xc5, 0xc7, 0xac,
+	0xb7, 0xbe, 0xaf, 0xad, 0xb4, 0xaf, 0xbd, 0xc2, 0xc3, 0xd1, 0xd0, 0xd8,
+	0xec, 0xde, 0xf3, 0xe5, 0xc7, 0xe4, 0xe0, 0xb6, 0xd1, 0xe7, 0xa9, 0xb4,
+	0xed, 0xcd, 0xb6, 0xd6, 0xcf, 0xae, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0x00, 0x00, 0x00, 0xdf, 0xa7, 0x9f, 0xdd, 0xbf, 0xaa, 0xcf, 0xc5, 0xa9,
+	0xc1, 0xc4, 0xac, 0xb2, 0xba, 0xaf, 0xb6, 0xbb, 0xbb, 0xcd, 0xce, 0xd4,
+	0xec, 0xde, 0xf3, 0xe4, 0xc4, 0xe1, 0xe0, 0xaf, 0xc7, 0xea, 0xbc, 0xae,
+	0xe1, 0xd6, 0xb6, 0xc7, 0xcc, 0xae, 0xa2, 0xab, 0x9a, 0x00, 0x00, 0x00,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0x00, 0x00, 0x00, 0xe3, 0xab, 0xc0, 0xe6, 0xa3, 0xa7, 0xdf, 0xba, 0xa8,
+	0xcf, 0xc5, 0xa9, 0xbd, 0xc2, 0xae, 0xad, 0xb4, 0xaf, 0xc6, 0xc9, 0xcd,
+	0xec, 0xde, 0xf3, 0xe2, 0xbf, 0xdc, 0xe7, 0xa9, 0xb4, 0xe7, 0xd6, 0xb8,
+	0xc7, 0xcc, 0xae, 0xac, 0xb6, 0xa6, 0x9d, 0xa8, 0x9f, 0x00, 0x00, 0x00,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xd9, 0xaf, 0xcf, 0xe1, 0xb4, 0xd2, 0xe2, 0xb0, 0xcb, 0xe4, 0xa9, 0xbb,
+	0xe2, 0xb2, 0xa6, 0xcf, 0xc5, 0xa9, 0x6a, 0x6a, 0x6a, 0x0d, 0x0d, 0x0d,
+	0x0d, 0x0d, 0x0d, 0x6a, 0x6a, 0x6a, 0xed, 0xcd, 0xb6, 0xc7, 0xcc, 0xae,
+	0xa6, 0xb1, 0xa3, 0x98, 0xa2, 0x9c, 0x8f, 0x97, 0x96, 0x7e, 0x84, 0x85,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xe8, 0xc6, 0xe7, 0xe5, 0xc2, 0xe3, 0xe3, 0xbd, 0xdd, 0xe1, 0xb6, 0xd5,
+	0xe2, 0xb0, 0xcb, 0x6a, 0x6a, 0x6a, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x6a, 0x6a, 0x6a, 0x9d, 0xa8, 0x9f,
+	0x8f, 0x97, 0x96, 0x8b, 0x90, 0x92, 0x97, 0x9e, 0xa2, 0xa0, 0xa7, 0xae,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xe7, 0xd3, 0xed, 0xe8, 0xd1, 0xed, 0xe8, 0xce, 0xec, 0xe9, 0xcc, 0xeb,
+	0xe8, 0xc6, 0xe7, 0x0d, 0x0d, 0x0d, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x0d, 0x0d, 0x0d, 0x97, 0x9e, 0xa2,
+	0xa7, 0xae, 0xb7, 0xb2, 0xb6, 0xc5, 0xba, 0xbc, 0xce, 0xbf, 0xbe, 0xd3,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xe9, 0xdf, 0xf0, 0xe9, 0xdf, 0xf0, 0xe9, 0xdf, 0xf0, 0xe9, 0xdf, 0xf0,
+	0xe9, 0xdf, 0xf0, 0x0d, 0x0d, 0x0d, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x0d, 0x0d, 0x0d, 0xe1, 0xd2, 0xf7,
+	0xe1, 0xd2, 0xf7, 0xe1, 0xd2, 0xf7, 0xe1, 0xd2, 0xf7, 0xe1, 0xd2, 0xf7,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xca, 0xc7, 0xd2, 0xc5, 0xc4, 0xcd, 0xbf, 0xbf, 0xc7, 0xb8, 0xb9, 0xc0,
+	0xae, 0xaf, 0xb6, 0x6a, 0x6a, 0x6a, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x6a, 0x6a, 0x6a, 0xd5, 0xa8, 0xe1,
+	0xd8, 0xb2, 0xe9, 0xd9, 0xb8, 0xed, 0xdb, 0xbd, 0xf0, 0xdc, 0xbf, 0xf1,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xa4, 0xa6, 0xac, 0xa8, 0xaa, 0xaf, 0xa0, 0xa6, 0xa8, 0x98, 0x9e, 0x9c,
+	0xa1, 0xa8, 0x9e, 0xb1, 0xb6, 0xa1, 0x6a, 0x6a, 0x6a, 0x0d, 0x0d, 0x0d,
+	0x0d, 0x0d, 0x0d, 0x6a, 0x6a, 0x6a, 0xc0, 0x8c, 0xad, 0xcc, 0x90, 0xb5,
+	0xd3, 0x94, 0xca, 0xd6, 0xa2, 0xdb, 0xd5, 0xa8, 0xe1, 0xcf, 0xa7, 0xdf,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0x00, 0x00, 0x00, 0x98, 0x9f, 0x9b, 0xa1, 0xa8, 0x9e, 0xac, 0xb3, 0xa0,
+	0xb9, 0xb9, 0xa4, 0xd0, 0xb8, 0xa8, 0xc5, 0xb5, 0xb8, 0xb6, 0xbb, 0xad,
+	0xe3, 0xd7, 0xb5, 0xdd, 0xb4, 0xa9, 0xcb, 0x89, 0xac, 0xc0, 0x8c, 0xad,
+	0xc8, 0x91, 0xb5, 0xd1, 0x8d, 0xb7, 0xd3, 0x94, 0xca, 0x00, 0x00, 0x00,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0x00, 0x00, 0x00, 0xa1, 0xa7, 0x98, 0xb1, 0xb6, 0xa1, 0xbd, 0xb9, 0xa5,
+	0xd0, 0xb8, 0xa8, 0xca, 0xb5, 0xb7, 0xb8, 0xb1, 0xb1, 0xc2, 0xc8, 0xb2,
+	0xe3, 0xd7, 0xb5, 0xe1, 0xbf, 0xaf, 0xdb, 0x92, 0x9a, 0xbe, 0x82, 0xa6,
+	0xc0, 0x8c, 0xad, 0xc8, 0x91, 0xb4, 0xc7, 0x8b, 0xb0, 0x00, 0x00, 0x00,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xbc, 0xb6, 0xa1, 0xd0, 0xb8, 0xa8,
+	0xcd, 0xb6, 0xb7, 0xc0, 0xb4, 0xb5, 0xb1, 0xb1, 0xaa, 0xca, 0xd1, 0xb4,
+	0xe3, 0xd7, 0xb5, 0xe2, 0xc1, 0xb0, 0xdb, 0xa8, 0xa3, 0xd2, 0x8a, 0xa9,
+	0xb7, 0x7e, 0xa2, 0xbd, 0x89, 0xa9, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xc9, 0xaf, 0xaf,
+	0xc5, 0xb5, 0xb8, 0xb8, 0xb1, 0xb1, 0xb6, 0xbb, 0xad, 0xd0, 0xd6, 0xb5,
+	0xe3, 0xd7, 0xb5, 0xe2, 0xbf, 0xaf, 0xdd, 0xb4, 0xa9, 0xdb, 0x92, 0x9a,
+	0xc6, 0x84, 0xa7, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xac, 0xaa, 0xa6, 0xbd, 0xc3, 0xb0, 0xd2, 0xd7, 0xb5,
+	0xe3, 0xd7, 0xb5, 0xe2, 0xbf, 0xae, 0xdb, 0xb6, 0xa8, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff
+};
+
+
+static const char * book_open_xpm[] = {
+"16 16 4 1",
+"       c None s None",
+".      c black",
+"X      c #808080",
+"o      c white",
+"                ",
+"  ..            ",
+" .Xo.    ...    ",
+" .Xoo. ..oo.    ",
+" .Xooo.Xooo...  ",
+" .Xooo.oooo.X.  ",
+" .Xooo.Xooo.X.  ",
+" .Xooo.oooo.X.  ",
+" .Xooo.Xooo.X.  ",
+" .Xooo.oooo.X.  ",
+"  .Xoo.Xoo..X.  ",
+"   .Xo.o..ooX.  ",
+"    .X..XXXXX.  ",
+"    ..X.......  ",
+"     ..         ",
+"                "};
+
+static const char * book_closed_xpm[] = {
+"16 16 6 1",
+"       c None s None",
+".      c black",
+"X      c red",
+"o      c yellow",
+"O      c #808080",
+"#      c white",
+"                ",
+"       ..       ",
+"     ..XX.      ",
+"   ..XXXXX.     ",
+" ..XXXXXXXX.    ",
+".ooXXXXXXXXX.   ",
+"..ooXXXXXXXXX.  ",
+".X.ooXXXXXXXXX. ",
+".XX.ooXXXXXX..  ",
+" .XX.ooXXX..#O  ",
+"  .XX.oo..##OO. ",
+"   .XX..##OO..  ",
+"    .X.#OO..    ",
+"     ..O..      ",
+"      ..        ",
+"                "};
+
+static const char * mini_page_xpm[] = {
+"16 16 4 1",
+"       c None s None",
+".      c black",
+"X      c white",
+"o      c #808080",
+"                ",
+"   .......      ",
+"   .XXXXX..     ",
+"   .XoooX.X.    ",
+"   .XXXXX....   ",
+"   .XooooXoo.o  ",
+"   .XXXXXXXX.o  ",
+"   .XooooooX.o  ",
+"   .XXXXXXXX.o  ",
+"   .XooooooX.o  ",
+"   .XXXXXXXX.o  ",
+"   .XooooooX.o  ",
+"   .XXXXXXXX.o  ",
+"   ..........o  ",
+"    oooooooooo  ",
+"                "};
+
+static const char * gtk_mini_xpm[] = {
+"15 20 17 1",
+"       c None",
+".      c #14121F",
+"+      c #278828",
+"@      c #9B3334",
+"#      c #284C72",
+"$      c #24692A",
+"%      c #69282E",
+"&      c #37C539",
+"*      c #1D2F4D",
+"=      c #6D7076",
+"-      c #7D8482",
+";      c #E24A49",
+">      c #515357",
+",      c #9B9C9B",
+"'      c #2FA232",
+")      c #3CE23D",
+"!      c #3B6CCB",
+"               ",
+"      ***>     ",
+"    >.*!!!*    ",
+"   ***....#*=  ",
+"  *!*.!!!**!!# ",
+" .!!#*!#*!!!!# ",
+" @%#!.##.*!!$& ",
+" @;%*!*.#!#')) ",
+" @;;@%!!*$&)'' ",
+" @%.%@%$'&)$+' ",
+" @;...@$'*'*)+ ",
+" @;%..@$+*.')$ ",
+" @;%%;;$+..$)# ",
+" @;%%;@$$$'.$# ",
+" %;@@;;$$+))&* ",
+"  %;;;@+$&)&*  ",
+"   %;;@'))+>   ",
+"    %;@'&#     ",
+"     >%$$      ",
+"      >=       "};
+
+const gchar ** xpms[] = { 
+  book_open_xpm,
+  book_closed_xpm,
+  mini_page_xpm,
+  gtk_mini_xpm,
+  NULL
+};
+
+static void
+quit_func (GtkWidget *widget, gpointer dummy)
+{
+	gtk_main_quit ();
+}
+
+static void
+expose_func (GtkWidget *drawing_area, GdkEventExpose *event, gpointer data)
+{
+	GdkPixbuf *pixbuf;
+
+	pixbuf = (GdkPixbuf *)gtk_object_get_data(GTK_OBJECT(drawing_area), "pixbuf");
+
+	if (!pixbuf->art_pixbuf) {
+		g_warning ("art_pixbuf is NULL in expose_func!!\n");
+		return;
+	}
+
+	if (pixbuf->art_pixbuf->has_alpha) {
+		gdk_draw_rgb_32_image (drawing_area->window,
+				       drawing_area->style->black_gc,
+				       event->area.x, event->area.y, 
+				       event->area.width, 
+				       event->area.height,
+				       GDK_RGB_DITHER_MAX, 
+				       pixbuf->art_pixbuf->pixels 
+				       + (event->area.y * pixbuf->art_pixbuf->rowstride) 
+				       + (event->area.x * pixbuf->art_pixbuf->n_channels),
+				       pixbuf->art_pixbuf->rowstride);
+	} else {
+		gdk_draw_rgb_image (drawing_area->window,
+				    drawing_area->style->white_gc,
+				    event->area.x, event->area.y, 
+				    event->area.width, 
+				    event->area.height,
+				    GDK_RGB_DITHER_NORMAL,
+				    pixbuf->art_pixbuf->pixels 
+				    + (event->area.y * pixbuf->art_pixbuf->rowstride) 
+				    + (event->area.x * pixbuf->art_pixbuf->n_channels),
+				    pixbuf->art_pixbuf->rowstride);
+	}
+}
+
+static void
+config_func (GtkWidget *drawing_area, GdkEventConfigure *event, gpointer data)
+{
+	GdkPixbuf *pixbuf;
+    
+	pixbuf = (GdkPixbuf *)gtk_object_get_data(GTK_OBJECT(drawing_area), "pixbuf");
+
+	g_print("X:%d Y:%d\n", event->width, event->height);
+
+#if 0
+	if (((event->width) != (pixbuf->art_pixbuf->width)) ||
+	    ((event->height) != (pixbuf->art_pixbuf->height))) 
+		gdk_pixbuf_scale(pixbuf, event->width, event->height);
+#endif
+}
+
+static GtkWidget*
+new_testrgb_window (GdkPixbuf *pixbuf, gchar *title)
+{
+	GtkWidget *window;
+	GtkWidget *vbox;
+	GtkWidget *temp_box;
+	GtkWidget *button;
+	GtkWidget *drawing_area;
+	gint w, h;
+ 
+	w = pixbuf->art_pixbuf->width;
+	h = pixbuf->art_pixbuf->height;
+
+	window = gtk_widget_new (gtk_window_get_type (),
+				 "GtkObject::user_data", NULL,
+				 "GtkWindow::type", GTK_WINDOW_TOPLEVEL,
+				 "GtkWindow::title", "testrgb",
+				 "GtkWindow::allow_shrink", TRUE,
+				 NULL);
+	gtk_signal_connect (GTK_OBJECT (window), "destroy",
+			    (GtkSignalFunc) quit_func, NULL);
+
+	vbox = gtk_vbox_new (FALSE, 0);
+
+	if (title)
+		gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (title),
+				    TRUE, TRUE, 0);
+
+	drawing_area = gtk_drawing_area_new ();
+
+	temp_box = gtk_hbox_new (FALSE, 0);
+	gtk_drawing_area_size (GTK_DRAWING_AREA(drawing_area), w, h);
+	gtk_box_pack_start (GTK_BOX (temp_box), drawing_area, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), temp_box, FALSE, FALSE, 0);
+	
+
+	gtk_signal_connect (GTK_OBJECT(drawing_area), "expose_event",
+			    GTK_SIGNAL_FUNC(expose_func), NULL);
+	gtk_signal_connect (GTK_OBJECT(drawing_area), "configure_event",
+			    GTK_SIGNAL_FUNC (config_func), NULL);
+
+	gtk_object_set_data (GTK_OBJECT(drawing_area), "pixbuf", pixbuf);
+
+	gtk_widget_show (drawing_area);
+
+	button = gtk_button_new_with_label ("Quit");
+	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+	gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
+				   (GtkSignalFunc) gtk_widget_destroy,
+				   GTK_OBJECT (window));
+
+	gtk_widget_show (button);
+
+	gtk_container_add (GTK_CONTAINER (window), vbox);
+	gtk_widget_show_all (vbox);
+
+	gtk_widget_show (window);
+
+        return window;
+}
+
+
+static gint
+update_timeout(gpointer data)
+{
+        ProgressFileStatus *status = data;
+	gboolean done;
+
+	done = TRUE;
+	if (!feof(status->imagefile)) {
+		gint nbytes;
+
+		nbytes = fread(status->buf, 1, status->readlen, 
+			       status->imagefile);
+
+		done = !gdk_pixbuf_loader_write (GDK_PIXBUF_LOADER (status->loader), status->buf, nbytes);
+			
+	}
+
+	if (done) {
+                gtk_widget_queue_draw(*status->rgbwin);
+		gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader));
+		gtk_object_destroy (GTK_OBJECT(status->loader));
+		fclose (status->imagefile);
+		g_free (status->buf);
+	}
+
+	return !done;
+}
+
+
+static void
+progressive_prepared_callback(GdkPixbufLoader* loader, gpointer data)
+{
+        GtkWidget** retloc = data;
+        GdkPixbuf* pixbuf;
+
+        pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
+        g_assert(pixbuf != NULL);
+
+        gdk_pixbuf_ref(pixbuf); /* for the RGB window */
+
+        *retloc = new_testrgb_window(pixbuf, "Progressive");
+
+        return;
+}
+
+
+static void
+progressive_updated_callback(GdkPixbufLoader* loader, guint x, guint y, guint width, guint height, gpointer data)
+{
+        GtkWidget** window_loc = data;
+
+/*  	g_print ("progressive_updated_callback:\n\t%d\t%d\t%d\t%d\n", x, y, width, height); */
+
+        if (*window_loc != NULL)
+                gtk_widget_queue_draw_area(*window_loc,
+					   x, y, width, height);
+
+        return;
+}
+
+static int readlen = 4096;
+
+int
+main (int argc, char **argv)
+{
+	int i;
+	int found_valid = FALSE;
+
+	GdkPixbuf *pixbuf;
+	GdkPixbufLoader *pixbuf_loader;
+
+	gtk_init (&argc, &argv);
+
+	gdk_rgb_set_verbose (TRUE);
+
+	gdk_rgb_init ();
+
+	gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
+	gtk_widget_set_default_visual (gdk_rgb_get_visual ());
+
+	{
+		char *tbf_readlen = getenv("TBF_READLEN");
+		if(tbf_readlen) readlen = atoi(tbf_readlen);
+	}
+
+	{
+		char *tbf_bps = getenv("TBF_KBPS");
+		guint bps;
+
+		if (tbf_bps) {
+			bps = atoi(tbf_bps);
+			g_print ("Simulating %d kBytes/sec\n", bps);
+			readlen = (bps*1024)/10;
+		}
+	}
+
+	i = 1;
+	if (argc == 1) {
+                const gchar*** xpmp;
+                
+		pixbuf = gdk_pixbuf_new_from_data ((guchar *) default_image, ART_PIX_RGB, FALSE,
+						   DEFAULT_WIDTH, DEFAULT_HEIGHT, DEFAULT_WIDTH * 3,
+						   NULL, NULL);
+		new_testrgb_window (pixbuf, NULL);
+
+                xpmp = xpms;
+                while (*xpmp) {
+                        pixbuf = gdk_pixbuf_new_from_xpm_data (*xpmp);
+                        new_testrgb_window (pixbuf, NULL);
+                        ++xpmp;
+                }
+                
+		found_valid = TRUE;
+	} else {
+		for (i = 1; i < argc; i++) {
+
+			pixbuf = gdk_pixbuf_new_from_file (argv[i]);
+#if 0
+			pixbuf = gdk_pixbuf_rotate(pixbuf, 10.0);
+#endif
+
+			if (pixbuf) {
+				new_testrgb_window (pixbuf, "File");
+				found_valid = TRUE;
+			}
+		}
+#if 1
+                {
+                        GtkWidget* rgb_window = NULL;
+			ProgressFileStatus   status;
+
+                        pixbuf_loader = gdk_pixbuf_loader_new ();
+			status.loader = pixbuf_loader;
+
+			status.rgbwin = &rgb_window;
+
+			status.buf = g_malloc (readlen);
+                        gtk_signal_connect(GTK_OBJECT(pixbuf_loader),
+                                           "area_prepared",
+                                           GTK_SIGNAL_FUNC(progressive_prepared_callback),
+                                           &rgb_window);
+
+                        gtk_signal_connect(GTK_OBJECT(pixbuf_loader),
+                                           "area_updated",
+                                           GTK_SIGNAL_FUNC(progressive_updated_callback),
+                                           &rgb_window);
+
+			
+                        status.imagefile = fopen (argv[1], "r");
+                        g_assert (status.imagefile != NULL);
+
+			status.readlen = readlen;
+
+                        status.timeout = gtk_timeout_add(100, update_timeout, &status);
+                }
+#endif
+	}
+
+	if (found_valid)
+		gtk_main ();
+
+	return 0;
+}

docs/.cvsignore

@@ -16,3 +16,7 @@ Makefile.in
 *.cps
 *.fns
 *.vrs
+html
+text
+texinfo.tex
+gtk-config.1

docs/Changes-1.2.txt

@@ -3,12 +3,99 @@ Incompatible Changes from GTK+-1.0 to GTK+-1.2:
 * GtkAcceleratorTable has been replaced with GtkAccelGroup
 
 * GtkMenuFactory has been replaced with GtkItemFactory, although
-  a version of GtkMenuFactory is provided to ease compatibility.
+  a version of GtkMenuFactory is currently still provided to ease
+  the migration phase.
 
-* GtkButton has been changed to derive from GtkBin. 
+* The GtkTypeInfo structures used in the gtk_*_type_init() functions have
+  changed a bit, the old format:  
+      GtkTypeInfo bin_info =
+      {
+        "GtkBin",
+        sizeof (GtkBin),
+        sizeof (GtkBinClass),
+        (GtkClassInitFunc) gtk_bin_class_init,
+        (GtkObjectInitFunc) gtk_bin_init,
+        (GtkArgSetFunc) NULL,
+        (GtkArgGetFunc) NULL,
+      };
+
+  needs to be converted to:
+
+      static const GtkTypeInfo bin_info =
+      {
+        "GtkBin",
+        sizeof (GtkBin),
+        sizeof (GtkBinClass),
+        (GtkClassInitFunc) gtk_bin_class_init,
+        (GtkObjectInitFunc) gtk_bin_init,
+        /* reserved_1 */ NULL,
+        /* reserved_2 */ NULL,
+        (GtkClassInitFunc) NULL,
+      };
+
+  the GtkArgSetFunc and GtkArgGetFunc functions are not supported from the
+  type system anymore, and you should make sure that your code only fills
+  in these fields with NULL and doesn't use the deprecated function typedefs
+  (GtkArgSetFunc) and (GtkArgGetFunc) anymore.
+
+* A number of Gtk functions were renamed. For compatibility, gtkcompat.h
+  #define's the old 1.0.x function names in terms of the new names.
+  To assure your Gtk program doesn't rely on outdated function
+  variants, compile your program with -DGTK_DISABLE_COMPAT_H to disable
+  the compatibility aliases.
+
+  Here is the list of the old names and replacements:
+
+  Old:				      Replacement:
+
+  gtk_accel_label_accelerator_width   gtk_accel_label_get_accel_width
+  gtk_check_menu_item_set_state	      gtk_check_menu_item_set_active
+  gtk_container_border_width	      gtk_container_set_border_width
+  gtk_label_set  	              gtk_label_set_text
+  gtk_notebook_current_page           gtk_notebook_get_current_page
+  gtk_packer_configure                gtk_packer_set_child_packing
+  gtk_paned_gutter_size	              gtk_paned_set_gutter_size
+  gtk_paned_handle_size		      gtk_paned_set_handle_size
+  gtk_scale_value_width               gtk_scale_get_value_width
+  gtk_style_apply_default_pixmap      gtk_style_apply_default_background (1)
+  gtk_toggle_button_set_state         gtk_toggle_button_set_active
+  gtk_window_position		      gtk_window_set_position
  
- To access a button's child, use GTK_BIN (button)->child, instead
- of the old GTK_BUTTON (button)->child.
+  (1) gtk_style_apply_default_background() has an additional
+      argument, gboolean set_bg. This parameter should be FALSE if
+      the background is being set for a NO_WINDOW widget, otherwise
+      true.
+
+* During the development phase of the 1.1.x line of Gtk certain functions
+  were deprecated and later removed. Functions affected are:
+
+  Removed:                          Replacement:
+  gtk_clist_set_border		    gtk_clist_set_shadow_type
+  gtk_container_block_resize	    gtk_container_set_resize_mode
+  gtk_container_unblock_resize	    gtk_container_set_resize_mode
+  gtk_container_need_resize	    gtk_container_check_resize
+  gtk_ctree_show_stub		    gtk_ctree_set_show_stub
+  gtk_ctree_set_reorderable	    gtk_clist_set_reorderable
+  gtk_ctree_set_use_drag_icons	    gtk_clist_set_use_drag_icons
+  gtk_entry_adjust_scroll	    (1)
+  gtk_object_class_add_user_signal  gtk_object_class_user_signal_new
+  gtk_preview_put_row		    gtk_preview_put
+  gtk_progress_bar_construct	    gtk_progress_set_adjustment
+  gtk_scrolled_window_construct	    gtk_scrolled_window_set_{h|v}adjustment
+  gtk_spin_button_construct	    gtk_spin_button_configure
+  gtk_widget_thaw_accelerators	    gtk_widget_unlock_accelerators
+  gtk_widget_freeze_accelerators    gtk_widget_lock_accelerators
+
+(1) This function is no longer needed as GtkEntry should automatically
+    keep the scroll adjusted properly.
+
+* Additionally, all gtk_*_interp functions were removed.
+  gtk_*_full versions were provided as of GTK+-1.0 and should
+  be used instead.
+
+* GtkButton has been changed to derive from GtkBin.
+  To access a button's child, use GTK_BIN (button)->child, instead
+  of the old GTK_BUTTON (button)->child.
 
 * The selection API has been slightly modified:
 
@@ -46,4 +133,142 @@ Incompatible Changes from GTK+-1.0 to GTK+-1.2:
 * The old drag and drop API has been completely removed and replaced.
   See the reference documentation for details on the new API.
 
+* Support for Themes has been added. In general, this does
+  not affect application code, however, a few new rules should
+  be observed:
+
+   - To set a shape for a window, you must use 
+     gtk_widget_shape_combine_mask() instead of 
+     gdk_window_shape_combine_mask(), or the shape will be
+     reset when switching themes.
+
+   - It is no longer permissable to draw directly on an arbitrary
+     widget, or to set an arbitrary widget's background pixmap.
+     If you need to do that, use a GtkDrawingArea or (for a 
+     toplevel) the new GtkDrawWindow widget.
+
+* The ScrolledWindow widget no longer creates a Viewport
+  automatically. Instead, it has been generalized to accept
+  any "self-scrolling" widget.
+
+  The self-scrolling widgets in the Gtk+ core are GtkViewport,
+  GtkCList, GtkCTree, GtkText, and GtkLayout. All of these widgets can
+  be added to a scrolled window as normal children with
+  gtk_container_add() and scrollbars will be set up automatically.
+
+  To add scrollbars to a non self-scrolling widget, (such as a GtkList),
+  first add it to a viewport, then add the viewport to a scrolled window.
+  The scrolled window code provides a convenience function to do this:
+
+  void gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrollwin,
+					      GtkWidget         *child);
+
+  This does exactly what it says - it creates a Viewport, adds the child
+  widget to it, then adds the Viewport to the scrolled window.
+
+  The scrollbars have been removed from the GtkCList and GtkCTree,
+  because they are now scrolled by simply adding them to a Scrolled
+  Window. The scrollbar policy is set on the scrolled window with
+  gtk_scrolled_window_set_policy() and not on the child widgets
+  (e.g. GtkCList's gtk_clist_set_policy() was removed).
+  
+* The "main loop" of GTK+ has been moved to GLib. This should not
+  affect existing programs, since compatibility functions have
+  been provided. However, you may want to consider migrating
+  your code to use the GLib main loop directly.
+
+* the GTK_BASIC flag was removed, and with it the corresponding
+  macro and function GTK_WIDGET_BASIC() and gtk_widget_basic().
+  
+* All freeze/thaw methods are now recursive - that is, if you
+  freeze a widget n times, you must also thaw it n times.
+
+  Therefore, if you have code like:
+
+  gboolean frozen;
+  frozen = GTK_CLIST_FROZEN (clist);
+  gtk_clist_freeze (clist);
+  [...]
+  if (!frozen)
+    gtk_clist_thaw (clist);
+
+  it will not work anymore. It must be, simply:
+
+  gtk_clist_freeze (clist);
+  [...]
+  gtk_clist_thaw (clist);
+
+* The thread safety in GTK+ 1.2 is slightly different than
+  that which appeared in early versions in the 1.1
+  development track. The main difference is that it relies on 
+  the thread primitives in GLib, and on the thread-safe 
+  GLib main loop.
+
+  This means:
+
+   - You must call g_thread_init() before executing any
+     other GTK+ or GDK functions in a threaded GTK+ program.
+
+   - Idles, timeouts, and input functions are executed outside 
+     of the main GTK+ lock. So, if you need to call GTK+ 
+     inside of such a callback, you must surround the callback
+     with a gdk_threads_enter()/gdk_threads_leave() pair.
+
+     [ However, signals are still executed within the main
+       GTK+ lock ]
+
+     In particular, this means, if you are writing widgets
+     that might be used in threaded programs, you _must_
+     surround timeouts and idle functions in this matter.
+
+     As always, you must also surround any calls to GTK+
+     not made within a signal handler with a 
+     gdk_threads_enter()/gdk_threads_leave() pair.
+    
+   - There is no longer a special --with-threads configure
+     option for GTK+. To use threads in a GTK+ program, you
+     must:
+
+      a) If you want to use the native thread implementation,
+         make sure GLib found this in configuration, otherwise,
+         call you must provide a thread implementation to
+	 g_thread_init().
+   
+      b) Link with the libraries returned by:
+ 
+           gtk-config --libs gthread
+
+         and use the cflags from:
+
+            gtk-config --cflags gthread
+
+     You can get these CFLAGS and LIBS by passing gthread
+     as the fourth parameter to the AM_PATH_GTK automake
+     macro.
+
+* Prior to GTK+-1.2, there were two conflicting interpretations
+  of widget->requistion. It was either taken to be
+  the size that the widget requested, or that size
+  modified by calls to gtk_widget_set_usize(). In GTK+-1.2,
+  it is always interpreted the first way.
+
+  Container widgets are affected in two ways by this:
+
+   1) Container widgets should not pass widget->requisition
+      as the second parameter to gtk_widget_size_request().
+      Instead they should call it like:
+   
+      GtkRequisition child_requisition;
+      gtk_widget_size_request (widget, &child_requisition);
+
+   2) Container widgets should not access child->requisition
+      directly. Either they should use the values returned
+      by gtk_widget_size_request(), or they should call
+      the new function:
+
+    void gtk_widget_get_child_requisition (GtkWidget      *widget,
+					   GtkRequisition *requisition);
+
+      which returns the requisition of the given widget, modified
+      by calls to gtk_widget_set_usize().
 

docs/Changes-1.4.txt

@@ -0,0 +1,11 @@
+Incompatible Changes from GTK+-1.2 to GTK+-1.4:
+
+- The gdk_time* functions have been removed. This functionality
+  has been unused since the main loop was moved into GLib
+  prior to 1.2. 
+
+- The signature for GtkPrintFunc (used for gtk_item_factory_dump_items)
+  has been changed to take a 'const gchar *' instead of 'gchar *', to
+  match what we do for glib, and other similar cases.
+
+- The detail arguments in the GtkStyleClass structure are now 'const gchar *'.

docs/Makefile.am

@@ -1,33 +1,201 @@
 ## Process this file with automake to produce Makefile.in
 
-info_TEXINFOS = gdk.texi gtk.texi glib.texi
+info_TEXINFOS = gdk.texi gtk.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		\
-	gtk_tut_fr.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
+TUTORIAL_FR_FILES=html/gtk_tut_fr-1.html   	\
+html/gtk_tut_fr-2.html   	\
+html/gtk_tut_fr-3.html   	\
+html/gtk_tut_fr-4.html   	\
+html/gtk_tut_fr-5.html   	\
+html/gtk_tut_fr-6.html   	\
+html/gtk_tut_fr-7.html   	\
+html/gtk_tut_fr-8.html   	\
+html/gtk_tut_fr-9.html   	\
+html/gtk_tut_fr-10.html  	\
+html/gtk_tut_fr-11.html  	\
+html/gtk_tut_fr-12.html  	\
+html/gtk_tut_fr-13.html  	\
+html/gtk_tut_fr-14.html  	\
+html/gtk_tut_fr-15.html  	\
+html/gtk_tut_fr-16.html  	\
+html/gtk_tut_fr-17.html  	\
+html/gtk_tut_fr-18.html  	\
+html/gtk_tut_fr-19.html  	\
+html/gtk_tut_fr-20.html  	\
+html/gtk_tut_fr-21.html  	\
+html/gtk_tut_fr-22.html  	\
+html/gtk_tut_fr-23.html  	\
+html/gtk_tut_fr-24.html  	\
+html/gtk_tut_fr.html text/gtk_tut_fr.txt
+
+TUTORIAL_FILES=text/gtk_tut.txt html/gtk_tut.html \
+html/gtk_tut.html        	\
+html/gtk_tut-1.html      	\
+html/gtk_tut-2.html      	\
+html/gtk_tut-3.html      	\
+html/gtk_tut-4.html      	\
+html/gtk_tut-5.html      	\
+html/gtk_tut-6.html      	\
+html/gtk_tut-7.html      	\
+html/gtk_tut-8.html      	\
+html/gtk_tut-9.html      	\
+html/gtk_tut-10.html     	\
+html/gtk_tut-11.html     	\
+html/gtk_tut-12.html     	\
+html/gtk_tut-13.html     	\
+html/gtk_tut-14.html     	\
+html/gtk_tut-15.html     	\
+html/gtk_tut-16.html     	\
+html/gtk_tut-17.html     	\
+html/gtk_tut-18.html     	\
+html/gtk_tut-19.html     	\
+html/gtk_tut-20.html     	\
+html/gtk_tut-21.html     	\
+html/gtk_tut-22.html     	\
+html/gtk_tut-23.html     	\
+html/gtk_tut-24.html     	\
+html/gtk_tut-25.html     	\
+html/gtk_tut-26.html     	\
+html/gtk_tut-27.html     	\
+html/gtk_tut-28.html     	\
+html/gtk_tut-29.html     	\
+html/gtk_tut-30.html     	\
+html/gtk_tut-31.html
+
+TUTORIAL_IT_FILES=	html/gtk_tut_it.html     	\
+	html/gtk_tut_it-1.html   	\
+	html/gtk_tut_it-2.html   	\
+	html/gtk_tut_it-3.html   	\
+	html/gtk_tut_it-4.html   	\
+	html/gtk_tut_it-5.html   	\
+	html/gtk_tut_it-6.html   	\
+	html/gtk_tut_it-7.html   	\
+	html/gtk_tut_it-8.html   	\
+	html/gtk_tut_it-9.html   	\
+	html/gtk_tut_it-10.html  	\
+	html/gtk_tut_it-11.html  	\
+	html/gtk_tut_it-12.html  	\
+	html/gtk_tut_it-13.html  	\
+	html/gtk_tut_it-14.html  	\
+	html/gtk_tut_it-15.html  	\
+	html/gtk_tut_it-16.html  	\
+	html/gtk_tut_it-17.html  	\
+	html/gtk_tut_it-18.html  	\
+	html/gtk_tut_it-19.html  	\
+	html/gtk_tut_it-20.html  	\
+	html/gtk_tut_it-21.html  	\
+	html/gtk_tut_it-22.html  	\
+	html/gtk_tut_it-23.html  	\
+	html/gtk_tut_it-24.html		\
+	text/gtk_tut_it.txt
+
+FAQ_FILES=html/gtkfaq.html		\
+	html/gtkfaq-1.html       	\
+	html/gtkfaq-2.html       	\
+	html/gtkfaq-3.html       	\
+	html/gtkfaq-4.html       	\
+	html/gtkfaq-5.html       	\
+	html/gtkfaq-6.html       	\
+	html/gtkfaq-7.html		\
+	text/gtkfaq.txt
+
+html/gtk_tut_table.gif: gdk.html gtk.html
+
+.PHONY: html htmldir faq tutorial tutorial_it tutorial_fr files
+
+distdocs: gdk.html gtk.html faq tutorial tutorial_it tutorial_fr
+
+htmldir:
+	(cd $(srcdir); mkdir -p html; cp gtk_tut*gif html)
+
+textdir:
+	mkdir -p $(srcdir)/text
+
+gdk.html gdk_toc.html: gdk.texi
+	(cd $(srcdir); texi2html gdk.texi)
+
+gtk.html gtk_toc.html: gtk.texi
+	(cd $(srcdir); texi2html gtk.texi)
+
+html/gdk.html html/gdk_toc.html: htmldir gdk.html gdk_toc.html
+	(cd $(srcdir); cp gdk.html gdk_toc.html html/)
+
+html/gtk.html html/gtk_toc.html: htmldir gtk.html gtk_toc.html
+	(cd $(srcdir); cp gtk.html gtk_toc.html html/)
+
+$(FAQ_FILES): faq
+
+faq: htmldir textdir
+	(cd $(srcdir); sgml2html gtkfaq.sgml; \
+	perl gtkdocs_fix gtkfaq*html; \
+	mv gtkfaq*html html/; \
+	sgml2txt gtkfaq.sgml; \
+	mv gtkfaq.txt text/)
+
+$(TUTORIAL_FILES): tutorial
+
+$(TUTORIAL_FR_FILES): tutorial_fr
+
+$(TUTORIAL_IT_FILES): tutorial_it
+
+tutorial: htmldir textdir
+	(cd $(srcdir); sgml2html gtk_tut.sgml; \
+	perl gtkdocs_fix gtk_tut*html; \
+	mv gtk_tut*html html/; \
+	sgml2txt gtk_tut.sgml; \
+	mv gtk_tut.txt text/)
+
+tutorial_it: htmldir textdir
+	(cd $(srcdir); sgml2html --language=it gtk_tut_it.sgml; \
+	perl gtkdocs_fix gtk_tut_it*html; \
+	mv gtk_tut_it*html html/; \
+	sgml2txt --language=it gtk_tut_it.sgml; \
+	mv gtk_tut_it.txt text/)
+
+tutorial_fr: htmldir textdir
+	(cd $(srcdir); sgml2html --language=fr gtk_tut_fr.sgml; \
+	perl gtkdocs_fix gtk_tut_fr*html; \
+	mv gtk_tut_fr*html html/; \
+	sgml2txt --language=fr gtk_tut_fr.sgml; \
+	mv gtk_tut_fr.txt text/)
 
-	
 
 files:
 	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
 	  echo $$p; \
 	done
+
+EXTRA_DIST += \
+	Changes-1.2.txt			\
+	debugging.txt			\
+	developers.txt			\
+	refcounting.txt			\
+	styles.txt			\
+	text_widget.txt 		\
+	widget_system.txt 		\
+	generation.txt			\
+        gtk-config.txt  	        \
+	gtk-config.1.in			\
+	texinfo.tex 			\
+	macros.texi			\
+	gtkdocs_fix			\
+	gtkfaq.sgml			\
+	gtk_tut.sgml			\
+	gtk_tut_it.sgml			\
+	gtk_tut_fr.sgml			\
+	gtk_tut_packbox1.gif 		\
+	gtk_tut_packbox2.gif 		\
+	html/gtk_tut_table.gif		\
+	html/gtk_tut_packbox1.gif 	\
+	html/gtk_tut_packbox2.gif 	\
+	gtk_tut_table.gif		\
+	html/gdk.html            	\
+	html/gdk_toc.html        	\
+	html/gtk.html            	\
+	html/gtk_toc.html        	\
+	$(TUTORIAL_FILES)		\
+	$(TUTORIAL_FR_FILES)		\
+	$(TUTORIAL_IT_FILES)		\
+	$(FAQ_FILES)

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:

docs/Makefile.sgml

@@ -1,40 +0,0 @@
-#
-# To use this makefile, do:
-# make -f Makefile.gtkfaq
-#
-# This is not done by default because you might
-# not have sgml2html installed... Perhaps we could
-# detect that in the future and combine it in with
-# the automake stuff...
-#
-
-all: html ps
-
-html: faq tut italian_tut
-	perl gtkdocs_fix gtkfaq*.html gtk_tut*.html
-
-txt:
-	sgml2txt gtkfaq.sgml
-	sgml2txt gtk_tut.sgml
-	sgml2txt gtk_tut_it.sgml
-
-ps: dvi
-	dvips -o gtkfaq.ps gtkfaq.dvi
-	dvips -o gtk_tut.ps gtk_tut.dvi
-	dvips -o gtk_tut_it.ps gtk_tut_it.dvi
-
-dvi: 
-	sgml2latex gtkfaq.sgml
-	sgml2latex gtk_tut.sgml
-	sgml2latex gtk_tut_it.sgml
-
-faq:
-	sgml2html gtkfaq.sgml
-
-tut:
-	sgml2html gtk_tut.sgml
-
-italian_tut:
-	sgml2html gtk_tut_it.sgml
-
-

docs/generation.txt

@@ -0,0 +1,177 @@
+Overview:
+========
+
+This file describes the way that autogeneration
+works within the GTK+ source code.
+
+The following files in the gdk/ subdirectory
+are autogenerated:
+
+  gdkkeysyms.h
+  gdkcursors.h 
+
+The following files in the gtk/ subdirectory 
+are autogenerated:
+
+ gtk.defs
+   Description of GTK+ types (and some functions) in a lisp-style
+   format.
+ gtktypebuiltins.h
+   Header file including declarations for internal types  
+ gtktypebuiltins_vars.c
+   Variables for type values for internal types.
+ gtktypebuiltins_ids.c
+   Arrays holding information about each internal type.
+ gtktypebuiltins_evals.c
+   Arrays holding mapping between enumeration values
+   and strings.
+
+ gtkmarshal.c
+ gtkmarshal.h
+   Autogenerated signal marshallers
+
+GDK
+===
+
+gdkkeysyms.h and gdkcursors.h are generated from
+the corresponding header files
+
+  X11/cursorfont.h
+  X11/keysymdef.h
+
+by some simple sed scripts. These are not actually
+run automatically because we want all the keysyms
+even on systems with a limited set.
+So the Gdk rule to generate both files (X-derived-headers)
+only needs to be rerun for every new release of the X Window
+System.
+
+GTK+ - type definitions
+=======================
+
+The type definitions are generated from several sources:
+
+ gtk-boxed.defs - definitions for boxed types
+ GTK+ header files
+ GDK header files
+
+The makeenums.pl script does a heuristic parse of 
+the header files and extracts all enumerations declarations.
+It also recognizes a number of pseudo-comments in the
+header files:
+
+Two of these apply to individual enumeration values:
+
+  /*< skip >*/
+
+ This enumeration value should be skipped.
+  
+  /*< nick=NICK >*/
+
+ The nickname for this value should NICK instead of the
+ normally guessed value. For instance:
+
+  typedef enum {
+    GTK_TARGET_SAME_APP = 1 << 0,    /*< nick=same-app >*/
+    GTK_TARGET_SAME_WIDGET = 1 << 1  /*< nick=same-widget >*/
+  } GtkTargetFlags;
+
+ makes the nicks "same-app" and "same-widget", instead of
+ "app" and "widget" that would normally be used.
+
+The other two apply to entire enumeration declarations.
+ 
+  /*< prefix=PREFIX >*/
+
+  Specifies the prefix to be removed from the enumeration
+  values to generate nicknames.
+
+  /*< flags >*/
+
+ Specifies that this enumeration is used as a bitfield.
+ (makenums.pl normally guesses this from the presence of values
+  with << operators). For instance:
+
+  typedef enum                    /*< flags >*/
+  {
+    GDK_IM_PREEDIT_AREA      = 0x0001, 
+    GDK_IM_PREEDIT_CALLBACKS = 0x0002, 
+    [ ... ]
+ } GdkIMStyle;
+
+makeenums.pl can be run into two modes:
+
+ 1) Generate the gtktypebuiltins_eval.c file (this
+    contains arrays holding the mapping of 
+    string <=> enumeration value)
+
+ 2) Generate the enumeration portion of gtk.defs.
+
+The enumearation portion is added to the boxed type 
+declarations in gtk-boxed.defs to create gtk.defs.
+
+The makeetypes.awk program takes the gtk.defs file, and
+from that generates various files depending on the
+third parameter passed to it:
+
+ macros: gtktypebuiltins.h
+ variables: gtktypebuiltins_vars.c
+ entries: gtktypebuiltins_ids.c
+
+GTK+ - marshallers
+==================
+
+The files gtkmarshal.c and gtkmarshal.h include declarations
+and definitions for the marshallers needed inside of
+GTK+. The marshallers to be generated are listed in
+the file gtkmashal.list, which is processed
+by genmarshal.pl.
+
+The format of this file is a list of lines:
+
+  <retval-type>:<arg1-type>,<arg2-type>,<arg3-type>
+ 
+e.g.:
+
+  BOOL:POINTER,STRING,STRING,POINTER
+
+A marshaller is generated for each line in the file.
+The possible types are:
+
+ NONE
+ BOOL
+ CHAR
+ INT
+ UINT
+ LONG
+ ULONG
+ FLOAT
+ DOUBLE
+ STRING
+ ENUM
+ FLAGS
+ BOXED
+ POINTER
+ OBJECT
+ FOREIGN    (gpointer data, GtkDestroyNotify notify)
+ C_CALLBACK (GtkFunction func, gpointer func_data)
+ SIGNAL     (GtkSignalFunc f, gpointer data)
+ ARGS       (gint n_args, GtkArg *args)
+ CALLBACK   (GtkCallBackMarshal marshall,
+             gpointer data,
+	     GtkDestroyNotify Notify)
+
+Some of these types map to multiple return values - these
+are marked above with the return types in parantheses.
+
+NOTES
+=====
+
+When autogenerating GTK+ files, the autogenerated
+files are often rebuild resulting in the same result.
+
+To prevent unecessary rebuilds of the entire directory, some files
+that multiple other source files depend on are not actually written
+to directly.  Instead, an intermediate file is written, which
+is then compared to the old file, and only if it is different
+is it copied into the final location.

docs/glib.texi

@@ -1,455 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-@c %**start of header
-@setfilename glib.info
-@settitle GLIB
-@setchapternewpage odd
-
-@set edition 1.0
-@set update-date 3 Feburary 1998
-@set update-month Feburary 1998
-@c %**end of header
-
-@ifinfo
-This file documents GLIB, A library of useful routines for C programming
-
-Copyright (C) 1998 Gregory A McLean
-
-Permission is granted to make and distributed verbatim copies of this
-manual, provided the copyright notice and this permission notice are
-preserved on all copies. 
-
-@ignore
-Permission is granted to process this file throught TeX and print the 
-results, provided the printed document carries copying permission notice 
-identical to this one except for the removal of this paragraph (this 
-paragraph not being relevant to the printed manual).
-
-@end ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation
-approved by Gregory McLean.
-@end ifinfo
-
-@titlepage
-@title GLIB, Useful routines for C programming 
-@subtitle Version 1.0
-@subtitle @value{update-month}
-@author by Gregory McLean
-
-@page
-@vskip 0pt plus 1filll
-Copyright @copyright{} 1998 Gregory McLean
-
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation
-approved by Gregory McLean.
-@end titlepage
-
-@dircategory Library of useful routines for 'C' programing
-@direntry
-* GLIB: (glib).        useful routines for 'C' programming
-@end direntry
-
-@node Top, Copying, (dir), (dir)
-@top useful routines for 'C' programming
-@ifinfo
-This is edition @value{edition} of the GLIB documentation,
-@w{@value{update-date}}.
-@end ifinfo
-
-@menu
-* Copying::                     Your rights.
-* Overview::                    What is GLIB?
-* Doubly linked lists::         Doubly linked lists
-* Signly linked lists::         Singly linked lists
-* List allocators::             List Allocators
-* Hash tables::                 Hash tables
-* Caches::                      Cache handling
-* Trees::                       Tree handling
-* Memory::                      Memory handling
-* Timers::                      Timer functions
-* Output::                      Output handling
-* Utilities::                   Utilitiy functions
-* Errors::                      Error handling
-* String Chunks::               String Chunks
-* Strings::                     String handling
-* Resizable arrays::            Resizeable arrays
-* GScanner::                    Flexible lexical scanner
-* Miscellany::                  Other stuff
-* Function Index::              Index of functions
-* Concept Index::               Index of concepts
-@end menu
-
-@node Copying, Overview, Top, Top
-@comment node-name, next, previous, up
-@chapter Copying
-
-@node Overview, Doubly linked lists, Copying, Top
-@comment node-name, next, previous, up
-@chapter What is GLIB
-
-@node Doubly linked lists, Signly linked lists, Overview, Top
-@comment node-name, next, previous, up
-@chapter Doubly linked lists
-
-@subsection Functions
-
-@deftypefun GList* g_list_alloc (void)
-@end deftypefun
-
-@deftypefun void g_list_free (GList *@var{list})
-@end deftypefun
-
-@deftypefun void g_list_free_1 (GList *@var{list})
-@end deftypefun
-
-@deftypefun GList* g_list_append (GList *@var{list}, gpointer @var{data})
-@end deftypefun
-
-@deftypefun GList* g_list_prepend (GList *@var{list}, gpointer @var{data})
-@end deftypefun
-
-@deftypefun GList* g_list_insert (GList *@var{list}, gpointer @var{data}, gint @var{position})
-@end deftypefun
-
-@deftypefun GList* g_list_insert_sorted (GList *@var{list}, gpointer @var{data}, GCompareFunc @var{func})
-@end deftypefun
-
-@deftypefun GList* g_list_concat (GList *@var{list1}, GList *@var{list2})
-@end deftypefun
-
-@deftypefun GList* g_list_remove (GList *@var{list}, gpointer @var{data})
-@end deftypefun
-
-@deftypefun GList* g_list_remove_link (GList *@var{list}, GList *@var{link})
-@end deftypefun
-
-@deftypefun GList* g_list_reverse (GList *@var{list})
-@end deftypefun
-
-@deftypefun GList* g_list_nth (GList *@var{list}, gint @var{n})
-@end deftypefun
-
-@deftypefun GList* g_list_find (GList *@var{list}, gpointer @var{data})
-@end deftypefun
-
-@deftypefun GList* g_list_last (GList *@var{list})
-@end deftypefun
-
-@deftypefun GList* g_list_first (GList *@var{list})
-@end deftypefun
-
-@deftypefun gint g_list_length (GList *@var{list})
-@end deftypefun
-
-@deftypefun void g_list_foreach (GList *@var{list}, GFunc @var{func}, gpointer @var{user_data})
-@end deftypefun
-
-@node Signly linked lists, List allocators, Doubly linked lists, Top
-@comment node-name, next, previous, up
-@chapter Signly linked lists
-
-@subsection Functions
-@deftypefun GSList* g_slist_alloc (void)
-@end deftypefun
-
-@deftypefun void g_slist_free (GSList *@var{list})
-@end deftypefun
-
-@deftypefun void g_slist_free_1 (GSList *@var{list})
-@end deftypefun
-
-@deftypefun GSList* g_slist_append (GSList *@var{list}, gpointer @var{data})
-@end deftypefun
-
-@deftypefun GSList* g_slist_prepend (GSList *@var{list}, gpointer @var{data})
-@end deftypefun
-
-@deftypefun GSList* g_slist_insert (GSList *@var{list}, gpointer @var{data}, gint @var{position})
-@end deftypefun
-
-@deftypefun GSList* g_slist_insert_sorted (GSList *@var{list}, gpointer @var{data}, GCompareFunc @var{func})
-@end deftypefun
-
-@deftypefun GSList* g_slist_concat (GSList *@var{list1}, GSList *@var{list2})
-@end deftypefun
-
-@deftypefun GSList* g_slist_remove (GSList *@var{list}, gpointer @var{data})
-@end deftypefun
-
-@deftypefun GSList* g_slist_remove_link (GSList *@var{list}, GSList *@var{link})
-@end deftypefun
-
-@deftypefun GSList* g_slist_reverse (GSList *@var{list})
-@end deftypefun
-
-@deftypefun GSList* g_slist_nth (GSList *@var{list}, gint @var{n})
-@end deftypefun
-
-@deftypefun GSList* g_slist_find (GSList *@var{list}, gpointer @var{data})
-@end deftypefun
-
-@deftypefun GSList* g_slist_last (GSList *@var{list})
-@end deftypefun
-
-@deftypefun gint g_slist_length (GSList *@var{list})
-@end deftypefun
-
-@deftypefun void g_slist_foreach (GSList *@var{list}, GFunc @var{func}, gpointer @var{user_data})
-@end deftypefun
-
-@node List allocators, Hash tables, Signly linked lists, Top
-@comment node-name, next, previous, up
-@chapter List allocators
-
-@subsection Functions
-
-@deftypefun GListAllocator* g_list_allocator_new (void)
-@end deftypefun
-
-@deftypefun void g_list_allocator_free (GListAllocator *@var{allocator})
-@end deftypefun
-
-@deftypefun GListAllocator* g_slist_set_allocator (GListAllocator *@var{allocator})
-@end deftypefun
-
-@deftypefun GListAllocator* g_list_set_allocator (GListAllocator *@var{allocator})
-@end deftypefun
-
-@node Hash tables, Caches, List allocators, Top
-@comment node-name, next, previous, up
-@chapter Hash tables
-
-@subsection Functions
-
-@deftypefun GHashTable* g_hash_table_new (GHashFunc @var{hash_func}, GCompareFunc @var{key_compare_func})
-@end deftypefun
-
-@deftypefun void g_hash_table_destroy (GHashTable *@var{hash_table})
-@end deftypefun
-
-@deftypefun void g_hash_table_insert (GHashTable *@var{hash_table}, gpointer @var{key}, gpointer @var{value})
-@end deftypefun
-
-@deftypefun void g_hash_table_remove (GHashTable *@var{hash_table}, gpointer @var{key})
-@end deftypefun
-
-@deftypefun gpointer g_hash_table_lookup (GHashTable *@var{hash_table}, gpointer @var{key})
-@end deftypefun
-
-@deftypefun void g_hash_table_freeze (GHashTable *@var{hash_table})
-@end deftypefun
-
-@deftypefun void g_hash_table_thaw (GHashTable *@var{hash_table})
-@end deftypefun
-
-@deftypefun void g_hash_table_foreach (GHashTable *@var{hash_table}, GHFunc @var{func}, gpointer @var{user_data})
-@end deftypefun
-
-@node Caches, Trees, Hash tables, Top
-@comment node-name, next, previous, up
-@chapter Cache handling
-
-@subsection Functions
-
-@deftypefun GCache* g_cache_new (GCacheNewFunc @var{value_new_func}, GCacheDestroyFunc @var{value_destroy_func}, GCacheDupFunc @var{key_dup_func}, GCacheDestroyFunc @var{key_destroy_func}, GHashFunc @var{hash_key_func}, GHashFunc @var{hash_value_func}, GCompareFunc @var{key_compare_func})
-@end deftypefun
-
-@deftypefun void g_cache_destroy (GCache *@var{cache})
-@end deftypefun
-
-@deftypefun gpointer g_cache_insert (GCache *@var{cache}, gpointer @var{key})
-@end deftypefun
-
-@deftypefun void g_cache_remove (GCache *@var{cache}, gpointer @var{key})
-@end deftypefun
-
-@deftypefun void g_cache_key_foreach (GCache *@var{cache}, GHFunc @var{func}, gpointer @var{user_data})
-@end deftypefun
-
-@deftypefun void g_cache_value_foreach (GCache *@var{cache}, GHFunc @var{func}, gpointer @var{user_data})
-@end deftypefun
-
-@node Trees, Memory, Caches, Top
-@comment node-name, next, previous, up
-@chapter Tree handling
-
-@subsection Functions
-
-@deftypefun GTree* g_tree_new (GCompareFunc @var{key_compare_func})
-@end deftypefun
-
-@deftypefun void g_tree_destroy (GTree *@var{tree})
-@end deftypefun
-
-@deftypefun void g_tree_remove (GTree *@var{tree}, gpointer @var{key}, gpointer @var{value})
-@end deftypefun
-
-@deftypefun gpointer g_tree_lookup (GTree *@var{tree}, gpointer @var{key})
-@end deftypefun
-
-@deftypefun void g_tree_traverse (GTree *@var{tree}, GTraverseFunc @var{traverse_func}, GTraverseType @var{traverse_type}, gpointer @var{data}
-@end deftypefun
-
-@deftypefun gpointer g_tree_search (GTree *@var{tree}, GSearchFunc @var{search_func}, gpointer @var{data})
-@end deftypefun
-
-@deftypefun gint g_tree_height (GTree *@var{tree})
-@end deftypefun
-
-@deftypefun gint g_tree_nnodes (GTree *@var{tree})
-@end deftypefun
-
-@node Memory, Timers, Trees, Top
-@comment node-name, next, previous, up
-@chapter Memory handling
-
-@subsection Functions
-
-@deftypefun gpointer g_malloc (gulong @var{size})
-@end deftypefun
-
-@deftypefun gpointer g_malloc0 (gulong @var{size})
-@end deftypefun
-
-@deftypefun gpointer g_realloc (gpointer @var{mem}, gulong @var{size})
-@end deftypefun
-
-@deftypefun void g_mem_profile (void)
-@end deftypefun
-
-@deftypefun void g_mem_check (gpointer @var{mem})
-@end deftypefun
-
-@deftypefun GMemChunk* g_mem_chunk_new (gchar *@var{name}, gint @var{atom_size}, gulong @var{area_size}, gint @var{type})
-@end deftypefun
-
-@deftypefun void g_mem_chunk_destroy (GMemChunk *@var{mem_chunk})
-@end deftypefun
-
-@deftypefun gpointer g_mem_chunk_alloc (GMemChunk *@var{mem_chunk})
-@end deftypefun
-
-@deftypefun void g_mem_chunk_free (GMemChunk *@var{mem_chunk}, gpointer @var{mem})
-@end deftypefun
-
-@deftypefun void g_mem_chunk_clean (GMemChunk *@var{mem_chunk})
-@end deftypefun
-
-@deftypefun void g_mem_chunk_reset (GMemChunk *@var{mem_chunk})
-@end deftypefun
-
-@deftypefun void g_mem_chunk_print (GMemChunk *@var{mem_chunk})
-@end deftypefun
-
-@deftypefun void g_mem_chunk_info (void)
-@end deftypefun
-
-@deftypefun void g_blow_chunks (void)
-Not what you might be thinking, @code{g_blow_chunks()} simply compresses all 
-the chunks. This operation consists of freeing every memory area that should
-be freed (but which we haven't gotten around to doing yet).
-@end deftypefun
-
-@node Timers, Output, Memory, Top
-@comment node-name, next, previous, up
-@chapter Timer functions
-
-@subsection Functions
-
-@deftypefun GTimer* g_timer_new (void)
-@end deftypefun
-
-@deftypefun void g_timer_destroy (GTimer *@var{timer})
-@end deftypefun
-
-@deftypefun void g_timer_start (GTimer *@var{timer})
-@end deftypefun
-
-@deftypefun void g_timer_stop (GTimer *@var{timer})
-@end deftypefun
-
-@deftypefun void g_timer_reset (GTimer *@var{timer})
-@end deftypefun
-
-@deftypefun gdouble g_timer_elapsed (GTimer *@var{timer}, gulong *@var{microseconds})
-@end deftypefun
-
-@node Output, Utilities, Timers, Top
-@comment node-name, next, previous, up
-@chapter Output functions
-
-@subsection Functions
-
-@deftypefun void g_error (gchar *@var{format}, @dots{})
-@end deftypefun
-
-@deftypefun void g_warning (gchar *@var{format}, @dots{})
-@end deftypefun
-
-@deftypefun void g_message (gchar *@var{format}, @dots{})
-@end deftypefun
-
-@deftypefun void g_print (gchar *@var{format}, @dots{})
-@end deftypefun
-
-@node Utilities, Errors, Output, Top
-@comment node-name, next, previous, up
-@chapter Utility functions
-
-@node Errors, String Chunks, Utilities, Top
-@comment node-name, next, previous, up
-@chapter Error handling
-
-@node String Chunks, Strings, Errors, Top
-@comment node-name, next, previous, up
-@chapter String chunks
-
-@node Strings, Resizable arrays, String Chunks, Top
-@comment node-name, next, previous, up
-@chapter String handling
-
-@node Resizable arrays, GScanner, Strings, Top
-@comment node-name, next, previous, up
-@chapter Resizable arrays
-
-@node GScanner, Miscellany, Resizable arrays, Top
-@comment node-name, next, previous, up
-@chapter Flexible lexical scanner
-
-@node Miscellany, Function Index, GScanner, Top
-@comment node-name, next, previous, up
-@chapter Other stuff
-
-@node Function Index, Concept Index, Miscellany, Top
-@comment node-name, next, previous, up
-@unnumbered Function Index
-
-@printindex fn
-
-@node Concept Index, , Function Index, Top
-@comment node-name, next, previous, up
-@unnumbered Concept Index
-
-@printindex cp
-
-@summarycontents
-@contents 
-@bye
-

docs/gtk-config.1.in

@@ -1,4 +1,4 @@
-.TH GTK+ 1 "11 May 1998" Version 1.0.2
+.TH GTK+ 1 "25 October 1998" Version @VERSION@
 .SH NAME
 gtk-config - script to get information about the installed version of GTK+
 .SH SYNOPSIS

docs/gtk-config.txt

@@ -36,6 +36,14 @@ gtk-config takes the following flags:
      If PREFIX is specified, overrides the configured value of $exec_prefix.
      Otherwise, prints out the configured value of $exec_prefix
  
+You may also add to the command line a list of additional
+libraries that gtk-config should supply the CFLAGS and LIBS
+for. The only currently supported library is 'gthread'.
+
+As an example of this latter usage, you can get the
+appropriate cflags for a threaded program with:
+
+ gtk-config --cflags gthread
 
 
 Example of using gtk-config

docs/gtk.texi

@@ -1109,7 +1109,7 @@ opaque.
 All widget creation routines in GTK return pointers to GtkWidget
 structures. In reality, all widget creation routines create structures
 that can be viewed as equivalent to the GtkWidget structure, but often
-have contain additional information. @xref{Object Implementation}
+have contain additional information. @xref{Object Implementation}.
 
 The widgets available for use are implemented in a hierarchy. Several
 widgets exist solely as common bases for more specific widgets. For

docs/package_tutorial.sh

@@ -0,0 +1,99 @@
+#! /bin/sh
+# package_tutorial.sh - Package up the tutorial into various formats
+# Copyright (C) Tony Gale 1999
+# Contact: gale@gtk.org
+#
+# NOTE: This script requires the following to be installed:
+#            o SGML Tools
+#            o Latex
+#            o DVI tools
+
+TARGET=`pwd`/gtk_tut.sgml
+GIFS="`pwd`/*.gif"
+EXAMPLES=`pwd`/../examples
+
+PATH=`pwd`:$PATH
+
+DATE=`date '+%y%m%d'`
+
+# Check top level directory
+if [ ! -d gtk_tutorial ]; then
+  if [ -e gtk_tutorial ]; then
+    echo "ERROR: gtk_tutorial is not a directory"
+    exit
+  fi
+  mkdir gtk_tutorial.$DATE
+fi 
+
+cd gtk_tutorial.$DATE
+
+# SGML Format
+echo -n "Copy SGML and GIF's.... "
+if [ ! -d sgml ]; then
+  if [ -e sgml ]; then
+    echo "ERROR: html is not a directory"
+    exit
+  fi
+  mkdir sgml
+fi
+
+(cd sgml ; cp $TARGET . ; cp $GIFS .)
+echo "done"
+
+# HTML Format
+echo -n "Formatting into HTML.... " 
+if [ ! -d html ]; then
+  if [ -e html ]; then
+    echo "ERROR: html is not a directory"
+    exit
+  fi
+  mkdir html
+fi
+
+(cd html ; sgml2html $TARGET ; cp $GIFS .)
+echo "done"
+
+# Text Format
+echo -n "Formatting into Text.... "
+if [ ! -d txt ]; then
+  if [ -e txt ]; then
+    echo "ERROR: txt is not a directory"
+    exit
+  fi
+  mkdir txt
+fi
+
+(cd txt ; sgml2txt -f $TARGET 2>&1 > /dev/null )
+echo "done"
+
+# PS and DVI Format
+echo -n "Formatting into PS and DVI.... "
+if [ ! -d ps ]; then
+  if [ -e ps ]; then
+    echo "ERROR: ps is not a directory"
+    exit
+  fi
+  mkdir ps
+fi
+
+(cd ps ; sgml2latex --output=ps $TARGET > /dev/null)
+(cd ps ; sgml2latex $TARGET > /dev/null)
+echo "done"
+
+# Copy examples
+echo -n "Copying examples"
+cp -R $EXAMPLES .
+(cd examples ; make clean ; rm -rf CVS */CVS)
+echo "done"
+
+# Package it all up
+echo -n "Creating packages.... "
+cd ..
+tar cvfz gtk_tutorial.$DATE.tar.gz gtk_tutorial.$DATE
+echo "done"
+
+rm -rf gtk_tutorial.$DATE
+
+echo
+echo Package gtk_tutorial.$DATE.tar.gz created.
+echo

docs/refcounting.txt

@@ -240,7 +240,7 @@ Taking care of proper referencing
 ---------------------------------
 
 There are some cases where referencing of widgets from outside the toolkit
-(on the application side is needed).
+(on the application side) is needed.
 Once the application performes an operation on a widget that will cause
 its reference count to drop, if it wants to take further actions on the
 widget, it needs to hold a reference to it.

docs/reference/AUTHORS

@@ -0,0 +1,7 @@
+Damon Chaplin <damon@karuna.freeserve.co.uk> and others.
+
+See:
+
+ http://www.gtk.org/rdp/status.html
+
+for a complete list.

docs/reference/COPYING

@@ -0,0 +1,30 @@
+This work may be reproduced and distributed in whole or in part, in
+any medium, physical or electronic, so as long as this copyright
+notice remains intact and unchanged on all copies.  Commercial
+redistribution is permitted and encouraged, but you may not
+redistribute, in whole or in part, under terms more restrictive than
+those under which you received it. If you redistribute a modified or
+translated version of this work, you must also make the source code to
+the modified or translated version available in electronic form
+without charge.  However, mere aggregation as part of a larger work
+shall not count as a modification for this purpose.
+
+All code examples in this work are placed into the public domain,
+and may be used, modified and redistributed without restriction.
+
+BECAUSE THIS WORK IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE WORK, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE WORK "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  SHOULD THE WORK PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY REPAIR OR CORRECTION.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE WORK AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+WORK, EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGES.

docs/reference/ChangeLog

@@ -0,0 +1,206 @@
+2000-02-03  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gdk/gdk-sections.txt: rearranged a bit.
+
+	* gdk/tmpl/event_structs.sgml: updated.
+
+	* gtk/gtk-sections.txt: added INCLUDE tag for Private Info section.
+
+	* gdk/tmpl/color_contexts.sgml: added note saying it is deprecated.
+	* gdk/tmpl/dnd.sgml: added note saying read the GTK+ DnD docs.
+
+2000-02-02  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gdk/tmpl/*.sgml: ran make templates.
+
+	* gdk/gdk-docs.sgml: rearranged sections.
+
+	* gdk/tmpl/events.sgml: documented.
+
+	* gdk/tmpl/general.sgml: documented.
+
+	* gdk/tmpl/rgb.sgml: fixed a few '@' -> '#'.
+
+	* gdk/gdk-sections.txt: rearranged a few bits, including moving
+	GdkWChar and related functions from the input method section to the
+	font section, and GdkCapStyle etc. from Drawing Primitives to GCs.
+
+	* gdk/tmpl/images.sgml: documented.
+
+	* gdk/tmpl/drawing.sgml: updated.
+
+	* gdk/tmpl/regions.sgml: updated.
+
+	* gdk/tmpl/input_contexts.sgml: documented.
+
+	* gdk/tmpl/input_methods.sgml: documented.
+
+	* gdk/tmpl/selections.sgml: changed xref to a link since Jade says
+	a xref to a RefEntry is not supported.
+
+2000-01-19  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/tmpl/gtkscrollbar.sgml: Started.
+
+2000-01-08  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/tmpl/gtkclist.sgml: update from Paul Schifferer
+	<isengard@geocities.com>
+
+Wed Jan  5 10:23:41 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/tmpl/gtkprogress.sgml: Missing </listitem>, remove extra <para>
+	* gtk/tmpl/gtkobject.sgml: dos2unix
+	* gtk/tmpl/gtkcurve.sgml: missing </para>
+	* gtk/tmpl/gtkarg.sgml: dos2unix, missing </para>
+	* gtk/tmpl/gtkcolorsel.sgml: Missing </listitem>'s
+	* gtk/tmpl/gtksignal.sgml (signal): dos2unix, missing </para>'s
+	* gtk/tmpl/gtkmarshal.sgml: Missing </refsect2>
+
+1999-11-16  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/tmpl/gtkmenubar.sgml: fixed minor error - using <em>.
+
+	* gtk/tmpl/gtknotebook.sgml: 
+	* gtk/tmpl/gtklist.sgml: new sections from
+	Nicolas George <george@clipper.ens.fr>, with help from
+	"Bob Springett"	<bobspringett@claranet.fr>.
+
+	* gtk/tmpl/gtkobject.sgml: 
+	* gtk/tmpl/gtkarg.sgml: new sections from
+	David Benson <daveb@idealab.com>.
+
+	* gtk/tmpl/gtkvbox.sgml: 
+	* gtk/tmpl/gtkhbox.sgml: fixed line endings.
+
+	* gtk/tmpl/gtkvbbox.sgml: update from Lee Mallabone
+	<lee0@callnetuk.com>
+
+	* gdk/tmpl/drawing.sgml: fixed error in gdk_draw_arc() @angle2 param
+	- it is relative to @angle1 rather than from the 3 o'clock position.
+
+	* gtk/tmpl/gtkfontseldlg.sgml: changed enums to use @ fields.
+
+	* gtk/tmpl/gtkcolorsel.sgml: 
+	* gtk/tmpl/gtkcolorseldlg.sgml: 
+	* gtk/tmpl/gtkprogress.sgml: 
+	* gtk/tmpl/gtkprogressbar.sgml: new sections from Tom Martone
+	<tom@martoneconsulting.com>
+
+	* gtk/tmpl/gtkclist.sgml: partially written documentation from
+	Paul Schifferer <isengard@geocities.com> who won't be able to finish it
+
+1999-09-22  Martin Norbäck  <d95mback@dtek.chalmers.se>
+	
+	* gtk/tmpl/gtkclist.sgml: Added information about the sorting functions
+
+Tue Oct 26 16:50:15 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/tmpl/gtkrc.sgml: Added information about widget
+	paths and pattern matching.
+
+1999-09-22  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/tmpl/*.sgml: ran make templates, to fix problems with structs.
+
+	* gtk/gtk-sections.txt: rearranged GtkCombo section.
+
+	* gtk/tmpl/gtkvseparator.sgml: 
+	* gtk/tmpl/gtkhseparator.sgml: 
+	* gtk/tmpl/gtkgc.sgml: 
+	* gtk/tmpl/gtkfeatures.sgml: 
+	* gtk/tmpl/gtktipsquery.sgml: 
+	* gtk/tmpl/gtkitem.sgml: 
+	* gtk/tmpl/gtkinvisible.sgml: 
+	* gtk/tmpl/gtkgamma.sgml: 
+	* gtk/tmpl/gtkdata.sgml: 
+	* gtk/tmpl/gtkcurve.sgml: 
+	* gtk/tmpl/gtkcombo.sgml: 
+	* gtk/tmpl/gtkaccellabel.sgml: documented.
+
+1999-09-20  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/gtk-docs.sgml: added role="no-toc" to the GTK+ Widgets & Objects
+	chapter since we've created our own special contents page.
+
+1999-09-19  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/tmpl/gtkmarshal.sgml: 
+	* gtk/tmpl/gtksignal.sgml: new sections from 
+         David Benson <daveb@idealab.com>.
+
+	* gtk/gtk-sections.txt: rearranged signal sections, and made most
+	marshallers private. Moved GtkSignalRunType to signals section.
+
+	* gtk/tmpl/gtkradiobutton.sgml: new section from Lee Mallabone.
+
+1999-09-17  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/gtk-docs.sgml: removed menu factory and debugging sections.
+
+	* gtk/gtk-sections.txt: made menu factory stuff private since it is
+	deprecated. Also made debugging stuff private since it is only useful
+	within GTK+.
+
+1999-09-14  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/tmpl/gtkfilesel.sgml: fixed mismatched parentheses.
+
+1999-09-02  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gdk/tmpl/event_structs.sgml: 
+	* gdk/tmpl/drawing.sgml: minor fixes.
+
+1999-09-20  David C. Mason  <dcm@redhat.com>
+
+	* gtk/tmpl/gtkimage.sgml: first pass at gtkimage... not complete
+
+1999-08-28  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/tmpl/gtkbbox.sgml: new section from Lee Mallabone.
+
+	* gdk/gdk-sections.txt: rearranged rgb, regions, and drawing sections.
+
+	* gdk/tmpl/rgb.sgml: new section from Raph Levien, with a few changes
+	by me, including a little example app.
+
+	* gdk/tmpl/regions.sgml: 
+	* gdk/tmpl/event_structs.sgml: 
+	* gdk/tmpl/drawing.sgml: my first attempt.
+	* gdk/tmpl/cursors.sgml: tiny changes.
+
+Tue Aug 17 09:14:01 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/tmpl/gtktypeutils.sgml: Fix corrupted end tag.
+
+	* gtk/tmpl/gtkselection.sgml gtk/tmpl/gtkrc.sgml
+	  gtk/tmpl/gtkdnd.sgml gtk/tmpl/gtkarrow.sgml
+	  gtk/tmpl/gtkpaned.sgml gtk/tmpl/gtkmisc.sgml
+	  gtk/tmpl/gtkhandlebox.sgml gtk/tmpl/gtkctree.sgml:
+	Added missing close tags.
+
+Thu Aug 19 14:43:08 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/tmpl/gcs.sgml gdk/gdk-sections.txt: Added section. 
+	  (Written a while ago but fell through the cracks)
+
+	* gtk/gtk-docs.sgml: Add a &hash; entity here as a
+	  temporary hack. (There is no standard entity
+	  for '#', and no way of escaping '#' in gtk-doc)
+
+	* gtk/tmpl/gtkrc.sgml: Use the above to fix up #rrggbb
+	  string literals.
+
+	* gtk/tmpl/gtkdrawingarea.sgml: Fixed a couple
+	  of errors in the example. (pointed out by
+	  Nick Lamb)
+
+Mon Aug 16 6:60:53 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/tmpl/properties.sgml
+	  gdk/tmpl/selections.sgml
+	  gdk/tmpl/input_devices.sgml: Documented
+
+	* gdk/gdk-sections.txt: Moved around types for
+	  input devices properties and selections, marked
+	  a few functions as private.

docs/reference/README

@@ -0,0 +1,62 @@
+This package contains the reference documentation
+for GTK+. For more information about GTK+
+see:
+
+ http://www.gtk.org
+
+For information about contributing to the
+GLib/GTK+ reference documentation project, see:
+
+ http://www.gtk.org/rdp/
+
+The GTK+ reference documentation is freely redistributable,
+see the file COPYING for details.
+
+
+REQUIREMENTS
+============
+
+To build the documentation, you must have the gtk-doc
+package installed. To rebuild the template files,
+you must have the current version of the GTK+
+header files installed.
+
+
+BUILD
+=====
+
+First, run configure to generate the makefiles for this
+module. There is one option specific to this package
+
+  --with-html-dir=DIR   top of installed HTML documentation tree
+
+
+The Makefiles in the gdk/ and gtk/ subdirs each define three targets:
+
+ templates:
+  
+  Scan the headers and merge the results with the current 
+  template files
+
+ sgml:
+
+  Generate SGML files using the DocBook DTD from
+  the template files
+
+ html:
+
+  Generate HTML from the SGML files.
+
+To build the documentation, do:
+
+ make sgml
+ make html
+
+You should only run the 'make templates' step if you
+need to regenerate the templates for a more recent
+version of the GTK+ sources.
+
+INSTALLATION
+============
+
+ make install

docs/reference/README.cvs-commits

@@ -0,0 +1,39 @@
+Before making any changes to this module, please
+contact:
+
+  Damon Chaplin <damon@karuna.freeserve.co.uk>
+
+This will ensure that duplicate work does not occur,
+and also make sure we know who has written what
+parts of the documentation. See 
+
+ http://www.gtk.org/rdp/
+
+for more information.
+
+By contributing work to the Reference Documentation
+Project, you agree that it will be covered under the
+license terms described in the file COPYING
+included in this directory.
+
+
+Other notes:
+
+- Do not run 'make templates' unless you have
+  the latest cvs version of the gtk-1-2
+  branch of GTK+ and the latest CVS version
+  of gtk-doc.
+
+  (This is very important. Otherwise, the template
+  files may be come corrupted.)
+
+  Make sure that gtk-config --prefix points
+  to the correct version of GTK+.
+
+- As always, ChangeLog entries should be made for
+  each commit. These can be really brief
+  "documented GHashTable"; but if you are editing
+  something someone else wrote, please be specific.
+  (Or better, send the changes to them for their
+  approval, first)
+

docs/reference/gdk-pixbuf/.cvsignore

@@ -0,0 +1,5 @@
+Makefile
+Makefile.in
+html
+sgml
+gdk-pixbuf.html

docs/reference/gdk-pixbuf/Makefile.am

@@ -0,0 +1,104 @@
+## Process this file with automake to produce Makefile.in
+
+# The name of the module.
+DOC_MODULE=gdk-pixbuf
+
+# The top-level SGML file.
+DOC_MAIN_SGML_FILE=gdk-pixbuf.sgml
+
+# The directory containing the source code (if it contains documentation).
+DOC_SOURCE_DIR=$(GDK_PIXBUF_DIR)/gdk-pixbuf
+
+CFLAGS=`gnome-config --cflags gnomeui gdk_pixbuf gnomecanvaspixbuf`
+LDFLAGS=`gnome-config --libs gnomeui gdk_pixbuf gnomecanvaspixbuf`
+
+HTML_DIR=$(datadir)/gnome/html
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+tmpl_sources =					\
+	tmpl/animation.sgml			\
+	tmpl/creating.sgml			\
+	tmpl/file-loading.sgml			\
+	tmpl/from-drawables.sgml		\
+	tmpl/gdk-pixbuf-loader.sgml		\
+	tmpl/gdk-pixbuf-unused.sgml		\
+	tmpl/gdk-pixbuf.sgml			\
+	tmpl/gnome-canvas-pixbuf.sgml		\
+	tmpl/refcounting.sgml			\
+	tmpl/rendering.sgml			\
+	tmpl/scaling.sgml			\
+	tmpl/util.sgml
+
+gdk_pixbuf_docdir = $(HTML_DIR)
+gdk_pixbuf_doc_DATA =			\
+	gdk-pixbuf.html			\
+	gdk-pixbuf.hierarchy		\
+	gdk-pixbuf.types		\
+	gdk-pixbuf-decl.txt		\
+	gdk-pixbuf-sections.txt
+
+EXTRA_DIST = $(gdk_pixbuf_doc_DATA)
+
+if ENABLE_GTK_DOC
+gdk-pixbuf.html: html/book1.html
+	-cd $(srcdir) && cp html/book1.html gdk-pixbuf.html
+else
+gdk-pixbuf.html:
+endif
+
+html/book1.html: sgml/gdk-pixbuf-doc.bottom
+	$(MAKE) html
+
+sgml/gdk-pixbuf-doc.bottom: $(tmpl_sources)
+	$(MAKE) sgml
+
+scan:
+	-(cd $(srcdir) \
+	&& env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \
+		 gtkdoc-scanobj --module=$(DOC_MODULE) \
+	&& gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="pixops.h pixops-internal.h" )
+
+templates: scan
+	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
+
+sgml:
+	cd $(srcdir) \
+	&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
+
+html:
+	test -d $(srcdir)/html || mkdir $(srcdir)/html
+	-cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+
+clean-local:
+	rm -f *~ *.bak *.signals *-unused.txt
+
+maintainer-clean-local: clean
+	cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
+	(installfiles=`echo $(srcdir)/html/*.html`; \
+	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+	then echo '-- Nothing to install' ; \
+	else \
+	  for i in $$installfiles; do \
+	    echo '-- Installing '$$i ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+	  done; \
+	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
+	  echo '-- Fixing Crossreferences' ; \
+	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
+	fi)
+
+dist-hook:
+	mkdir $(distdir)/html
+	mkdir $(distdir)/sgml
+	mkdir $(distdir)/tmpl
+	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
+	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
+	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
+
+.PHONY : html sgml templates scan

docs/reference/gdk-pixbuf/gdk-pixbuf-decl.txt

@@ -0,0 +1,414 @@
+<USER_FUNCTION>
+<NAME>ModulePreparedNotifyFunc</NAME>
+<RETURNS>void </RETURNS>
+GdkPixbuf *pixbuf, gpointer user_data
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>ModuleUpdatedNotifyFunc</NAME>
+<RETURNS>void </RETURNS>
+GdkPixbuf *pixbuf,
+					  guint x, guint y,
+					  guint width, guint height,
+					  gpointer user_data
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>ModuleFrameDoneNotifyFunc</NAME>
+<RETURNS>void </RETURNS>
+GdkPixbufFrame *frame,
+					    gpointer user_data
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>ModuleAnimationDoneNotifyFunc</NAME>
+<RETURNS>void </RETURNS>
+GdkPixbuf *pixbuf,
+						gpointer user_data
+</USER_FUNCTION>
+<STRUCT>
+<NAME>GdkPixbufModule</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkPixbufModule</NAME>
+struct GdkPixbufModule {
+	char *module_name;
+	gboolean (* format_check) (guchar *buffer, int size);
+	GModule *module;
+	GdkPixbuf *(* load) (FILE *f);
+        GdkPixbuf *(* load_xpm_data) (const char **data);
+
+        /* Incremental loading */
+
+        gpointer (* begin_load) (ModulePreparedNotifyFunc prepare_func,
+				 ModuleUpdatedNotifyFunc update_func,
+				 ModuleFrameDoneNotifyFunc frame_done_func,
+				 ModuleAnimationDoneNotifyFunc anim_done_func,
+				 gpointer user_data);
+        void (* stop_load) (gpointer context);
+        gboolean (* load_increment) (gpointer context, const guchar *buf, guint size);
+
+	/* Animation loading */
+	GdkPixbufAnimation *(* load_animation) (FILE *f);
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gdk_pixbuf_get_module</NAME>
+<RETURNS>GdkPixbufModule  *</RETURNS>
+guchar *buffer, guint size
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_load_module</NAME>
+<RETURNS>void  </RETURNS>
+GdkPixbufModule *image_module
+</FUNCTION>
+<MACRO>
+<NAME>GDK_TYPE_PIXBUF_LOADER</NAME>
+#define GDK_TYPE_PIXBUF_LOADER		   (gdk_pixbuf_loader_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GDK_PIXBUF_LOADER</NAME>
+#define GDK_PIXBUF_LOADER(obj)		   (GTK_CHECK_CAST ((obj), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoader))
+</MACRO>
+<MACRO>
+<NAME>GDK_PIXBUF_LOADER_CLASS</NAME>
+#define GDK_PIXBUF_LOADER_CLASS(klass)	   (GTK_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoaderClass))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_PIXBUF_LOADER</NAME>
+#define GDK_IS_PIXBUF_LOADER(obj)	   (GTK_CHECK_TYPE ((obj), GDK_TYPE_PIXBUF_LOADER))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_PIXBUF_LOADER_CLASS</NAME>
+#define GDK_IS_PIXBUF_LOADER_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_LOADER))
+</MACRO>
+<STRUCT>
+<NAME>GdkPixbufLoader</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkPixbufLoader</NAME>
+struct GdkPixbufLoader
+{
+	GtkObject object;
+
+	/* < Private > */
+	gpointer private;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkPixbufLoaderClass</NAME>
+</STRUCT>
+<FUNCTION>
+<NAME>gdk_pixbuf_loader_get_type</NAME>
+<RETURNS>GtkType  </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_loader_new</NAME>
+<RETURNS>GdkPixbufLoader     *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_loader_write</NAME>
+<RETURNS>gboolean  </RETURNS>
+GdkPixbufLoader *loader,const guchar    *buf,size_t           count
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_loader_get_pixbuf</NAME>
+<RETURNS>GdkPixbuf           *</RETURNS>
+GdkPixbufLoader *loader
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_loader_get_animation</NAME>
+<RETURNS>GdkPixbufAnimation  *</RETURNS>
+GdkPixbufLoader *loader
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_loader_close</NAME>
+<RETURNS>void  </RETURNS>
+GdkPixbufLoader *loader
+</FUNCTION>
+<STRUCT>
+<NAME>GdkPixbuf</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkPixbufFrame</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkPixbufAnimation</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkPixbuf</NAME>
+struct GdkPixbuf {
+	/* Reference count */
+	int ref_count;
+
+	/* Libart pixbuf */
+	ArtPixBuf *art_pixbuf;
+};
+</STRUCT>
+<ENUM>
+<NAME>GdkPixbufFrameAction</NAME>
+typedef enum {
+	GDK_PIXBUF_FRAME_RETAIN,
+	GDK_PIXBUF_FRAME_DISPOSE,
+	GDK_PIXBUF_FRAME_REVERT
+} GdkPixbufFrameAction;
+</ENUM>
+<STRUCT>
+<NAME>GdkPixbufFrame</NAME>
+struct GdkPixbufFrame {
+	/* The pixbuf with this frame's image data */
+	GdkPixbuf *pixbuf;
+
+	/* Offsets for overlaying onto the animation's area */
+	int x_offset;
+	int y_offset;
+
+	/* Frame duration in ms */
+	int delay_time;
+
+	/* Overlay mode */
+	GdkPixbufFrameAction action;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkPixbufAnimation</NAME>
+struct GdkPixbufAnimation {
+	/* Reference count */
+	int ref_count;
+
+	/* Number of frames */
+        int n_frames;
+
+	/* List of GdkPixbufFrame structures */
+        GList *frames;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gdk_pixbuf_get_format</NAME>
+<RETURNS>ArtPixFormat  </RETURNS>
+GdkPixbuf *pixbuf
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_get_n_channels</NAME>
+<RETURNS>int  </RETURNS>
+GdkPixbuf *pixbuf
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_get_has_alpha</NAME>
+<RETURNS>int  </RETURNS>
+GdkPixbuf *pixbuf
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_get_bits_per_sample</NAME>
+<RETURNS>int  </RETURNS>
+GdkPixbuf *pixbuf
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_get_pixels</NAME>
+<RETURNS>guchar       *</RETURNS>
+GdkPixbuf *pixbuf
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_get_width</NAME>
+<RETURNS>int  </RETURNS>
+GdkPixbuf *pixbuf
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_get_height</NAME>
+<RETURNS>int  </RETURNS>
+GdkPixbuf *pixbuf
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_get_rowstride</NAME>
+<RETURNS>int  </RETURNS>
+GdkPixbuf *pixbuf
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_ref</NAME>
+<RETURNS>GdkPixbuf  *</RETURNS>
+GdkPixbuf *pixbuf
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_unref</NAME>
+<RETURNS>void  </RETURNS>
+GdkPixbuf *pixbuf
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_new_from_art_pixbuf</NAME>
+<RETURNS>GdkPixbuf  *</RETURNS>
+ArtPixBuf *art_pixbuf
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_new</NAME>
+<RETURNS>GdkPixbuf  *</RETURNS>
+ArtPixFormat format, gboolean has_alpha, int bits_per_sample,int width, int height
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_new_from_file</NAME>
+<RETURNS>GdkPixbuf  *</RETURNS>
+const char *filename
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_new_from_data</NAME>
+<RETURNS>GdkPixbuf  *</RETURNS>
+guchar *data,ArtPixFormat format,gboolean has_alpha,int width, int height,int rowstride,ArtDestroyNotify dfunc,gpointer dfunc_data
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_new_from_xpm_data</NAME>
+<RETURNS>GdkPixbuf  *</RETURNS>
+const char **data
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_add_alpha</NAME>
+<RETURNS>GdkPixbuf  *</RETURNS>
+GdkPixbuf *pixbuf, gboolean substitute_color,guchar r, guchar g, guchar b
+</FUNCTION>
+<ENUM>
+<NAME>GdkPixbufAlphaMode</NAME>
+typedef enum {
+	GDK_PIXBUF_ALPHA_BILEVEL,
+	GDK_PIXBUF_ALPHA_FULL
+} GdkPixbufAlphaMode;
+</ENUM>
+<FUNCTION>
+<NAME>gdk_pixbuf_render_threshold_alpha</NAME>
+<RETURNS>void  </RETURNS>
+GdkPixbuf *pixbuf, GdkBitmap *bitmap,int src_x, int src_y,int dest_x, int dest_y,int width, int height,int alpha_threshold
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_render_to_drawable</NAME>
+<RETURNS>void  </RETURNS>
+GdkPixbuf *pixbuf,GdkDrawable *drawable, GdkGC *gc,int src_x, int src_y,int dest_x, int dest_y,int width, int height,GdkRgbDither dither,int x_dither, int y_dither
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_render_to_drawable_alpha</NAME>
+<RETURNS>void  </RETURNS>
+GdkPixbuf *pixbuf, GdkDrawable *drawable,int src_x, int src_y,int dest_x, int dest_y,int width, int height,GdkPixbufAlphaMode alpha_mode,int alpha_threshold,GdkRgbDither dither,int x_dither, int y_dither
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_render_pixmap_and_mask</NAME>
+<RETURNS>void  </RETURNS>
+GdkPixbuf *pixbuf,GdkPixmap **pixmap_return, GdkBitmap **mask_return,int alpha_threshold
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_get_from_drawable</NAME>
+<RETURNS>GdkPixbuf  *</RETURNS>
+GdkPixbuf *dest,GdkDrawable *src, GdkColormap *cmap,int src_x, int src_y,int dest_x, int dest_y,int width, int height
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_copy_area</NAME>
+<RETURNS>void  </RETURNS>
+GdkPixbuf *src_pixbuf,int src_x, int src_y,int width, int height,GdkPixbuf *dest_pixbuf,int dest_x, int dest_y
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_scale</NAME>
+<RETURNS>void  </RETURNS>
+GdkPixbuf      *src,GdkPixbuf      *dest,int             dest_x,int             dest_y,int             dest_width,int             dest_height,double          offset_x,double          offset_y,double          scale_x,double          scale_y,ArtFilterLevel  filter_level
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_composite</NAME>
+<RETURNS>void  </RETURNS>
+GdkPixbuf      *src,GdkPixbuf      *dest,int             dest_x,int             dest_y,int             dest_width,int             dest_height,double          offset_x,double          offset_y,double          scale_x,double          scale_y,ArtFilterLevel  filter_level,int             overall_alpha
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_composite_color</NAME>
+<RETURNS>void  </RETURNS>
+GdkPixbuf      *src,GdkPixbuf      *dest,int             dest_x,int             dest_y,int             dest_width,int             dest_height,double          offset_x,double          offset_y,double          scale_x,double          scale_y,ArtFilterLevel  filter_level,int             overall_alpha,int             check_x,int             check_y,int             check_size,art_u32         color1,art_u32         color2
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_scale_simple</NAME>
+<RETURNS>GdkPixbuf  *</RETURNS>
+GdkPixbuf      *src,int             dest_width,int             dest_height,ArtFilterLevel  filter_level
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_composite_color_simple</NAME>
+<RETURNS>GdkPixbuf  *</RETURNS>
+GdkPixbuf      *src,int             dest_width,int             dest_height,ArtFilterLevel  filter_level,int             overall_alpha,int             check_size,art_u32         color1,art_u32         color2
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_animation_new_from_file</NAME>
+<RETURNS>GdkPixbufAnimation  *</RETURNS>
+const char *filename
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_animation_ref</NAME>
+<RETURNS>GdkPixbufAnimation  *</RETURNS>
+GdkPixbufAnimation *animation
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_animation_unref</NAME>
+<RETURNS>void  </RETURNS>
+GdkPixbufAnimation *animation
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_preinit</NAME>
+<RETURNS>void  </RETURNS>
+gpointer app, gpointer modinfo
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_postinit</NAME>
+<RETURNS>void  </RETURNS>
+gpointer app, gpointer modinfo
+</FUNCTION>
+<MACRO>
+<NAME>GNOME_TYPE_CANVAS_PIXBUF</NAME>
+#define GNOME_TYPE_CANVAS_PIXBUF            (gnome_canvas_pixbuf_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GNOME_CANVAS_PIXBUF</NAME>
+#define GNOME_CANVAS_PIXBUF(obj)            (GTK_CHECK_CAST ((obj),		\
+					     GNOME_TYPE_CANVAS_PIXBUF, GnomeCanvasPixbuf))
+</MACRO>
+<MACRO>
+<NAME>GNOME_CANVAS_PIXBUF_CLASS</NAME>
+#define GNOME_CANVAS_PIXBUF_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass),	\
+					     GNOME_TYPE_CANVAS_PIXBUF, GnomeCanvasPixbufClass))
+</MACRO>
+<MACRO>
+<NAME>GNOME_IS_CANVAS_PIXBUF</NAME>
+#define GNOME_IS_CANVAS_PIXBUF(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CANVAS_PIXBUF))
+</MACRO>
+<MACRO>
+<NAME>GNOME_IS_CANVAS_PIXBUF_CLASS</NAME>
+#define GNOME_IS_CANVAS_PIXBUF_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass),	\
+					     GNOME_TYPE_CANVAS_PIXBUF))
+</MACRO>
+<STRUCT>
+<NAME>GnomeCanvasPixbuf</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GnomeCanvasPixbufClass</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GnomeCanvasPixbuf</NAME>
+struct GnomeCanvasPixbuf {
+	GnomeCanvasItem item;
+
+	/* Private data */
+	gpointer priv;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gnome_canvas_pixbuf_get_type</NAME>
+<RETURNS>GtkType  </RETURNS>
+void
+</FUNCTION>
+<MACRO>
+<NAME>GDK_PIXBUF_MAJOR</NAME>
+#define GDK_PIXBUF_MAJOR (0)
+</MACRO>
+<MACRO>
+<NAME>GDK_PIXBUF_MINOR</NAME>
+#define GDK_PIXBUF_MINOR (4)
+</MACRO>
+<MACRO>
+<NAME>GDK_PIXBUF_MICRO</NAME>
+#define GDK_PIXBUF_MICRO (0)
+</MACRO>
+<MACRO>
+<NAME>GDK_PIXBUF_VERSION</NAME>
+#define GDK_PIXBUF_VERSION "0.4.0"
+</MACRO>
+<VARIABLE>
+<NAME>gdk_pixbuf_version</NAME>
+extern const char *gdk_pixbuf_version;
+</VARIABLE>

docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt

@@ -0,0 +1,105 @@
+<INCLUDE>gdk-pixbuf/gdk-pixbuf.h</INCLUDE>
+
+<SECTION>
+<FILE>gdk-pixbuf</FILE>
+GdkPixbuf
+gdk_pixbuf_get_format
+gdk_pixbuf_get_n_channels
+gdk_pixbuf_get_has_alpha
+gdk_pixbuf_get_bits_per_sample
+gdk_pixbuf_get_pixels
+gdk_pixbuf_get_width
+gdk_pixbuf_get_height
+gdk_pixbuf_get_rowstride
+</SECTION>
+
+<SECTION>
+<FILE>refcounting</FILE>
+gdk_pixbuf_ref
+gdk_pixbuf_unref
+</SECTION>
+
+<SECTION>
+<FILE>file-loading</FILE>
+gdk_pixbuf_new_from_file
+</SECTION>
+
+<SECTION>
+<FILE>creating</FILE>
+gdk_pixbuf_new_from_art_pixbuf
+gdk_pixbuf_new
+gdk_pixbuf_new_from_data
+gdk_pixbuf_new_from_xpm_data
+</SECTION>
+
+<SECTION>
+<FILE>rendering</FILE>
+GdkPixbufAlphaMode
+gdk_pixbuf_render_to_drawable_alpha
+gdk_pixbuf_render_to_drawable
+gdk_pixbuf_render_threshold_alpha
+gdk_pixbuf_render_pixmap_and_mask
+</SECTION>
+
+<SECTION>
+<FILE>from-drawables</FILE>
+gdk_pixbuf_get_from_drawable
+</SECTION>
+
+<SECTION>
+<FILE>util</FILE>
+gdk_pixbuf_add_alpha
+gdk_pixbuf_copy_area
+</SECTION>
+
+<SECTION>
+<FILE>animation</FILE>
+GdkPixbufFrameAction
+GdkPixbufFrame
+GdkPixbufAnimation
+gdk_pixbuf_animation_new_from_file
+gdk_pixbuf_animation_ref
+gdk_pixbuf_animation_unref
+</SECTION>
+
+<SECTION>
+<FILE>scaling</FILE>
+gdk_pixbuf_scale
+gdk_pixbuf_composite
+gdk_pixbuf_composite_color
+gdk_pixbuf_scale_simple
+gdk_pixbuf_composite_color_simple
+</SECTION>
+
+<SECTION>
+<FILE>gdk-pixbuf-loader</FILE>
+GDK_PIXBUF_LOADER
+<TITLE>GdkPixbufLoader</TITLE>
+gdk_pixbuf_loader_new
+gdk_pixbuf_loader_write
+gdk_pixbuf_loader_get_pixbuf
+gdk_pixbuf_loader_get_animation
+gdk_pixbuf_loader_close
+<SUBSECTION Standard>
+GDK_TYPE_PIXBUF_LOADER
+GDK_IS_PIXBUF_LOADER
+gdk_pixbuf_loader_get_type
+GDK_PIXBUF_LOADER_CLASS
+GDK_IS_PIXBUF_LOADER_CLASS
+<SUBSECTION Private>
+GdkPixbufLoader
+</SECTION>
+
+<SECTION>
+<FILE>gnome-canvas-pixbuf</FILE>
+GNOME_CANVAS_PIXBUF
+<TITLE>GnomeCanvasPixbuf</TITLE>
+<SUBSECTION Standard>
+GNOME_TYPE_CANVAS_PIXBUF
+GNOME_IS_CANVAS_PIXBUF
+gnome_canvas_pixbuf_get_type
+GNOME_CANVAS_PIXBUF_CLASS
+GNOME_IS_CANVAS_PIXBUF_CLASS
+<SUBSECTION Private>
+GnomeCanvasPixbuf
+</SECTION>

docs/reference/gdk-pixbuf/gdk-pixbuf.args

@@ -0,0 +1,66 @@
+<ARG>
+<NAME>GnomeCanvasPixbuf::pixbuf</NAME>
+<TYPE>gpointer</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GnomeCanvasPixbuf::width</NAME>
+<TYPE>gdouble</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GnomeCanvasPixbuf::width_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GnomeCanvasPixbuf::width_in_pixels</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GnomeCanvasPixbuf::height</NAME>
+<TYPE>gdouble</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GnomeCanvasPixbuf::height_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GnomeCanvasPixbuf::height_in_pixels</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GnomeCanvasPixbuf::x</NAME>
+<TYPE>gdouble</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GnomeCanvasPixbuf::x_in_pixels</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GnomeCanvasPixbuf::y</NAME>
+<TYPE>gdouble</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GnomeCanvasPixbuf::y_in_pixels</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+

docs/reference/gdk-pixbuf/gdk-pixbuf.hierarchy

@@ -0,0 +1,4 @@
+GtkObject
+  GdkPixbufLoader
+  GnomeCanvasItem
+    GnomeCanvasPixbuf

docs/reference/gdk-pixbuf/gdk-pixbuf.sgml

@@ -0,0 +1,60 @@
+<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!entity gdk-pixbuf-gdk-pixbuf SYSTEM "sgml/gdk-pixbuf.sgml">
+<!entity gdk-pixbuf-refcounting SYSTEM "sgml/refcounting.sgml">
+<!entity gdk-pixbuf-file-loading SYSTEM "sgml/file-loading.sgml">
+<!entity gdk-pixbuf-creating SYSTEM "sgml/creating.sgml">
+<!entity gdk-pixbuf-rendering SYSTEM "sgml/rendering.sgml">
+<!entity gdk-pixbuf-scaling SYSTEM "sgml/scaling.sgml">
+<!entity gdk-pixbuf-from-drawables SYSTEM "sgml/from-drawables.sgml">
+<!entity gdk-pixbuf-util SYSTEM "sgml/util.sgml">
+<!entity gdk-pixbuf-animation SYSTEM "sgml/animation.sgml">
+<!entity GdkPixbufLoader SYSTEM "sgml/gdk-pixbuf-loader.sgml">
+<!entity GnomeCanvasPixbuf SYSTEM "sgml/gnome-canvas-pixbuf.sgml">
+]>
+
+<book>
+  <bookinfo>
+    <title>The GdkPixbuf Library</title>
+
+    <authorgroup>
+      <author>
+	<firstname>Federico</firstname>
+	<surname>Mena Quintero</surname>
+	<affiliation>
+	  <address>
+	    <email>federico@gimp.org</email>
+	  </address>
+	</affiliation>
+      </author>
+    </authorgroup>
+
+    <copyright>
+      <year>1999</year>
+      <holder>The Free Software Foundation</holder>
+    </copyright>
+  </bookinfo>
+
+  <reference>
+    <title>API Reference</title>
+
+    <partintro>
+      <para>
+	This part presents the class and function reference for the
+	GdkPixbuf library.  Classes are described together with their
+	methods; individual functions are grouped by functional group.
+      </para>
+    </partintro>
+
+    &gdk-pixbuf-gdk-pixbuf;
+    &gdk-pixbuf-refcounting;
+    &gdk-pixbuf-file-loading;
+    &gdk-pixbuf-creating;
+    &gdk-pixbuf-rendering;
+    &gdk-pixbuf-scaling;
+    &gdk-pixbuf-from-drawables;
+    &gdk-pixbuf-util;
+    &gdk-pixbuf-animation;
+    &GdkPixbufLoader;
+    &GnomeCanvasPixbuf;
+  </reference>
+</book>

docs/reference/gdk-pixbuf/gdk-pixbuf.signals

@@ -0,0 +1,34 @@
+<SIGNAL>
+<NAME>GdkPixbufLoader::area-updated</NAME>
+<RETURNS>void</RETURNS>
+GdkPixbufLoader *gdkpixbufloader
+gint  arg1
+gint  arg2
+gint  arg3
+gint  arg4
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GdkPixbufLoader::area-prepared</NAME>
+<RETURNS>void</RETURNS>
+GdkPixbufLoader *gdkpixbufloader
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GdkPixbufLoader::frame-done</NAME>
+<RETURNS>void</RETURNS>
+GdkPixbufLoader *gdkpixbufloader
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GdkPixbufLoader::animation-done</NAME>
+<RETURNS>void</RETURNS>
+GdkPixbufLoader *gdkpixbufloader
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GdkPixbufLoader::closed</NAME>
+<RETURNS>void</RETURNS>
+GdkPixbufLoader *gdkpixbufloader
+</SIGNAL>
+

docs/reference/gdk-pixbuf/gdk-pixbuf.types

@@ -0,0 +1,7 @@
+#include <gnome.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk-pixbuf/gdk-pixbuf-loader.h>
+#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
+
+gdk_pixbuf_loader_get_type
+gnome_canvas_pixbuf_get_type

docs/reference/gdk-pixbuf/tmpl/animation.sgml

@@ -0,0 +1,91 @@
+<!-- ##### SECTION Title ##### -->
+Animations
+
+<!-- ##### SECTION Short_Description ##### -->
+Animations as multi-frame structures.
+
+<!-- ##### SECTION Long_Description ##### -->
+  <para>
+    The GdkPixbuf library provides a simple mechanism to load and
+    represent animations, primarily animated GIF files.  Animations
+    are represented as lists of #GdkPixbufFrame structures.  Each
+    frame structure contains a #GdkPixbuf structure and information
+    about the frame's overlay mode and duration.
+  </para>
+
+<!-- ##### SECTION See_Also ##### -->
+  <para>
+    #GdkPixbufLoader
+  </para>
+
+<!-- ##### ENUM GdkPixbufFrameAction ##### -->
+  <para>
+    Each animation frame can have several things happen to it when the
+    next frame is displayed.  The #GdkPixbufFrameAction determines this.
+    If a frame as marked as #GDK_PIXBUF_FRAME_RETAIN, then the image
+    will remain displayed, and will be potentially occluded by the next
+    frame.  If it is marked as #GDK_PIXBUF_FRAME_DISPOSE, then the
+    animation is reverted to the setting before the frame was shown.  If
+    it is marked as #GDK_PIXBUF_FRAME_REVERT, then the animation is
+    reverted to the first image before continuing.
+  </para>
+
+@GDK_PIXBUF_FRAME_RETAIN: 
+@GDK_PIXBUF_FRAME_DISPOSE: 
+@GDK_PIXBUF_FRAME_REVERT: 
+
+<!-- ##### STRUCT GdkPixbufFrame ##### -->
+  <para>
+    This structure describes a frame in a #GdkPixbufAnimation.  Each
+    frame consists of a #GdkPixbuf, an offset of the frame within the
+    animation's bounding box, a duration, and an overlay mode or
+    action.
+  </para>
+
+@pixbuf: The frame's image contents.
+@x_offset: X offset of the frame inside the animation's bounding box.
+@y_offset: Y offset of the frame inside the animation's bounding box.
+@delay_time: Duration of the frame in milliseconds.
+@action: Overlay mode.
+
+<!-- ##### STRUCT GdkPixbufAnimation ##### -->
+  <para>
+    This structure describes an animation, which is represented as a
+    list of #GdkPixbufFrame structures.
+  </para>
+
+@ref_count: Reference count.
+@n_frames: Number of frames in the animation.
+@frames: List of #GdkPixbufFrame structures.
+
+<!-- ##### FUNCTION gdk_pixbuf_animation_new_from_file ##### -->
+<para>
+
+</para>
+
+@filename: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_animation_ref ##### -->
+<para>
+
+</para>
+
+@animation: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_animation_unref ##### -->
+<para>
+
+</para>
+
+@animation: <!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+
+

docs/reference/gdk-pixbuf/tmpl/creating.sgml

@@ -0,0 +1,96 @@
+<!-- ##### SECTION Title ##### -->
+Image Data in Memory
+
+<!-- ##### SECTION Short_Description ##### -->
+Creating a pixbuf from image data that is already in memory.
+
+<!-- ##### SECTION Long_Description ##### -->
+  <para>
+    The most basic way to create a pixbuf is to wrap an existing
+    #ArtPixBuf structure with a #GdkPixbuf to add reference counting
+    capabilities to it.  The gdk_pixbuf_new_from_art_pixbuf() performs
+    this operation.
+  </para>
+
+  <para>
+    As a convenience, you can use the gdk_pixbuf_new_from_data()
+    function to wrap an existing data buffer with a #GdkPixbuf.  You
+    need to specify the destroy notification function that will be
+    called when the data buffer needs to be freed; this will happen
+    when the pixbuf's reference count drops to zero and thus the
+    #ArtPixBuf needs to be destroyed.  If you have a chunk of static
+    data compiled into your application, you can pass in #NULL as the
+    destroy notification function so that the data will not be freed.
+  </para>
+
+  <para>
+    The gdk_pixbuf_new() function can be used as a convenience to
+    create a pixbuf with an empty buffer.  This is equivalent to
+    allocating a data buffer using malloc() and then wrapping it with
+    gdk_pixbuf_new_from_data().  The gdk_pixbuf_new() function will
+    compute an optimal rowstride so that rendering can be performed
+    with an efficient algorithm.
+  </para>
+
+  <para>
+    As a special case, you can use the gdk_pixbuf_new_from_xpm_data()
+    function to create a pixbuf from inline XPM image data.
+  </para>
+
+<!-- ##### SECTION See_Also ##### -->
+  <para>
+    #ArtPixBuf
+  </para>
+
+<!-- ##### FUNCTION gdk_pixbuf_new_from_art_pixbuf ##### -->
+<para>
+
+</para>
+
+@art_pixbuf: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_new ##### -->
+<para>
+
+</para>
+
+@format: 
+@has_alpha: 
+@bits_per_sample: 
+@width: 
+@height: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_new_from_data ##### -->
+<para>
+
+</para>
+
+@data: 
+@format: 
+@has_alpha: 
+@width: 
+@height: 
+@rowstride: 
+@dfunc: 
+@dfunc_data: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_new_from_xpm_data ##### -->
+<para>
+
+</para>
+
+@data: 
+@Returns: <!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+
+

docs/reference/gdk-pixbuf/tmpl/file-loading.sgml

@@ -0,0 +1,41 @@
+<!-- ##### SECTION Title ##### -->
+File Loading
+
+<!-- ##### SECTION Short_Description ##### -->
+Loading a pixbuf from a file.
+
+<!-- ##### SECTION Long_Description ##### -->
+  <para>
+    The GdkPixbuf library provides a simple mechanism for loading an
+    image from a file in synchronous fashion.  This means that the
+    library takes control of the application while the file is being
+    loaded; from the user's point of view, the application will block
+    until the image is done loading.
+  </para>
+
+  <para>
+    This interface can be used by applications in which blocking is
+    acceptable while an image is being loaded.  It can also be used to
+    load small images in general.  Applications that need progressive
+    loading can use the #GdkPixbufLoader functionality instead.
+  </para>
+
+<!-- ##### SECTION See_Also ##### -->
+  <para>
+    #GdkPixbufLoader
+  </para>
+
+<!-- ##### FUNCTION gdk_pixbuf_new_from_file ##### -->
+<para>
+
+</para>
+
+@filename: 
+@Returns: <!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+
+

docs/reference/gdk-pixbuf/tmpl/from-drawables.sgml

@@ -0,0 +1,42 @@
+<!-- ##### SECTION Title ##### -->
+Drawables to Pixbufs
+
+<!-- ##### SECTION Short_Description ##### -->
+Getting parts of a drawable's image data into a pixbuf.
+
+<!-- ##### SECTION Long_Description ##### -->
+  <para>
+    The functions in this section allow you to take the image data
+    from a GDK drawable and dump it into a #GdkPixbuf.  This can be
+    used for screenshots and other special effects.  Note that these
+    operations can be expensive, since the image data has to be
+    transferred from the X server to the client program and converted.
+  </para>
+
+<!-- ##### SECTION See_Also ##### -->
+  <para>
+    #GdkPixbuf, gdk_image_get()
+  </para>
+
+<!-- ##### FUNCTION gdk_pixbuf_get_from_drawable ##### -->
+<para>
+
+</para>
+
+@dest: 
+@src: 
+@cmap: 
+@src_x: 
+@src_y: 
+@dest_x: 
+@dest_y: 
+@width: 
+@height: 
+@Returns: <!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+
+

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-io.sgml

@@ -0,0 +1,70 @@
+<!-- ##### SECTION Title ##### -->
+gdk-pixbuf-io
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### USER_FUNCTION ModulePreparedNotifyFunc ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@user_data: 
+
+
+<!-- ##### USER_FUNCTION ModuleUpdatedNotifyFunc ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@user_data: 
+@x: 
+@y: 
+@width: 
+@height: 
+
+
+<!-- ##### STRUCT GdkPixbufModule ##### -->
+<para>
+
+</para>
+
+@module_name: 
+@format_check: 
+@module: 
+@load: 
+@load_xpm_data: 
+@begin_load: 
+@stop_load: 
+@load_increment: 
+
+<!-- ##### FUNCTION gdk_pixbuf_get_module ##### -->
+<para>
+
+</para>
+
+@buffer: 
+@size: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_load_module ##### -->
+<para>
+
+</para>
+
+@image_module: 
+
+

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml

@@ -0,0 +1,182 @@
+<!-- ##### SECTION Title ##### -->
+GdkPixbufLoader
+
+<!-- ##### SECTION Short_Description ##### -->
+Application-driven progressive image loading.
+
+<!-- ##### SECTION Long_Description ##### -->
+  <para>
+    #GdkPixbufLoader provides a way for applications to drive the
+    process of loading an image, by letting them send the image data
+    directly.  Applications can use this functionality instead of
+    gdk_pixbuf_new_from_file() when they need to parse image data in
+    small chunks.  For example, it should be used when reading an image
+    from a (potentially) slow network connection, or when loading an
+    extremely large file.
+  </para>
+  <para>
+    To use #GdkPixbufLoader to load an image, just create a new one, and
+    call gdk_pixbuf_loader_write() to send the data to it.  When done,
+    gdk_pixbuf_loader_close() should be called to end the stream and
+    finalize everything.  The loader will emit two important signals
+    throughout the process.  The first, #"area_prepared", will be called
+    as soon as the image has enough information to determine the size of
+    the image to be used.  It will pass a @GdkPixbuf in.  If you want to
+    use it, you can simply ref it.  In addition, no actual information
+    will be passed in yet, so the pixbuf can be safely filled with any
+    temporary graphics (or an initial color) as needed.  You can also
+    call the gdk_pixbuf_loader_get_pixbuf() once this signal has been
+    emitted and get the same pixbuf.
+  </para>
+  <para>
+    The other signal, #"area_updated" gets called every
+    time a region is updated.  This way you can update a partially
+    completed image.  Note that you do not know anything about the
+    completeness of an image from the area updated.  For example, in an
+    interlaced image, you need to make several passes before the image
+    is done loading.
+  </para>
+  <refsect2>
+  <title>Loading an animation</title>
+    <para>
+      Loading an animation is a little more complex then loading an
+      image.  In addition to the above signals, there is also a
+      #"frame_done" signal, as well as an #"animation_done" signal.  The
+      first lets the application know that it is dealing with an
+      animation, instead of a static image.  It also passes a
+      #GdkPixbufFrame in the signal.  As before, if you want to keep the
+      frame, you need to ref it.  Once the first #"frame_done" signal
+      has been emitted, you can call gdk_pixbuf_loader_get_animation()
+      to get the #GdkPixbufAnimation struct.  Each subsequent frame goes
+      through a similar lifecycle.  For example #"area_prepared" is
+      re-emitted.  Then #"area_updated" is emitted as many times as
+      necessary.  Finally, #"animation_done" is emitted as soon as all
+      frames are done.
+    </para>  
+  </refsect2>
+
+<!-- ##### SECTION See_Also ##### -->
+  <para>
+    gdk_pixbuf_new_from_file()
+  </para>
+
+<!-- ##### MACRO GDK_PIXBUF_LOADER ##### -->
+  <para>
+    Casts a #GtkObject to a #GdkPixbufLoader.
+  </para>
+
+@obj: A GTK+ object.
+
+
+<!-- ##### FUNCTION gdk_pixbuf_loader_new ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_loader_write ##### -->
+<para>
+
+</para>
+
+@loader: 
+@buf: 
+@count: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_loader_get_pixbuf ##### -->
+<para>
+
+</para>
+
+@loader: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_loader_get_animation ##### -->
+<para>
+
+</para>
+
+@loader: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_loader_close ##### -->
+<para>
+
+</para>
+
+@loader: 
+
+
+<!-- ##### SIGNAL GdkPixbufLoader::area-updated ##### -->
+  <para>
+    This signal is emitted when a significant area of the image being
+    loaded has been updated.  Normally it means that a complete
+    scanline has been read in, but it could be a different area as
+    well.  Applications can use this signal to know when to repaint
+    areas of an image that is being loaded.
+  </para>
+
+@gdkpixbufloader: the object which received the signal.
+@arg1: 
+@arg2: 
+@arg3: 
+@arg4: 
+<!-- # Unused Parameters # -->
+@loader: Loader which emitted the signal.
+@x: X offset of upper-left corner of the updated area.
+@y: Y offset of upper-left corner of the updated area.
+@width: Width of updated area.
+@height: Height of updated area.
+
+<!-- ##### SIGNAL GdkPixbufLoader::area-prepared ##### -->
+  <para>
+    This signal is emitted when the pixbuf loader has been fed the
+    initial amount of data that is required to figure out the size and
+    format of the image that it will create.  After this signal is
+    emitted, applications can call gdk_pixbuf_loader_get_pixbuf() to
+    fetch the partially-loaded pixbuf.
+  </para>
+
+@gdkpixbufloader: the object which received the signal.
+<!-- # Unused Parameters # -->
+@loader: Loader which emitted the signal.
+
+<!-- ##### SIGNAL GdkPixbufLoader::frame-done ##### -->
+<para>
+
+</para>
+
+@gdkpixbufloader: the object which received the signal.
+
+<!-- ##### SIGNAL GdkPixbufLoader::animation-done ##### -->
+<para>
+
+</para>
+
+@gdkpixbufloader: the object which received the signal.
+
+<!-- ##### SIGNAL GdkPixbufLoader::closed ##### -->
+  <para>
+    This signal is emitted when gdk_pixbuf_loader_close() is called.
+    It can be used by different parts of an application to receive
+    notification when an image loader is closed by the code that
+    drives it.
+  </para>
+
+@gdkpixbufloader: the object which received the signal.
+<!-- # Unused Parameters # -->
+@loader: Loader which emitted the signal.
+
+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml

@@ -0,0 +1,114 @@
+<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gdk_pixbuf_load_module ##### -->
+<para>
+
+</para>
+
+@image_module: 
+
+<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### ARG GnomeCanvasPixbuf:height_pixels ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT GdkPixbufModule ##### -->
+<para>
+
+</para>
+
+@module_name: 
+@format_check: 
+@module: 
+@load: 
+@load_xpm_data: 
+@begin_load: 
+@stop_load: 
+@load_increment: 
+
+<!-- ##### ARG GnomeCanvasPixbuf:y_pixels ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### USER_FUNCTION ModuleUpdatedNotifyFunc ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@user_data: 
+@x: 
+@y: 
+@width: 
+@height: 
+
+<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:Title ##### -->
+gdk-pixbuf-io
+
+
+<!-- ##### ARG GnomeCanvasPixbuf:x_set ##### -->
+  <para>
+    Determines whether the <link
+    linkend="GnomeCanvasPixbuf--x">x</link> argument is used to
+    translate the pixbuf from its logical origin in item-relative
+    coordinates.
+  </para>
+
+
+<!-- ##### ARG GnomeCanvasPixbuf:y_set ##### -->
+  <para>
+    Determines whether the <link
+    linkend="GnomeCanvasPixbuf--y">y</link> argument is used to
+    translate the pixbuf from its logical origin in item-relative
+    coordinates.  Works in the same way as the <link
+    linkend="GnomeCanvasPixbuf--x-set">x_set</link> argument.  The
+    default is %FALSE.
+  </para>
+
+
+<!-- ##### USER_FUNCTION ModulePreparedNotifyFunc ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@user_data: 
+
+<!-- ##### ARG GnomeCanvasPixbuf:x_pixels ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gdk_pixbuf_get_module ##### -->
+<para>
+
+</para>
+
+@buffer: 
+@size: 
+@Returns: 
+
+<!-- ##### ARG GnomeCanvasPixbuf:width_pixels ##### -->
+<para>
+
+</para>
+
+

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml

@@ -0,0 +1,108 @@
+<!-- ##### SECTION Title ##### -->
+The GdkPixbuf Structure
+
+<!-- ##### SECTION Short_Description ##### -->
+Information that describes an image.
+
+<!-- ##### SECTION Long_Description ##### -->
+
+  <para>
+    The <structname>GdkPixbuf</structname> structure contains
+    information that describes an image in memory.  It is actually a
+    simple wrapper that adds reference counting capabilities to an
+    #ArtPixBuf structure.
+  </para>
+
+<!-- ##### SECTION See_Also ##### -->
+  <para>
+    #ArtPixBuf
+  </para>
+
+<!-- ##### STRUCT GdkPixbuf ##### -->
+  <para>
+    This is the main structure in the GdkPixbuf library.  This
+    structure adds reference counting capabilities to an #ArtPixBuf
+    structure.
+  </para>
+
+@ref_count: Reference count.
+@art_pixbuf: An #ArtPixBuf that actually contains the description of
+the image data.
+
+<!-- ##### FUNCTION gdk_pixbuf_get_format ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_get_n_channels ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_get_has_alpha ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_get_bits_per_sample ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_get_pixels ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_get_width ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_get_height ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_get_rowstride ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@Returns: <!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+
+

docs/reference/gdk-pixbuf/tmpl/gnome-canvas-pixbuf.sgml

@@ -0,0 +1,302 @@
+<!-- ##### SECTION Title ##### -->
+GnomeCanvasPixbuf
+
+<!-- ##### SECTION Short_Description ##### -->
+Canvas item to display #GdkPixbuf images.
+
+<!-- ##### SECTION Long_Description ##### -->
+  <para>
+    This canvas item displays #GdkPixbuf images.  It handles full
+    affine transformations in both GDK and antialiased modes, and also
+    supports the <ulink url="http://www.w3.org">W3C</ulink>'s <ulink
+    url="http://www.w3.org/Graphics/SVG/">SVG</ulink>-like scaling and
+    translation semantics for absolute pixel values.
+  </para>
+
+  <para>
+    #GdkPixbuf structures may be shared among different pixbuf canvas
+    items; the pixbuf item uses #GdkPixbuf's reference counting
+    functions for this.
+  </para>
+
+  <refsect2>
+    <title>Custom Scaling and Translation</title>
+
+    <para>
+      In addition to the normal affine transformations supported by
+      canvas items, the #GnomeCanvasPixbuf item supports independent
+      object arguments for scaling and translation.  This is useful
+      for explicitly setting a size to which the pixbuf's image will
+      be scaled, and for specifying translation offsets that take
+      place in the item's local coordinate system.
+    </para>
+
+    <para>
+      By default, the pixbuf canvas item will attain the size in units
+      of the #GdkPixbuf it contains.  If a #GnomeCanvasPixbuf is
+      configured to use a #GdkPixbuf that has a size of 300 by 200
+      pixels, then the pixbuf item will automatically obtain a size of
+      300 by 200 units in the item's local coordinate system.  If the
+      item is transformed with a scaling transformation of (0.5, 2.0),
+      then the final image size will be of 150 by 400 pixels.
+    </para>
+
+    <para>
+      To set custom width and height values, you must set the <link
+      linkend="GnomeCanvasPixbuf--width-set">width_set</link> or <link
+      linkend="GnomeCanvasPixbuf--height-set">height_set</link>
+      arguments to %TRUE, and then set the <link
+      linkend="GnomeCanvasPixbuf--width">width</link> or <link
+      linkend="GnomeCanvasPixbuf--height">height</link> arguments to
+      the desired values.  The former two arguments control whether
+      the latter two are used when computing the final image's size;
+      they are both %FALSE by default so that the pixbuf item will
+      attain a size in units equal to the size in pixels of the
+      #GdkPixbuf that the item contains.
+    </para>
+
+    <para>
+      The custom translation offsets are controlled by the <link
+      linkend="GnomeCanvasPixbuf--x">x</link> and <link
+      linkend="GnomeCanvasPixbuf--y">y</link> arguments.  The logical
+      upper-left vertex of the image will be translated by the
+      specified distance, aligned with the item's local coordinate
+      system.
+    </para>
+  </refsect2>
+
+  <refsect2>
+    <title>Absolute Pixel Scaling and Translation</title>
+
+    <para>
+      The <ulink url="http://www.w3.org/Graphics/SVG/">Scalable Vector
+      Graphics</ulink> specification (SVG) of the <ulink
+      url="http://www.w3.org">World Wide Web Consortium</ulink> also
+      allows images to be translated and scaled by absolute pixel
+      values that are independent of an item's normal affine
+      transformation.
+    </para>
+
+    <para>
+      Normally, the pixbuf item's translation and scaling arguments
+      are interpreted in units, so they will be modified by the item's
+      affine transformation.  The <link
+      linkend="GnomeCanvasPixbuf--width-in-pixels">width_in_pixels</link>,
+      <link
+      linkend="GnomeCanvasPixbuf--height-in-pixels">height_in_pixels</link>,
+      <link
+      linkend="GnomeCanvasPixbuf--x-in-pixels">x_in_pixels</link>, and
+      <link
+      linkend="GnomeCanvasPixbuf--y-in-pixels">y_in_pixels</link>
+      object arguments can be used to modify this behavior.  If one of
+      these arguments is %TRUE, then the corresponding scaling or
+      translation value will not be affected lengthwise by the pixbuf
+      item's affine transformation.
+    </para>
+
+    <para>
+      For example, consider a pixbuf item whose size is (300, 200).
+      If the item is modified with a scaling transformation of (0.5,
+      2.0) but the <link
+      linkend="GnomeCanvasPixbuf--width-in-pixels">width_in_pixels</link>
+      is set to %TRUE, then the item will appear to be (300, 400)
+      pixels in size.  This means that in this case the item's affine
+      transformation only applies to the height value, while the width
+      value is kept in absolute pixels.
+    </para>
+
+    <para>
+      Likewise, consider a pixbuf item whose (<link
+      linkend="GnomeCanvasPixbuf--x">x</link>, <link
+      linkend="GnomeCanvasPixbuf--y">y</link>) arguments are set to
+      (30, 40).  If the item is then modified by the same scaling
+      transformation of (0.5, 2.0) but the <link
+      linkend="GnomeCanvasPixbuf--y-in-pixels">y_in_pixels</link>
+      argument is set to %TRUE, then the image's upper-left corner
+      will appear to be at position (15, 40).  In this case, the
+      affine transformation is applied only to the x offset, while the
+      y offset is kept in absolute pixels.
+    </para>
+
+    <para>
+      In short, these arguments control whether a particular dimension
+      of a pixbuf item is scaled or not in the normal way by the
+      item's affine transformation.
+    </para>
+  </refsect2>
+
+  <refsect2>
+    <title>Resource Management</title>
+
+    <para>
+      When you set the #GdkPixbuf structure that a #GnomeCanvasPixbuf
+      item will use by setting the <link
+      linkend="GnomeCanvasPixbuf--pixbuf">pixbuf</link> argument, a
+      reference count will be added to that #GdkPixbuf structure.
+      When the pixbuf item no longer needs the #GdkPixbuf structure,
+      such as when the item is destroyed or when a new pixbuf
+      structure is passed to it, then the old #GdkPixbuf structure
+      will be automatically unreferenced.
+    </para>
+
+    <para>
+      This means that if an application just needs to load a pixbuf
+      image and set it into a pixbuf canvas item, it can do the
+      following to &lsquo;forget&rsquo; about the pixbuf structure:
+
+      <programlisting>
+	GdkPixbuf *pixbuf;
+	GnomeCanvasItem *item;
+
+	pixbuf = gdk_pixbuf_new_from_file ("foo.png");
+	g_assert (pixbuf != NULL);
+
+	item = gnome_canvas_item_new (gnome_canvas_root (my_canvas),
+				      gnome_canvas_pixbuf_get_type (),
+				      "pixbuf", pixbuf,
+				      NULL);
+	gdk_pixbuf_unref (pixbuf);
+      </programlisting>
+    </para>
+
+    <para>
+      After this happens, the reference count of the pixbuf structure
+      will be 1:  the gdk_pixbuf_new_from_file() function creates it
+      with a reference count of 1, then setting the <link
+      linkend="GnomeCanvasPixbuf--pixbuf">pixbuf</link> argument of
+      the #GnomeCanvasPixbuf item increases it to 2, and then it is
+      decremented to 1 by the call to gdk_pixbuf_unref().  When the
+      canvas item is destroyed, it will automatically unreference the
+      pixbuf structure again, causing its reference count to drop to
+      zero and thus be freed.
+    </para>
+  </refsect2>
+
+<!-- ##### SECTION See_Also ##### -->
+  <para>
+    #GnomeCanvas, #GdkPixbuf
+  </para>
+
+<!-- ##### MACRO GNOME_CANVAS_PIXBUF ##### -->
+  <para>
+    Casts a #GtkOjbect to a #GnomeCanvasPixbuf.
+  </para>
+
+@obj: A GTK+ object.
+
+
+<!-- ##### ARG GnomeCanvasPixbuf:pixbuf ##### -->
+  <para>
+    Contains a pointer to a #GdkPixbuf structure that will be used by
+    the pixbuf canvas item as an image source.  When a pixbuf is set
+    its reference count is incremented; if the pixbuf item kept a
+    pointer to another #GdkPixbuf structure, the reference count of
+    this structure will be decremented.  Also, the GdkPixbuf's
+    reference count will automatically be decremented when the
+    #GnomeCanvasPixbuf item is destroyed.  When a pixbuf is queried, a
+    reference count will not be added to the return value; you must do
+    this yourself if you intend to keep the pixbuf structure around.
+  </para>
+
+<!-- ##### ARG GnomeCanvasPixbuf:width ##### -->
+  <para>
+    Indicates the width the pixbuf will be scaled to.  This argument
+    will only be used if the <link
+    linkend="GnomeCanvasPixbuf--width-set">width_set</link> argument
+    is %TRUE.  If the <link
+    linkend="GnomeCanvasPixbuf--width-in-pixels">width_in_pixels</link>
+    argument is %FALSE, the width will be taken to be in canvas units,
+    and thus will be scaled along with the canvas item's affine
+    transformation.  If width_in_pixels is %TRUE, the width will be
+    taken to be in pixels, and will visually remain a constant size
+    even if the item's affine transformation changes.
+  </para>
+
+<!-- ##### ARG GnomeCanvasPixbuf:width_set ##### -->
+  <para>
+    Determines whether the <link
+    linkend="GnomeCanvasPixbuf--width">width</link> argument is taken
+    into account when scaling the pixbuf item.  If this argument is
+    %FALSE, then the width value of the pixbuf's #ArtPixBuf will be
+    used instead.  This argument is %FALSE by default.
+  </para>
+
+<!-- ##### ARG GnomeCanvasPixbuf:width_in_pixels ##### -->
+  <para>
+    If this argument is %TRUE, then the width of the pixbuf will be
+    considered to be in pixels, that is, it will not be visually
+    scaled even if the item's affine transformation changes.  If this
+    is %FALSE, then the width of the pixbuf will be considered to be
+    in canvas units, and so will be scaled normally by affine
+    transformations.  The default is %FALSE.
+  </para>
+
+<!-- ##### ARG GnomeCanvasPixbuf:height ##### -->
+  <para>
+    Indicates the height the pixbuf will be scaled to.  This argument
+    will only be used if the <link
+    linkend="GnomeCanvasPixbuf--height-set">height_set</link> argument
+    is %TRUE.  Works in the same way as the <link
+    linkend="GnomeCanvasPixbuf--width">width</link> argument.
+  </para>
+
+<!-- ##### ARG GnomeCanvasPixbuf:height_set ##### -->
+  <para>
+    Determines whether the <link
+    linkend="GnomeCanvasPixbuf--height">height</link> argument is
+    taken into account when scaling the pixbuf item.  Works in the
+    same way as the <link
+    linkend="GnomeCanvasPixbuf--width-set">width_set</link> argument.
+    The default is %FALSE.
+  </para>
+
+<!-- ##### ARG GnomeCanvasPixbuf:height_in_pixels ##### -->
+  <para>
+    Works in the same way as the <link
+    linkend="GnomeCanvasPixbuf--width-in-pixels">width_in_pixels</link>
+    argument.  The default is %FALSE.
+  </para>
+
+<!-- ##### ARG GnomeCanvasPixbuf:x ##### -->
+  <para>
+    Indicates the horizontal translation offset of the pixbuf item's
+    image.  This offset may not actually appear horizontal, since it
+    will be affected by the item's affine transformation.  The default
+    is 0.0.
+  </para>
+
+<!-- ##### ARG GnomeCanvasPixbuf:x_in_pixels ##### -->
+  <para>
+    If this argument is %TRUE, the pixbuf's translation with respect
+    to its logical origin in item-relative coordinates will be in
+    pixels, that is, the visible offset will not change even if the
+    item's affine transformation changes.  If it is %FALSE, the
+    pixbuf's translation will be taken to be in canvas units, and thus
+    will change along with the item's affine transformation.  The
+    default is %FALSE.
+  </para>
+
+<!-- ##### ARG GnomeCanvasPixbuf:y ##### -->
+  <para>
+    Indicates the vertical translation offset of the pixbuf item's
+    image.  Works in the same way as the <link
+    linkend="GnomeCanvasPixbuf--x">x</link> argument.  The default is
+    0.0.
+  </para>
+
+<!-- ##### ARG GnomeCanvasPixbuf:y_in_pixels ##### -->
+  <para>
+    Works in the same way as the <link
+    linkend="GnomeCanvasPixbuf--x-in-pixels">x_in_pixels</link>
+    argument, but controls whether the <link
+    linkend="GnomeCanvasPixbuf--y">y</link> translation offset is
+    scaled or not.  The default is %FALSE.
+  </para>
+
+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+

docs/reference/gdk-pixbuf/tmpl/refcounting.sgml

@@ -0,0 +1,44 @@
+<!-- ##### SECTION Title ##### -->
+Reference Counting
+
+<!-- ##### SECTION Short_Description ##### -->
+Functions to perform reference counting on a #GdkPixbuf.
+
+<!-- ##### SECTION Long_Description ##### -->
+  <para>
+    #GdkPixbuf structures are reference counted.  This means that
+    an application can share a single pixbuf among many parts of the
+    code.  When a piece of the program needs to keep a pointer to a
+    pixbuf, it should add a reference to it.  When it no longer needs
+    the pixbuf, it should subtract a reference.  The pixbuf will be
+    destroyed when its reference count drops to zero.  Newly-created
+    #GdkPixbuf structures start with a reference count of one.
+  </para>
+
+<!-- ##### SECTION See_Also ##### -->
+  <para>
+    #GdkPixbuf, #ArtPixBuf
+  </para>
+
+<!-- ##### FUNCTION gdk_pixbuf_ref ##### -->
+  <para>
+
+  </para>
+
+@pixbuf: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_unref ##### -->
+<para>
+
+</para>
+
+@pixbuf: <!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+
+

docs/reference/gdk-pixbuf/tmpl/rendering.sgml

@@ -0,0 +1,125 @@
+<!-- ##### SECTION Title ##### -->
+Rendering
+
+<!-- ##### SECTION Short_Description ##### -->
+Rendering a pixbuf to a GDK drawable.
+
+<!-- ##### SECTION Long_Description ##### -->
+  <para>
+    The GdkPixbuf library provides several convenience functions to
+    render pixbufs to GDK drawables.  It uses the GdkRGB to render the
+    image data.
+  </para>
+
+  <para>
+    At this point there is not a standard alpha channel extension for
+    the X Window System, so it is not possible to use full opacity
+    information when painting images to arbitrary drawables.  The
+    GdkPixbuf convenience functions will threshold the opacity
+    information to create a bi-level clipping mask (black and white),
+    and use that to draw the image onto a drawable.
+  </para>
+
+  <important>
+    <para>
+      Since these functions use GdkRGB for rendering, you must
+      initialize GdkRGB before using any of them.  You can do this by
+      calling gdk_rgb_init() near the beginning of your program.
+    </para>
+  </important>
+
+<!-- ##### SECTION See_Also ##### -->
+  <para>
+    GdkRGB
+  </para>
+
+<!-- ##### ENUM GdkPixbufAlphaMode ##### -->
+  <para>
+    These values can be passed to
+    gdk_pixbuf_render_to_drawable_alpha() to control how the alpha
+    chanel of an image should be handled.  This function can create a
+    bilevel clipping mask (black and white) and use it while painting
+    the image.  In the future, when the X Window System gets an alpha
+    channel extension, it will be possible to do full alpha
+    compositing onto arbitrary drawables.  For now both cases fall
+    back to a bilevel clipping mask.
+  </para>
+
+@GDK_PIXBUF_ALPHA_BILEVEL: A bilevel clipping mask (black and white)
+will be created and used to draw the image.  Pixels below 0.5 opacity
+will be considered fully transparent, and all others will be
+considered fully opaque.
+@GDK_PIXBUF_ALPHA_FULL: For now falls back to #GDK_PIXBUF_ALPHA_BILEVEL.
+In the future it will do full alpha compositing.
+
+<!-- ##### FUNCTION gdk_pixbuf_render_to_drawable_alpha ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@drawable: 
+@src_x: 
+@src_y: 
+@dest_x: 
+@dest_y: 
+@width: 
+@height: 
+@alpha_mode: 
+@alpha_threshold: 
+@dither: 
+@x_dither: 
+@y_dither: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_render_to_drawable ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@drawable: 
+@gc: 
+@src_x: 
+@src_y: 
+@dest_x: 
+@dest_y: 
+@width: 
+@height: 
+@dither: 
+@x_dither: 
+@y_dither: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_render_threshold_alpha ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@bitmap: 
+@src_x: 
+@src_y: 
+@dest_x: 
+@dest_y: 
+@width: 
+@height: 
+@alpha_threshold: <!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+
+
+<!-- ##### FUNCTION gdk_pixbuf_render_pixmap_and_mask ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@pixmap_return: 
+@mask_return: 
+@alpha_threshold: 
+
+

docs/reference/gdk-pixbuf/tmpl/scaling.sgml

@@ -0,0 +1,162 @@
+<!-- ##### SECTION Title ##### -->
+Scaling
+
+<!-- ##### SECTION Short_Description ##### -->
+Scaling pixbufs and scaling and compositing pixbufs
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+gdk-pixbuf contains functions to scale pixbufs, to scale pixbufs and
+composite against an existing image, and to scale pixbufs and
+composite against a solid color or checkerboard.  (Compositing a
+checkerboard is a common way to show an image with an alpha-channel in
+image-viewing and editing software.)
+</para>
+<para>
+Since the full-featured functions (gdk_pixbuf_scale(),
+gdk_pixbuf_composite(), and gdk_pixbuf_composite_color()) are
+rather complex to use and have many arguments, two simple
+convenience functions are provided, gdk_pixbuf_scale_simple()
+and gdk_pixbuf_composite_color_simple() which create a
+new pixbuf of a given size, scale an original image to fit,
+and then return the new pixmap.
+</para>
+
+<para>
+The following example demonstrates handling an expose event by
+rendering the appropriate area of a source image (which is scaled to
+fit the widget) onto the widget's window.  The source image is
+rendered against a checkerboard, which provides a visual
+representation of the alpha channel if the image has one. If the image
+doesn't have an alpha channel, calling gdk_pixbuf_composite_color()
+function has exactly the same effect as calling gdk_pixbuf_scale().
+</para>
+
+<programlisting>
+gboolean
+expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+{
+  GdkPixbuf *dest;
+
+  gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
+  
+  dest = gdk_pixbuf_new (ART_PIX_RGB, FALSE, 8, event->area.width, event->area.height);
+
+  gdk_pixbuf_composite_color (pixbuf, dest,
+                              0, 0, event->area.width, event->area.height,
+                              -event->area.x, -event->area.y,
+                              (double) widget->allocation.width / pixbuf->art_pixbuf->width,
+                              (double) widget->allocation.height / pixbuf->art_pixbuf->height,
+                              filter_level, 255,
+                               event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);
+
+  gdk_pixbuf_render_to_drawable (dest, widget->window, widget->style->fg_gc[GTK_STATE_NORMAL],
+                                 0, 0, event->area.x, event->area.y,
+                                 event->area.width, event->area.height,
+                                 GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
+  
+  gdk_pixbuf_unref (dest);
+  
+  return TRUE;
+}
+</programlisting>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### FUNCTION gdk_pixbuf_scale ##### -->
+<para>
+
+</para>
+
+@src: 
+@dest: 
+@dest_x: 
+@dest_y: 
+@dest_width: 
+@dest_height: 
+@offset_x: 
+@offset_y: 
+@scale_x: 
+@scale_y: 
+@filter_level: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_composite ##### -->
+<para>
+
+</para>
+
+@src: 
+@dest: 
+@dest_x: 
+@dest_y: 
+@dest_width: 
+@dest_height: 
+@offset_x: 
+@offset_y: 
+@scale_x: 
+@scale_y: 
+@filter_level: 
+@overall_alpha: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_composite_color ##### -->
+<para>
+
+</para>
+
+@src: 
+@dest: 
+@dest_x: 
+@dest_y: 
+@dest_width: 
+@dest_height: 
+@offset_x: 
+@offset_y: 
+@scale_x: 
+@scale_y: 
+@filter_level: 
+@overall_alpha: 
+@check_x: 
+@check_y: 
+@check_size: 
+@color1: 
+@color2: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_scale_simple ##### -->
+<para>
+
+</para>
+
+@src: 
+@dest_width: 
+@dest_height: 
+@filter_level: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_composite_color_simple ##### -->
+<para>
+
+</para>
+
+@src: 
+@dest_width: 
+@dest_height: 
+@filter_level: 
+@overall_alpha: 
+@check_size: 
+@color1: 
+@color2: 
+@Returns: <!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+
+

docs/reference/gdk-pixbuf/tmpl/util.sgml

@@ -0,0 +1,52 @@
+<!-- ##### SECTION Title ##### -->
+Utilities
+
+<!-- ##### SECTION Short_Description ##### -->
+Utility and miscellaneous convenience functions.
+
+<!-- ##### SECTION Long_Description ##### -->
+  <para>
+    These functions provide miscellaneous utilities for manipulating
+    pixbufs.  The pixel data in pixbufs may of course be manipulated
+    directly by applications, but several common operations can be
+    performed by these functions instead.
+  </para>
+
+<!-- ##### SECTION See_Also ##### -->
+  <para>
+    #GdkPixbuf
+  </para>
+
+<!-- ##### FUNCTION gdk_pixbuf_add_alpha ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@substitute_color: 
+@r: 
+@g: 
+@b: 
+@Returns: <!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+
+
+<!-- ##### FUNCTION gdk_pixbuf_copy_area ##### -->
+<para>
+
+</para>
+
+@src_pixbuf: 
+@src_x: 
+@src_y: 
+@width: 
+@height: 
+@dest_pixbuf: 
+@dest_x: 
+@dest_y: 
+
+

docs/reference/gdk/.cvsignore

@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+sgml
+html
+gdk-decl-list.txt
+gdk-unused.txt

docs/reference/gdk/Makefile.am

@@ -0,0 +1,50 @@
+## Process this file with automake to produce Makefile.in
+
+# The name of the module.
+DOC_MODULE=gdk
+
+# The top-level SGML file.
+DOC_MAIN_SGML_FILE=gdk-docs.sgml
+
+# We could alternatively use this for using installed headers.
+INCLUDE_DIR=`gtk-config --prefix`/include/gdk
+
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+scan:
+	gtkdoc-scan --module=$(DOC_MODULE) $(INCLUDE_DIR)/gdk.h $(INCLUDE_DIR)/gdktypes.h $(INCLUDE_DIR)/gdkrgb.h
+
+templates: scan
+	gtkdoc-mktmpl --module=$(DOC_MODULE)
+
+sgml:
+	gtkdoc-mkdb --module=$(DOC_MODULE)
+
+html:
+	if ! test -d html ; then mkdir html ; fi
+	-cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+
+clean-local:
+	rm -f *~ *.bak *.hierarchy *.signals *.args *-unused.txt
+
+maintainer-clean-local: clean
+	rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt 
+
+install-data-local:
+	install -d -m 0755 $(TARGET_DIR)
+	install -m 0644 html/*.html $(TARGET_DIR)
+	install -m 0644 html/index.sgml $(TARGET_DIR)
+	gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)
+
+EXTRA_DIST = \
+	$(DOC_MAIN_SGML_FILE) \
+	$(DOC_MODULE)-sections.txt \
+	gdk-overrides.txt \
+	gdk-decl.txt
+
+dist-hook:
+	mkdir $(distdir)/tmpl
+	cp -p tmpl/*.sgml $(distdir)/tmpl
+
+.PHONY : html sgml templates scan

docs/reference/gdk/gdk-docs.sgml

@@ -0,0 +1,72 @@
+<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!entity gdk-General SYSTEM "sgml/general.sgml">
+<!entity gdk-Bitmaps-and-Pixmaps SYSTEM "sgml/pixmaps.sgml">
+<!entity gdk-Images SYSTEM "sgml/images.sgml">
+<!entity gdk-GdkRGB SYSTEM "sgml/rgb.sgml">
+<!entity gdk-Colormaps-and-Colors SYSTEM "sgml/colors.sgml">
+<!entity gdk-Fonts SYSTEM "sgml/fonts.sgml">
+<!entity gdk-Drawing-Primitives SYSTEM "sgml/drawing.sgml">
+<!entity gdk-Graphics-Contexts SYSTEM "sgml/gcs.sgml">
+<!entity gdk-Visuals SYSTEM "sgml/visuals.sgml">
+<!entity gdk-Windows SYSTEM "sgml/windows.sgml">
+<!entity gdk-Selections SYSTEM "sgml/selections.sgml">
+<!entity gdk-Properties-and-Atoms SYSTEM "sgml/properties.sgml">
+<!entity gdk-Input-Methods SYSTEM "sgml/input_methods.sgml">
+<!entity gdk-Input-Contexts SYSTEM "sgml/input_contexts.sgml">
+<!entity gdk-Color-Contexts SYSTEM "sgml/color_contexts.sgml">
+<!entity gdk-Points-Rectangles-and-Regions SYSTEM "sgml/regions.sgml">
+<!entity gdk-Threads SYSTEM "sgml/threads.sgml">
+<!entity gdk-Key-Values SYSTEM "sgml/keys.sgml">
+<!entity gdk-Input-Devices SYSTEM "sgml/input_devices.sgml">
+<!entity gdk-Events SYSTEM "sgml/events.sgml">
+<!entity gdk-Event-Structures SYSTEM "sgml/event_structs.sgml">
+<!entity gdk-Cursors SYSTEM "sgml/cursors.sgml">
+<!entity gdk-Input SYSTEM "sgml/input.sgml">
+<!entity gdk-Drag-and-Drop SYSTEM "sgml/dnd.sgml">
+]>
+<book id="index">
+  <bookinfo>
+    <title>GDK Reference Manual</title>
+  </bookinfo>
+
+  <chapter id="gdk">
+    <title>GDK</title>
+    &gdk-General;
+
+    &gdk-Points-Rectangles-and-Regions;
+    &gdk-Graphics-Contexts;
+    &gdk-Drawing-Primitives;
+
+    &gdk-Bitmaps-and-Pixmaps;
+    &gdk-GdkRGB;
+    &gdk-Images;
+
+    &gdk-Colormaps-and-Colors;
+    &gdk-Color-Contexts;
+    &gdk-Visuals;
+
+    &gdk-Fonts;
+    &gdk-Cursors;
+
+    &gdk-Windows;
+
+    &gdk-Events;
+    &gdk-Event-Structures;
+
+    &gdk-Selections;
+    &gdk-Drag-and-Drop;
+
+    &gdk-Properties-and-Atoms;
+
+    &gdk-Threads;
+
+    &gdk-Input;
+
+    &gdk-Input-Devices;
+
+    &gdk-Key-Values;
+
+    &gdk-Input-Methods;
+    &gdk-Input-Contexts;
+  </chapter>
+</book>

docs/reference/gdk/gdk-overrides.txt

@@ -0,0 +1,23 @@
+
+# GdkPixmap, GdkBitmap and GdkDrawable are the same as GdkWindow.
+<STRUCT>
+<NAME>GdkPixmap</NAME>
+struct GdkPixmap
+{
+  gpointer user_data;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkBitmap</NAME>
+struct GdkBitmap
+{
+  gpointer user_data;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkDrawable</NAME>
+struct GdkDrawable
+{
+  gpointer user_data;
+};
+</STRUCT>

docs/reference/gdk/gdk-sections.txt

@@ -0,0 +1,622 @@
+
+<INCLUDE>gdk/gdk.h</INCLUDE>
+
+<SECTION>
+<TITLE>General</TITLE>
+<FILE>general</FILE>
+gdk_init
+gdk_init_check
+gdk_exit
+gdk_set_locale
+gdk_set_sm_client_id
+
+<SUBSECTION>
+gdk_get_display
+
+<SUBSECTION>
+gdk_flush
+
+<SUBSECTION>
+gdk_screen_width
+gdk_screen_height
+gdk_screen_width_mm
+gdk_screen_height_mm
+
+<SUBSECTION>
+gdk_pointer_grab
+gdk_pointer_ungrab
+gdk_pointer_is_grabbed
+
+<SUBSECTION>
+gdk_keyboard_grab
+gdk_keyboard_ungrab
+
+<SUBSECTION>
+gdk_key_repeat_disable
+gdk_key_repeat_restore
+
+<SUBSECTION>
+gdk_beep
+
+<SUBSECTION>
+gdk_get_use_xshm
+gdk_set_use_xshm
+
+<SUBSECTION>
+gdk_error_trap_push
+gdk_error_trap_pop
+
+<SUBSECTION Private>
+GdkStatus
+gdk_time_get
+gdk_timer_get
+gdk_timer_set
+gdk_timer_enable
+gdk_timer_disable
+</SECTION>
+
+<SECTION>
+<TITLE>Bitmaps and Pixmaps</TITLE>
+<FILE>pixmaps</FILE>
+GdkPixmap
+gdk_pixmap_new
+gdk_bitmap_create_from_data
+gdk_pixmap_create_from_data
+gdk_pixmap_create_from_xpm
+gdk_pixmap_colormap_create_from_xpm
+gdk_pixmap_create_from_xpm_d
+gdk_pixmap_colormap_create_from_xpm_d
+gdk_pixmap_ref
+gdk_pixmap_unref
+GdkBitmap
+gdk_bitmap_ref
+gdk_bitmap_unref
+</SECTION>
+
+<SECTION>
+<TITLE>Images</TITLE>
+<FILE>images</FILE>
+GdkImage
+gdk_image_new
+GdkImageType
+gdk_image_new_bitmap
+gdk_image_get
+gdk_image_destroy
+<SUBSECTION>
+gdk_image_put_pixel
+gdk_image_get_pixel
+</SECTION>
+
+<SECTION>
+<TITLE>GdkRGB</TITLE>
+<FILE>rgb</FILE>
+gdk_rgb_init
+
+<SUBSECTION>
+gdk_draw_rgb_image
+gdk_draw_rgb_image_dithalign
+gdk_draw_indexed_image
+gdk_draw_gray_image
+gdk_draw_rgb_32_image
+GdkRgbDither
+
+<SUBSECTION>
+gdk_rgb_cmap_new
+gdk_rgb_cmap_free
+GdkRgbCmap
+
+<SUBSECTION>
+gdk_rgb_gc_set_foreground
+gdk_rgb_gc_set_background
+gdk_rgb_xpixel_from_rgb
+
+<SUBSECTION>
+gdk_rgb_set_install
+gdk_rgb_set_min_colors
+gdk_rgb_get_visual
+gdk_rgb_get_cmap
+gdk_rgb_ditherable
+gdk_rgb_set_verbose
+</SECTION>
+
+<SECTION>
+<TITLE>Colormaps and Colors</TITLE>
+<FILE>colors</FILE>
+GdkColor
+GdkColormap
+gdk_colormap_new
+gdk_colormap_ref
+gdk_colormap_unref
+gdk_colormap_get_system
+gdk_colormap_get_system_size
+gdk_colormap_change
+gdk_colormap_alloc_colors
+gdk_colormap_alloc_color
+gdk_colormap_free_colors
+gdk_colormap_get_visual
+gdk_colors_store
+gdk_color_copy
+gdk_color_free
+gdk_colors_alloc
+gdk_colors_free
+gdk_color_white
+gdk_color_black
+gdk_color_parse
+gdk_color_alloc
+gdk_color_change
+gdk_color_equal
+gdk_color_hash
+</SECTION>
+
+<SECTION>
+<TITLE>Fonts</TITLE>
+<FILE>fonts</FILE>
+GdkFont
+GdkFontType
+gdk_font_load
+gdk_fontset_load
+gdk_font_ref
+gdk_font_unref
+gdk_font_id
+gdk_font_equal
+
+<SUBSECTION>
+gdk_string_extents
+gdk_text_extents
+gdk_text_extents_wc
+gdk_string_width
+gdk_text_width
+gdk_text_width_wc
+gdk_char_width
+gdk_char_width_wc
+gdk_string_measure
+gdk_text_measure
+gdk_char_measure
+gdk_string_height
+gdk_text_height
+gdk_char_height
+
+<SUBSECTION>
+GdkWChar
+gdk_wcstombs
+gdk_mbstowcs
+</SECTION>
+
+<SECTION>
+<TITLE>Drawing Primitives</TITLE>
+<FILE>drawing</FILE>
+gdk_draw_point
+gdk_draw_points
+gdk_draw_line
+gdk_draw_lines
+gdk_draw_segments
+GdkSegment
+gdk_draw_rectangle
+gdk_draw_arc
+gdk_draw_polygon
+
+<SUBSECTION>
+gdk_draw_string
+gdk_draw_text
+gdk_draw_text_wc
+
+<SUBSECTION>
+gdk_draw_pixmap
+gdk_draw_image
+
+<SUBSECTION Private>
+gdk_draw_bitmap
+</SECTION>
+
+<SECTION>
+<TITLE>Graphics Contexts</TITLE>
+<FILE>gcs</FILE>
+GdkGC
+GdkGCValues
+GdkGCValuesMask
+
+GdkFunction
+
+gdk_gc_new
+gdk_gc_new_with_values
+gdk_gc_ref
+gdk_gc_unref
+gdk_gc_destroy
+gdk_gc_get_values
+gdk_gc_set_foreground
+gdk_gc_set_background
+gdk_gc_set_font
+gdk_gc_set_function
+gdk_gc_set_fill
+GdkFill
+gdk_gc_set_tile
+gdk_gc_set_stipple
+gdk_gc_set_ts_origin
+gdk_gc_set_clip_origin
+gdk_gc_set_clip_mask
+gdk_gc_set_clip_rectangle
+gdk_gc_set_clip_region
+gdk_gc_set_subwindow
+GdkSubwindowMode
+gdk_gc_set_exposures
+gdk_gc_set_line_attributes
+GdkLineStyle
+GdkCapStyle
+GdkJoinStyle
+gdk_gc_set_dashes
+gdk_gc_copy
+</SECTION>
+
+<SECTION>
+<TITLE>Visuals</TITLE>
+<FILE>visuals</FILE>
+GdkVisual
+GdkVisualType
+GdkByteOrder
+gdk_query_depths
+gdk_query_visual_types
+gdk_list_visuals
+
+gdk_visual_get_best_depth
+gdk_visual_get_best_type
+gdk_visual_get_system
+gdk_visual_get_best
+gdk_visual_get_best_with_depth
+gdk_visual_get_best_with_type
+gdk_visual_get_best_with_both
+gdk_visual_ref
+gdk_visual_unref
+</SECTION>
+
+<SECTION>
+<TITLE>Windows</TITLE>
+<FILE>windows</FILE>
+GdkWindowAttr
+GdkWindow
+GdkWindowType
+GdkWindowClass
+GdkWindowAttributesType
+GdkWindowHints
+GdkGeometry
+
+gdk_window_new
+gdk_window_destroy
+gdk_window_ref
+gdk_window_unref
+gdk_window_at_pointer
+gdk_window_show
+gdk_window_hide
+gdk_window_is_visible
+gdk_window_is_viewable
+gdk_window_withdraw
+gdk_window_move
+gdk_window_resize
+gdk_window_move_resize
+gdk_window_reparent
+gdk_window_clear
+gdk_window_clear_area
+gdk_window_clear_area_e
+gdk_window_copy_area
+gdk_window_raise
+gdk_window_lower
+gdk_window_register_dnd
+gdk_window_set_user_data
+gdk_window_set_override_redirect
+gdk_window_add_filter
+gdk_window_remove_filter
+GdkFilterFunc
+GdkFilterReturn
+GdkXEvent
+gdk_window_shape_combine_mask
+gdk_window_set_child_shapes
+gdk_window_merge_child_shapes
+gdk_window_set_static_gravities
+gdk_window_set_hints
+gdk_window_set_title
+gdk_window_set_background
+gdk_window_set_back_pixmap
+GDK_PARENT_RELATIVE
+gdk_window_set_cursor
+gdk_window_set_colormap
+gdk_window_get_user_data
+gdk_window_get_geometry
+gdk_window_set_geometry_hints
+gdk_window_get_position
+gdk_window_get_root_origin
+gdk_window_get_size
+gdk_window_get_visual
+gdk_window_get_colormap
+gdk_window_get_type
+gdk_window_get_origin
+gdk_window_get_deskrelative_origin
+gdk_window_get_pointer
+GdkModifierType
+gdk_window_get_parent
+gdk_window_get_toplevel
+gdk_window_get_children
+gdk_window_get_events
+gdk_window_set_events
+gdk_window_set_icon
+gdk_window_set_icon_name
+gdk_window_set_transient_for
+gdk_window_set_role
+gdk_window_set_group
+gdk_window_set_decorations
+GdkWMDecoration
+gdk_window_set_functions
+GdkWMFunction
+gdk_window_get_toplevels
+GdkDrawable
+gdk_drawable_set_data
+</SECTION>
+
+<SECTION>
+<TITLE>Selections</TITLE>
+<FILE>selections</FILE>
+GdkSelection
+GdkSelectionType
+GdkTarget
+gdk_selection_owner_set
+gdk_selection_owner_get
+gdk_selection_convert
+gdk_selection_property_get
+gdk_selection_send_notify
+</SECTION>
+
+<SECTION>
+<TITLE>Properties and Atoms</TITLE>
+<FILE>properties</FILE>
+GdkAtom
+GDK_NONE
+gdk_text_property_to_text_list
+gdk_free_text_list
+gdk_string_to_compound_text
+gdk_free_compound_text
+gdk_atom_intern
+gdk_atom_name
+gdk_property_get
+gdk_property_change
+GdkPropMode
+gdk_property_delete
+</SECTION>
+
+<SECTION>
+<TITLE>Input Methods</TITLE>
+<FILE>input_methods</FILE>
+GdkIMStyle
+gdk_im_ready
+gdk_im_decide_style
+gdk_im_set_best_style
+
+<SUBSECTION>
+gdk_im_begin
+gdk_im_end
+</SECTION>
+
+<SECTION>
+<TITLE>Input Contexts</TITLE>
+<FILE>input_contexts</FILE>
+GdkIC
+gdk_ic_new
+gdk_ic_destroy
+gdk_ic_get_events
+gdk_ic_get_style
+gdk_ic_get_attr
+gdk_ic_set_attr
+
+<SUBSECTION>
+GdkICAttr
+GdkICAttributesType
+gdk_ic_attr_new
+gdk_ic_attr_destroy
+</SECTION>
+
+<SECTION>
+<TITLE>Color Contexts</TITLE>
+<FILE>color_contexts</FILE>
+GdkColorContext
+GdkColorContextDither
+GdkColorContextMode
+
+gdk_color_context_new
+gdk_color_context_new_mono
+gdk_color_context_free
+gdk_color_context_get_pixel
+gdk_color_context_get_pixels
+gdk_color_context_get_pixels_incremental
+gdk_color_context_query_color
+gdk_color_context_query_colors
+gdk_color_context_add_palette
+gdk_color_context_init_dither
+gdk_color_context_free_dither
+gdk_color_context_get_pixel_from_palette
+gdk_color_context_get_index_from_palette
+</SECTION>
+
+<SECTION>
+<TITLE>Points, Rectangles and Regions</TITLE>
+<FILE>regions</FILE>
+GdkPoint
+
+<SUBSECTION>
+GdkRectangle
+gdk_rectangle_intersect
+gdk_rectangle_union
+
+<SUBSECTION>
+GdkRegion
+gdk_region_new
+gdk_region_polygon
+GdkFillRule
+gdk_region_destroy
+
+<SUBSECTION>
+gdk_regions_intersect
+gdk_regions_union
+gdk_regions_subtract
+gdk_regions_xor
+gdk_region_union_with_rect
+gdk_region_offset
+gdk_region_shrink
+
+<SUBSECTION>
+gdk_region_empty
+gdk_region_equal
+gdk_region_point_in
+gdk_region_rect_in
+GdkOverlapType
+gdk_region_get_clipbox
+</SECTION>
+
+<SECTION>
+<TITLE>Threads</TITLE>
+<FILE>threads</FILE>
+gdk_threads_mutex
+GDK_THREADS_ENTER
+GDK_THREADS_LEAVE
+gdk_threads_enter
+gdk_threads_leave
+</SECTION>
+
+<SECTION>
+<TITLE>Key Values</TITLE>
+<FILE>keys</FILE>
+gdk_keyval_name
+gdk_keyval_from_name
+
+<SUBSECTION>
+gdk_keyval_is_upper
+gdk_keyval_is_lower
+
+<SUBSECTION>
+gdk_keyval_to_upper
+gdk_keyval_to_lower
+</SECTION>
+
+<SECTION>
+<TITLE>Input Devices</TITLE>
+<FILE>input_devices</FILE>
+GDK_CORE_POINTER
+gdk_input_list_devices
+GdkDeviceInfo
+GdkDeviceKey
+gdk_input_set_extension_events
+GdkExtensionMode
+gdk_input_set_source
+GdkInputSource
+gdk_input_set_mode
+GdkInputMode
+gdk_input_set_axes
+GdkAxisUse
+gdk_input_set_key
+gdk_input_window_get_pointer
+gdk_input_motion_events
+GdkTimeCoord
+
+<SUBSECTION Private>
+gdk_input_init
+gdk_input_exit
+</SECTION>
+
+<SECTION>
+<TITLE>Events</TITLE>
+<FILE>events</FILE>
+GdkEventType
+GdkEventMask
+GDK_CURRENT_TIME
+GDK_PRIORITY_EVENTS
+
+<SUBSECTION>
+gdk_events_pending
+gdk_event_peek
+gdk_event_get
+gdk_event_get_graphics_expose
+gdk_event_put
+gdk_event_copy
+gdk_event_free
+gdk_event_get_time
+
+<SUBSECTION>
+gdk_event_handler_set
+GdkEventFunc
+
+<SUBSECTION>
+gdk_event_send_client_message
+gdk_event_send_clientmessage_toall
+gdk_add_client_message_filter
+
+<SUBSECTION>
+gdk_get_show_events
+gdk_set_show_events
+</SECTION>
+
+<SECTION>
+<TITLE>Event Structures</TITLE>
+<FILE>event_structs</FILE>
+GdkEvent
+
+<SUBSECTION>
+GdkEventAny
+GdkEventKey
+GdkEventButton
+GdkEventMotion
+GdkEventExpose
+GdkEventVisibility
+GdkEventCrossing
+GdkEventFocus
+GdkEventConfigure
+GdkEventProperty
+GdkEventSelection
+GdkEventDND
+GdkEventProximity
+GdkEventClient
+GdkEventNoExpose
+
+<SUBSECTION>
+GdkVisibilityState
+GdkCrossingMode
+GdkNotifyType
+GdkPropertyState
+</SECTION>
+
+<SECTION>
+<TITLE>Cursors</TITLE>
+<FILE>cursors</FILE>
+GdkCursor
+GdkCursorType
+gdk_cursor_new
+gdk_cursor_new_from_pixmap
+gdk_cursor_destroy
+</SECTION>
+
+<SECTION>
+<TITLE>Input</TITLE>
+<FILE>input</FILE>
+gdk_input_add_full
+GdkInputCondition
+GdkInputFunction
+GdkDestroyNotify
+gdk_input_add
+gdk_input_remove
+</SECTION>
+
+<SECTION>
+<TITLE>Drag and Drop</TITLE>
+<FILE>dnd</FILE>
+gdk_drag_get_selection
+gdk_drag_abort
+gdk_drop_reply
+gdk_drag_context_new
+gdk_drag_drop
+gdk_drag_find_window
+gdk_drag_context_ref
+gdk_drag_begin
+gdk_drag_motion
+gdk_drop_finish
+gdk_drag_get_protocol
+GdkDragProtocol
+gdk_drag_context_unref
+GdkDragContext
+GdkDragAction
+gdk_drag_status
+</SECTION>

docs/reference/gdk/tmpl/color_contexts.sgml

@@ -0,0 +1,207 @@
+<!-- ##### SECTION Title ##### -->
+Color Contexts
+
+<!-- ##### SECTION Short_Description ##### -->
+routines for allocating colors (deprecated).
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+The #GdkColorContext type is used for allocating groups of colors.
+</para>
+<para>
+It is now deprecated in favor of the gdk_colormap_*() functions described in
+the <link linkend="gdk-Colormaps-and-Colors">Colormaps and Colors</link>
+section.
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT GdkColorContext ##### -->
+<para>
+
+</para>
+
+@visual: 
+@colormap: 
+@num_colors: 
+@max_colors: 
+@num_allocated: 
+@mode: 
+@need_to_free_colormap: 
+@std_cmap_atom: 
+@clut: 
+@cmap: 
+@color_hash: 
+@palette: 
+@num_palette: 
+@fast_dither: 
+
+<!-- ##### STRUCT GdkColorContextDither ##### -->
+<para>
+
+</para>
+
+@fast_rgb: 
+@fast_err: 
+@fast_erg: 
+@fast_erb: 
+
+<!-- ##### ENUM GdkColorContextMode ##### -->
+<para>
+
+</para>
+
+@GDK_CC_MODE_UNDEFINED: 
+@GDK_CC_MODE_BW: 
+@GDK_CC_MODE_STD_CMAP: 
+@GDK_CC_MODE_TRUE: 
+@GDK_CC_MODE_MY_GRAY: 
+@GDK_CC_MODE_PALETTE: 
+
+<!-- ##### FUNCTION gdk_color_context_new ##### -->
+<para>
+
+</para>
+
+@visual: 
+@colormap: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_color_context_new_mono ##### -->
+<para>
+
+</para>
+
+@visual: 
+@colormap: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_color_context_free ##### -->
+<para>
+
+</para>
+
+@cc: 
+
+
+<!-- ##### FUNCTION gdk_color_context_get_pixel ##### -->
+<para>
+
+</para>
+
+@cc: 
+@red: 
+@green: 
+@blue: 
+@failed: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_color_context_get_pixels ##### -->
+<para>
+
+</para>
+
+@cc: 
+@reds: 
+@greens: 
+@blues: 
+@ncolors: 
+@colors: 
+@nallocated: 
+
+
+<!-- ##### FUNCTION gdk_color_context_get_pixels_incremental ##### -->
+<para>
+
+</para>
+
+@cc: 
+@reds: 
+@greens: 
+@blues: 
+@ncolors: 
+@used: 
+@colors: 
+@nallocated: 
+
+
+<!-- ##### FUNCTION gdk_color_context_query_color ##### -->
+<para>
+
+</para>
+
+@cc: 
+@color: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_color_context_query_colors ##### -->
+<para>
+
+</para>
+
+@cc: 
+@colors: 
+@num_colors: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_color_context_add_palette ##### -->
+<para>
+
+</para>
+
+@cc: 
+@palette: 
+@num_palette: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_color_context_init_dither ##### -->
+<para>
+
+</para>
+
+@cc: 
+
+
+<!-- ##### FUNCTION gdk_color_context_free_dither ##### -->
+<para>
+
+</para>
+
+@cc: 
+
+
+<!-- ##### FUNCTION gdk_color_context_get_pixel_from_palette ##### -->
+<para>
+
+</para>
+
+@cc: 
+@red: 
+@green: 
+@blue: 
+@failed: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_color_context_get_index_from_palette ##### -->
+<para>
+
+</para>
+
+@cc: 
+@red: 
+@green: 
+@blue: 
+@failed: 
+@Returns: 
+
+

docs/reference/gdk/tmpl/colors.sgml

@@ -0,0 +1,390 @@
+<!-- ##### SECTION Title ##### -->
+Colormaps and Colors
+
+<!-- ##### SECTION Short_Description ##### -->
+manipulation of colors and colormaps.
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+These functions are used to modify colormaps.
+A colormap is an object that contains the mapping
+between the color values stored in memory and
+the RGB values that are used to display color
+values. In general, colormaps only contain
+significant information for pseudo-color visuals,
+but even for other visual types, a colormap object
+is required in some circumstances.
+</para>
+
+<para>
+There are a couple of special colormaps that can
+be retrieved. The system colormap (retrieved 
+with gdk_colormap_get_system()) is the default
+colormap of the system. If you are using GdkRGB,
+there is another colormap that is important - the
+colormap in which GdkRGB works, retrieved with
+gdk_rgb_get_cmap(). However, when using GdkRGB, 
+it is not generally necessary to allocate colors
+directly.
+</para>
+
+<para>
+In previous revisions of this interface, a number
+of functions that take a #GdkColormap parameter
+were replaced with functions whose names began
+with "gdk_colormap_". This process will probably
+be extended somewhat in the future - 
+gdk_color_white(), gdk_color_black(), and 
+gdk_color_change() will probably become aliases.
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT GdkColor ##### -->
+<para>
+The #GdkColor structure is used to describe an 
+allocated or unallocated color.
+
+<informaltable pgwide=1 frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<tbody>
+
+<row>
+<entry><structfield>pixel</structfield></entry>
+<entry>For allocated colors, the value used to
+draw this color on the screen.</entry>
+</row>
+
+<row>
+<entry><structfield>red</structfield></entry>
+<entry>The red component of the color. This is
+a value between 0 and 65535, with 65535 indicating
+full intensitiy.</entry>
+</row>
+
+<row>
+<entry><structfield>green</structfield></entry>
+<entry>the blue component of the color.</entry>
+</row>
+
+<row>
+<entry><structfield>blue</structfield></entry>
+<entry>the green component of the color..</entry>
+</row>
+
+</tbody></tgroup></informaltable>
+</para>
+
+@pixel: 
+@red: 
+@green: 
+@blue: 
+
+<!-- ##### STRUCT GdkColormap ##### -->
+<para>
+The colormap structure contains the following public
+fields.
+
+<informaltable pgwide=1 frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<tbody>
+
+<row>
+<entry><structfield>size</structfield></entry>
+<entry>For pseudo-color colormaps, the number of colors
+in the colormap..</entry>
+</row>
+
+<row>
+<entry><structfield>colors</structfield></entry>
+<entry>An array containing the current values in the
+colormap. This can be used to map from pixel values
+back to RGB values. This is only meaningful for
+pseudo-color colormaps.</entry>
+</row>
+
+</tbody></tgroup></informaltable>
+</para>
+
+@size: 
+@colors: 
+
+<!-- ##### FUNCTION gdk_colormap_new ##### -->
+<para>
+Create a new colormap for the given visual.
+</para>
+
+@visual: a #GdkVisual.
+@allocate: if %TRUE, the newly created colormap will be
+  a private colormap, and all colors in it will be
+  allocated for the applications use.
+@Returns: the new #GdkColormap.
+
+
+<!-- ##### FUNCTION gdk_colormap_ref ##### -->
+<para>
+Increase the reference count of a colormap.
+</para>
+
+@cmap: a #GdkColormap.
+@Returns: @cmap
+
+
+<!-- ##### FUNCTION gdk_colormap_unref ##### -->
+<para>
+Decrease the reference count of a colormap. If the
+resulting reference count is zero, destroys the colormap.
+</para>
+
+@cmap: a #GdkColormap.
+
+
+<!-- ##### FUNCTION gdk_colormap_get_system ##### -->
+<para>
+Returns the system's default colormap.
+</para>
+
+@Returns: the default colormap.
+
+
+<!-- ##### FUNCTION gdk_colormap_get_system_size ##### -->
+<para>
+Returns the size of the system's default colormap.
+(See the description of struct #GdkColormap for an
+explanation of the size of a colormap.)
+</para>
+
+@Returns: the size of the system's default colormap.
+
+
+<!-- ##### FUNCTION gdk_colormap_change ##### -->
+<para>
+Change the value of the first @ncolors in a private colormap
+to match the values in the <structfield>colors</structfield>
+array in the color map. This function is obsolete and
+should not be used. See gdk_color_change().
+</para>
+
+@colormap: a #GdkColormap.
+@ncolors: the number of colors to change.
+
+
+<!-- ##### FUNCTION gdk_colormap_alloc_colors ##### -->
+<para>
+Allocates colors from a colormap.
+</para>
+
+@colormap: a #GdkColormap.
+@colors: The color values to allocate. On return, the pixel
+ values for allocated colors will be filled in.
+@ncolors: The number of colors in @colors.
+@writeable: If %TRUE, the colors are allocated writeable
+ (their values can later be changed using gdk_color_change()).
+ Writeable colors cannot be shared between applications.
+@best_match: If %TRUE, GDK will attempt to do matching against
+ existing colors if the colors cannot be allocated as
+ requested.
+@success: An array of length @ncolors. On return, this
+ indicates whether the corresponding color in @colors was
+ sucessfully allocated or not.
+@Returns: The number of colors that were not sucessfully 
+ allocated.
+
+
+<!-- ##### FUNCTION gdk_colormap_alloc_color ##### -->
+<para>
+Allocate a single color from a colormap.
+</para>
+
+@colormap: a #GdkColormap.
+@color: the color to allocate. On return the
+<structfield>pixel</structfield> field will be
+filled in if allocation succeeds.
+@writeable: If %TRUE, the color is allocated writeable
+ (their values can later be changed using gdk_color_change()).
+ Writeable colors cannot be shared between applications.
+@best_match: If %TRUE, GDK will attempt to do matching against
+ existing colors if the color cannot be allocated as
+ requested.
+@Returns: %TRUE if the allocation succeeded.
+
+
+<!-- ##### FUNCTION gdk_colormap_free_colors ##### -->
+<para>
+Free previously allocated colors.
+</para>
+
+@colormap: a #GdkColormap.
+@colors: the colors to free.
+@ncolors: the number of colors in @colors.
+
+
+<!-- ##### FUNCTION gdk_colormap_get_visual ##### -->
+<para>
+Return the visual for which a given colormap was created.
+</para>
+
+@colormap: a #GdkColormap.
+@Returns: the visual of the colormap.
+
+
+<!-- ##### FUNCTION gdk_colors_store ##### -->
+<para>
+Change the value of the first @ncolors colors in
+a private colormap. This function is obsolete and
+should not be used. See gdk_color_change().
+</para>
+
+@colormap: a #GdkColormap.
+@colors: the new color values.
+@ncolors: the number of colors to change.
+
+
+<!-- ##### FUNCTION gdk_color_copy ##### -->
+<para>
+Make a copy of a color structure. The result
+must be freed using gdk_color_free().
+</para>
+
+@color: a #GdkColor.
+@Returns: a copy of @color.
+
+
+<!-- ##### FUNCTION gdk_color_free ##### -->
+<para>
+Free a color structure created with 
+gdk_color_copy().
+</para>
+
+@color: a #GdkColor.
+
+
+<!-- ##### FUNCTION gdk_colors_alloc ##### -->
+<para>
+Allocate colors from a colormap. This function
+is obsolete. See gdk_colormap_alloc_colors().
+For full documentation of the fields, see 
+the Xlib documentation for XAllocColorCells.
+</para>
+
+@colormap: a #GdkColormap.
+@contiguous: if %TRUE, the colors should be allocated
+ in contiguous color cells.
+@planes: an array in which to store the plane masks.
+@nplanes: the number of planes to allocate. (Or zero,
+ to indicate that the color allocation should not be
+ planar.)
+@pixels: an array into which to store allocated pixel
+ values.
+@npixels: the number of pixels in each plane to allocate.
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_colors_free ##### -->
+<para>
+Free colors allocated with gdk_colors_alloc(). This
+function is obsolete. See gdk_colormap_free_colors().
+</para>
+
+@colormap: a #GdkColormap.
+@pixels: the pixel values of the colors to free.
+@npixels: the number of values in @pixels.
+@planes: the plane masks for all planes to free, OR'd
+ together.
+
+
+<!-- ##### FUNCTION gdk_color_white ##### -->
+<para>
+Return the white color for a given colormap. The resulting
+value has already allocated been allocated. 
+</para>
+
+@colormap: a #GdkColormap.
+@color: the location to store the color.
+@Returns: %TRUE if the allocation succeeded.
+
+
+<!-- ##### FUNCTION gdk_color_black ##### -->
+<para>
+Return the black color for a given colormap. The resulting
+value has already benn allocated. 
+</para>
+
+@colormap: a #GdkColormap.
+@color: the location to store the color.
+@Returns: %TRUE if the allocation succeeded.
+
+
+<!-- ##### FUNCTION gdk_color_parse ##### -->
+<para>
+Parse a textual specification of a color and fill in
+the <structfield>red</structfield>,
+<structfield>green</structfield>, and 
+<structfield>blue</structfield> fields of a 
+#GdkColor structure. The color is <emphasis>not</emphasis> 
+allocated, you must call gdk_colormap_alloc_color() yourself.
+The text string can be in any of the forms accepted
+by <function>XParseColor</function>; these include
+name for a color from <filename>rgb.txt</filename>, such as
+<literal>DarkSlateGray</literal>, or a hex specification
+such as <literal>305050</literal>.
+</para>
+
+@spec: the string specifying the color.
+@color: the #GdkColor to fill in
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_color_alloc ##### -->
+<para>
+Allocate a single color from a colormap.
+This function is obsolete. See gdk_colormap_alloc_color().
+</para>
+
+@colormap: a #GdkColormap.
+@color: The color to allocate. On return, the 
+<structfield>pixel</structfield> field will be
+filled in.
+@Returns: %TRUE if the allocation succeeded.
+
+
+<!-- ##### FUNCTION gdk_color_change ##### -->
+<para>
+Change the value of a color that has already
+been allocated. If @colormap is not a private
+colormap, then the color must have been allocated
+using gdk_colormap_alloc_colors() with the 
+@writeable set to %TRUE.
+</para>
+
+@colormap: a #GdkColormap.
+@color: a #GdkColor, with the color to change
+in the <structfield>pixel</structfield> field,
+and the new value in the remaining fields.
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_color_equal ##### -->
+<para>
+Compare two colors. 
+</para>
+
+@colora: a #GdkColor.
+@colorb: another #GdkColor.
+@Returns: %TRUE if the two colors compare equal
+
+
+<!-- ##### FUNCTION gdk_color_hash ##### -->
+<para>
+A hash function suitable for using for a hash
+table that stores #GdkColor's.
+</para>
+
+@colora: a #GdkColor.
+@colorb: NOT USED.
+@Returns: The hash function appled to @colora
+
+

docs/reference/gdk/tmpl/cursors.sgml

@@ -0,0 +1,99 @@
+<!-- ##### SECTION Title ##### -->
+Cursors
+
+<!-- ##### SECTION Short_Description ##### -->
+standard and pixmap cursors.
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT GdkCursor ##### -->
+<para>
+
+</para>
+
+@type: 
+
+<!-- ##### ENUM GdkCursorType ##### -->
+<para>
+The standard cursors available.
+</para>
+
+
+<!-- ##### FUNCTION gdk_cursor_new ##### -->
+<para>
+Creates a new standard cursor.
+</para>
+
+@cursor_type: the type of the cursor.
+@Returns: a new #GdkCursor.
+
+
+<!-- ##### FUNCTION gdk_cursor_new_from_pixmap ##### -->
+<para>
+Creates a new cursor from a given pixmap and mask. Both the pixmap and mask
+must have a depth of 1 (i.e. each pixel has only 2 values - on or off).
+The standard cursor size is 16 by 16 pixels.
+</para>
+<example><title>Creating a custom cursor.</title>
+<programlisting>
+/* This data is in X bitmap format, and can be created with the 'bitmap'
+   utility. */
+#define cursor1_width 16
+#define cursor1_height 16
+static unsigned char cursor1_bits[] = {
+   0x80, 0x01, 0x40, 0x02, 0x20, 0x04, 0x10, 0x08, 0x08, 0x10, 0x04, 0x20,
+   0x82, 0x41, 0x41, 0x82, 0x41, 0x82, 0x82, 0x41, 0x04, 0x20, 0x08, 0x10,
+   0x10, 0x08, 0x20, 0x04, 0x40, 0x02, 0x80, 0x01};
+
+static unsigned char cursor1mask_bits[] = {
+   0x80, 0x01, 0xc0, 0x03, 0x60, 0x06, 0x30, 0x0c, 0x18, 0x18, 0x8c, 0x31,
+   0xc6, 0x63, 0x63, 0xc6, 0x63, 0xc6, 0xc6, 0x63, 0x8c, 0x31, 0x18, 0x18,
+   0x30, 0x0c, 0x60, 0x06, 0xc0, 0x03, 0x80, 0x01};
+
+
+  GdkCursor *cursor;
+  GdkPixmap *source, *mask;
+  GdkColor fg = { 0, 65535, 0, 0 }; /* Red. */
+  GdkColor bg = { 0, 0, 0, 65535 }; /* Blue. */
+
+
+  source = gdk_bitmap_create_from_data (NULL, cursor1_bits,
+					cursor1_width, cursor1_height);
+  mask = gdk_bitmap_create_from_data (NULL, cursor1mask_bits,
+				      cursor1_width, cursor1_height);
+  cursor = gdk_cursor_new_from_pixmap (source, mask, &amp;fg, &amp;bg, 8, 8);
+  gdk_pixmap_unref (source);
+  gdk_pixmap_unref (mask);
+
+
+  gdk_window_set_cursor (widget->window, cursor);
+</programlisting>
+</example>
+
+@source: the pixmap specifying the cursor.
+@mask: the pixmap specifying the mask, which must be the same size as @source.
+@fg: the foreground color, used for the bits in the source which are 1.
+The color does not have to be allocated first.
+@bg: the background color, used for the bits in the source which are 0.
+The color does not have to be allocated first.
+@x: the horizontal offset of the 'hotspot' of the cursor.
+@y: the vertical offset of the 'hotspot' of the cursor.
+@Returns: a new #GdkCursor.
+
+
+<!-- ##### FUNCTION gdk_cursor_destroy ##### -->
+<para>
+Destroys a cursor, freeing any resources allocated for it.
+</para>
+
+@cursor: a #GdkCursor.
+
+

docs/reference/gdk/tmpl/dnd.sgml

@@ -0,0 +1,194 @@
+<!-- ##### SECTION Title ##### -->
+Drag and Drop
+
+<!-- ##### SECTION Short_Description ##### -->
+functions for controlling drag and drop handling.
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+These functions provide a low level interface for drag and drop.
+GDK supports both the Xdnd and Motif drag and drop protocols transparently.
+</para>
+<para>
+GTK+ provides a higher level abstraction based on top of these functions,
+and so they are not normally needed in GTK+ applications.
+See the <link linkend="gtk-Drag-and-Drop">Drag and Drop</link> section of
+the GTK+ documentation for more information.
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### FUNCTION gdk_drag_get_selection ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_drag_abort ##### -->
+<para>
+
+</para>
+
+@context: 
+@time: 
+
+
+<!-- ##### FUNCTION gdk_drop_reply ##### -->
+<para>
+
+</para>
+
+@context: 
+@ok: 
+@time: 
+
+
+<!-- ##### FUNCTION gdk_drag_context_new ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_drag_drop ##### -->
+<para>
+
+</para>
+
+@context: 
+@time: 
+
+
+<!-- ##### FUNCTION gdk_drag_find_window ##### -->
+<para>
+
+</para>
+
+@context: 
+@drag_window: 
+@x_root: 
+@y_root: 
+@dest_window: 
+@protocol: 
+
+
+<!-- ##### FUNCTION gdk_drag_context_ref ##### -->
+<para>
+
+</para>
+
+@context: 
+
+
+<!-- ##### FUNCTION gdk_drag_begin ##### -->
+<para>
+
+</para>
+
+@window: 
+@targets: 
+@Returns: 
+<!-- # Unused Parameters # -->
+@actions: 
+
+
+<!-- ##### FUNCTION gdk_drag_motion ##### -->
+<para>
+
+</para>
+
+@context: 
+@dest_window: 
+@protocol: 
+@x_root: 
+@y_root: 
+@suggested_action: 
+@possible_actions: 
+@time: 
+@Returns: 
+<!-- # Unused Parameters # -->
+@action: 
+
+
+<!-- ##### FUNCTION gdk_drop_finish ##### -->
+<para>
+
+</para>
+
+@context: 
+@success: 
+@time: 
+
+
+<!-- ##### FUNCTION gdk_drag_get_protocol ##### -->
+<para>
+
+</para>
+
+@xid: 
+@protocol: 
+@Returns: 
+
+
+<!-- ##### ENUM GdkDragProtocol ##### -->
+<para>
+
+</para>
+
+@GDK_DRAG_PROTO_MOTIF: 
+@GDK_DRAG_PROTO_XDND: 
+@GDK_DRAG_PROTO_ROOTWIN: 
+@GDK_DRAG_PROTO_NONE: 
+
+<!-- ##### FUNCTION gdk_drag_context_unref ##### -->
+<para>
+
+</para>
+
+@context: 
+
+
+<!-- ##### STRUCT GdkDragContext ##### -->
+<para>
+
+</para>
+
+@protocol: 
+@is_source: 
+@source_window: 
+@dest_window: 
+@targets: 
+@actions: 
+@suggested_action: 
+@action: 
+@start_time: 
+
+<!-- ##### ENUM GdkDragAction ##### -->
+<para>
+
+</para>
+
+@GDK_ACTION_DEFAULT: 
+@GDK_ACTION_COPY: 
+@GDK_ACTION_MOVE: 
+@GDK_ACTION_LINK: 
+@GDK_ACTION_PRIVATE: 
+@GDK_ACTION_ASK: 
+
+<!-- ##### FUNCTION gdk_drag_status ##### -->
+<para>
+
+</para>
+
+@context: 
+@action: 
+@time: 
+
+

docs/reference/gdk/tmpl/drawing.sgml

@@ -0,0 +1,239 @@
+<!-- ##### SECTION Title ##### -->
+Drawing Primitives
+
+<!-- ##### SECTION Short_Description ##### -->
+functions for drawing points, lines, arcs, and text.
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+These functions provide support for drawing points, lines, arcs and text
+onto what are called 'drawables'. Drawables, as the name suggests, are things
+which support drawing onto them, and are either #GdkWindow or #GdkPixmap
+objects.
+</para>
+<para>
+Many of the drawing operations take a #GdkGC argument, which represents a
+graphics context. This #GdkGC contains a number of drawing attributes such
+as foreground color, background color and line width, and is used to reduce
+the number of arguments needed for each drawing operation. See the
+<link linkend="gdk-Graphics-Contexts">Graphics Contexts</link> section for
+more information.
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### FUNCTION gdk_draw_point ##### -->
+<para>
+Draws a point, using the foreground color and other attributes of the #GdkGC.
+</para>
+
+@drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+@gc: a #GdkGC.
+@x: the x coordinate of the point.
+@y: the y coordinate of the point.
+
+
+<!-- ##### FUNCTION gdk_draw_points ##### -->
+<para>
+Draws a number of points, using the foreground color and other attributes of
+the #GdkGC.
+</para>
+
+@drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+@gc: a #GdkGC.
+@points: an array of #GdkPoint structures.
+@npoints: the number of points to be drawn.
+
+
+<!-- ##### FUNCTION gdk_draw_line ##### -->
+<para>
+Draws a line, using the foreground color and other attributes of the #GdkGC.
+</para>
+
+@drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+@gc: a #GdkGC.
+@x1: the x coordinate of the start point.
+@y1: the y coordinate of the start point.
+@x2: the x coordinate of the end point.
+@y2: the y coordinate of the end point.
+
+
+<!-- ##### FUNCTION gdk_draw_lines ##### -->
+<para>
+Draws a series of lines connecting the given points.
+The way in which joins between lines are draw is determined by the
+#GdkCapStyle value in the #GdkGC. This can be set with
+gdk_gc_set_line_attributes().
+</para>
+
+@drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+@gc: a #GdkGC.
+@points: an array of #GdkPoint structures specifying the endpoints of the
+lines.
+@npoints: the size of the @points array.
+
+
+<!-- ##### FUNCTION gdk_draw_segments ##### -->
+<para>
+Draws a number of unconnected lines.
+</para>
+
+@drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+@gc: a #GdkGC.
+@segs: an array of #GdkSegment structures specifying the start and end points
+of the lines to be drawn,
+@nsegs: the number of line segments to draw, i.e. the size of the @segs array.
+
+
+<!-- ##### STRUCT GdkSegment ##### -->
+<para>
+Specifies the start and end point of a line for use by the gdk_draw_segments()
+function.
+</para>
+
+@x1: the x coordinate of the start point.
+@y1: the y coordinate of the start point.
+@x2: the x coordinate of the end point.
+@y2: the y coordinate of the end point.
+
+<!-- ##### FUNCTION gdk_draw_rectangle ##### -->
+<para>
+Draws a rectangular outline or filled rectangle, using the foreground color
+and other attributes of the #GdkGC.
+</para>
+<note>
+<para>
+A rectangle drawn filled is 1 pixel smaller in both dimensions than a rectangle
+outlined. Calling gdk_draw_rectangle (window, gc, TRUE, 0, 0, 20, 20) results
+in a filled rectangle 20 pixels wide and 20 pixels high. Calling
+gdk_draw_rectangle (window, gc, FALSE, 0, 0, 20, 20) results in an outlined
+rectangle with corners at (0, 0), (0, 20), (20, 20), and (20, 0), which
+makes it 21 pixels wide and 21 pixels high.
+</para>
+</note>
+
+@drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+@gc: a #GdkGC.
+@filled: TRUE if the rectangle should be filled.
+@x: the x coordinate of the left edge of the rectangle.
+@y: the y coordinate of the top edge of the rectangle.
+@width: the width of the rectangle.
+@height: the height of the rectangle.
+
+
+<!-- ##### FUNCTION gdk_draw_arc ##### -->
+<para>
+Draws an arc or a filled 'pie slice'. The arc is defined by the bounding
+rectangle of the entire ellipse, and the start and end angles of the part of
+the ellipse to be drawn.
+</para>
+
+@drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+@gc: a #GdkGC.
+@filled: TRUE if the arc should be filled, producing a 'pie slice'.
+@x: the x coordinate of the left edge of the bounding rectangle.
+@y: the y coordinate of the top edge of the bounding rectangle.
+@width: the width of the bounding rectangle.
+@height: the height of the bounding rectangle.
+@angle1: the start angle of the arc, relative to the 3 o'clock position,
+counter-clockwise, in 1/64ths of a degree.
+@angle2: the end angle of the arc, relative to @angle1, in 1/64ths of a degree.
+
+
+<!-- ##### FUNCTION gdk_draw_polygon ##### -->
+<para>
+Draws an outlined or filled polygon.
+</para>
+
+@drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+@gc: a #GdkGC.
+@filled: TRUE if the polygon should be filled. The polygon is closed
+automatically, connecting the last point to the first point if necessary.
+@points: an array of #GdkPoint structures specifying the points making up the
+polygon.
+@npoints: the number of points.
+
+
+<!-- ##### FUNCTION gdk_draw_string ##### -->
+<para>
+Draws a string of characters in the given font or fontset.
+</para>
+
+@drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+@font: a #GdkFont.
+@gc: a #GdkGC.
+@x: the x coordinate of the left edge of the text.
+@y: the y coordinate of the baseline of the text.
+@string: the string of characters to draw.
+
+
+<!-- ##### FUNCTION gdk_draw_text ##### -->
+<para>
+Draws a number of characters in the given font or fontset.
+</para>
+
+@drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+@font: a #GdkFont.
+@gc: a #GdkGC.
+@x: the x coordinate of the left edge of the text.
+@y: the y coordinate of the baseline of the text.
+@text: the characters to draw.
+@text_length: the number of characters of @text to draw.
+
+
+<!-- ##### FUNCTION gdk_draw_text_wc ##### -->
+<para>
+Draws a number of wide characters using the given font of fontset.
+If the font is a 1-byte font, the string is converted into 1-byte characters
+(discarding the high bytes) before output.
+</para>
+
+@drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+@font: a #GdkFont.
+@gc: a #GdkGC.
+@x: the x coordinate of the left edge of the text.
+@y: the y coordinate of the baseline of the text.
+@text: the wide characters to draw.
+@text_length: the number of characters to draw.
+
+
+<!-- ##### FUNCTION gdk_draw_pixmap ##### -->
+<para>
+Draws a pixmap, or a part of a pixmap, onto another drawable.
+</para>
+
+@drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+@gc: a #GdkGC.
+@src: the source #GdkPixmap to draw.
+@xsrc: the left edge of the source rectangle within @src.
+@ysrc: the top of the source rectangle within @src.
+@xdest: the x coordinate of the destination within @drawable.
+@ydest: the y coordinate of the destination within @drawable.
+@width: the width of the area to be copied, or -1 to make the area extend to
+the right edge of the source pixmap.
+@height: the height of the area to be copied, or -1 to make the area extend
+to the bottom edge of the source pixmap.
+
+
+<!-- ##### FUNCTION gdk_draw_image ##### -->
+<para>
+Draws a #GdkImage onto a drawable.
+The depth of the #GdkImage must match the depth of the #GdkDrawable.
+</para>
+
+@drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+@gc: a #GdkGC.
+@image: the #GdkImage to draw.
+@xsrc: the left edge of the source rectangle within @image.
+@ysrc: the top of the source rectangle within @image.
+@xdest: the x coordinate of the destination within @drawable.
+@ydest: the y coordinate of the destination within @drawable.
+@width: the width of the area to be copied, or -1 to make the area extend to
+the right edge of @image.
+@height: the height of the area to be copied, or -1 to make the area extend
+to the bottom edge of @image.
+
+

docs/reference/gdk/tmpl/event_structs.sgml

@@ -0,0 +1,368 @@
+<!-- ##### SECTION Title ##### -->
+Event Structures
+
+<!-- ##### SECTION Short_Description ##### -->
+data structures specific to each type of event.
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+The event structs contain data specific to each type of event in GDK.
+</para>
+<note>
+<para>
+A common mistake is to forget to set the event mask of a widget so that the
+required events are received. See gtk_widget_set_events().
+</para>
+</note>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### UNION GdkEvent ##### -->
+<para>
+The #GdkEvent struct contains a union of all of the event structs,
+and allows access to the data fields in a number of ways.
+</para>
+<para>
+The event type is always the first field in all of the event structs, and
+can always be accessed with the following code, no matter what type of event
+it is:
+<informalexample>
+<programlisting>
+  GdkEvent *event;  
+  GdkEventType type;
+
+  type = event->type;
+</programlisting>
+</informalexample>
+</para>
+
+<para>
+To access other fields of the event structs, the pointer to the event can be
+cast to the appropriate event struct pointer, or the union member name can be
+used. For example if the event type is %GDK_BUTTON_PRESS then the x coordinate
+of the button press can be accessed with:
+<informalexample>
+<programlisting>
+  GdkEvent *event;  
+  gdouble x;
+
+  x = ((GdkEventButton*)event)->x;
+</programlisting>
+</informalexample>
+or:
+<informalexample>
+<programlisting>
+  GdkEvent *event;  
+  gdouble x;
+
+  x = event->button.x;
+</programlisting>
+</informalexample>
+</para>
+
+
+<!-- ##### STRUCT GdkEventAny ##### -->
+<para>
+Contains the fields which are common to all event structs.
+Any event pointer can safely be cast to a pointer to a #GdkEventAny to access
+these fields.
+</para>
+
+@type: the type of the event.
+@window: the window which received the event.
+@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+
+<!-- ##### STRUCT GdkEventKey ##### -->
+<para>
+Describes a key press or key release event.
+</para>
+
+@type: the type of the event (%GDK_KEY_RELEASE or %GDK_KEY_RELEASE).
+@window: the window which received the event.
+@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+@time: the time of the event in milliseconds.
+@state: a bit-mask representing the state of the modifier keys (e.g. Control,
+Shift and Alt) and the pointer buttons. See #GdkModifierType.
+@keyval: the key that was pressed or released. See the &lt;gdk/gdkkeysym.h&gt;
+header file for a complete list of GDK key codes.
+@length: the length of @string.
+@string: a null-terminated multi-byte string containing the composed characters
+resulting from the key press. When text is being input, in a GtkEntry for
+example, it is these characters which should be added to the input buffer.
+When using <link linkend="gdk-Input-Methods"> Input Methods</link> to support
+internationalized text input, the composed characters appear here after the
+pre-editing has been completed.
+
+<!-- ##### STRUCT GdkEventButton ##### -->
+<para>
+Used for button press and button release events. The
+<structfield>type</structfield> field will be one of %GDK_BUTTON_PRESS,
+%GDK_2BUTTON_PRESS, %GDK_3BUTTON_PRESS, and %GDK_BUTTON_RELEASE.
+</para>
+<para>
+Double and triple-clicks result in a sequence of events being received.
+For double-clicks the order of events will be:
+<orderedlist>
+<listitem><para>%GDK_BUTTON_PRESS</para></listitem>
+<listitem><para>%GDK_BUTTON_RELEASE</para></listitem>
+<listitem><para>%GDK_BUTTON_PRESS</para></listitem>
+<listitem><para>%GDK_2BUTTON_PRESS</para></listitem>
+<listitem><para>%GDK_BUTTON_RELEASE</para></listitem>
+</orderedlist>
+Note that the first click is received just like a normal
+button press, while the second click results in a %GDK_2BUTTON_PRESS being
+received just after the %GDK_BUTTON_PRESS.
+</para>
+<para>
+Triple-clicks are very similar to double-clicks, except that %GDK_3BUTTON_PRESS
+is inserted after the third click. The order of the events is:
+<orderedlist>
+<listitem><para>%GDK_BUTTON_PRESS</para></listitem>
+<listitem><para>%GDK_BUTTON_RELEASE</para></listitem>
+<listitem><para>%GDK_BUTTON_PRESS</para></listitem>
+<listitem><para>%GDK_2BUTTON_PRESS</para></listitem>
+<listitem><para>%GDK_BUTTON_RELEASE</para></listitem>
+<listitem><para>%GDK_BUTTON_PRESS</para></listitem>
+<listitem><para>%GDK_3BUTTON_PRESS</para></listitem>
+<listitem><para>%GDK_BUTTON_RELEASE</para></listitem>
+</orderedlist>
+</para>
+<para>
+For a double click to occur, the second button press must occur within 1/4 of
+a second of the first. For a triple click to occur, the third button press
+must also occur within 1/2 second of the first button press.
+</para>
+
+@type: the type of the event (%GDK_BUTTON_PRESS, %GDK_2BUTTON_PRESS,
+%GDK_3BUTTON_PRESS or %GDK_BUTTON_RELEASE).
+@window: the window which received the event.
+@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+@time: the time of the event in milliseconds.
+@x: the x coordinate of the mouse relative to the window.
+@y: the y coordinate of the mouse relative to the window.
+@pressure: the pressure of the button press, intended for input devices such
+as graphics tablets. It defaults to 0.5.
+@xtilt: the horizontal tilt of the input device. Defaults to 0.
+@ytilt: the vertical tilt of the input device. Defaults to 0.
+@state: a bit-mask representing the state of the modifier keys (e.g. Control,
+Shift and Alt) and the pointer buttons. See #GdkModifierType.
+@button: the button which was pressed or released, numbered from 1 to 5.
+Normally button 1 is the left mouse button, 2 is the middle button,
+and 3 is the right button. On 2-button mice, the middle button can often
+be simulated by pressing both mouse buttons together.
+@source: the input device where the event came from, usually %GDK_SOURCE_MOUSE.
+@deviceid: the input device ID, usually %GDK_CORE_POINTER but may be
+different if touch screens or graphics tablets are being used.
+@x_root: the x coordinate of the mouse relative to the root of the screen.
+@y_root: the y coordinate of the mouse relative to the root of the screen.
+
+<!-- ##### STRUCT GdkEventMotion ##### -->
+<para>
+
+</para>
+
+@type: the type of the event.
+@window: the window which received the event.
+@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+@time: 
+@x: 
+@y: 
+@pressure: 
+@xtilt: 
+@ytilt: 
+@state: 
+@is_hint: 
+@source: 
+@deviceid: 
+@x_root: 
+@y_root: 
+
+<!-- ##### STRUCT GdkEventExpose ##### -->
+<para>
+Generated when all or part of a window becomes visible and needs to be
+redrawn.
+</para>
+
+@type: the type of the event (%GDK_EXPOSE).
+@window: the window which received the event.
+@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+@area: the area that needs to be redrawn.
+@count: the number of contiguous %GDK_EXPOSE events following this one.
+The only use for this is "exposure compression", i.e. handling all contiguous
+%GDK_EXPOSE events in one go, though GDK performs some exposure compression
+so this is not normally needed.
+
+<!-- ##### STRUCT GdkEventVisibility ##### -->
+<para>
+Generated when the window visibility status has changed.
+</para>
+
+@type: the type of the event (%GDK_VISIBILITY_NOTIFY).
+@window: the window which received the event.
+@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+@state: the new visibility state (%GDK_VISIBILITY_FULLY_OBSCURED,
+%GDK_VISIBILITY_PARTIAL or %GDK_VISIBILITY_UNOBSCURED).
+
+<!-- ##### ENUM GdkVisibilityState ##### -->
+<para>
+Specifies the visiblity status of a window for a #GdkEventVisibility.
+</para>
+
+@GDK_VISIBILITY_UNOBSCURED: the window is completely visible.
+@GDK_VISIBILITY_PARTIAL: the window is partially visible.
+@GDK_VISIBILITY_FULLY_OBSCURED: the window is not visible at all.
+
+<!-- ##### STRUCT GdkEventCrossing ##### -->
+<para>
+
+</para>
+
+@type: the type of the event.
+@window: the window which received the event.
+@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+@subwindow: 
+@time: the time of the event in milliseconds.
+@x: 
+@y: 
+@x_root: 
+@y_root: 
+@mode: 
+@detail: 
+@focus: 
+@state: 
+
+<!-- ##### ENUM GdkCrossingMode ##### -->
+<para>
+
+</para>
+
+@GDK_CROSSING_NORMAL: 
+@GDK_CROSSING_GRAB: 
+@GDK_CROSSING_UNGRAB: 
+
+<!-- ##### ENUM GdkNotifyType ##### -->
+<para>
+
+</para>
+
+@GDK_NOTIFY_ANCESTOR: 
+@GDK_NOTIFY_VIRTUAL: 
+@GDK_NOTIFY_INFERIOR: 
+@GDK_NOTIFY_NONLINEAR: 
+@GDK_NOTIFY_NONLINEAR_VIRTUAL: 
+@GDK_NOTIFY_UNKNOWN: 
+
+<!-- ##### STRUCT GdkEventFocus ##### -->
+<para>
+Describes a change of keyboard focus.
+</para>
+
+@type: the type of the event (%GDK_FOCUS_CHANGE).
+@window: the window which received the event.
+@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+@in: TRUE if the window has gained the keyboard focus, FALSE if it has lost
+the focus.
+
+<!-- ##### STRUCT GdkEventConfigure ##### -->
+<para>
+Generated when a window size or position has changed.
+</para>
+
+@type: the type of the event (%GDK_CONFIGURE).
+@window: the window which received the event.
+@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+@x: the new x coordinate of the window, relative to its parent.
+@y: the new y coordinate of the window, relative to its parent.
+@width: the new width of the window.
+@height: the new height of the window.
+
+<!-- ##### STRUCT GdkEventProperty ##### -->
+<para>
+Describes a property change on a window.
+</para>
+
+@type: the type of the event (%GDK_PROPERTY_NOTIFY).
+@window: the window which received the event.
+@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+@atom: the property that was changed.
+@time: the time of the event in milliseconds.
+@state: whether the property was changed (%GDK_PROPERTY_NEW_VALUE) or
+deleted (%GDK_PROPERTY_DELETE).
+
+<!-- ##### ENUM GdkPropertyState ##### -->
+<para>
+Specifies the type of a property change for a #GdkEventProperty.
+</para>
+
+@GDK_PROPERTY_NEW_VALUE: the property value wan changed.
+@GDK_PROPERTY_DELETE: the property was deleted.
+
+<!-- ##### STRUCT GdkEventSelection ##### -->
+<para>
+
+</para>
+
+@type: the type of the event.
+@window: the window which received the event.
+@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+@selection: 
+@target: 
+@property: 
+@requestor: 
+@time: the time of the event in milliseconds.
+
+<!-- ##### STRUCT GdkEventDND ##### -->
+<para>
+
+</para>
+
+@type: the type of the event.
+@window: the window which received the event.
+@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+@context: 
+@time: the time of the event in milliseconds.
+@x_root: 
+@y_root: 
+
+<!-- ##### STRUCT GdkEventProximity ##### -->
+<para>
+
+</para>
+
+@type: the type of the event.
+@window: the window which received the event.
+@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+@time: the time of the event in milliseconds.
+@source: 
+@deviceid: 
+
+<!-- ##### STRUCT GdkEventClient ##### -->
+<para>
+An event sent by another client application.
+</para>
+
+@type: the type of the event (%GDK_CLIENT_EVENT).
+@window: the window which received the event.
+@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+@message_type: the type of the message, which can be defined by the
+application.
+@data_format: the format of the data, given as the number of bits in each
+data element, i.e. 8, 16, or 32. 8-bit data uses the b array of the data
+union, 16-bit data uses the s array, and 32-bit data uses the l array.
+
+<!-- ##### STRUCT GdkEventNoExpose ##### -->
+<para>
+Generated when the area of a #GdkDrawable being copied, with gdk_draw_pixmap()
+or gdk_window_copy_area(), was completely available.
+</para>
+<para>
+FIXME: add more here.
+</para>
+
+@type: the type of the event (%GDK_NO_EXPOSE).
+@window: the window which received the event.
+@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+

docs/reference/gdk/tmpl/events.sgml

@@ -0,0 +1,303 @@
+<!-- ##### SECTION Title ##### -->
+Events
+
+<!-- ##### SECTION Short_Description ##### -->
+functions for handling events from the window system.
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+This section describes functions dealing with events from the window system.
+</para>
+<para>
+In GTK+ applications the events are handled automatically in
+gtk_main_do_event() and passed on to the appropriate widgets, so these
+functions are rarely needed. Though some of the fields in the
+<link linkend="gdk-Event-Structures">Event Structures</link> are useful.
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+<variablelist>
+<varlistentry>
+<term><link linkend="gdk-Event-Structures">Event Structures</link></term>
+<listitem><para>
+The structs used for each type of event.
+</para></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<!-- ##### ENUM GdkEventType ##### -->
+<para>
+Specifies the type of the event.
+</para>
+<para>
+Do not confuse these events with the signals that GTK+ widgets emit.
+Although many of these events result in corresponding signals being emitted,
+the events are often transformed or filtered along the way.
+</para>
+
+@GDK_NOTHING: a special code to indicate a null event.
+@GDK_DELETE: the window manager has requested that the toplevel window be
+hidden or destroyed, usually when the user clicks on a special icon in the
+title bar.
+@GDK_DESTROY: the window has been destroyed.
+@GDK_EXPOSE: all or part of the window has become visible and needs to be
+redrawn.
+@GDK_MOTION_NOTIFY: the pointer (usually a mouse) has moved.
+@GDK_BUTTON_PRESS: a mouse button has been pressed.
+@GDK_2BUTTON_PRESS: a mouse button has been double-clicked (clicked twice
+within a short period of time). Note that each click also generates a
+%GDK_BUTTON_PRESS event.
+@GDK_3BUTTON_PRESS: a mouse button has been clicked 3 times in a short period
+of time. Note that each click also generates a %GDK_BUTTON_PRESS event.
+@GDK_BUTTON_RELEASE: a mouse button has been released.
+@GDK_KEY_PRESS: a key has been pressed.
+@GDK_KEY_RELEASE: a key has been released.
+@GDK_ENTER_NOTIFY: the pointer has entered the window.
+@GDK_LEAVE_NOTIFY: the pointer has left the window.
+@GDK_FOCUS_CHANGE: the keyboard focus has entered or left the window.
+@GDK_CONFIGURE: the size, position or stacking order of the window has changed.
+Note that GTK+ discards these events for %GDK_WINDOW_CHILD windows.
+@GDK_MAP: the window has been mapped.
+@GDK_UNMAP: the window has been unmapped.
+@GDK_PROPERTY_NOTIFY: a property on the window has been changed or deleted.
+@GDK_SELECTION_CLEAR: the application has lost ownership of a selection.
+@GDK_SELECTION_REQUEST: another application has requested a selection.
+@GDK_SELECTION_NOTIFY: a selection has been received.
+@GDK_PROXIMITY_IN: an input device has moved into contact with a sensing
+surface (e.g. a touchscreen or graphics tablet).
+@GDK_PROXIMITY_OUT: an input device has moved out of contact with a sensing
+surface.
+@GDK_DRAG_ENTER: the mouse has entered the window while a drag is in progress.
+@GDK_DRAG_LEAVE: the mouse has left the window while a drag is in progress.
+@GDK_DRAG_MOTION: the mouse has moved in the window while a drag is in
+progress.
+@GDK_DRAG_STATUS: the status of the drag operation initiated by the window
+has changed.
+@GDK_DROP_START: a drop operation onto the window has started.
+@GDK_DROP_FINISHED: the drop operation initiated by the window has completed.
+@GDK_CLIENT_EVENT: a message has been received from another application.
+@GDK_VISIBILITY_NOTIFY: the window visibility status has changed.
+@GDK_NO_EXPOSE: indicates that the source region was completely available
+when parts of a drawable were copied. This is not very useful.
+
+<!-- ##### ENUM GdkEventMask ##### -->
+<para>
+A set of bit-flags to indicate which events a window is to receive.
+Most of these masks map onto one or more of the #GdkEventType event types
+above.
+</para>
+<para>
+%GDK_POINTER_MOTION_HINT_MASK is a special mask which is used to reduce the
+number of %GDK_MOTION_NOTIFY events received. Normally a %GDK_MOTION_NOTIFY
+event is received each time the mouse moves. However, if the application
+spends a lot of time processing the event (updating the display, for example),
+it can easily lag behind the position of the mouse. When using the
+%GDK_POINTER_MOTION_HINT_MASK the server will only send %GDK_MOTION_NOTIFY
+events when the application asks for them, by calling gdk_window_get_pointer().
+</para>
+
+@GDK_EXPOSURE_MASK: 
+@GDK_POINTER_MOTION_MASK: 
+@GDK_POINTER_MOTION_HINT_MASK: 
+@GDK_BUTTON_MOTION_MASK: 
+@GDK_BUTTON1_MOTION_MASK: 
+@GDK_BUTTON2_MOTION_MASK: 
+@GDK_BUTTON3_MOTION_MASK: 
+@GDK_BUTTON_PRESS_MASK: 
+@GDK_BUTTON_RELEASE_MASK: 
+@GDK_KEY_PRESS_MASK: 
+@GDK_KEY_RELEASE_MASK: 
+@GDK_ENTER_NOTIFY_MASK: 
+@GDK_LEAVE_NOTIFY_MASK: 
+@GDK_FOCUS_CHANGE_MASK: 
+@GDK_STRUCTURE_MASK: 
+@GDK_PROPERTY_CHANGE_MASK: 
+@GDK_VISIBILITY_NOTIFY_MASK: 
+@GDK_PROXIMITY_IN_MASK: 
+@GDK_PROXIMITY_OUT_MASK: 
+@GDK_SUBSTRUCTURE_MASK: 
+@GDK_ALL_EVENTS_MASK: the combination of all the above event masks.
+
+<!-- ##### MACRO GDK_CURRENT_TIME ##### -->
+<para>
+Represents the current time, and can be used anywhere a time is expected.
+</para>
+
+
+
+<!-- ##### MACRO GDK_PRIORITY_EVENTS ##### -->
+<para>
+This is the priority that events from the X server are given in the
+<link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
+</para>
+
+
+
+<!-- ##### FUNCTION gdk_events_pending ##### -->
+<para>
+Checks if any events are waiting to be processed.
+</para>
+
+@Returns: TRUE if any events are pending.
+
+
+<!-- ##### FUNCTION gdk_event_peek ##### -->
+<para>
+Gets a copy of the first #GdkEvent in the event queue.
+(Note that this function will not get more events from the X server.
+It only checks the events that have already been moved to the GDK event queue.)
+</para>
+
+@Returns: a copy of the first #GdkEvent on the event queue, or NULL if no
+events are in the queue. The returned #GdkEvent should be freed with
+gdk_event_free().
+
+
+<!-- ##### FUNCTION gdk_event_get ##### -->
+<para>
+Gets the next #GdkEvent to be processed, fetching events from the X server if
+necessary.
+</para>
+
+@Returns: the next #GdkEvent to be processed, or NULL if no events are pending.
+The returned #GdkEvent should be freed with gdk_event_free().
+
+
+<!-- ##### FUNCTION gdk_event_get_graphics_expose ##### -->
+<para>
+Waits for a GraphicsExpose or NoExpose event from the X server.
+This is used in the #GtkText and #GtkCList widgets in GTK+ to make sure any
+GraphicsExpose events are handled before the widget is scrolled.
+</para>
+
+@window: the #GdkWindow to wait for the events for.
+@Returns: a #GdkEventExpose if a GraphicsExpose was received, or NULL if a
+NoExpose event was received.
+
+
+<!-- ##### FUNCTION gdk_event_put ##### -->
+<para>
+Appends a copy of the given event onto the front of the event queue.
+</para>
+
+@event: a #GdkEvent.
+
+
+<!-- ##### FUNCTION gdk_event_copy ##### -->
+<para>
+Copies a #GdkEvent, copying or incrementing the reference count of the
+resources associated with it (e.g. #GdkWindow's and strings).
+</para>
+
+@event: a #GdkEvent.
+@Returns: a copy of @event. The returned #GdkEvent should be freed with
+gdk_event_free().
+
+
+<!-- ##### FUNCTION gdk_event_free ##### -->
+<para>
+Frees a #GdkEvent, freeing or decrementing any resources associated with it.
+Note that this function should only be called with events returned from
+gdk_event_peek(), gdk_event_get(), gdk_event_get_graphics_expose() and
+gdk_event_copy().
+</para>
+
+@event: a #GdkEvent.
+
+
+<!-- ##### FUNCTION gdk_event_get_time ##### -->
+<para>
+Gets the timestamp from a #GdkEvent.
+</para>
+
+@event: a #GdkEvent.
+@Returns: the timestamp from @event, or #GDK_CURRENT_TIME if the event has
+no timestamp.
+
+
+<!-- ##### FUNCTION gdk_event_handler_set ##### -->
+<para>
+Sets the function to call to handle all events from GDK.
+</para>
+<para>
+Note that GTK+ uses this to install its own event handler, so it is probably
+not useful for GTK+ applications.
+</para>
+
+@func: the function to call to handle events from GDK.
+@data: user data to pass to the function.
+@notify: the function to call when the handler function is removed, i.e. when
+gdk_event_handler_set() is called with another event handler.
+
+
+<!-- ##### USER_FUNCTION GdkEventFunc ##### -->
+<para>
+Specifies the type of function passed to gdk_event_handler_set() to handle
+all GDK events.
+</para>
+
+@event: the #GdkEvent to process.
+@data: user data set when the event handler was installed with
+gdk_event_handler_set().
+
+
+<!-- ##### FUNCTION gdk_event_send_client_message ##### -->
+<para>
+Sends an X ClientMessage event to a given window.
+</para>
+<para>
+This could be used for communicating between different applications,
+though the amount of data is limited to 20 bytes.
+</para>
+
+@event: the #GdkEvent to send, which should be a #GdkEventClient.
+@xid: the window to send the X ClientMessage event to.
+@Returns: non-zero on success.
+
+
+<!-- ##### FUNCTION gdk_event_send_clientmessage_toall ##### -->
+<para>
+Sends an X ClientMessage event to all toplevel windows.
+</para>
+<para>
+Toplevel windows are determined by checking for the WM_STATE property, as
+described in the Inter-Client Communication Conventions Manual (ICCCM).
+If no windows are found with the WM_STATE property set, the message is sent
+to all children of the root window.
+</para>
+
+@event: the #GdkEvent to send, which should be a #GdkEventClient.
+
+
+<!-- ##### FUNCTION gdk_add_client_message_filter ##### -->
+<para>
+Adds a filter to be called when X ClientMessage events are received.
+</para>
+
+@message_type: the type of ClientMessage events to receive. This will be
+checked against the <structfield>message_type</structfield> field of the
+XClientMessage event struct.
+@func: the function to call to process the event.
+@data: user data to pass to @func.
+
+
+<!-- ##### FUNCTION gdk_get_show_events ##### -->
+<para>
+Returns non-zero if event debugging output is enabled.
+</para>
+
+@Returns: non-zero if event debugging output is enabled.
+
+
+<!-- ##### FUNCTION gdk_set_show_events ##### -->
+<para>
+Sets whether event debugging information is output.
+Note that GTK+ must be compiled with debugging enabled, i.e. using the
+'--enable-debug' configure option.
+</para>
+
+@show_events: TRUE to output event debugging information.
+
+