Queue a clear/redraw, not just a redraw, so the focus gets undrawn

Thu Nov  5 12:06:16 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkcheckbutton.c (gtk_check_button_draw_focus): Queue
	a clear/redraw, not just a redraw, so the focus
	gets undrawn properly.

	* gtk/gtktogglebutton.c (gtk_toggle_button_unrealize):
	Chain to gtk_widget_unrealize() instead of duplicating
	code.

Wed Nov  4 14:34:51 1998  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdk.c gdk/gdkprivate.h gdk/gdkwindow.c: Removed
	last vestiges of old DND.

Tue Nov  3 12:27:52 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkentry.c: Restored inner border to entries,
	erase cursors to background image.

Fri Oct 30 12:09:21 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkentry.c gtk/gtkstyle.[ch]: removed paint_entry() -
	it was identical to paint_flat_box().

	* gtk/gtkstyle.c: Coding style fixups.

	* gtk/gtkwindow.c (gtk_window_move_resize): removed useless
	test.

	* gtk/gtkframe.c gtkstyle.[ch] gtknotebook.c:
	Change 'side' for paint_[box/shadow]_gap and paint_extension
	to be GtkPositionType instead of a random int.

	* gtk/gtkaspectframe.c (gtk_aspect_frame_paint): Use
	"frame" as detail - an aspectframe should draw identical
	to a frame.

Tue Oct 27 09:58:11 1998  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdkwindow.c (gdk_window_merge_child_shapes): renamed
	from combine_child_shapes().

	* gdk/gdkwindow.c: Merge propagate_shapes() and
	propagate_combine_shapes() to remove code duplication.

.cvsignore

@@ -1,37 +1,12 @@
 *.lo
 config.log
 config.h
-config.h.in
 libtool
 config.status
 stamp-h
-stamp-h1
 Makefile
 Makefile.in
 aclocal.m4
 configure
-config.h.win32
-gtk-config-2.0
+gtk-config
 config.cache
-ABOUT-NLS
-intl
-stamp-h.in
-gtk+.spec
-gtk+-2.0.pc
-gtk+-2.0-uninstalled.pc
-gtk+-linux-fb-2.0.pc
-gtk+-nanox-2.0.pc
-gtk+-x11-2.0.pc
-gdk-2.0.pc
-gdk-2.0-uninstalled.pc
-gdk-linux-fb-2.0.pc
-gdk-nanox-2.0.pc
-gdk-x11-2.0.pc
-gdk-pixbuf-2.0.pc
-gdk-pixbuf-2.0-uninstalled.pc
-gtk-zip.sh
-missing
-install-sh
-mkinstalldirs
-sgml
-autom4te.cache

AUTHORS

@@ -4,26 +4,20 @@ 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@gtk.org>
-Damon Chaplin     <damon@gtk.org>
+Jerome Bolliet    <bolliet@in2p3.fr>
 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>
-Federico Mena     <quartic@gtk.org>
-Paolo Molaro      <lupus@gtk.org>
+Fedrerico Mena    <quartic@gtk.org>
+Paolo Molaro      <lupus@lettere.unipd.it>
 Jay Painter       <jpaint@gtk.org>
 Manish Singh      <manish@gtk.org>
 Owen Taylor       <otaylor@gtk.org>

HACKING

@@ -1,18 +1,18 @@
-If you want to hack on the GTK+ project, you'll need to have
-the following packages installed:
+If you want to hack on the Gtk+ project, it will make you life easier
+to have the following packages installed:
 
-	- GNU autoconf 2.52
-	- GNU automake 1.4
-	- GNU libtool 1.4
+	- GNU autoconf 2.12
+	- GNU automake 1.3
+	        (Beta releases are at ftp://ftp.cygnus.com/pub/tromey)
+	- GNU libtool 1.2b
 	- indent (GNU indent 1.9.1 is known good)
-	- GNU gettext 10.40
 
 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.
 
 In order to get CVS gtk+ installed on your system, you need to have
-the most recent CVS version of glib, pango, and atk installed as well.
-The installation process of these libraries is similar to that of gtk+, but
+the most recent CVS version of glib installed as well.
+The installation process of glib is similar to that of gtk+, but
 needs to be fulfilled prior to installation of gtk+.
 
 To compile a CVS version of gtk+ on your system, you will need to take
@@ -39,17 +39,16 @@ to autogen.sh and they will be passed on to configure.
 If at all possible, please use CVS to get the latest development version of
 gtk+ and glib.  You can do the following to get glib and gtk+ from cvs:
 
-   $ export CVSROOT=':pserver:anonymous@cvs.gnome.org:/cvs/gnome'
+   $ export CVSROOT=':pserver:anonymous@cvs.gimp.org:/debian/home/gnomecvs'
    $ cvs login
      (there is no password, just hit return)
-   $ cvs -z3 checkout glib
-   $ cvs -z3 checkout pango
-   $ cvs -z3 checkout atk
-   $ cvs -z3 checkout gtk+
-
-For information about submitting patches and commiting changes
-to CVS, see the README and README.cvs-commits files. In particular, 
-don't, under any circumstances, commit anything to CVS before
-reading and understanding README.cvs-commmits.
+   $ cvs -z9 checkout glib
+   $ cvs -z9 checkout gtk+
 
+Please submit patches to the gtk-list@redhat.com mailing list (you must
+subscribe before you post, e-mail gtk-list-request@redhat.com with a
+subject of "subscribe"). All kinds of contributions are accepted.
+Patches that you wish to go into the distribution should also be uploaded 
+to ftp://ftp.gimp.org/incoming.  Follow the rules there for naming your
+patches. 
 

INSTALL

@@ -1,41 +1,156 @@
 Prerequisites
 =============
 
-GTK+ requires the following packages:
-
- - The GLib, Pango, and Atk libraries, available at the same location as GTK+
-
- - The TIFF, PNG, and JPEG image loading libraries. You most
-   likely have these installed on your system already. If not
-   these libraries are available from:
-
-    http://www.libtiff.org/
-    ftp://swrinde.nde.swri.edu/pub/png/src/
-    ftp://ftp.uu.net/graphics/jpeg/
-
-   If these libraries are not available, the corresponding 
-   image loaders will simply not be built. However, this
-   may cause applications using GTK+ not to function properly.
+GTK+ requires the GLIB library, available at the same location as
+you got this package.
 
 Simple install procedure
 ========================
 
-  % gzip -cd gtk+-2.0.6.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.0.6			   # change to the toplevel directory
-  % ./configure				   # run the `configure' script
-  % make				   # build GTK
+  % gzip -cd gtk+-1.1.3.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-1.1.3                          # 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 Details
-===========
+The Nitty-Gritty
+================
 
-Complete information about installing GTK+ and related libraries can be found 
-in the file:
+The 'configure' script can be given a number of options to enable
+and disable various features. For a complete list, type:
 
- docs/reference/gtk/docs/reference/gtk/html/gtk-building.html
+  ./configure --help
 
-Or online at:
+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
+
+*  --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
+
+
+Using an uninstalled copy of GLIB
+=================================
+
+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.4
+
+This, however, will not work if you built GLIB with different
+source and build directories.
+
+
+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 and 2.1, 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.
 
- http://developer.gnome.org/doc/API/2.0/gtk/gtk-building.html
 

INSTALL.in

@@ -1,41 +0,0 @@
-Prerequisites
-=============
-
-GTK+ requires the following packages:
-
- - The GLib, Pango, and Atk libraries, available at the same location as GTK+
-
- - The TIFF, PNG, and JPEG image loading libraries. You most
-   likely have these installed on your system already. If not
-   these libraries are available from:
-
-    http://www.libtiff.org/
-    ftp://swrinde.nde.swri.edu/pub/png/src/
-    ftp://ftp.uu.net/graphics/jpeg/
-
-   If these libraries are not available, the corresponding 
-   image loaders will simply not be built. However, this
-   may cause applications using GTK+ not to function properly.
-
-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 Details
-===========
-
-Complete information about installing GTK+ and related libraries can be found 
-in the file:
-
- docs/reference/gtk/docs/reference/gtk/html/gtk-building.html
-
-Or online at:
-
- http://developer.gnome.org/doc/API/2.0/gtk/gtk-building.html
-

Makefile.am

@@ -1,47 +1,28 @@
-## Makefile.am for GTK+
+## Process this file with automake to produce Makefile.in
 
-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
+SRC_SUBDIRS = gdk gtk
+SUBDIRS = $(SRC_SUBDIRS) docs
 
-# require automake 1.4
-AUTOMAKE_OPTIONS = 1.4
+bin_SCRIPTS = gtk-config
 
-EXTRA_DIST =			\
-	HACKING			\
-	gtk+.spec.in		\
-	makecopyright		\
-	NEWS.pre-1-0		\
+EXTRA_DIST =	\
+	HACKING		\
+	gtk+.spec	\
+        gtk.m4          \
+	makecopyright	\
+	TODO		\
+	NEWS.pre-1-0	\
 	ChangeLog.pre-1-0	\
-	ChangeLog.pre-1-2	\
-	ChangeLog.pre-2-0	\
 	README.cvs-commits	\
-	README.win32		\
-	README.nanox		\
-	config.h.win32		\
-	gtk-zip.sh		\
-	sanitize-la.sh		\
-	po/README.translators	\
-	po/makefile.mingw	\
-	po/po2tbl.sed.in	\
+	examples/README.1ST	\
+	examples/extract.awk	\
+	examples/extract.sh	\
 	examples/aspectframe/Makefile  \
 	examples/aspectframe/aspectframe.c  \
-	examples/Makefile  \
-	examples/README.1ST  \
-	examples/extract.awk  \
-	examples/extract.sh  \
-	examples/arrow/Makefile	\
-	examples/arrow/arrow.c	\
-	examples/base/Makefile  \
-	examples/base/base.c  \
-	examples/buttonbox/Makefile \
-	examples/buttonbox/buttonbox.c	\
 	examples/buttons/Makefile  \
 	examples/buttons/buttons.c  \
 	examples/buttons/info.xpm  \
-	examples/calendar/Makefile  \
-	examples/calendar/calendar.c  \
-	examples/clist/Makefile  \
-	examples/clist/clist.c  \
+	examples/clist/clist.c \
 	examples/entry/Makefile  \
 	examples/entry/entry.c  \
 	examples/eventbox/Makefile  \
@@ -56,15 +37,18 @@ EXTRA_DIST =			\
 	examples/helloworld/helloworld.c  \
 	examples/helloworld2/Makefile  \
 	examples/helloworld2/helloworld2.c  \
-	examples/label/Makefile	\
-	examples/label/label.c	\
 	examples/list/Makefile  \
 	examples/list/list.c  \
 	examples/menu/Makefile  \
 	examples/menu/menu.c  \
-	examples/menu/itemfactory.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/packer/Makefile  \
+	examples/packer/pack.c \
 	examples/packbox/Makefile  \
 	examples/packbox/packbox.c  \
 	examples/paned/Makefile  \
@@ -75,14 +59,10 @@ 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  \
 	examples/scribble-simple/scribble-simple.c  \
-	examples/scribble-xinput/Makefile	\
-	examples/scribble-xinput/scribble-xinput.c	\
 	examples/scrolledwin/Makefile  \
 	examples/scrolledwin/scrolledwin.c  \
 	examples/selection/Makefile  \
@@ -92,74 +72,19 @@ 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
 
-GDKTARGET=@gdktarget@
 
-## Copy .pc files to target-specific names
-gtk+-$(GDKTARGET)-2.0.pc: gtk+-2.0.pc
-	rm -f gtk+-$(GDKTARGET)-2.0.pc && \
-	cp gtk+-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
+m4datadir = $(datadir)/aclocal
+m4data_DATA = gtk.m4
 
-gdk-$(GDKTARGET)-2.0.pc: gdk-2.0.pc
-	rm -f gdk-$(GDKTARGET)-2.0.pc && \
-	cp gdk-2.0.pc gdk-$(GDKTARGET)-2.0.pc
-
-gtk+-$(GDKTARGET)-2.0-uninstalled.pc: gtk+-2.0-uninstalled.pc
-	rm -f gtk+-$(GDKTARGET)-2.0-uninstalled.pc && \
-	cp gtk+-2.0-uninstalled.pc gtk+-$(GDKTARGET)-2.0-uninstalled.pc
-
-gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
-	rm -f gdk-$(GDKTARGET)-2.0-uninstalled.pc && \
-	cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
-
-DISTCLEANFILES =				\
-	gtk+-$(GDKTARGET)-2.0.pc		\
-	gdk-$(GDKTARGET)-2.0.pc			\
-	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
-	gdk-$(GDKTARGET)-2.0-uninstalled.pc
-
-## copy the default target for this platform to gdk-2.0.pc and gtk+-2.0.pc
-DEFAULT_GDKTARGET=x11
-install-data-hook:
-	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 test -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \
-	 test -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \
-	 rm -f gdk-2.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \
-	 rm -f gtk+-2.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \
-	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 rm -f gdk-2.0.pc && cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
-	 rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
-
-dist-hook: gtk+.spec
-	if test -f $(srcdir)/INSTALL.in && test -f $(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)
-
-.PHONY: files release sanity snapshot
+.PHONY: files populate checkin release
 
 files:
 	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
@@ -172,38 +97,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)-snap`date +"%Y%m%d"`
-
-
-# This is a version of the automake-1.4 distcheck rule modified
-# to pass --enable-gtk-doc to ./configure
-#
-mydistcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(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 --enable-gtk-doc \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
+	$(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`

NEWS

@@ -1,929 +1,3 @@
-Overview of Changes in GTK+ 2.0.6
-=================================
-
-* GtkTreeView bug fixes [Jonathan Blandford, Kristian Rietveld, 
-  Josh Green, Matthias Clasen]
-* Fix problem with keynav and insensitive menu items [Owen Taylor]
-* Fix pixbuf_from_drawable() for LSB -> MSB [Federico Mena Quintero]
-* Use GTK2_RC_FILES envvar instead of GTK_RC_FILES [Owen]
-* Focus check/radio buttons when activating with a mnemonic [Padraig O'Briain]
-* Cycle between multiple menubars with F10, not control-tab 
-  [Calum Benson, Padraig]
-* Misc bug fixes [Jacob Berkman, Matthias Clasen, Manuel Op de Coul,
-  Bill Haneman, Norihiro UMEDA, Shivaram Upadhyayula, Yao Zhang]
-* Build fixes for cross-compiling and portability [Arnaud Charlet, 
-  J. Ali Harlow]
-* Updated translations (bg,ca,da,fr,ja,ko,lv,no,pl,ru,sk,sv,vi)
-
-Overview of Changes in GTK+ 2.0.5
-=================================
-
-* Fix a wrong assertion that broke gtk_file_selection_set_filename();
-  also another fix from testing this function with non-UTF-8 filenames.
-* Fix incorrect property notification in GtkTextView. [James M. Cape]
-
-Overview of Changes in GTK+ 2.0.4
-=================================
-
-* Fix a number of types which were registered with the 
-  type system with the wrong names [James Henstridge, Jonathan Blandford]
-* Support missing data types in GtkList/TreeStore [Daniel Elstner]
-* Misc GtkTreeView bug fixes [Dave Camp, Jonathan, Daniel Elstner, 
-  Josh Parsons]
-* Drag and drop fixes, including a stuck grab. [Dave, Thomas Leonard, 
-  Owen Taylor]
-* Calculate screen size on win32 from the "logical DPI" 
-  [Joaquin Cuenca Abela, Tor Lillqvist]
-* Misc Win32 bug fixes. [Florent Duguet, Torn]
-* Fix theme changes for GtkMenu [Soeren Sandmann]
-* Fix gdk_pixbuf_from_drawable() for big endian. [Federico Mena Quintero]
-* Fix encoding handling for gtk_file_selection_set_filename()
-  [Sebastian Ritau, Owen]
-* Fix crash with DND, Qt and Metacity [Cha Young-Ho, Havoc, Owen]
-* Fixes for DirectColor visuals [Shivaram Upadhyayula]
-* Memory leak and UMR fixes [Michael Meeks, Matthias Clasen, Valgrind]
-* Misc bug fixes
-* Updated translations (ca,cs,da,es,et,fr,ms,nl,pl,pt,pt_BR,ru,sv)
-
-Other contributors: Nicholas Allen, Jacob Berkman, Remus Draica, 
-  Nano Golveia, Tim Janik, Sergey Kuzminov, George Lebl, Garrett Lesage, 
-  Robin Lu, Timo Meinen, Michel Selten, Boris Shingarov, Jeff Waugh
-
-Overview of Changes in GTK+ 2.0.3
-=================================
-
-* GtkTreeView fixes (Jonathan Blandford, Kristian Rietveld, Daniel Elstner)
-* Improve GdkRGB support for low color depths (Tor Lillqvist).
-* Tweak F10 behavior to focus GtkMenuBar. (Owen Taylor)
-* Include internal children when focusing. (Jonathan)
-* Win32 fixes (Tor Lillqvist, David Sterba)
-* Allow use of a pixmap as the drawable in gdk_pixmap_new(). (Kristian)
-* GdkPixbuf fixes (Matthias Clasen, Michael Natterer, Federico Mena Quintero)
-* GtkMenu fixes. (Soeren Sandmann)
-* Find gdk-pixbuf-csource when cross-compiling. (Michael Natterer)
-* Misc input-method related fixes (Yao Zhang, Federico)
-* Fix stuck grab during DND. (Dave Camp, Owen)
-* Remove in-bevel from scrolled-offscreen menus. (Ettore Perazzoli)
-* Various plug/socket fixes (Owen, Padraig O'Briain, Dave Camp, 
-  Michael Meeks)
-* Handle Xlib internal connections (HideToshi Tajima)
-* Many miscellaneous bug fixes.
-
-Other contributors: Jacob Berkman, Abigail Brady, Rich Burridge, 
-Anders Carlsson, Murray Cumming, Nalin Dahyabhai, James Henstridge, 
-David Highley, Ben Liblitt, Tim Janik, Bill Jannsen, Lauris Kaplinski, 
-Sergey Kuzminov, Alex Larsson, Sven Neumann, Havoc Pennington, Gareth Pearce, 
-Simon Floery, Thomas Leonard, Detlef Reichl, Martin Schulze, Christophe Saout,
-Timo Sirainen, Graham Swallow.
-
-Overview of Changes in GTK+ 2.0.2
-=================================
-
-* GtkTreeView cursor movement fixes [Kristian Rietveld]
-* GtkTreeModelSort iterator stamp fixes [Kristian Rietveld]
-
-Overview of Changes in GTK+ 2.0.1
-=================================
-
-* GtkTreeView fixes and performance improvements 
-  [Kristian Rietveld, Jonathan Blandford, Mike Piepe, Dave Camp]
-* GtkTextView fixes [Havoc Pennington]
-* Fix problems with accelerators on Solaris [Padraig O'Briain]
-* Some fixes for key bindings on keypad keys [Owen Taylor]
-* Fix problem with RENDER use on big endian machines 
-  [Owen Taylor, with help from Tuomas Kuosmanen]
-* Win32 fixes, especially dashed line drawing 
-  [Tor Lillqvist, Hans Breuer]
-* Compile with -D_REENTRANT when appropriate [Sven Numann]
-* Compiler warning cleanups [Erwann Chenede]
-* Fix handling of font-name XSETTING [Richard Hestilow]
-* Make linux-fb backend compile again [Carlo E. Prelz, Alex Larsson]
-* Fix problems with inappropriate menu scroll arrows [Owen]
-* Stock icon improvements [Jakub Steiner, Tuomas]
-* Much work on pixbuf loader robustness [Matthias Clasen]
-* Documentation improvements [Matthias, Vitaly Tiskkov]
-* Fix some crashes in GtkWindow accelerator handling code 
-  [Dave Camp, Matt Wilson]
-* Misc bug fixes
-
-Other contributors: Jacob Berkman, Dennis Björklund, Seth Burgess,
-  Murray Cumming, Johan Dahlin, John Ellis, Kang Jeong-He, 
-  James Henstridge, Richard Hult, Thomas Leonard, LEE Sau Dan, 
-  Alexey A. Malyshev, Mark McLoughlin, Michael Meeks, Sven Neumann, 
-  Andras Salamon, Soeren Sandmann, Dan Winship, Yao Zhang
-
-Overview of Changes in GTK+ 2.0.0
-=================================
-
-* GtkTreeView fixes [Jonathan Blandford, Kristian Rietveld, Darin Adler]
-* Build fixes [Anders Carlsson, Tor Lillqvist, Manish Singh]
-* Bug fixes. [Thomas Leonard, Owen Taylor]
-
-Overview of Changes in GTK+ 2.0.0 rc1
-=====================================
-
-* GtkTreeView fixes [Kristian Rietveld, Jonathan Blandford, Richard Hult]
-* Text widget fixes [Havoc Pennington]
-* Efficiency fixes when using Xft [Owen Taylor]
-* Key handling fixes and other fixes for Win32 [Hans Breuer, Tor Lillqvist]
-* Try to fix key handling without XKEYBOARD extension [Owen]
-* Documentation fixes and improvements 
-  [Matthias Clasen, Alexey Malyshev, Akira Tagoh, Vitaly Tishkov]
-* Widget drawing improvments [Soeren Sandmann]
-* Allow cycling between multiple menu bars with <Control>Tab [Owen]
-* Try to build libraries with only shared library dependencies on Xft to 
-  deal with transition to Xft2 [Owen]
-* Portability fixes [Owen, Miroslaw Dobrzanski-Neumann]
-* Don't use red as the default cursor color [Owen]
-* Bug fixes, bug fixes, bug fixes.
-
-Other contributors: Darin Adler, Jacob Berkman, Kevin Breit, Hans Breuer, 
-  Anders Carlsson, Damon Chaplin, Finlay Dobbie, Jody Goldberg,
-  Andreas J. Guelzow, Scott Guilbeaux, Vlad Harchev, James Henstridge,
-  Tim Janik, Satyajit Kanungo, Charles Kerr, Sergey Kuzminov, Miles Lane, 
-  Alexander Larsson, Paolo Maggi, Skip Montaro, Jan Mynarik, Sven Neumann, 
-  Padraig O'Briain, Narayani Pattipati, Mark Patton, Havoc Pennington, 
-  Ettore Perazzoli, Guillermo S. Romero, Manish Singh, Morten Welinder
-
-Overview of Changes in GTK+ 1.3.15
-==================================
-
-* New stock and improved icon images
-  [Tuomas Kuosmanen, Jakub Steiner, Anders Carlsson]
-* Widget drawing improvements for check and radio buttons,
-  spinbuttons [Soeren Sandmann]
-* Clean up module search path algorithm, use GTK_PATH [Owen Taylor]
-* Add GtkSetting for font name. [Richard Hestilow]
-* Much improved key matching code, accelerators work independent
-  of group [Owen]
-* Make mnemonics work for embedded GtkPlug widgets [Owen]
-* Keynav improvements for GtkTreeView [Kristian Rietveld]
-* Fix gtk_tree_view_scroll_to_cell() [Jonathan Blandford]
-* Rename gtk_tree_view_get_iter_root() and gtk_tree_path_new_root()
-  to gtk_tree_view_get_iter_first() and gtk_tree_path_new_first(),
-  add compatibility macros.
-* GtkTreeView bug fixes [Kristian, Anders, Damon Chaplin]
-* GtkTextView bug fixes [Havoc Pennington]
-* Pad class structures for future binary compatibility [Owen]
-* Tutorial improvements [Sven Neumann, Matthias Clasen]
-* Fixes for MULTIPLE selection target [Gregory Merchan, Owen]
-* Fix problems with initial widget size [Owen]
-* AIX compilation fixes [Miroslaw Dobrzanski-Neumann]
-* Win32 fixes [Hans Breuer, Tor Lillqvist]
-* Miscellaneous bug fixes
-
-Other contributors: David L. Cooper, Eric Fischer, Jody Goldberg, 
-  Satajyit Kanungo, Thomas Leonard, Mark Patton, Manish Singh, 
-  Nicolas Setton
-
-Overview of Changes in GTK+ 1.3.14
-==================================
-
-* Keyboard focus improvements [Owen Taylor]
-* Code cleanup [Matthias Clasen, Manish Singh, Darin Adler]
-* Fix accidentally exported variables [Mark McLoughlin]
-* GtkTreeView fixes [Jonathan Blandford, Kristian Rietveld, John Harper, Darin]
-* Default to yellow tooltips [Owen]
-* RC file fixes for reloading, priorities [Owen, Matthias]
-* GtkMenu behavior improvements and bug fixes [Owen, Arnaud Charlet]
-* GtkTextView fixes [Havoc Pennington, Daniel Elstner, Dennis Bjorklund]
-* Improve keynav for paned widgets, tooltips, spin buttons, notebooks, 
-  scrolled windows [Soeren Sandmann, Padraig, Owen]
-* Add Emacs/Default key themes [Owen]
-* Win32 fixes [Hans Breuer, Tor Lillqvist]
-* Ethiopic input methods [Daniel Yacob]
-* Opaque paned window resizing [Soeren]
-* Tweak table expansion behavior [Tim Janik]
-* Fix GtkCalendar focus drawing [Bill Haneman]
-* Allow themeable cursor thickness [Bill]
-* Start of fixing of tutorial for GTK+-2.0 [Matthias]
-* Add a ::adjust-bounds signal to GtkRange to allow spreadsheat style
-  scrollbars. [Jody Goldberg]
-* Add the ability to turn on multiple selection for GtkFileSel [Manish]
-* Bug fixes
-
-Other contributors: Jacob Berkman, Padraig O'Briain, Anders Carlsson,
- Johan Dahlin, Richard Hult, Stefan Kost, Alex Larsson, Thomas Leonard,
- Paolo Maggi, Alexey Malyshev, Federico Mena Quintero, Skip Montaro,
- Sven Neumann, Havoc Pennington, Laszlo Peter, Christian Rose, Joe Shaw,
- Kevin Vandersloot,  Morten Welinder, Peter Williams
-
-Overview of Changes in GTK+ 1.3.13
-==================================
-
-* Tree view fixes. [Kristian Rietveld, Jonathan Blandford, Anders Carlsson]
-* Tree view support for low-vision themes [Bill Haneman]
-* Text view bug fixes. [Havoc Pennington]
-* Win32 fixes and improvements.  [Tor Lillqvist, Hans Breuer, 
-  Archaeopteryx Software]
-* Documentation improvements [Matthias Clasen, Havoc Pennington]
-* Accelerate alpha compositing using RENDER extension if present,
-  and optimize the non-RENDER case a lot. [Owen Taylor]
-* Add support for "optional keybindings" (action signal returns FALSE) [Owen]
-* Fixed the infamous changing directory deletes filename bug 
-  [Owen and a cast of thousands]
-* Add mouse cursor hiding for text widgets [Anders Carlsson]
-* Simple Hangul input module [Yusuke Tabata]
-* Removed the scary startup warning.
-* GdkPixbuf pixel handling fixes [Owen, Michael Hore, Jim Cape]
-* Converted GtkFileSelection and GtkFontSelection to use GtKTreeView widgets
-  instead of the deprecated GtkCList [Owen]
-* gtkhsv.h was installed by mistake, fixed that. [reported by Ross Burton]
-* gdk_pixbuf_render_to_drawable() now also handles alpha pixbufs.
-* Made Gtkimage draw GtkPixmap, GtkImage, GdkPixbuf insensitive, prelighted,
-  etc. [Havoc, Owen]
-* Marked gtk_item_factory_path_from_widget() G_CONST_RETURN. [Matt Wilson]
-* gtk_image_menu_item_new_from_stock() now falls back to
-  new_with_mnemonic, for consistency with gtk_button_new_from_stock()
-  [Havoc Pennington]
-* GdkModifierType is now consistently used for modifier mask parameters
-  [Mark Patton]
-* gtk_widget_set_accel_path() is now publically exported.
-
-Other contributors: Darin Adler, Jeffrey Baker, Damon Chaplin, Brian Cameron, 
-  Murray Cumming, James Henstridge, Jacob Berkman, Arnaud Charlet, Jeff Franks, 
-  Jeff Garzik, Jody Goldberg, Diego Gonzalez, Melvin Hadasht, Raja Harinath, 
-  Tim Janik, Mike Kestner, Mathieu Lacage, Alex Larsson, Ryan Lovett, 
-  Mark McLoughlin, Sven Neumann, Padraig O'Briain, Xavier Ordoquy, Chris Phelps, 
-  Detlef Reichl, Guillermo S. Romero, Federico Mena Quintero, Manish Singh,
-  HideToshi Tajima, Vitaly Tishkov, Jon Trowbridge, Sergey Vlasov.
-
-Overview of Changes in GTK+ 1.3.12
-==================================
-
-* Fix problems with PNG saving [Michael Natterer]
-* Cleanups of deprecated usages [Sebastian Wilhelmi]
-* Win32 fixes [Tor Lillqvist]
-* Documentation improvements [Matthias Clasen, Havoc Pennington, 
-  Vitaly Tishkov]
-* Frame buffer port fixes [Manish Singh]
-* GtkTextView bug fixes [Havoc Pennington, Chris Phelps]
-* Menu behavior improvements [Kristian Rietveld]
-* Make focus line width configurable, focus color work on 
-  dark themes. [Bill Haneman, Owen Taylor]
-* Add state argument to gtk_paint_focus() [Bill]
-* Added incremental revalidation to tree view, for better apparent speed 
-  [Jonathan Blandford]
-* Remove useless gtk_tree_view_column_cell_event() [Jonathan]
-* Display XIM status in a separate window [HideToshi Tajima]
-* Add GDK_DEBUG=nograbs to disable pointer, keyboard grabs [Jacob Berkman]
-* Add menu of Unicode control characters to GtkEntry, GtkTextView 
-  [Dov Grobgeld, Havoc]
-* Pass key releases along to input methods [Owen]
-* Many bug fixes
-
-Other contributors: Darin Adler, Fabrice Bellet, Chris Blizzard, 
-  Hans Breuer, Anders Carlsson, Damon Chaplin, Murray Cumming, Jeff Franks, 
-  James Henstridge, Tim Janik, Alex Larsson, George Lebl, Kjartan, Maraas, 
-  Sven Neumann, Seth Nickell, Padraig O'Briain, Soeren Sandmann, Manish Singh, 
-  Matt Wilson
-
-Overview of Changes in GTK+ 1.3.11
-==================================
-
-* Massive rework of accelerator API and implementation (Tim Janik)
-* Major fixes to resizing and redrawing to eliminate hysteresis
-  and optimize. (Owen Taylor, Soeren Sandmann)
-* Make many widgets NO_WINDOW to improve appearance and reduce
-  drawing overhead (Owen)
-* Text view fixes (Havoc Pennington)
-* Make child widgets in GtkTextView work (Havoc)
-* GtkTreeModelSort fixage (Jonathan Blandford, Kristian Rietveld)
-* Clean up GtkTreeView drag and drop support (Owen)
-* Misc tree view fixes and improvements (Jonathan, Kristian, Anders, Matt Wilson)
-* Add gtk_window_get/set_focus(), gtk_window_set_default() as public
-  functions (Owen, Damian Ivereigh)
-* Fixes to GtkPlug/GtkSocket (Michael Meeks, Owen)
-* Change button ordering in standard dialogs to correspond to 
-  GNOME useability project proposal (Gregory Merchan)
-* Add support for context sensitivity in input methods (Owen)
-* Hook up gtk_im_context_set_use_preedit() (Hidetoshi Tajima)
-* Fix gdk_window_scroll() and other aspects of big windows (Owen)
-* Remove need for X connection for class initialization (Jacob Berkman)
-* Propagate key events to parents of focused widget (Owen)
-* Don't export normal GTK+ marshalers, export deprecated compat marshalers (Owen)
-* Many Win32 Fixes and improvements (Hans Breuer, Tor Lillqvist)
-* Bug and documentation fixing (Matthias Clasen, Anders Carlsson,
-  Jacob Berkman, others.)
-
-Other Contributors:
-  Darin Adler, Marius Andreiana, Erwann Chenede, Murray Cumming, Janet Davis, 
-  Daniel Egger, Daniel Elstner, Jeff Franks, Alex Larsson, George Lebl, 
-  Sergey Kuzminov, Eric Lemings, Arkadiusz Miskiewicz, Padraig O'Briain, Sven Neumann, 
-  Kristian Rietveld, Nicolas Setton, Manish Singh,  Vitaly Tishkov, Sebastian Wilhelmi, 
-  Michael Natterer
-
-Overview of Changes in GTK+ 1.3.10
-==================================
-
-* GtkTextView fixes [Havoc Pennington]
-* GtkTreeView fixes and improvements [Jonathan Blandford, Kristian,
-  Manish Singh, Joshua Pritikin, Oleg Maiboroda, James Henstridge]
-* gtkdemo improvements [Kristian Rietveld]
-* Drag and drop fixes to generic code and widgets 
-  [Owen Taylor, Damian Ivereigh]
-* Documentation improvement [Havoc Pennington, Matthias Clasen]
-* Spelling fixes [Jacob Berkman]
-* Move signals to the GtkEditable interface [Kristian]
-* Further stock image improvements [Jakub Steiner]
-* Support text chunks for the PGN loader, add gdk_pixbuf_get_option()
-  [Sven Neumann]
-* Rename gdk_pixbuf_new_from_stream back to new_from_inline [Owen]
-* Automatically call setlocale(), unless explictely disabled [Owen]
-* Property addition to various widgets [Michael Meeks, Owen]
-* Support building with automake-1.4 [James]
-* Make GtkRadioButton groups act as a single focus point [Owen]
-* Move gdk_window_lookup etc. to be cross-platform [Matthias]
-* Draw spinbuttons variably sized [Kristian]
-* Separate GdkAtom out from X atoms for compatibility with future
-  multihead changes [Owen]
-* Require gdk_threads_init() to be explicitly called instead
-  of piggybacking off of g_thread_init(). [Owen]
-* Improvements to text-view/label/entry popup menus [Damian, Jacob, Owen]
-* Bug fixes and cleanup [Matthias, others]
-
-Other Contributors:
-  Mark McLoughin, Mikael Hermansson, Soeren Sandmann, Anders Carlsson,
-  Tim Janik, Murray Cumming, Hidetoshi Tajima, Padraig O'Briain, 
-  Hans Breuer, Vitaly Tishkov, Dov Grobgeld
- 
-
-Overview of Changes in GTK+ 1.3.9
-=================================
-
-* Add editable text cells to GtkTreeView.
-  Keynav, drawing fixes in GtkTreeView [Jonathan Blandford]
-* Text widget no longer always has a \n in it. [Havoc Pennington]
-* Text widget bug fixes [Havoc, Dov Grobgeld, Hidetoshi Tajima]
-* Allow -1 for width/height in gdk_pixbuf_render_*(). [Matthias Clasen]
-* Minor fix for major resizing problems in recent releases [Owen Taylor]
-* Restore ability to set _set properties to TRUE for 
-  GtkCellRendererText, GtkTextTag [Owen]
-* Cursor drawing improvements [Owen]
-* Win32 fixes [Hans Breuer]
-* Mark various functions as deprecated or private.
-* Misc bug fixes, portability fixes, and cleanups.
-
-Other Contributors: 
- Vitaly Tishkov, Christian Rose, Frank Belew, Jeff Franks, Sven Neumann,
- Kristian Rietveld, Vitaly Tishkov, Joshua N. Pritikin, Matt Wilson, 
- James Henstridge, Detlef Reichl
-
-Overview of Changes in GTK+ 1.3.8
-=================================
-
-* GtkTreeView and GtkTreeModel API cleanups/improvements [Jrb]
-* GtkOptionMenu scrollwheel support [Alex]
-* GtkModule search paths [Owen]
-* Documenatation updates [Havoc,Jrb]
-* Major Gdk cleanup [Owen]
-* Miscellaneous other fixes/cleanups
-
-Other Contributors:
-  Joshua N Pritikin, Padraig O'Briain, Jakub Steiner, Matthias Clasen,
-  Matt Wilson, James Henstridge
-
-Overview of Changes in GTK+ 1.3.7
-=================================
-
-* Many Pixbuf (loader) improvements [Matthias Clasen, Soeren Sandmann]
-* Added publically installed utility gdk-pixbuf-csource to generate
-  inlined pixbufs in C source code [Tim Janik]
-* Optional movement of button children on press [Soeren, Owen Taylor]
-* Interactive searching in GtkTreeView [Kristian Rietveld]
-* Sorting/ordering improvements for GtkTreeView [Kris, Jonathan Blandford]
-* Animation of expander motion for GtkTreeView [Anders Carlsson]
-* Lots of misc GtkTreeView fixes and improvements [Jonathan]
-* New/improved stock icons [Jakub Steiner] 
-* Code and API rework for window resizing [Havoc Pennington]
-* Converted accel groups to GObject [James Henstridge]
-* More property support improvements
-* Add facility for "secondary" buttons in 
-  GtkButtonBox/GtkDialog [Gregory Merchan]
-* Disentangled child visability from MAPPED state [Owen]
-* Plug/Socket improvements and port to the XEMBED protocol [Owen]
-* Added priorities for styles in RC files, 
-  support multiple parse contents [Owen]
-* Made GdkVisual and GdkDevice GObjects [Alexander Larsson]
-* Key binding improvements [Havoc]
-* Added GtkWidget::event-after signal since normal event handling
-  is now aborted as soon as a handler returned TRUE [Tim]
-* Dnd fixes and improved icon support [Owen]
-* Removed GtkPacker widget
-* Fixing missing paired getters/setters [Kris]
-* Nuked remaining GtkArg cruft, implemented container/child properties [Tim]
-* Added window grab groups [Owen]
-* Many frame buffer improvements [Alex]
-* Win32 fixes and improvements [Hans Breuer]
-* Warning fixes [Darin Adler]
-* Miscellaneous bug and API fixes [Matthias et. al]
-
-Other Contributors:
-  Joshua N Pritikin, Hidetoshi Tajima, Manish Singh, ERDI Gergo, Jens Finke,
-  Chema Celorio, Lee Mallabone, Vitaly Tishkov, Sebastian Wilhelmi,
-  Nicola Girardi, Sven Neumann, Padraig O'Briain, Michael Natterer,
-  Suresh Chandrasekharan, Jonas Borgström, Jay Cox, Michael Meeks,
-  Mathias Hasselmann, Peter Williams, Thomas Broyer, Kjartan Maraas,
-  Joel Becker, Jeff Franks, Brian Cameron, Skip Montanaro
-
-Overview of Changes in GTK+ 1.3.6
-=================================
-
-* Properly renders strikethrough text
-* win32 fixes
-* Added "scale" property to GtkTextTag and GtkCellRendererText to do 
-  relative font scaling
-* Added "format_value" signal to GtkScale to reformat value text
-* framebuffer fixes
-* Property support added to lots of widgets
-* Many GtkTreeView new features and API/implementation fixes
-* Lots of new_with_mnemonic() convenience functions
-* Change GtkImageMenuItem API to be more consistent/useful
-* Added lots of new stock items/icons
-* Rewrote GtkRange/GtkScale/GtkScrollbar, includes support for
-  enabling/disabling extra scrollbar stepper arrows in gtkrc so NeXT
-  themes won't need broken hacks
-* Convenience API for GtkRange similar to the one added to GtkSpinButton
-  a while back
-* Make menubar/toolbar work properly with xthickness/ythickness of 1 or 0, 
-  and move some attributes from program settings to user settings.
-  Allows nice 1-pixel-bevel themes.
-* Moved ::focus virtual function from GtkContainer to GtkWidget
-* Plenty of bug fixes
-
-Overview of Changes in GTK+ 1.3.5
-=================================
-
-* New default theme based on Raleigh theme for 1.2.x.
-* Dependency on the ATK library added as a step to
-  providing accessibility-enabling interfaces
-* XEMBED-based GtkPlug/GtkSocket now basically works.
-* Drag and drop of column headers in GtkTreeView
-* GtkColorSelector work: hooks for saving and propagating palette, UI tweaks,
-  and API sanitization
-* Key binding fixes
-* Configurable padding/spacing in a lot of places
-* Invisible text in GtkTextView fixed
-* SHM segments now created with a mode of 0600
-* Bug fixes
-
-Overview of Changes in GTK+ 1.3.4
-=================================
-
-* Win32 fixes
-* GtkTreeView improvements and fixes
-* Fix glib-2.0.m4
-* Miscellaneous bug fixes
-
-Overview of Changes in GTK+ 1.3.3
-=================================
-
-[ 5600 lines of ChangeLog ]
-
-* API cleanups
-* Win32 work (Tor, Hans Breuer)
-* Focus improvements (Owen)
-* Frame buffer improvements (Alex)
-* Work on GtkTextView (Havoc)
-* Much work on GtkTreeView (Jonathan)
-* Selectable labels (Havoc)
-* Converted many arguments to properties (Lee Mallabone, John Margaglione)
-* Add exact regions to GdkExposeEvent, propagate it. (Alex)
-* Added ability to have resize grips in status bars (etc.) using
-  _NET_WM_MOVERESIZE protocol. (Havoc)
-* Added mnemnonic mechanism to make setting underline accelerators
-  much easier. (Alex)
-* Add per-style property mechanism to allow themes to change 
-  geometry parameters. (Tim)
-* Added global settings mechanisms for settings such as double-click
-  time. (Tim, Owen)
-* Various support functions for new and old WM properties (Havoc, Alex)
-* Add TRUE-stops-returns for boolean-returning signals (Ron Steinke)
-
-Overview of Changes in GTK+ 1.3.2
-=================================
-
-GTK Core:
-
-* New stock-icon and stock-item system. Use themeable pixbufs in
-  dialogs, buttons, etc. [Havoc]
-* Theme engines reworked to use derivation and new object system. [Owen]
-* Added GtkClipboard object for simple selection handling. [Owen]
-* Make GtkEditable an interface, move implementation to GtkOldEditable for
-  compat. [Owen]
-* Better handling of default directionality. [Robert]
-* Use GSignal as backend for GtkSignal and other GObject stuff. [Tim]
-* Move theme engines to GTypePlugin. [Owen]
-
-GDK:
-
-* Beginning of implementation of client parts of new window manager spec. [Owen]
-* Make gdk_drawable_get_image() work with backing store. [Havoc]
-
-Widgets:
-
-* New text widget [Havoc]
-  - Adjustable tab handling.
-  - Ability to have scrolling side areas in new text widget for tabs/line numbers.
-  - Many cleanups and small improvements.
-* Improvements to submenu navigation [Nils Barth/David Santiago] and
-  scrolling menus. [Alex]
-* Simplification of progress bar API. [Havoc]
-* Make GtkImage a generic image-display widget. [Havoc]
-* New GtkTreeView tree widget. Model/view architecture, flexible renderering,
-  large datasets, etc. [Jonathan]
-* New GtkMessageBox widget for message display. [Havoc]
-* Allow labels to have contents set from XML-like markup language. [Havoc]
-* Make dialogs derive from GtkDialog and use stock buttons. [Havoc]
-
-Internationalization:
-
-* Proper character set conversion for clipboard/selection. [Owen]
-* New input method system via loadable modules; support on-the-spot
-  preedit in GtkEntry and new text widget; allow switchin input methods
-  on the fly; include modules for XIM and demo Cyrillic-tranliteration 
-  module. [Owen]
-* VIQR, Thai, and Inuktitut input methods. [Robert]
-* Convert po files to UTF-8. [Robert]
-
-gdk-pixbuf:
-
-* Full-alpha compositing for gdk-pixbuf on drawable. [Havoc]
-* Add simple saving to gdk-pixbuf. [David Welton/Havoc]
-* Add improved error handling with GError to gdk-pixbuf. [Havoc]
-
-Ports:
-
-* Much work on Win32 Port. [Tor/Hans]
-* Much work on Linux-FB Port. [Elliot/Alex]
-
-Misc:
-
-* Start of new gtk-demo demo program. [Owen/Jonathan]
-* Bug fixes and more bug fixes.
-
-
-Overview of Changes in GTK+ 1.3.1:
-
-* GTK+ now uses the Pango library for text manipulation. All
-  strings in GTK+ now are in Unicode, languages written
-  from right-to-left, and complex-text languages are now supported.
-* The gdk-pixbuf library for image loading and manipulation is 
-  has been integrated with GTK+.
-* The GTK+ object system has mostly been moved to GLib, separating
-  it from the GUI code. Many significant enhancements have been
-  made as part of this.
-* A new text widget is now included. This started as a port
-  of the Tk text widget, and includes such features of the Tk
-  text widget as tags, marks, and unicode text support. It
-  has been enhanced to support model-view operation and the
-  full power of Pango.
-* The GDK library has been extensively revised to support multiple
-  windowing systems. The only fully functional backend in 1.3.1
-  is the X11 backend, however, ports to Win32, Linux-framebuffer,
-  Nano-X, BeOS, and MacOS exist in various states of completion,
-  and at least some of these will be finished and integrated in 
-  before the final GTK+-2.0 release.
-* 32-bit coordinates are now supported throughout GDK and GTK+
-  (they are emulated where not supported by the windowing system.)
-* Many minor bug fixes and enhancements. Incompatible changes
-  are documented in docs/Changes-2.0.txt
-
-Overview of Changes in GTK+ 1.2.8:
-
-* GNU Make 3.79 bug workaround
-* FAQ and tutorial updates and improvements
-* Miscellaneous bug fixes: CList, Calendar, rc-files, FontSelection
-
-Overview of Changes in GTK+ 1.2.7:
-
-* More header cleanups.
-* Fixed activation bug for insensitive widgets.
-* Locale fixes to RC file parsing code.
-* Miscellaneous bugfixes for Item Factory, CList, CTree, X Selections,
-  HScale, VScale, Pixmap, Viewport, OptionMenu, Entry and Notebook.
-* Upgrade to libtool 1.3.4.
-
-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,15 +1,10 @@
 General Information
 ===================
 
-This is GTK+ version 2.0.6. GTK+ is a multi-platform toolkit for
-creating graphical user interfaces. Offering a complete set of widgets,
-GTK+ is suitable for projects ranging from small one-off projects to
-complete application suites.
-
-GTK+ is free software and part of the GNU Project. However, the
-licensing terms for GTK+, the GNU LGPL, allow it to be used by all
-developers, including those developing proprietary software, without any
-license fees or royalties.
+This is GTK+ version 1.1.2.   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
@@ -17,111 +12,28 @@ The official ftp site is:
 The official web site is:
   http://www.gtk.org/
 
-Information about mailing lists can be found at
-  http://www.gtk.org/mailinglists.html
+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'
 
-GTK+-2.0.0 Specific Notes
-=========================
-
-* The default configuration of GTK+ has been stream-lined to reduce
-  confusion on the part of new users or users coming from other
-  environments.  Users used to older versions of GTK+ may want to make
-  some adjustments to the default configuration.
-
-   - Emacs keybindings such as Control-A and Control-E to move to the
-     ends of lines are not enabled by default in the editing widgets. To
-     turn on Emacs keybindings, add the line:
-
-      gtk-key-theme-name = "Emacs"
-   
-     To your ~/.gtkrc-2.0
-
-   - Editing of menu accelerators by pressing an accelerator over the
-     menu item is disabled by default. To enable, it, add:
-
-      gtk-can-change-accels = 1
-
-     to your ~/.gtkrc-2.0
-
-   - To improve useability for keyboard operation, GTK+ now selects the
-     contents of an entry when tabbing into it or when it is focused on
-     initial window map. To disable this behavior, add:
-
-      gtk-entry-select-on-focus = 0
- 
-     to your ~/.gtkrc-2.0
-
-* The GTK+ libraries use an '_' prefix to indicate private symbols that
-  must not be used by applications. The intention was not to export
-  symbols beginning with prefixes such as _gtk, _gdk, and _pango from
-  the libraries at all, but due to a bug in libtool, they are actually
-  exported at the moment on some platforms (including Linux). 
-  Applications that use these private symbols _will_ break when
-  this bug is fixed.
-
-* The Xft library that GTK+ uses to display anti-aliased fonts will
-  undergo a major version revision in the next few months. To deal with
-  this, by default, GTK+ and Pango are built so that applications will
-  not have explicit dependencies on version 1 on Xft. To make sure that
-  your application will be binary compatible with future versions of
-  GTK+:
-
-    - Do not configure Pango or GTK+ with the --enable-static or
-      --enable-explicit otions, since they will cause dependencies on
-      Xft version 1.
-
-    - Do not use Xft directly in your applicatons.
-
-* There is a bug in the Xft library in XFree86-4.1 and possibly previous
-  versions that causes random crashes when using the Pango Xft
-  backend. If you want to use Xft fonts, you should upgrade to
-  XFree86-4.2.
-
-* Xft support is not on by default. To turn it on set the environment
-  variable GDK_USE_XFT to '1'
-
-   GDK_USE_XFT=1
-   export GDK_USE_XFT
-
-* The gdk_pixbuf_xlib library included in the contrib/ directory of GTK+
-  is provided on a as-is basis and has not been tested at all. No
-  guarantees about the degree of workingness or about future
-  compatibility are provided.
-
-* There are known problems with some of the image loaders in the
-  gdk-pixbuf library included in GTK+ where corrupted images can cause
-  crashes and conceivably worse problems. Until these problems are fixed
-  (we hope to have this done for 2.0.1), gdk-pixbuf should not be used
-  to load untrusted data.
-
-* The assumption of GLib and GTK+ by default is that filenames on the
-  filesystem are encoded in UTF-8 rather than the encoding of the locale;
-  The GTK+ developers consider that having filenames whose interpretation
-  depends on the current locale is fundamentally a bad idea.
-
-  If you have filenames encoded in the encoding of your locale, then
-  you may want to set the G_BROKEN_FILENAMES environment variable:
-  
-   G_BROKEN_FILENAMES=1
-   export G_BROKEN_FILENAMES
-
-  Best integration of GTK+-2.0 with the environment is achieved by 
-  using a UTF-8 locale.
-
 How to report bugs
 ==================
 
-Bugs should be reported to the GNOME bug tracking system.
-(http://bugzilla.gnome.org, product gtk+.) You will need to create an
-account for yourself.
-  
-In the bug report please include:
-  
+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.
+
+In the mail include:
+
+* The version of GTK
+
 * Information about your system. For instance:
 
    - What operating system and version
@@ -132,32 +44,32 @@ In the bug report please include:
 
 * 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.
+  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.
 
-* If the bug was a crash, the exact text that was printed out when the
-  crash occured.
+  (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)
 
-* 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.
+* 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.
 
 Patches
 =======
 
-Patches should also be submitted to bugzilla.gnome.org. If the patch
-fixes an existing bug, add the patch as an attachment to that bug
-report.
+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.
 
-Otherwise, enter a new bug report that describes the patch, and attach
-the patch to that bug report.
-
-Bug reports containing patches should include the PATCH keyword in their
-keyword fields. If the patch adds to or changes the GTK programming
-interface, the API keyword should also be included.
-  
-Patches should be in unified diff form. (The -u option to GNU diff.)
+If the patch fixes a bug, it is usually a good idea to include
+all the information described in "How to Report Bugs".

README.cvs-commits

@@ -4,7 +4,7 @@ GTK+. This is a good thing, in that it encourages many people to work
 on GTK+, and progress can be made quickly. However, GTK+ is a fairly
 large and complicated package that many other things depend on, so to
 avoid unnecessary breakage, and to take advantage of the knowledge
-about GTK+ that has been built up over the last 4 years, we'd like
+about GTK+ that has been built up over the last 18 months, we'd like
 to ask people commiting to GTK+ to follow a few rules:
 
 0) Ask first. If your changes are major, or could possibly break existing
@@ -14,10 +14,15 @@ to ask people commiting to GTK+ to follow a few rules:
    somebody may know a better way to do things.
 
    If you are making changes to GTK+, you should be subscribed
-   to gtk-devel-list@gnome.org. (Subscription address:  
-   gtk-devel-list-request@gnome.org.) This is a good place to ask
+   to gtk-devel-list@redhat.com. (Subscription address:  
+   gtk-devel-list-request@redhat.com.) This is a good place to ask
    about intended changes. 
 
+   If you just want to make a trivial change, and don't want to subscribe, 
+   you can also mail gtk-bugs@gtk.org. Or, alternatively, you can look in 
+   the ChangeLog for somebody who has been making changes to the file 
+   you want to change and email them.
+
    #gimp on byxnet (irc.gimp.org, irc2.gimp.org, irc3.gimp.org, 
    irc.germany.gimp.org...)s also a good place to find GTK+ developers to
    discuss changes with, however, email to gtk-devel-list is the most
@@ -38,17 +43,10 @@ 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
-17 Apr 2001
+
+
+
+
+

README.in

@@ -1,163 +0,0 @@
-General Information
-===================
-
-This is GTK+ version @GTK_VERSION@. GTK+ is a multi-platform toolkit for
-creating graphical user interfaces. Offering a complete set of widgets,
-GTK+ is suitable for projects ranging from small one-off projects to
-complete application suites.
-
-GTK+ is free software and part of the GNU Project. However, the
-licensing terms for GTK+, the GNU LGPL, allow it to be used by all
-developers, including those developing proprietary software, without any
-license fees or royalties.
-
-The official ftp site is:
-  ftp://ftp.gtk.org/pub/gtk
-
-The official web site is:
-  http://www.gtk.org/
-
-Information about mailing lists can be found at
-  http://www.gtk.org/mailinglists.html
-
-Installation
-============
-
-See the file 'INSTALL'
-
-GTK+-2.0.0 Specific Notes
-=========================
-
-* The default configuration of GTK+ has been stream-lined to reduce
-  confusion on the part of new users or users coming from other
-  environments.  Users used to older versions of GTK+ may want to make
-  some adjustments to the default configuration.
-
-   - Emacs keybindings such as Control-A and Control-E to move to the
-     ends of lines are not enabled by default in the editing widgets. To
-     turn on Emacs keybindings, add the line:
-
-      gtk-key-theme-name = "Emacs"
-   
-     To your ~/.gtkrc-2.0
-
-   - Editing of menu accelerators by pressing an accelerator over the
-     menu item is disabled by default. To enable, it, add:
-
-      gtk-can-change-accels = 1
-
-     to your ~/.gtkrc-2.0
-
-   - To improve useability for keyboard operation, GTK+ now selects the
-     contents of an entry when tabbing into it or when it is focused on
-     initial window map. To disable this behavior, add:
-
-      gtk-entry-select-on-focus = 0
- 
-     to your ~/.gtkrc-2.0
-
-* The GTK+ libraries use an '_' prefix to indicate private symbols that
-  must not be used by applications. The intention was not to export
-  symbols beginning with prefixes such as _gtk, _gdk, and _pango from
-  the libraries at all, but due to a bug in libtool, they are actually
-  exported at the moment on some platforms (including Linux). 
-  Applications that use these private symbols _will_ break when
-  this bug is fixed.
-
-* The Xft library that GTK+ uses to display anti-aliased fonts will
-  undergo a major version revision in the next few months. To deal with
-  this, by default, GTK+ and Pango are built so that applications will
-  not have explicit dependencies on version 1 on Xft. To make sure that
-  your application will be binary compatible with future versions of
-  GTK+:
-
-    - Do not configure Pango or GTK+ with the --enable-static or
-      --enable-explicit otions, since they will cause dependencies on
-      Xft version 1.
-
-    - Do not use Xft directly in your applicatons.
-
-* There is a bug in the Xft library in XFree86-4.1 and possibly previous
-  versions that causes random crashes when using the Pango Xft
-  backend. If you want to use Xft fonts, you should upgrade to
-  XFree86-4.2.
-
-* Xft support is not on by default. To turn it on set the environment
-  variable GDK_USE_XFT to '1'
-
-   GDK_USE_XFT=1
-   export GDK_USE_XFT
-
-* The gdk_pixbuf_xlib library included in the contrib/ directory of GTK+
-  is provided on a as-is basis and has not been tested at all. No
-  guarantees about the degree of workingness or about future
-  compatibility are provided.
-
-* There are known problems with some of the image loaders in the
-  gdk-pixbuf library included in GTK+ where corrupted images can cause
-  crashes and conceivably worse problems. Until these problems are fixed
-  (we hope to have this done for 2.0.1), gdk-pixbuf should not be used
-  to load untrusted data.
-
-* The assumption of GLib and GTK+ by default is that filenames on the
-  filesystem are encoded in UTF-8 rather than the encoding of the locale;
-  The GTK+ developers consider that having filenames whose interpretation
-  depends on the current locale is fundamentally a bad idea.
-
-  If you have filenames encoded in the encoding of your locale, then
-  you may want to set the G_BROKEN_FILENAMES environment variable:
-  
-   G_BROKEN_FILENAMES=1
-   export G_BROKEN_FILENAMES
-
-  Best integration of GTK+-2.0 with the environment is achieved by 
-  using a UTF-8 locale.
-
-How to report bugs
-==================
-
-Bugs should be reported to the GNOME bug tracking system.
-(http://bugzilla.gnome.org, product gtk+.) You will need to create an
-account for yourself.
-  
-In the bug report please 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.
-
-* 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.
-
-Patches
-=======
-
-Patches should also be submitted to bugzilla.gnome.org. If the patch
-fixes an existing bug, add the patch as an attachment to that bug
-report.
-
-Otherwise, enter a new bug report that describes the patch, and attach
-the patch to that bug report.
-
-Bug reports containing patches should include the PATCH keyword in their
-keyword fields. If the patch adds to or changes the GTK programming
-interface, the API keyword should also be included.
-  
-Patches should be in unified diff form. (The -u option to GNU diff.)

README.nanox

@@ -1,32 +0,0 @@
-Gtk port to nano-X
-
-STATUS
-
-Once upon a time I got a few apps working, then started merging
-the new features added by Owen (32 bit sizes for windows and buffering).
-Since then I haven't found the time to work on it:-/
-
-
-TODO
-
-Finish internal window manager abstraction or add proper support in nano-X.
-Fix event polling.
-Implement GdkImage, GdkRgb stuff.
-Put generic region code in generic gdk and/or use the region code from nano-X.
-Fix ugly automake stuff for make dist.
-
-TODO in nano-X
-
-We need to be able to clip and change the background of windows at runtime
-for apps to not look so ugly!
-Fonts: wait for better nano-X font implementation.
-Properties on windows.
-Provide a pango module.
-
-If you want to work on this port or get additional informnation, get in 
-touch with me.
-Configure gtk with the --with-gdktarget=nanox to compile with nano-X support.
-
-Paolo Molaro
-lupus@linuxcare.com
-

README.win32

@@ -1,95 +0,0 @@
-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, and prebuilt runtime and developer packages see
-http://www.gimp.org/win32/ .
-
-There is a gtk-1-3-win32-production branch of GTK+ that was branched
-off from before the addition of the no-flicker and other recent
-functionality. That is what should be used by "production" code until
-this CVS HEAD (2.0) version is useable. (But note, the Win32 backend
-has never been claimed to be "production quality", although it works
-surprisingly well for the GIMP.)
-
-Building GTK+ on Win32
-======================
-
-There are two ways to build GTK+ for win32:
-
-1) Use the autoconf-generated configure script, and the resulting
-Makefiles (which use libtool and gcc to do the compilation). I use
-this myself, but it might be hell to setup correctly. 
-
-Personally I run configure with:
-CC='gcc -mpentium -fnative-struct' CPPFLAGS='-I/target/include' CFLAGS=-O2 LDFLAGS='-L/target/lib' ./configure --disable-static --prefix=/target --with-gdktarget=win32 --with-wintab=/src/wtkit126 --with-ie55=/src/workshop/ie55_lib --host=i386-pc-mingw32 --enable-maintainer-mode
-
-It might well be that in order for this to work, you will have to get
-a bleeding-edge version of libtool for Win32, run libtoolize yourself,
-and then run autoconf to generate the configure script.
-
-2) Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
-makefile.msc in gdk and gtk.
-
-Alternative 1 also generates Microsoft import libraries (.lib), if you
-have lib.exe available. It might also work for cross-compilation from
-Unix.
-
-There are hand-written makefiles for mingw (look for makefile.mingw in
-various directories), but those haven't been kept up-to-date, and
-probably won't work without editing. Sorry. If you make them work
-again, by all means do submit patches.
-
-Note that I use method 1 myself. Hans Breuer has been taking care of
-the MSVC makefiles. At times, we disagree a bit about various issues,
-and the makefile.msc files might not produce identically named DLLs
-and import libraries as the "autoconfiscated" makefiles and libtool
-do.
-
-Using GTK+ on Win32
-===================
-
-To use GTK+ on Win32, you also need either one of the above mentioned
-compilers. Other compilers might work, but don't count on it. Look for
-prebuilt developer packages (DLLs, import libraries, headers) on the
-above website.
-
-Multi-threaded use of GTK+ on Win32
-===================================
-
-Multi-threaded GTK+ programs might work in special simple cases, but
-not in general. Sorry. If you have all GTK+ and GDK calls in the same
-thread, it might work. Otherwise, probably not at all. Possible ways
-to fix this are being investigated.
-
-Wintab
-======
-
-The tablet support uses the Wintab API. The Wintab development kit can
-be downloaded from http://www.pointing.com. Pass the --with-wintab
-flag to configure if you use that. If you use nmake and you don't care
-for Wintab, undefine HAVE_WINTAB in config.h.win32 and remove
-references to the wntab32x library from the makefile before building.
-
-Libintl
-=======
-
-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 the web site mentioned above. The "intl" library
-as gets built as a DLL called libintl-1.dll. 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 intl library from
-the makefiles.
-
-ActiveIMM
-=========
-
-If you want to build a GTK+ that supports ActiveIMM (the Input Method
-Manager for non-EastAsia locales that can be used on Win9x/NT4), you
-need the dimm.h header file. That is somewhat difficult to find, but
-http://msdn.microsoft.com/downloads/samples/internet/wizard/ seems to
-be a good place to look nowadays. If you use "autoconfiscated" build,
-pass the --with-ie55 flag to configure specifyin the location of the
-ie55_lib directory created by downloading the IE5.5 headers and libs
-from the above URL.
-
---Tor Lillqvist <tml@iki.fi>

TODO

@@ -1,25 +1,96 @@
+For 1.2.0 release:
+-	remove deprecated functions from *.[hc] files, especially the
+	non-functional ones.
+	
+Bugs:
+ * Change bitfields to guints from enums, or vice versa?
 
-Outstanding items:
+ * 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.
+ 
+ * A filter function which destroys the GDK window it is filtering
+   events on is bad news.
+
+Additions:
  * 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.
 
- * GtkToolTips: allocate GtkTooltipsData from memchunks
+ * 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
                           
+ * 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).
  
- * Radio buttons need to display CAN/HAS_DEFAULT correctly, if draw_inidicator
-   is TRUE. (Radio buttons do not need to CAN_DEFAULT! OWT)
+ * 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.
 
- * More dialogs: Print, maybe others...
+ * GtkCList improvements. (Jay Painter)
 
+ * 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
@@ -42,31 +113,68 @@ Outstanding items:
     ( 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.
 
- * The menu code should skip separators during keyboard navigation,
-   whether they are sensitive or insensitive.
-
- * OwnerButtonPressGrab needs to go!
+ * New signals to handle accelerators: accel_before and accel_after (or
+   somesuch) to pre and post process accelerator calls. [Yosh]
 
 Text/Edit widget:
 
@@ -77,7 +185,7 @@ Text/Edit widget:
   Improvements:
 
   - Unify the key binding support in some fashion between the
-    Entry and Text widget widgets, use GtkBindings for this.
+    Entry and Text widget widgets (???)
 
   - Figure out a way not to recompute the geometry on insertions/deletions
     which are large, but not a significant fraction of the
@@ -185,7 +293,7 @@ DND
 
  - Use a cursor instead of an ICON when over Motif windows,
    to get rid of the current junk that Motif leaves because
-   of its XCopyArea stupidity for doing highlighting.
+   of it's XCopyArea stupidity for doing highlighting.
 
  - Add a GTK_DRAG_VERIFY target flag and a "drag_data_verify"   
    signal so that apps can easily check if a, say, 

TODO.xml

@@ -1,739 +0,0 @@
-<!-- This is used to generate the online TODO list for GTK+ using
-     the script docs/make-todo. Whenever a change to this file is
-     committed to CVS,the file is run through make-todo and the online
-     version updated. If you modify this file, you should check for
-     parse errors by running:
-
-     $ docs/make-todo TODO.xml > /dev/null
-
-     before committing, or you may screw up the online version --> 
-<todo logourl="gtk-logo-rgb.gif">
-  <title>GTK+ TODO list</title>
-  <section>
-    <title>GDK</title>
-    
-    <entry size="medium" status="90%" target="2.0">
-      <title>Add backing store support</title>
-      <description>
-	<p>
-	  GTK+'s drawing model involves clearing to a background, and
-	  then drawing widgets on top of this. Without having
-	  backing-store support, this results in flickering in various
-	  situations. Backing store cannot be added widget-by-widget,
-	  because the drawing in a particular window is not confined
-	  to a single widget. Instead it needs to be added per GDK
-	  window. 
-	</p>
-	<p>
-	  The way this is done is by having
-	  <tt>gdk_window_begin_paint()</tt>
-	  and <tt>gdk_window_end_paint()</tt> functions that
-	  redirect all drawing to a particular window to an offscreen
-	  pixmap, and then copy that offscreen pixmap back onto the
-	  screen when the paint operation is done. The implementation
-	  of this is mostly complete in the <tt>gtk-no-flicker</tt> branch of
-	  GTK+.
-	</p>
-      </description>
-      <url>http://www.gtk.org/~otaylor/gtk/1.4/gdk-drawing.html</url>
-      <contact>Owen Taylor &lt;otaylor@redhat.com&gt;</contact>
-    </entry>
-
-    <entry size="medium" status="90%" target="2.0">
-      <title>32 Bit Coordinates</title>
-      <description>
-	<p>
-	  GTK+-1.2 and earlier share X's limitation on the
-	  size of coordinates and restrict all dimensions
-	  to 16 bit quantities. By clever use of X it is
-	  possible to lift this restriction and present a
-	  full 32-bit space to the user.
-	</p>
-	<p>
-	  There are some difficulties with performance in this
-	  approach - mostly because scrolling can involve mapping and
-	  unmapping lots of widgets, but in general, current
-	  trials in this area seem to work pretty well.  
-	</p>
-      </description>
-      <url>http://www.gtk.org/~otaylor/gtk/1.4/gdk-drawing.html</url>
-      <contact>Owen Taylor &lt;otaylor@redhat.com&gt;</contact>
-    </entry>
-
-    <entry size="small" status="0%" target="2.0">
-      <title>Customizable double-click timeout</title>
-      <description>
-	<p>
-	  The current fixed double-click timeout in GTK+
-	  is too small for some users. This needs to be
-	  customizable
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-      <bugs>#3958</bugs>
-    </entry>
-
-    <entry size="small" status="0%" target="2.0">
-      <title>Make color handling more convenient</title>
-      <description>
-	<p>
-          Add some color convenience functions; such as a way to get an
-          allocated GdkColor from GdkRGB, and export functions from gtkstyle.c
-          that lighten/darken a given color, and set a color from HSV in
-          addition to RGB. Also, consider having static variables that contain
-          preallocated common colors (gdk_blue, gdk_red, etc.), the problem
-          being colormap issues.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="small" status="0%" target="2.0">
-      <title>Cursors</title>
-      <description>
-	<p>
-          Two tasks: 1) move the cursors in the cursor font that people actually
-          care about to the top of the gdkcursor.h header file, and put a nice
-          list of the 15 cursors people actually care about in the docs 2) if
-          the cursor font lacks some commonly-useful cursors (like magnifying
-          glass), add these cursors to gdkcursor.h and then emulate them in
-          gdk_cursor_new by transparently creating the cursor from a bitmap.
-          The list of Qt cursors is worth http://doc.trolltech.com/qcursor.html
-          looking at for this task.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="medium" status="100%" target="2.0">
-      <title>Make GdkRGB work on any visual</title>
-      <description>
-	<p>
-          GdkRGB should be able to render to an arbitrary visual
-          (i.e. the visual shouldn't be fixed at gdk_rgb_init() 
-          time). This will break gdk_rgb_gc_set_foreground() and 
-          friends, though.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-  </section> <!-- GDK -->
-
-  <section>
-    <title>Internationalization</title>
-    
-    <entry size="big" status="90%" target="2.0">
-      <title>Integrate Pango</title>
-      <description>
-	<p>
-	  The purpose of the Pango project is to provide a system for
-	  layout and rendering of internationalized text. It handles
-	  most of the issues necessary to 
-	</p>
-      </description>
-      <url>http://www.pango.org</url>
-      <contact>gtk-i18n-list@redhat.com</contact>
-    </entry>
-
-    <entry size="medium" status="90%" target="2.0">
-      <title>Switch to using UTF-8</title>
-      <description>
-	<p>
-	  This is closely related to Pango integration. Pango deals
-	  with all strings in terms of UTF-8; by switching GTK+ over
-	  to UTF-8 we make it considerably simpler for developers to
-	  support multiple languages properly while still retaining
-	  a large degree of compatibility with existing programs.
-	</p>
-	<p>
-	  Some work has already been done on this as part of the Win32
-	  port, since the Win32 port is currently using UTF-8 for all
-	  strings. In general, this should be an easy job; the hardest
-	  parts are places like GtkFileSelection, cut and paste, and
-	  input method support where there is interaction between GTK+
-	  and the operating system.
-	</p>
-      </description>
-      <contact>gtk-i18n-list@redhat.com</contact>
-    </entry>
-
-    <entry size="big" status="60%" target="2.0">
-      <title>Rewrite Input Method Support</title>
-      <description>
-	<p>
-	  Support for Input Methods is GTK+-1.2 is done via XIM, with
-	  supported styles being over-the-spot and the root-window
-	  styles. However, the over-the-spot style is not going to
-	  work well with the Pango integration, since it relies on the
-	  text rendering in the program being done in the standard
-	  Xlib style, so it will be necessary to also support
-	  on-the-spot input. On-the-spot input is done by supplying a
-	  set of callbacks that are invoked by the input methods.
-	</p>
-	<p>
-	  GTK+-2.0 will have a new system with loadable input method
-	  modules. These modules can either be implemented using XIM,
-	  or written from scratch.
-	</p>
-      </description>
-      <contact>gtk-i18n-list@redhat.com</contact>
-    </entry>
-  </section> <!-- i18n -->
-
-  <section>
-    <title>GTK+ Core</title>
-
-    <entry size="big" status="60%" target="2.0">
-      <title>GLib based object and type system</title>
-      <description>
-	<p>
-	  The GTK+ object system is already in use in quite a few different
-	  non-GUI applications; it would be desirable for these uses
-	  to have the object and type systems separated from the GUI portions
-	  of GTK+ and be generalized for non-GUI usage.
-	</p>
-      </description>
-      <contact>Tim Janik &lt;timj@gtk.org&gt;</contact>
-    </entry>
-
-    <entry size="big" status="1%" target="2.0">
-      <title>Overall callback improvements</title>
-      <description>
-	<p>
-	  The GTK+ type and signal systems need significant improvements to
-	  allow signal creation with default handlers from language bindings
-	  and to aid language bindings in deriving new objects.
-	  One aspect of this is the Closure support, recently suggested by
-	  Karl Nelson &lt;kenelson@ece.ucdavis.edu&gt;, but this also
-	  requires a GLib based type and parameter system (ties in with
-	  "GLib based object and type system").
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="big" status="0%" target="2.0">
-      <title>State change notification</title>
-      <description>
-	<p>
-	  GTK+ objects emit various types of signals, some to perform
-	  arbitrary actions, some to allow customization from user code,
-	  and some signals are emitted to notify of certain changes
-	  of an object. For the latter, what really is required is a
-	  gneneric signal that can be used to monitor *any* kind of object
-	  changes. For that, all object changes need to be routed through
-	  a central point (otherwise the signal emissions are spread all
-	  over the object implementation), i.e. an object argument setter.
-	  The state change notification signal doesn't need to be emitted
-	  syncronously, in fact, it's probably most effective to always
-	  emit this asynchronously, so subsequent changes are accumulated.
-	</p>
-      </description>
-      <contact>Tim Janik &lt;timj@gtk.org&gt;</contact>
-    </entry>
-
-    <entry size="big" status="5%" target="2.0">
-      <title>Widget as sensitivity/grab state machine</title>
-      <description>
-	<p>
-	  Maintenance of pointer and keybnoard grabs is currently very
-	  tedious and error-prone, most widget's cook up their own stuff
-	  in this regard.
-	  By moving the general concept of "Grabs" to the GTK+ level as
-	  a widget state, and providing a new signal for alterations of
-	  a widget's state ("visible", "visible+insensitive",
-	  "visible+grab", "hidden", "hidden+insensitive", etc.), things
-	  can be unified and more stabelize. A couple of bugs, such as
-	  insensitive widgets still holding a grab, or buttons that
-	  still think they are depressed when hidden, will be squeezed
-	  automatically with that.
-	</p>
-      </description>
-      <contact>Tim Janik &lt;timj@gtk.org&gt;</contact>
-    </entry>
-
-    <entry size="big" status="0%" target="2.0">
-      <title>Allow argument customization</title>
-      <description>
-	<p>
-	  Many types of object arguments (expander style in the CList,
-	  default padding in button boxes, etc), conceptually go with
-	  the theme, or as user preferences; they should not be set by
-	  a particular program.
-	</p>
-	<p>
-	  There needs to be a mechanism for themes to be able to
-	  control these arguments from the RC file. 
-	</p>
-      </description>
-    </entry>
-
-    <entry size="medium" status="0%" target="2.0">
-      <title>Allow global customization</title>
-      <description>
-	<p>
-	  There are a number of global parameters in GTK+ and GDK that should be
-	  customizable by the user, such as the double-click timeout,
-	  or whether widgets should be backing-stored by default. 
-	</p>
-	<p>
-	  If we had argument customization from an RC file, it might
-	  be possible to do this simply with a global object with
-	  arguments for the various global parameters that was
-	  customized in the same fashion as object arguments.
-	</p>
-      </description>
-    </entry>
-
-    <entry size="small" status="0%" target="2.0">
-      <title>Gtk+ Modules installation directory</title>
-      <description>
-	<p>
-	  Gtk+ needs to support an extra lib/ directory, to search
-	  for dynamically loadable modules, it also needs to support
-	  an environment variable to specify module search paths.
-	  This has quite some cross-platform issues with the GModule
-	  code (especially on AIX).
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-
-    <entry size="small" status="20%" target="2.0">
-      <title>Convenient widget setup</title>
-      <description>
-	<p>
-          Make it simpler to set all the basic attributes of a widget.  Might
-          want set_tooltip(), set_accel(), set_color(FOREGROUND, color),
-          set_min_size() (usize does this, but needs a rename), set_whatsthis(),
-          etc. set_accel() may not work for all widgets, may need a convenience
-          API for button and label accelerators specifically.
-	</p>
-        <p>
-          The idea is that it should be easy, out of the box, to set up a widget
-          with all the nice touches and features the widget really should
-          have. Users shouldn't need to do their own convenience functions for
-          this.
-        </p>
-
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="medium" status="0%" target="> 2.0">
-      <title>Make selections/clipboard more convenient</title>
-      <description>
-	<p>
-          Make GtkSelectionData more like the MIME blobs in Swing and Qt.
-          Consider a GtkClipboard object to simplify cut-and-paste handling.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-
-    <entry size="small" status="80%" target="2.0">
-      <title>Stock label/icon system</title>
-      <description>
-	<p>
-          A system like GnomeStock for getting a standard labels/icons 
-          for menus and toolbars. Should be extensible by themes, and 
-          by libgnomeui. Some work already done on this.
-	</p>
-      </description>
-      <contact>hp@redhat.com</contact>
-    </entry>
-
-
-    <entry size="big" status="0%" target="> 2.0">
-      <title>Session Management</title>
-      <description>
-	<p>
-          Look in to session management. Consider whether to use 
-          X11R6 SM, or some custom spec shared with KDE. Create
-          GTK+ API for this.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="big" status="0%" target="> 2.0">
-      <title>Online help enhancements</title>
-      <description>
-	<p>
-          Look at a small "What's This" popup widget, 
-          and a What's This system in general (this part 
-          could maybe be done for 2.0). A more difficult, probably 
-          a post-2.0 task, is to integrate a very simple little
-          help browser gizmo into GTK.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-
-    <entry size="medium" status="0%" target="2.0">
-      <title>GUI-editable means of user configuration</title>
-      <description>
-	<p>
-          Need to be able to set double click time, whether cursors
-          blink, etc., from a control panel type of deal.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-  </section> <!-- Core -->
-
-  <section>
-    <title>GTK+ Widgets</title>
-
-    <entry size="small" status="100%" target="2.0">
-      <title>Make GtkFrame use a label</title>
-      <description>
-	<p>
-	  The title of a frame should simply be another child widget
-	  which, by default, holds a label widget. This will important
-	  with Pango where proper text behavior will be more complex to
-	  implement, but is also useful for certain user-interface
-	  designs. (It can be useful, for example, to put a checkbutton
-	  in that slot.)
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="big" status="90%" target="2.0">
-      <title>Replace GtkText Widget</title>
-      <description>
-	<p>
-	  The GtkText widget is badly in need of replacement, since it
-	  is buggy and insufficiently feature rich. This is being done
-	  using Havoc Pennington's port of the Tk Text widget.
-	</p>
-	<p>
-	  As part of this job <a href="http://www.pango.org">Pango</a>
-	  support is being added to the replacement. The structure of
-	  the Tk text widget port is suited to this as it works
-	  paragraph-by-paragraph, and Pango works at a sub-paragraph
-	  scale. The main remaining tasks here are to implement
-	  incremental reflow to make performance acceptable and to
-	  implement embedded pixmaps and widgets.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="small" status="20%" target="2.0">
-      <title>Improve Radio/Checkbutton Look</title>
-      <description>
-	<p>
-	  The default look for the radio and checkbuttons is both
-	  unattractive and not friendly to the user . Motif did not
-	  get this one right, and we should not keep on following the
-	  Motif look. The right thing here is probably to copy the
-	  Windows appearance for these controls fairly closely. This
-	  will fit in with well with the rest of the GTK+ look.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="small" status="99%" target="2.0">
-      <title>Improve Submenu Navigation</title>
-      <description>
-	<p>
-	  Navigating through a deep menu tree in GTK+ is currently
-	  quite tricky, because as soon as one leaves a menu item,
-	  the submenu disappears. The way that the Macintosh is
-	  reputed to handle this is that to pop down the current
-	  submenu, you have to leave the triangle defined by the
-	  upper left hand corner of the menu item and right
-	  side of the submenu.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="small" status="0%" target="2.0 ?">
-      <title>Improve Spinbutton Look</title>
-      <description>
-	<p>
-	  Spinbuttons currently appear to have lumpy boundaries,
-	  because sides of the arrows aren't at an angle that
-	  meshes well with the pixel grid. However, fixing this
-	  would require making the spinbuttons narrower and
-	  harder to hit. This points out a general problem with
-	  the spinbutton (and the arrows on the scrollbars) - the
-	  target area for clicks actually the bounding box of the
-	  arrows, but the user thinks that they must click on the
-	  arrows themselves. It would probably be more friendly
-	  to use a square button with an arrow drawn on top instead
-	  of a arrow-shaped button, the approach taken by most other
-	  windowing systems.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="big" status="90%" target="2.0">
-      <title>Supply horizontable/vertical wrapping boxes</title>
-      <description>
-	<p>
-	  An often requested feature are wrapping containers, at this
-	  point, gimp's development version already uses such widgets:
-	  horizontable/vertical wrap boxes, that need to go into 2.0
-	  proper at some point.
-	</p>
-      </description>
-      <contact>Tim Janik &lt;timj@gtk.org&gt;</contact>
-    </entry>
-
-    <entry size="medium" status="90%" target="2.0">
-      <title>Improved generic combo support</title>
-      <description>
-	<p>
-	  Gtk+'s combo box has several drawbacks in design and
-	  implementation. An new attempt at providing the combo box
-	  functionality with improved flexibility has been made with
-	  the GtkClueHunter widget, sitting in the CVS module "gle".
-	</p>
-      </description>
-      <contact>Tim Janik &lt;timj@gtk.org&gt;</contact>
-    </entry>
-
-    <entry size="big" status="40%" target="2.0?">
-      <title>Add unified set of List/Tree/Grid widgets</title>
-      <description>
-	<p>
-	  Currently, GTK+ has a large number of list and tree widgets
-	  (GtkList, GtkTree, GtkCList, GtkCTree), none of which are
-	  ideal. The GtkList and GtkTree widgets perform badly on large
-	  number of items. (GtkTree widget is also quite buggy.) GtkCList
-	  and GtkCTree mostly solve the size problem, but are quite
-	  complex and, despite that, not very flexible. They are limited to
-	  displaying pixmaps and text, and can neither support arbitrary
-	  widgets nor custom drawing functions.
-	</p>
-	<p>
-	  In addition to list and tree widgets, a closely related need
-	  is a sheet widget that displays a (possibly editable) 2-D grid.
-	  It would be desirable to have a complete set of widgets that
-	  could be presented as the one-true-solution for these needs.
-	  Model/View techniques could be used effectively to increase
-	  both the simplicity and power of the interfaces.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="small" status="0%" target="2.0">
-      <title>GtkImage</title>
-      <description>
-	<p>
-          gdk-pixbuf is moving to become a GTK+ dependency, a new image-display
-          widget is thus needed.
-	</p>
-      </description>
-      <contact>hp@redhat.com</contact>
-    </entry>
-
-    <entry size="small" status="0%" target="2.0">
-      <title>Attempt to fix GtkStatusbar</title>
-      <description>
-	<p>
-          GtkStatusbar is too inconvenient to use.
-          The only non-breakage-inducing fix we could
-          come up with is to permit 0 as a context ID, so you
-          don't have to use gtk_statusbar_get_context_id().
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-    
-    <entry size="small" status="95%" target="2.0">
-      <title>Decruft GtkProgress, GtkProgressbar</title>
-      <description>
-        <p>UPDATE: this is done, just need to apply the patch.
-        </p>
-        
-	<p>
-          This interface is just a disaster of overcomplexity;
-          it should pretty much just be set_percentage(), 
-          pulse() (to move during activity mode), and set_text().
-          There's no reason that there are two objects, should 
-          just be one interface. Almost all the functions
-          that currently exist should be deprecated.
-	</p>
-      </description>
-      <contact>hp@redhat.com</contact>
-    </entry>
-
-    <entry size="small" status="0%" target="2.0">
-      <title>Entry validation hooks</title>
-      <description>
-	<p>
-          Simple hooks for validation in a GtkEntry.  Pretty much just a
-          "validate" callback which takes a string (current entry contents) and
-          returns either VALID, INVALID, or COULDBEVALID. Then the 
-          GtkEntry calls this function if it's set, and does the appropriate 
-          UI things. GTK should come with validators for int and float,
-          see GtkSpinButton where these are already implemented.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="big" status="0%" target="> 2.0">
-      <title>pseudo-MDI Widget</title>
-      <description>
-	<p>
-          Add a widget that lets you rearrange various views (similar to many
-          IDEs, like Visual SlickEdit or JBuilder). Basically there should be a
-          central slot and 4 slots around the sides; each slot holds one or more
-          views. If two views are dropped in the same slot, then a notebook is
-          created displaying both views. If a view is dropped outside the
-          application window, it becomes a standalone window. It should be
-          possible to restrict whether a view can be dropped on the sides,
-          horizontal/vertical sides only, in the central content area, or in
-          any of those places.
-	</p>
-        <p>
-          (Havoc has a proposed interface for this, mail hp@redhat.com)
-        </p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="medium" status="0%" target="> 2.0">
-      <title>Icon List Widget</title>
-      <description>
-	<p>
-          A simple icon list widget, suitable for creating a file selector or
-          the like.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="medium" status="0%" target="> 2.0">
-      <title>Dock widget</title>
-      <description>
-	<p>
-          Add a widget like GnomeDock (perhaps based on GnomeDock)
-          that allows people to put rearrangeable toolbars, menubars, etc. 
-          around a central content area. The widget should have hooks for 
-          saving the current positions of the various docked bars.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="big" status="0%" target="> 2.0">
-      <title>Canvas widget</title>
-      <description>
-	<p>
-          Figure out how to get GnomeCanvas or a derived work into GTK+ itself.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="medium" status="57%" target="2.0">
-      <title>Menu scroll</title>
-      <description>
-	<p>
-          When menus are bigger than the screen, allow scrolling
-          as on the Mac.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="medium" status="20%" target="2.0">
-      <title>Toolbar/menubar wrap</title>
-      <description>
-	<p>
-          When toolbars and menubars are too wide, do some sort of 
-          wrapping or drop-down deal. (See Windows/Mac apps for examples.)
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="small" status="0%" target="2.0">
-      <title>Blink cursor in GtkEntry</title>
-      <description>
-	<p>
-          Make the cursor optionally blink in GtkEntry. Beware, the entry code
-          is somewhat in flux; mail Owen and ask.
-	</p>
-      </description>
-      <contact>otaylor@redhat.com</contact>
-    </entry>
-
-    <entry size="small" status="100%" target="2.0">
-      <title>Don't highlight first menu item when menus come up</title>
-      <description>
-	<p>
-          Keep GtkMenu from prelighting the first menu item.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="small" status="100%" target="2.0">
-      <title>Integrate new color selector</title>
-      <description>
-	<p>
-          There's a new color selector in CVS (module gnome-colorsel),
-          it needs to be folded in to GTK and any remaining issues resolved.
-          (This new selector is API-compatible with the old one, and 
-          still called GtkColorSelector).
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="medium" status="70%" target="2.0">
-      <title>Write new font selector</title>
-      <description>
-	<p>
-          Pango introduces a new font handling system,
-          replacing the XLFD system. Need a font selector for this.
-          The XLFD selector should probably remain, for apps where
-          it makes sense (like gnome-terminal probably).
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-    <entry size="small" status="0%" target="2.0">
-      <title>Stack Widget</title>
-      <description>
-	<p>
-          Jonathan has a widget like a tabless/frameless notebook, used for
-          something like the GNOME control center where you want to toggle which
-          widget is visible to the user. Needs to be cleaned up and considered
-          for GTK.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org, jrb@redhat.com</contact>
-    </entry>
-
-    <entry size="small" status="0%" target="2.0">
-      <title>Clean up GtkNotebook</title>
-      <description>
-	<p>
-          GtkNotebook currently breaks GTK invariants about
-          mapping/visibility/etc., needs fixing.
-	</p>
-      </description>
-      <contact>gtk-devel-list@gnome.org</contact>
-    </entry>
-
-  </section> <!-- GTK+ -->
-</todo>
-

acconfig.h

@@ -15,44 +15,27 @@
 
 
 /* Other stuff */
-#undef ENABLE_NLS
 #undef GTK_COMPILED_WITH_DEBUGGING
 
-#undef HAVE_CATGETS
-#undef HAVE_DIMM_H
-#undef HAVE_GETTEXT
 #undef HAVE_IPC_H
-#undef HAVE_LC_MESSAGES
-#undef HAVE_PROGRESSIVE_JPEG
-#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_WINSOCK_H
-#undef HAVE_WINTAB
 #undef HAVE_XCONVERTCASE
-#undef HAVE_XFT
 
-#undef HAVE_SIGSETJMP
+/* 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
 
-#undef USE_GMODULE
-#undef USE_MMX
-
-/* Define to use XKB extension */
-#undef HAVE_XKB
-
-/* Define to use shadowfb in the linux-fb port */
-#undef ENABLE_SHADOW_FB
-
-/* Define to use a fb manager in the linux-fb port */
-#undef ENABLE_FB_MANAGER
+/* Define to enable POSIX threading awareness */
+#undef USE_PTHREADS
 
 #undef XINPUT_NONE
 #undef XINPUT_GXI
@@ -64,8 +47,6 @@
 /* Most machines will be happy with int or void.  IRIX requires '...' */
 #undef SIGNAL_ARG_TYPE
 
-#undef GETTEXT_PACKAGE
-
 /* #undef PACKAGE */
 /* #undef VERSION */
 

acinclude.m4

@@ -1,351 +1,259 @@
-# autoconf 2.13 / 2.50 compatibility macro
+## 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
+##
+## 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
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program 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
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+##
+## As a special exception to the GNU General Public License, if you
+## distribute this file as part of a program that contains a
+## configuration script generated by Autoconf, you may include it under
+## the same distribution terms that you use for the rest of that program.
 
-# GLIB_AC_DIVERT_BEFORE_HELP(STUFF)
-# ---------------------------------
-# Put STUFF early enough so that they are available for $ac_help expansion.
-# Handle both classic (<= v2.13) and modern autoconf
-AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP],
-[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])],
-       [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])],
-              [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
-$1
-AC_DIVERT_POP()])])])
+# 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
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
 
+# Check for any special flags to pass to ltconfig.
+libtool_flags=
+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 "$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"
 
-# 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.
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case "$host" in
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case "`/usr/bin/file conftest.o`" in
+    *32-bit*)
+      LD="${LD-ld} -32"
+      ;;
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
 
-# serial 5
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  CFLAGS="$CFLAGS -belf"
+  ;;
+esac
 
-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)
+# 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])
+])
 
-    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_libintl" = "yes"; then
-	     LIBS="$LIBS -lintl";
-           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
+# AM_ENABLE_SHARED - implement the --enable-shared flag
+# Usage: AM_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_ARG_ENABLE(shared,
+changequote(<<, >>)dnl
+<<  --enable-shared         build shared libraries [default=>>AM_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 ;;
+no) enable_shared=no ;;
+*)
+  enable_shared=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_shared=yes
     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])
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac],
+enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl
+])
+
+# AM_DISABLE_SHARED - set the default shared flag to --disable-shared
+AC_DEFUN(AM_DISABLE_SHARED,
+[AM_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)]
+#   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_ARG_ENABLE(static,
+changequote(<<, >>)dnl
+<<  --enable-static         build static libraries [default=>>AM_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 ;;
+no) enable_static=no ;;
+*)
+  enable_static=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_static=yes
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac],
+enable_static=AM_ENABLE_STATIC_DEFAULT)dnl
+])
 
 
-#    # 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
+# AM_PROG_LD - find the path to the GNU or non-GNU linker
+AC_DEFUN(AM_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_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"
+    ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(ac_cv_path_LD,
+[if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog"; 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.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      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
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$ac_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_SUBST(LD)
+AM_PROG_LD_GNU
+])
 
-    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
-  ])
+AC_DEFUN(AM_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
+  ac_cv_prog_gnu_ld=yes
+else
+  ac_cv_prog_gnu_ld=no
+fi])
+])
 
+# AM_PROG_NM - find the path to a BSD-compatible name lister
+AC_DEFUN(AM_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
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/nm; 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"
+      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"
+      else
+        ac_cv_path_NM="$ac_dir/nm"
+      fi
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+  ;;
+esac])
+NM="$ac_cv_path_NM"
+AC_MSG_RESULT([$NM])
+AC_SUBST(NM)
+])

autogen.sh

@@ -1,60 +1,35 @@
 #!/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
 
 DIE=0
 
-have_libtool=false
-if libtool --version < /dev/null > /dev/null 2>&1 ; then
-	libtool_version=`libtoolize --version |  libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
-	case $libtool_version in
-	    1.4*)
-		have_libtool=true
-		;;
-	esac
-fi
-if $have_libtool ; then : ; else
-	echo
-	echo "You must have libtool 1.4 installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-	DIE=1
-fi
-
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have autoconf installed to compile $PROJECT."
-	echo "libtool the appropriate package for your distribution,"
+	echo "Download the appropriate package for your distribution,"
 	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
 	DIE=1
 }
 
-have_automake=false
-if automake --version < /dev/null > /dev/null 2>&1 ; then
-	automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
-	case $automake_version in
-	   1.2*|1.3*|1.4) 
-		;;
-	   *)
-		have_automake=true
-		;;
-	esac
-fi
-if $have_automake ; then : ; else
+(libtool --version) < /dev/null > /dev/null 2>&1 || {
 	echo
-	echo "You must have automake 1.4-p1 installed to compile $PROJECT."
-	echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.4-p1.tar.gz"
+	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
-fi
+}
+
+(automake --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have automake installed to compile $PROJECT."
+	echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz"
+	echo "(or a newer version if it is available)"
+	DIE=1
+}
 
 if test "$DIE" -eq 1; then
 	exit 1
@@ -65,48 +40,24 @@ test $TEST_TYPE $FILE || {
 	exit 1
 }
 
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
-        if test -z "$*"; then
-                echo "I am going to run ./configure with no arguments - if you wish "
-                echo "to pass any to it, please specify them on the $0 command line."
-        fi
+if test -z "$*"; then
+	echo "I am going to run ./configure with no arguments - if you wish "
+        echo "to pass any to it, please specify them on the $0 command line."
 fi
 
 case $CC in
 *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
 esac
 
-if test -z "$ACLOCAL_FLAGS"; then
-
-	acdir=`aclocal --print-ac-dir`
-        m4list="glib-2.0.m4 glib-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
-
 aclocal $ACLOCAL_FLAGS
 
 # optionally feature autoheader
 (autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
 
-automake -a $am_opt
+automake $am_opt
 autoconf
-cd $ORIGDIR
 
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
-        $srcdir/configure --enable-maintainer-mode --enable-gtk-doc "$@"
+./configure "$@"
 
-        echo 
-        echo "Now type 'make' to compile $PROJECT."
-fi
+echo 
+echo "Now type 'make' to compile $PROJECT."

config.guess

@@ -0,0 +1,890 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Written by Per Bothner <bothner@cygnus.com>.
+# The master version of this file is at the FSF in /home/gd/gnu/lib.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit system type (host/target name).
+#
+# Only a few systems have been added to this list; please add others
+# (but try to keep the structure clean).
+#
+
+# 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
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+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
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
+	# A Vn.n version is a released version.
+	# 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
+	.globl main
+	.ent main
+main:
+	.frame \$30,0,\$26,0
+	.prologue 0
+	.long 0x47e03d80 # implver $0
+	lda \$2,259
+	.long 0x47e20c21 # amask $2,$1
+	srl \$1,8,\$2
+	sll \$2,2,\$2
+	sll \$0,3,\$0
+	addl \$1,\$0,\$0
+	addl \$2,\$0,\$0
+	ret \$31,(\$26),1
+	.end main
+EOF
+	${CC-cc} dummy.s -o dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		./dummy
+		case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+		esac
+	fi
+	rm -f dummy.s dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
+	exit 0 ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-cbm-sysv4
+	exit 0;;
+    amiga:NetBSD:*:*)
+      echo m68k-cbm-netbsd${UNAME_RELEASE}
+      exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc64:OpenBSD:*:*)
+	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hkmips:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit 0;;
+    arm32:NetBSD:*:*)
+	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    SR2?01:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:*|MIS*: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
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    NILE:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit 0 ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:NetBSD:*:*)
+	echo m68k-atari-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:NetBSD:*:*)
+	echo m68k-sun-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:NetBSD:*:*)
+	echo m68k-apple-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    2020: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; {
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  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
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit 0 ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit 0 ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
+	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
+	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	fi
+        else echo i586-dg-dgux${UNAME_RELEASE}
+        fi
+ 	exit 0 ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit 0 ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit 0 ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit 0 ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit 0 ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+    i?86:AIX:*:*)
+	echo i386-ibm-aix
+	exit 0 ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		sed 's/^		//' << EOF >dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		${CC-cc} 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
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit 0 ;;
+    *:AIX:*:4)
+	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=4.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit 0 ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit 0 ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit 0 ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit 0 ;;
+    9000/[3478]??: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 ;;
+	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
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	${CC-cc} 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:*:* )
+	echo hppa1.1-hp-bsd
+	exit 0 ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit 0 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    i?86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit 0 ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit 0 ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit 0 ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit 0 ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit 0 ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit 0 ;;
+    CRAY*X-MP:*:*:*)
+	echo xmp-cray-unicos
+        exit 0 ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${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_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    F301:UNIX_System_V:*:*)
+       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+       exit 0 ;;
+    hp3[0-9][05]:NetBSD:*:*)
+	echo m68k-hp-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    i?86:BSD/386:*:* | *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:FreeBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
+    *:NetBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin32
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin32
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    *:GNU:*:*)
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    *:Linux:*:*)
+	# uname on the ARM produces all sorts of strangeness, and we need to
+	# filter it out.
+	case "$UNAME_MACHINE" in
+	  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`
+	ld_supported_emulations=`echo $ld_help_string \
+			 | sed -ne '/supported emulations:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported emulations: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_emulations" in
+	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
+	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
+	  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 ;;
+	esac
+
+	if test "${UNAME_MACHINE}" = "alpha" ; then
+		sed 's/^	//'  <<EOF >dummy.s
+		.globl main
+		.ent main
+	main:
+		.frame \$30,0,\$26,0
+		.prologue 0
+		.long 0x47e03d80 # implver $0
+		lda \$2,259
+		.long 0x47e20c21 # amask $2,$1
+		srl \$1,8,\$2
+		sll \$2,2,\$2
+		sll \$0,3,\$0
+		addl \$1,\$0,\$0
+		addl \$2,\$0,\$0
+		ret \$31,(\$26),1
+		.end main
+EOF
+		LIBC=""
+		${CC-cc} dummy.s -o dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./dummy
+			case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+			esac	
+
+			objdump --private-headers dummy | \
+			  grep ld.so.1 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		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[];
+{
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  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
+	else
+	  # Either a pre-BFD a.out linker (linux-gnuoldld)
+	  # or one that does not give us useful --help.
+	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+	  # If ld does not provide *any* "supported emulations:"
+	  # that means it is gnuoldld.
+	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+
+	  case "${UNAME_MACHINE}" in
+	  i?86)
+	    VENDOR=pc;
+	    ;;
+	  *)
+	    VENDOR=unknown;
+	    ;;
+	  esac
+	  # Determine whether the default compiler is a.out or elf
+	  cat >dummy.c <<EOF
+#include <features.h>
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+#endif
+  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
+	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.
+    i?86:DYNIX/ptx:4*:*)
+	echo i386-sequent-sysv4
+	exit 0 ;;
+    i?86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
+    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+	fi
+	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`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		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
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit 0 ;;
+    pc:*:*:*)
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit 0 ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit 0 ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit 0 ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit 0 ;;
+    M68*:*:R3V[567]*:*)
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
+    m68*:LynxOS:2.*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit 0 ;;
+    i?86:LynxOS:2.*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit 0 ;;
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit 0 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    news*:NEWS-OS:*:6*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        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
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#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);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+  printf ("vax-dec-bsd\n"); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+${CC-cc} 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.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit 0 ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit 0 ;;
+    c34*)
+	echo c34-convex-bsd
+	exit 0 ;;
+    c38*)
+	echo c38-convex-bsd
+	exit 0 ;;
+    c4*)
+	echo c4-convex-bsd
+	exit 0 ;;
+    esac
+fi
+
+#echo '(Unable to guess system type)' 1>&2
+
+exit 1

config.h.in

@@ -0,0 +1,62 @@
+/* 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 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_LIBDL
+#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 broken_wctype function.  */
+#undef HAVE_BROKEN_WCTYPE
+
+/* Define if you have the getpagesize function.  */
+#undef HAVE_GETPAGESIZE
+
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
+
+/* Define if you have the <wchar.h> header file.  */
+#undef HAVE_WCHAR_H
+
+/* Define if you have the <wctype.h> header file.  */
+#undef HAVE_WCTYPE_H

config.h.win32.in

@@ -1,289 +0,0 @@
-/* config.h.win32.in. Merged from two versions generated by configure for gcc and MSVC.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-/* acconfig.h
-   This file is in the public domain.
-
-   Descriptive text for the C preprocessor macros that
-   the distributed Autoconf macros can define.
-   No software package will use all of them; autoheader copies the ones
-   your configure.in uses into your configuration header file templates.
-
-   The entries are in sort -df order: alphabetical, case insensitive,
-   ignoring punctuation (such as underscores).  Although this order
-   can split up related entries, it makes it easier to check whether
-   a given entry is in the file.
-
-   Leave the following blank line there!!  Autoheader needs it.  */
-
-
-/* Other stuff */
-#define ENABLE_NLS 1
-#define GTK_COMPILED_WITH_DEBUGGING "yes"
-
-/* #undef HAVE_CATGETS */
-/* #undef HAVE_DIMM_H */
-#define HAVE_GETTEXT 1
-/* #undef HAVE_IPC_H */
-/* #undef HAVE_LC_MESSAGES */
-#define HAVE_PROGRESSIVE_JPEG 1
-/* #undef HAVE_PWD_H */
-/* #undef HAVE_SHM_H */
-/* #undef HAVE_STPCPY */
-/* #undef HAVE_XSHM_H */
-/* #undef HAVE_SHAPE_EXT */
-/* #undef HAVE_SYS_SELECT_H */
-#ifndef _MSC_VER
-#define HAVE_SYS_TIME_H 1
-#else /* _MSC_VER */
-/* #undef HAVE_SYS_TIME_H */
-#endif /* _MSC_VER */
-#define HAVE_WINSOCK_H 1
-#define HAVE_WINTAB 1
-/* #undef HAVE_XCONVERTCASE */
-/* #undef HAVE_XFT */
-
-/* #undef HAVE_SIGSETJMP */
-
-#define NO_FD_SET 1
-
-/* #undef RESOURCE_BASE */
-
-#ifndef _MSC_VER
-#define USE_GMODULE 1
-#define USE_MMX 1
-#endif
-
-/* Define to use X11R6 additions to XIM */
-/* #undef USE_X11R6_XIM */
-
-/* Define to use XKB extension */
-/* #undef HAVE_XKB */
-
-/* Define to use shadowfb in the linux-fb port */
-/* #undef ENABLE_SHADOW_FB */
-
-/* Define to use a fb manager in the linux-fb port */
-/* #undef ENABLE_FB_MANAGER */
-
-/* #undef XINPUT_NONE */
-/* #undef XINPUT_GXI */
-/* #undef XINPUT_XFREE */
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Most machines will be happy with int or void.  IRIX requires '...' */
-/* #undef SIGNAL_ARG_TYPE */
-
-#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
-
-/* #undef PACKAGE */
-/* #undef VERSION */
-
-
-/* Leave that blank line there!!  Autoheader needs it.
-   If you're adding to this file, keep in mind:
-   The entries are in sort -df order: alphabetical, case insensitive,
-   ignoring punctuation (such as underscores).  */
-
-/* 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 using `alloca.c'. */
-/* #undef C_ALLOCA */
-
-/* always defined to indicate that i18n is enabled */
-#define ENABLE_NLS 1
-
-/* Define if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define if you have the <argz.h> header file. */
-/* #undef HAVE_ARGZ_H */
-
-/* Define if you have the `bind_textdomain_codeset' function. */
-/* #undef HAVE_BIND_TEXTDOMAIN_CODESET */
-
-/* Is the wctype implementation broken */
-/* #undef HAVE_BROKEN_WCTYPE */
-
-/* Define if you have the `dcgettext' function. */
-#define HAVE_DCGETTEXT 1
-
-/* Define if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define if you have the `getcwd' function. */
-#define HAVE_GETCWD 1
-
-/* Define if you have the `getpagesize' function. */
-#ifndef _MSC_VER
-#define HAVE_GETPAGESIZE 1
-#else /* _MSC_VER */
-/* #undef HAVE_GETPAGESIZE */
-#endif /* _MSC_VER */
-
-/* Define if you have the `getresuid' function. */
-/* #undef HAVE_GETRESUID */
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#define HAVE_GETTEXT 1
-
-/* Define if you have the <inttypes.h> header file. */
-/* #undef HAVE_INTTYPES_H */
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-/* #undef HAVE_LC_MESSAGES */
-
-/* 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 `lstat' function. */
-/* #undef HAVE_LSTAT */
-
-/* Define if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have the `mkstemp' function. */
-/* #undef HAVE_MKSTEMP */
-
-/* Define if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
-
-/* Define if you have the `munmap' function. */
-/* #undef HAVE_MUNMAP */
-
-/* Define if you have the <nl_types.h> header file. */
-/* #undef HAVE_NL_TYPES_H */
-
-/* Define if you have the `putenv' function. */
-#define HAVE_PUTENV 1
-
-/* Define if you have the <pwd.h> header file. */
-/* #undef HAVE_PWD_H */
-
-/* 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 <stdint.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_STDINT_H 1
-#else /* _MSC_VER */
-/* #undef HAVE_STDINT_H */
-#endif /* _MSC_VER */
-
-/* Define if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define if you have the `strcasecmp' function. */
-#ifndef _MSC_VER
-#define HAVE_STRCASECMP 1
-#else /* _MSC_VER */
-/* #undef HAVE_STRCASECMP */
-#endif /* _MSC_VER */
-
-/* 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 <strings.h> header file. */
-/* #undef HAVE_STRINGS_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/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define if you have the <sys/time.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_SYS_TIME_H 1
-#else /* _MSC_VER */
-/* #undef HAVE_SYS_TIME_H */
-#endif /* _MSC_VER */
-
-/* Define if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-/* #undef HAVE_SYS_WAIT_H */
-
-/* Define if you have the <unistd.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_UNISTD_H 1
-#else /* _MSC_VER */
-/* #undef HAVE_UNISTD_H */
-#endif /* _MSC_VER */
-
-/* Have wchar.h include file */
-#define HAVE_WCHAR_H 1
-
-/* Have wctype.h include file */
-#define HAVE_WCTYPE_H 1
-
-/* Define if you have the <winsock.h> header file. */
-#define HAVE_WINSOCK_H 1
-
-/* 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 as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* 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
-
-/* Define if the X Window System is missing or not being used. */
-/* #undef X_DISPLAY_MISSING */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#define gid_t int
-
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
-/* #undef inline */
-
-/* Define to `long' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#define uid_t int

config.sub

@@ -0,0 +1,952 @@
+#! /bin/sh
+# Configuration validation subroutine script, version 1.1.
+#   Copyright (C) 1991, 92-97, 1998 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.
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+if [ x$1 = x ]
+then
+	echo Configuration name missing. 1>&2
+	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+	echo "or     $0 ALIAS" 1>&2
+	echo where ALIAS is a recognized configuration type. 1>&2
+	exit 1
+fi
+
+# First pass through any local machine types.
+case $1 in
+	*local*)
+		echo $1
+		exit 0
+		;;
+	*)
+	;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  linux-gnu*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple)
+		os=
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco5)
+		os=sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+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)
+		basic_machine=$basic_machine-unknown
+		;;
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i[34567]86)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	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-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	      | mipstx39-* | mipstx39el-* \
+	      | f301-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-cbm
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-cbm
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-cbm
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	cray2)
+		basic_machine=cray2-cray
+		os=-unicos
+		;;
+	[ctj]90-cray)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	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)
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i[34567]86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i[34567]86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i[34567]86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i[34567]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux-gnu
+		;;
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux-gnu
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+        pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pentium | p5 | k5 | nexen)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | k6 | 6x86)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | nexen-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=rs6000-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+	        ;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+	        ;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	xmp)
+		basic_machine=xmp-cray
+		os=-unicos
+		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# 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.
+	mips)
+		if [ x$os = x-linux-gnu ]; then
+			basic_machine=mips-unknown
+		else
+			basic_machine=mips-mips
+		fi
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sparc)
+		basic_machine=sparc-sun
+		;;
+        cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-ns2 )
+	        os=-nextstep2
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+        pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+        *-gould)
+		os=-sysv
+		;;
+        *-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+        *-sgi)
+		os=-irix
+		;;
+        *-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f301-fujitsu)
+		os=-uxpv
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-vxsim* | -vxworks*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os

contrib/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

contrib/Makefile.am

@@ -1,8 +0,0 @@
-
-if USE_X11
-XDIRS=gdk-pixbuf-xlib
-else
-XDIRS=
-endif
-
-SUBDIRS=$(XDIRS)

contrib/gdk-pixbuf-xlib/.cvsignore

@@ -1,7 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-.libs
-.deps
-gdk-pixbuf-xlib-2.0.pc

contrib/gdk-pixbuf-xlib/ChangeLog

@@ -1,86 +0,0 @@
-2002-01-25  Federico Mena Quintero  <federico@ximian.com>
-
-	Merge from gdk-pixbuf stable.
-
-	* gdk-pixbuf-xlib-drawable.c (rgb565msb): Fixed the endianness
-	conversion --- swap the individual 16 bit values instead of taking
-	everying as a 32 bit value.
-	(rgb565lsb): Likewise.
-	(rgb555lsb): Likewise.
-	(rgb555msb): Likewise.
-
-2001-11-26  Akira TAGOH  <tagoh@redhat.com>
-
-	* Makefile.am (libgdk_pixbuf_xlib_1_3_la_LDFLAGS):
-	Added -version-info.
-
-2001-05-19  Havoc Pennington  <hp@pobox.com>
-
-	* gdk-pixbuf-xlibrgb.c: docs
-
-2001-06-04  Havoc Pennington  <hp@redhat.com>
-
-	* gdk-pixbuf-xlibrgb.c (xlib_rgb_init): remove C++ comment,
-	reported by Dan McNichol
-
-Mon Jan  8 11:41:41 2001  Owen Taylor  <otaylor@redhat.com>
-
-	* Makefile.am (INCLUDES): Add @x_cflags@ (#36310)
-
-2001-01-02  Havoc Pennington  <hp@redhat.com>
-
-	* gdk-pixbuf-xlib-2.0.pc.in (Description): fix up description a bit.
-
-2000-10-06  Havoc Pennington  <hp@redhat.com>
-
-	* gdk-pixbuf-xlib.c: Put display/screen here, instead of in 
-	the main gdk-pixbuf library as it was in 1.0; since the io-xpm 
-	loader doesn't use these variables anymore it should be OK
-
-2000-09-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gdk-pixbuf/gdk-pixbuf-xlib-drawable.c
-	(gdk_pixbuf_xlib_get_from_drawable): Do not use
-	gdk_screen_{width,height}().  Thanks to John Harper for pointing
-	this out.
-
-2000-08-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gdk-pixbuf/gdk-pixbuf-xlibrgb.c: Added API reference docs.
-
-2000-08-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gdk-pixbuf/gdk-pixbuf-xlib-drawable.c (handle_x_error): Return
-	0.
-	(xlib_window_is_viewable): Return FALSE in the last case.
-
-	* gdk-pixbuf/gdk-pixbuf-xlib-render.c: Updated the inline docs.
-
-	* gdk-pixbuf/gdk-pixbuf-xlib.c: Added API docs.
-
-2000-08-25  John Harper  <john@dcs.warwick.ac.uk>
-
-	Work to create an Xlib version of gdk-pixbuf (with the Xlib
-	port of GdkRGB for rendering):
-
-	* configure.in: check for X libraries, set and substitute
-	GDK_PIXBUF_XLIB_{LIBDIR,INCLUDEDIR,LIBS} variables
-
-	* gdk_pixbuf_xlibConf.sh.in: new file -- gnome-config details
-	for the gdk-pixbuf-xlib library
-	* Makefile.am: build and install gdk_pixbuf_xlibConf.sh
-
-	* gdk-pixbuf/gdk-pixbuf-xlib-render.c,
-	gdk-pixbuf/gdk-pixbuf-xlib.c, gdk-pixbuf/gdk-pixbuf-xlib.h,
-	gdk-pixbuf/gdk-pixbuf-xlib-private.h,
-	gdk-pixbuf/gdk-pixbuf-xlib-drawable.c: new files, ported the
-	GDK dependent parts of gdk-pixbuf to use Xlib. Functions that
-	were called gdk_pixbuf_FOO are now gdk_pixbuf_xlib_FOO
-
-	* gdk-pixbuf/gdk-pixbuf-xlibrgb.c,
-	gdk-pixbuf/gdk-pixbuf-xlibrgb.h: added Chris Blizzard's Xlib
-	port of GdkRGB (from Mozilla CVS)
-
-	* gdk-pixbuf/Makefile.am: build a library libgdk_pixbuf_xlib.la
-	including the non-GDK dependent objects from libgdk_pixbuf.la
-	plus the Xlib ports and xlibrgb

contrib/gdk-pixbuf-xlib/Makefile.am

@@ -1,34 +0,0 @@
-lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
-
-INCLUDES = @STRIP_BEGIN@			\
-	-I$(top_srcdir) -I$(top_builddir) 	\
-	-I$(top_srcdir)/gdk-pixbuf 		\
-	-I$(top_srcdir)/contrib 		\
-	@GDK_PIXBUF_XLIB_DEP_CFLAGS@		\
-@STRIP_END@
-
-LDADDS = @STRIP_BEGIN@ 				\
-	@GDK_PIXBUF_XLIB_DEP_LIBS@		\
-@STRIP_END@
-
-libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
-	-export-dynamic						\
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
-libgdk_pixbuf_xlib_2_0_la_SOURCES =         \
-	gdk-pixbuf-xlib-private.h	\
-        gdk-pixbuf-xlib.c               \
-        gdk-pixbuf-xlib-render.c        \
-        gdk-pixbuf-xlib-drawable.c      \
-        gdk-pixbuf-xlibrgb.c
-
-libgdk_pixbuf_xlibincludedir=$(includedir)/gtk-2.0/gdk-pixbuf-xlib
-
-libgdk_pixbuf_xlibinclude_HEADERS =         		\
-        gdk-pixbuf-xlib.h               	    	\
-        gdk-pixbuf-xlibrgb.h
-
-pkgconfigdir   = $(libdir)/pkgconfig
-pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc
-
-EXTRA_DIST = gdk-pixbuf-xlib-2.0.pc.in

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in

@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: GdkPixbuf Xlib
-Description: GdkPixbuf rendering for Xlib
-Version: @VERSION@
-Requires: gobject-2.0,gmodule-2.0,gdk-pixbuf-2.0
-Libs: -L${libdir} -lgdk_pixbuf_xlib-@GTK_API_VERSION@
-Cflags: -I${includedir}

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-private.h

@@ -1,30 +0,0 @@
-/* GdkPixbuf library - Xlib header file
- *
- * Authors: John Harper <john@dcs.warwick.ac.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef GDK_PIXBUF_XLIB_PRIVATE_H
-#define GDK_PIXBUF_XLIB_PRIVATE_H
-
-#include "gdk-pixbuf-xlib.h"
-#include <X11/Xlib.h>
-
-extern Display *gdk_pixbuf_dpy;
-extern int gdk_pixbuf_screen;
-
-#endif

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-render.c

@@ -1,398 +0,0 @@
-/* GdkPixbuf library - Rendering functions
- *
- * Copyright (C) 1999 The Free Software Foundation
- *
- * Author: Federico Mena-Quintero <federico@gimp.org>
- *
- * 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.
- */
-
-/* Trivially ported to Xlib(RGB) by John Harper. */
-
-#include <config.h>
-#include "gdk-pixbuf-private.h"
-#include "gdk-pixbuf-xlib-private.h"
-
-
-
-/**
- * gdk_pixbuf_xlib_render_threshold_alpha:
- * @pixbuf: A pixbuf.
- * @bitmap: Bitmap where the bilevel mask will be painted to.
- * @src_x: Source X coordinate.
- * @src_y: source Y coordinate.
- * @dest_x: Destination X coordinate.
- * @dest_y: Destination Y coordinate.
- * @width: Width of region to threshold.
- * @height: Height of region to threshold.
- * @alpha_threshold: Opacity values below this will be painted as zero; all
- * other values will be painted as one.
- *
- * Takes the opacity values in a rectangular portion of a pixbuf and thresholds
- * them to produce a bi-level alpha mask that can be used as a clipping mask for
- * a drawable.
- *
- **/
-void
-gdk_pixbuf_xlib_render_threshold_alpha (GdkPixbuf *pixbuf, Pixmap bitmap,
-					int src_x, int src_y,
-					int dest_x, int dest_y,
-					int width, int height,
-					int alpha_threshold)
-{
-	GC gc;
-	XColor color;
-	int x, y;
-	guchar *p;
-	int start, start_status;
-	int status;
-	XGCValues gcv;
-
-	g_return_if_fail (pixbuf != NULL);
-	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
-	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
-	g_return_if_fail (pixbuf->bits_per_sample == 8);
-
-	g_return_if_fail (bitmap != 0);
-	g_return_if_fail (width >= 0 && height >= 0);
-	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
-	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
-
-	g_return_if_fail (alpha_threshold >= 0 && alpha_threshold <= 255);
-
-	if (width == 0 || height == 0)
-		return;
-
-	gc = XCreateGC (gdk_pixbuf_dpy, bitmap, 0, &gcv);
-
-	if (!pixbuf->has_alpha) {
-		color.pixel = (alpha_threshold == 255) ? 0 : 1;
-		XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
-		XFillRectangle (gdk_pixbuf_dpy, bitmap, gc,
-				dest_x, dest_y, width, height);
-		XFreeGC (gdk_pixbuf_dpy, gc);
-		return;
-	}
-
-	color.pixel = 0;
-	XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
-	XFillRectangle (gdk_pixbuf_dpy, bitmap, gc,
-			dest_x, dest_y, width, height);
-
-	color.pixel = 1;
-	XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
-
-	for (y = 0; y < height; y++) {
-		p = (pixbuf->pixels + (y + src_y) * pixbuf->rowstride + src_x * pixbuf->n_channels
-		     + pixbuf->n_channels - 1);
-
-		start = 0;
-		start_status = *p < alpha_threshold;
-
-		for (x = 0; x < width; x++) {
-			status = *p < alpha_threshold;
-
-			if (status != start_status) {
-				if (!start_status)
-					XDrawLine (gdk_pixbuf_dpy, bitmap, gc,
-						   start + dest_x, y + dest_y,
-						   x - 1 + dest_x, y + dest_y);
-
-				start = x;
-				start_status = status;
-			}
-
-			p += pixbuf->n_channels;
-		}
-
-		if (!start_status)
-			XDrawLine (gdk_pixbuf_dpy, bitmap, gc,
-				   start + dest_x, y + dest_y,
-				   x - 1 + dest_x, y + dest_y);
-	}
-
-	XFreeGC (gdk_pixbuf_dpy, gc);
-}
-
-
-
-/* Creates a buffer by stripping the alpha channel of a pixbuf */
-static guchar *
-remove_alpha (GdkPixbuf *pixbuf, int x, int y, int width, int height, int *rowstride)
-{
-	guchar *buf;
-	int xx, yy;
-	guchar *src, *dest;
-
-	g_assert (pixbuf->n_channels == 4);
-	g_assert (pixbuf->has_alpha);
-	g_assert (width > 0 && height > 0);
-	g_assert (x >= 0 && x + width <= pixbuf->width);
-	g_assert (y >= 0 && y + height <= pixbuf->height);
-
-	*rowstride = 4 * ((width * 3 + 3) / 4);
-
-	buf = g_new (guchar, *rowstride * height);
-
-	for (yy = 0; yy < height; yy++) {
-		src = pixbuf->pixels + pixbuf->rowstride * (yy + y) + x * pixbuf->n_channels;
-		dest = buf + *rowstride * yy;
-
-		for (xx = 0; xx < width; xx++) {
-			*dest++ = *src++;
-			*dest++ = *src++;
-			*dest++ = *src++;
-			src++;
-		}
-	}
-
-	return buf;
-}
-
-/**
- * gdk_pixbuf_xlib_render_to_drawable:
- * @pixbuf: A pixbuf.
- * @drawable: Destination drawable.
- * @gc: GC used for rendering.
- * @src_x: Source X coordinate within pixbuf.
- * @src_y: Source Y coordinate within pixbuf.
- * @dest_x: Destination X coordinate within drawable.
- * @dest_y: Destination Y coordinate within drawable.
- * @width: Width of region to render, in pixels.
- * @height: Height of region to render, in pixels.
- * @dither: Dithering mode for XlibRGB.
- * @x_dither: X offset for dither.
- * @y_dither: Y offset for dither.
- *
- * Renders a rectangular portion of a pixbuf to a drawable while using the
- * specified GC.  This is done using XlibRGB, so the specified drawable must
- * have the XlibRGB visual and colormap.  Note that this function will ignore
- * the opacity information for images with an alpha channel; the GC must already
- * have the clipping mask set if you want transparent regions to show through.
- *
- * For an explanation of dither offsets, see the XlibRGB documentation.  In
- * brief, the dither offset is important when re-rendering partial regions of an
- * image to a rendered version of the full image, or for when the offsets to a
- * base position change, as in scrolling.  The dither matrix has to be shifted
- * for consistent visual results.  If you do not have any of these cases, the
- * dither offsets can be both zero.
- **/
-void
-gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
-				    Drawable drawable, GC gc,
-				    int src_x, int src_y,
-				    int dest_x, int dest_y,
-				    int width, int height,
-				    XlibRgbDither dither,
-				    int x_dither, int y_dither)
-{
-	guchar *buf;
-	int rowstride;
-
-	g_return_if_fail (pixbuf != NULL);
-	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
-	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
-	g_return_if_fail (pixbuf->bits_per_sample == 8);
-
-	g_return_if_fail (drawable != 0);
-	g_return_if_fail (gc != 0);
-
-	g_return_if_fail (width >= 0 && height >= 0);
-	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
-	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
-
-	if (width == 0 || height == 0)
-		return;
-
-	/* This will have to be modified once we support other image types.
-	 * Also, GdkRGB does not have gdk_draw_rgb_32_image_dithalign(), so we
-	 * have to pack the buffer first.  Sigh.
-	 */
-
-	if (pixbuf->has_alpha)
-		buf = remove_alpha (pixbuf, src_x, src_y, width, height, &rowstride);
-	else {
-		buf = pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 3;
-		rowstride = pixbuf->rowstride;
-	}
-
-	xlib_draw_rgb_image_dithalign (drawable, gc,
-				       dest_x, dest_y,
-				       width, height,
-				       dither,
-				       buf, rowstride,
-				       x_dither, y_dither);
-
-	if (pixbuf->has_alpha)
-		g_free (buf);
-}
-
-
-
-/**
- * gdk_pixbuf_xlib_render_to_drawable_alpha:
- * @pixbuf: A pixbuf.
- * @drawable: Destination drawable.
- * @src_x: Source X coordinate within pixbuf.
- * @src_y: Source Y coordinates within pixbuf.
- * @dest_x: Destination X coordinate within drawable.
- * @dest_y: Destination Y coordinate within drawable.
- * @width: Width of region to render, in pixels.
- * @height: Height of region to render, in pixels.
- * @alpha_mode: If the image does not have opacity information, this is ignored.
- * Otherwise, specifies how to handle transparency when rendering.
- * @alpha_threshold: If the image does have opacity information and @alpha_mode
- * is GDK_PIXBUF_ALPHA_BILEVEL, specifies the threshold value for opacity
- * values.
- * @dither: Dithering mode for XlibRGB.
- * @x_dither: X offset for dither.
- * @y_dither: Y offset for dither.
- *
- * Renders a rectangular portion of a pixbuf to a drawable.  This is done using
- * XlibRGB, so the specified drawable must have the XlibRGB visual and colormap.
- *
- * When used with #GDK_PIXBUF_ALPHA_BILEVEL, this function has to create a bitmap
- * out of the thresholded alpha channel of the image and, it has to set this
- * bitmap as the clipping mask for the GC used for drawing.  This can be a
- * significant performance penalty depending on the size and the complexity of
- * the alpha channel of the image.  If performance is crucial, consider handling
- * the alpha channel yourself (possibly by caching it in your application) and
- * using gdk_pixbuf_xlib_render_to_drawable() or GdkRGB directly instead.
- **/
-void
-gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf, Drawable drawable,
-					  int src_x, int src_y,
-					  int dest_x, int dest_y,
-					  int width, int height,
-					  GdkPixbufAlphaMode alpha_mode,
-					  int alpha_threshold,
-					  XlibRgbDither dither,
-					  int x_dither, int y_dither)
-{
-	Pixmap bitmap = 0;
-	GC gc;
-	XGCValues gcv;
-
-	g_return_if_fail (pixbuf != NULL);
-	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
-	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
-	g_return_if_fail (pixbuf->bits_per_sample == 8);
-
-	g_return_if_fail (drawable != 0);
-	g_return_if_fail (width >= 0 && height >= 0);
-	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
-	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
-
-	if (width == 0 || height == 0)
-		return;
-
-	gc = XCreateGC (gdk_pixbuf_dpy, drawable, 0, &gcv);
-
-	if (pixbuf->has_alpha) {
-		/* Right now we only support GDK_PIXBUF_ALPHA_BILEVEL, so we
-		 * unconditionally create the clipping mask.
-		 */
-
-		bitmap = XCreatePixmap (gdk_pixbuf_dpy,
-					RootWindow (gdk_pixbuf_dpy,
-						    gdk_pixbuf_screen),
-					width, height, 1);
-		gdk_pixbuf_xlib_render_threshold_alpha (pixbuf, bitmap,
-							src_x, src_y,
-							0, 0,
-							width, height,
-							alpha_threshold);
-
-		XSetClipMask (gdk_pixbuf_dpy, gc, bitmap);
-		XSetClipOrigin (gdk_pixbuf_dpy, gc, dest_x, dest_y);
-	}
-
-	gdk_pixbuf_xlib_render_to_drawable (pixbuf, drawable, gc,
-					    src_x, src_y,
-					    dest_x, dest_y,
-					    width, height,
-					    dither,
-					    x_dither, y_dither);
-
-	if (bitmap)
-	        XFreePixmap (gdk_pixbuf_dpy, bitmap);
-
-	XFreeGC (gdk_pixbuf_dpy, gc);
-}
-
-/**
- * gdk_pixbuf_xlib_render_pixmap_and_mask:
- * @pixbuf: A pixbuf.
- * @pixmap_return: Return value for the created pixmap.
- * @mask_return: Return value for the created mask.
- * @alpha_threshold: Threshold value for opacity values.
- *
- * Creates a pixmap and a mask bitmap which are returned in the @pixmap_return
- * and @mask_return arguments, respectively, and renders a pixbuf and its
- * corresponding tresholded alpha mask to them.  This is merely a convenience
- * function; applications that need to render pixbufs with dither offsets or to
- * given drawables should use gdk_pixbuf_xlib_render_to_drawable_alpha() or
- * gdk_pixbuf_xlib_render_to_drawable(), and
- * gdk_pixbuf_xlib_render_threshold_alpha().
- *
- * If the pixbuf does not have an alpha channel, then *@mask_return will be set
- * to None.
- **/
-void
-gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
-					Pixmap *pixmap_return,
-					Pixmap *mask_return,
-					int alpha_threshold)
-{
-        g_return_if_fail (pixbuf != NULL);
-
-	if (pixmap_return) {
-		GC gc;
-		XGCValues gcv;
-
-		*pixmap_return = XCreatePixmap (gdk_pixbuf_dpy,
-						RootWindow (gdk_pixbuf_dpy,
-							    gdk_pixbuf_screen),
-						pixbuf->width,
-						pixbuf->height,
-						xlib_rgb_get_depth ());
-		gc = XCreateGC (gdk_pixbuf_dpy, *pixmap_return, 0, &gcv);
-		gdk_pixbuf_xlib_render_to_drawable (pixbuf, *pixmap_return, gc,
-						    0, 0, 0, 0,
-						    pixbuf->width,
-						    pixbuf->height,
-						    XLIB_RGB_DITHER_NORMAL,
-						    0, 0);
-		XFreeGC (gdk_pixbuf_dpy, gc);
-	}
-
-	if (mask_return) {
-		if (pixbuf->has_alpha) {
-		    *mask_return = XCreatePixmap (gdk_pixbuf_dpy,
-						  RootWindow (gdk_pixbuf_dpy,
-							      gdk_pixbuf_screen),
-						  pixbuf->width,
-						  pixbuf->height, 1);
-		    gdk_pixbuf_xlib_render_threshold_alpha (pixbuf,
-							    *mask_return,
-							    0, 0, 0, 0,
-							    pixbuf->width,
-							    pixbuf->height,
-							    alpha_threshold);
-		} else
-			*mask_return = 0;
-	}
-}

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c

@@ -1,63 +0,0 @@
-/* GdkPixbuf library - Initialization functions
- *
- * Author: John Harper <john@dcs.warwick.ac.uk>
- *
- * 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 <X11/Xlib.h>
-#include <gdk-pixbuf/gdk-pixbuf-private.h>
-#include "gdk-pixbuf-xlib-private.h"
-
-Display *gdk_pixbuf_dpy = NULL;
-int gdk_pixbuf_screen = -1;
-
-/**
- * gdk_pixbuf_xlib_init:
- * @display: X display to use.
- * @screen_num: Screen number.
- * 
- * Initializes the gdk-pixbuf Xlib machinery by calling xlib_rgb_init().  This
- * function should be called near the beginning of your program, or before using
- * any of the gdk-pixbuf-xlib functions.
- **/
-void
-gdk_pixbuf_xlib_init (Display *display, int screen_num)
-{
-    xlib_rgb_init (display, ScreenOfDisplay (display, screen_num));
-    gdk_pixbuf_dpy = display;
-    gdk_pixbuf_screen = screen_num;
-}
-
-/**
- * gdk_pixbuf_xlib_init_with_depth:
- * @display: X display to use.
- * @screen_num: Screen number.
- * @prefDepth: Preferred depth for XlibRGB.
- * 
- * Similar to gdk_pixbuf_xlib_init(), but also lets you specify the preferred
- * depth for XlibRGB if you do not want it to use the default depth it picks.
- **/
-void
-gdk_pixbuf_xlib_init_with_depth (Display *display,
-				 int screen_num, int prefDepth)
-{
-    xlib_rgb_init_with_depth (display, ScreenOfDisplay (display, screen_num),
-			      prefDepth);
-    gdk_pixbuf_dpy = display;
-    gdk_pixbuf_screen = screen_num;
-}

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h

@@ -1,82 +0,0 @@
-/* GdkPixbuf library - Xlib header file
- *
- * Authors: John Harper <john@dcs.warwick.ac.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef GDK_PIXBUF_XLIB_H
-#define GDK_PIXBUF_XLIB_H
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
-#include <X11/Xlib.h>
-
-
-
-/* init */
-
-void gdk_pixbuf_xlib_init (Display *display, int screen_num);
-
-void gdk_pixbuf_xlib_init_with_depth (Display *display, int screen_num,
-				      int prefDepth);
-
-
-
-/* render */
-
-void gdk_pixbuf_xlib_render_threshold_alpha (GdkPixbuf *pixbuf, Pixmap bitmap,
-					     int src_x, int src_y,
-					     int dest_x, int dest_y,
-					     int width, int height,
-					     int alpha_threshold);
-
-void gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
-					 Drawable drawable, GC gc,
-					 int src_x, int src_y,
-					 int dest_x, int dest_y,
-					 int width, int height,
-					 XlibRgbDither dither,
-					 int x_dither, int y_dither);
-
-
-void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
-					       Drawable drawable,
-					       int src_x, int src_y,
-					       int dest_x, int dest_y,
-					       int width, int height,
-					       GdkPixbufAlphaMode alpha_mode,
-					       int alpha_threshold,
-					       XlibRgbDither dither,
-					       int x_dither, int y_dither);
-
-void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
-					     Pixmap *pixmap_return,
-					     Pixmap *mask_return,
-					     int alpha_threshold);
-
-
-
-/* drawable */
-
-GdkPixbuf *gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest,
-					      Drawable src,
-					      Colormap cmap, Visual *visual,
-					      int src_x, int src_y,
-					      int dest_x, int dest_y,
-					      int width, int height);
-
-#endif /* GDK_PIXBUF_XLIB_H */

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h

@@ -1,195 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "MPL"); you may not use this file except in
- * compliance with the MPL.  You may obtain a copy of the MPL at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the MPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL
- * for the specific language governing rights and limitations under the
- * MPL.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Library General Public License (the "LGPL"), in
- * which case the provisions of the LGPL are applicable instead of
- * those above.  If you wish to allow use of your version of this file
- * only under the terms of the LGPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision by
- * deleting the provisions above and replace them with the notice and
- * other provisions required by the LGPL.  If you do not delete the
- * provisions above, a recipient may use your version of this file
- * under either the MPL or the LGPL.
- */
-
-/*
- * This code is derived from GdkRgb.
- * For more information on GdkRgb, see http://www.levien.com/gdkrgb/
- * Raph Levien <raph@acm.org>
- */
-
-/* Ported by Christopher Blizzard to Xlib.  With permission from the
- * original authors of this file, the contents of this file are also
- * redistributable under the terms of the Mozilla Public license.  For
- * information about the Mozilla Public License, please see the
- * license information at http://www.mozilla.org/MPL/
- */
-
-/* This code is copyright the following authors:
- * Raph Levien          <raph@acm.org>
- * Manish Singh         <manish@gtk.org>
- * Tim Janik            <timj@gtk.org>
- * Peter Mattis         <petm@xcf.berkeley.edu>
- * Spencer Kimball      <spencer@xcf.berkeley.edu>
- * Josh MacDonald       <jmacd@xcf.berkeley.edu>
- * Christopher Blizzard <blizzard@redhat.com>
- * Owen Taylor          <otaylor@redhat.com>
- * Shawn T. Amundson    <amundson@gtk.org>
-*/
-
-
-#ifndef __XLIB_RGB_H__
-#define __XLIB_RGB_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xos.h>
-#include <X11/Intrinsic.h>
-
-#include <glib.h>
-
-typedef struct _XlibRgbCmap XlibRgbCmap;
-
-struct _XlibRgbCmap {
-  unsigned int colors[256];
-  unsigned char lut[256]; /* for 8-bit modes */
-};
-
-void
-xlib_rgb_init (Display *display, Screen *screen);
-void
-xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth);
-
-unsigned long
-xlib_rgb_xpixel_from_rgb (guint32 rgb);
-
-void
-xlib_rgb_gc_set_foreground (GC gc, guint32 rgb);
-
-void
-xlib_rgb_gc_set_background (GC gc, guint32 rgb);
-
-typedef enum
-{
-  XLIB_RGB_DITHER_NONE,
-  XLIB_RGB_DITHER_NORMAL,
-  XLIB_RGB_DITHER_MAX
-} XlibRgbDither;
-
-void
-xlib_draw_rgb_image (Drawable drawable,
-		     GC gc,
-		     int x,
-		     int y,
-		     int width,
-		     int height,
-		     XlibRgbDither dith,
-		     unsigned char *rgb_buf,
-		     int rowstride);
-
-void
-xlib_draw_rgb_image_dithalign (Drawable drawable,
-			       GC gc,
-			       int x,
-			       int y,
-			       int width,
-			       int height,
-			       XlibRgbDither dith,
-			       unsigned char *rgb_buf,
-			       int rowstride,
-			       int xdith,
-			       int ydith);
-
-void
-xlib_draw_rgb_32_image (Drawable drawable,
-			GC gc,
-			int x,
-			int y,
-			int width,
-			int height,
-			XlibRgbDither dith,
-			unsigned char *buf,
-			int rowstride);
-
-void
-xlib_draw_gray_image (Drawable drawable,
-		      GC gc,
-		      int x,
-		      int y,
-		      int width,
-		      int height,
-		      XlibRgbDither dith,
-		      unsigned char *buf,
-		      int rowstride);
-
-XlibRgbCmap *
-xlib_rgb_cmap_new (guint32 *colors, int n_colors);
-
-void
-xlib_rgb_cmap_free (XlibRgbCmap *cmap);
-
-void
-xlib_draw_indexed_image (Drawable drawable,
-                         GC gc,
-                         int x,
-                         int y,
-                         int width,
-                         int height,
-                         XlibRgbDither dith,
-                         unsigned char *buf,
-                         int rowstride,
-                         XlibRgbCmap *cmap);
-
-/* Below are some functions which are primarily useful for debugging
-   and experimentation. */
-Bool
-xlib_rgb_ditherable (void);
-
-void
-xlib_rgb_set_verbose (Bool verbose);
-
-/* experimental colormap stuff */
-void
-xlib_rgb_set_install (Bool install);
-
-void
-xlib_rgb_set_min_colors (int min_colors);
-
-Colormap
-xlib_rgb_get_cmap (void);
-
-Visual *
-xlib_rgb_get_visual (void);
-
-XVisualInfo *
-xlib_rgb_get_visual_info (void);
-
-int
-xlib_rgb_get_depth (void);
-
-Display *
-xlib_rgb_get_display (void);
-
-Screen *
-xlib_rgb_get_screen (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __XLIB_RGB_H__ */

debian/build

@@ -1,62 +0,0 @@
-#!/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,8 +1,167 @@
-gtk+-cvs (19981116.01) unstable; urgency=low
+gtk+ (1:0.99.8-1) unstable; urgency=low
 
-  * First test build from CVS
+  * 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
 
- -- Ben Gertzfield <che@debian.org>  Tue, 17 Nov 1998 12:02:13 -0800
+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
 
 Local variables:
 mode: debian-changelog

debian/control

@@ -1,81 +1,41 @@
-Source: gtk+-cvs
-Priority: extra
+Source: gtk+
+Priority: optional
 Section: libs
 Maintainer: Ben Gertzfield <che@debian.org>
 Standards-Version: 2.4.0.0
 
-Package: libgtk-cvs-1.1
+Package: libgtk1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-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!**
- . 
+Description: The GIMP Toolkit set of widgets for X
  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-cvs-dev
+Package: libgtk-dev
 Architecture: any
 Section: devel
-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!**
- .
+Depends: libgtk1 (>= 1:0.99.8)
+Suggests: libgtk-doc
+Replaces: libgtk1 (<= 0.99.7)
+Description: Header files and static libraries for the GIMP Toolkit
  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 1.1, or if you wish to compile your own plug-ins for
+ the GIMP Toolkit, or if you wish to compile your own plug-ins for
  The GIMP.
 
-Package: libgtk-cvs-doc
+Package: libgtk-doc
 Architecture: all
-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!**
- .
+Section: docs
+Replaces: libgtk-dev (<< 1:0.99.4)
+Description: Documentation and example code for the GIMP Toolkit
  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@debian.org> on
-Tue, 17 Nov 1998 12:07:17 -0800
+This package was debianized by Ben Gertzfield che@imsa.edu on
+Tue, 22 Jul 1997 20:53:20 -0500
 
-It was produced from the CVS repository at cvs.gimp.org.
+It was downloaded from ftp.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

@@ -1,9 +0,0 @@
-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-doc.files

@@ -1,8 +0,0 @@
-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-dev.postinst

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

debian/libgtk-doc.postinst

@@ -8,4 +8,7 @@ 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-doc.prerm

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

debian/rules

@@ -1,50 +1,27 @@
 #!/usr/bin/make -f
 
-# debian/rules file for gtk+ Debian package
-# written April 1998 by Ben Gertzfield <che@debian.org
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
 build: build-stamp
 build-stamp:
 	dh_testdir
-	./autogen.sh --prefix=/usr --with-xinput=xfree
+	# Add here commands to compile the package.
+	./configure --prefix=/usr --with-xinput=xfree
 	$(MAKE)
-	cd docs && make distdocs
+	cd docs && make -f Makefile.sgml
 	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 build-dbg-stamp install-stamp install-dbg-stamp
+	rm -f build-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
+	-rm docs/*.html
 	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
@@ -53,105 +30,88 @@ 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-cvs-doc
+binary-indep: build install libgtk-doc
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
-binary-arch: build install libgtk-cvs-dev libgtk-cvs-1.1 libgtk-cvs-dbg
+binary-arch: build install libgtk-dev libgtk1
 
-libgtk-cvs-1.1: build
-	dh_testdir -plibgtk-cvs-1.1 
-	dh_testroot -plibgtk-cvs-1.1
-	dh_installdirs -plibgtk-cvs-1.1
+libgtk1: build
+	dh_testdir -plibgtk1 
+	dh_testroot -plibgtk1
+#	dh_clean -plibgtk1
+	dh_installdirs -plibgtk1
 	# 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/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
+	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
 
-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
+libgtk-dev: build
+	dh_testdir -plibgtk-dev
+	dh_testroot -plibgtk-dev
+	dh_clean -plibgtk-dev -k
+	dh_installdirs -plibgtk-dev
 	# Add here commands to install the files into debian/tmp
-	dh_movefiles -plibgtk-cvs-dev
+	dh_movefiles -plibgtk-dev
 	cp gtk-config debian/tmp/usr/bin
-	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
+#	$(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
 
-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/
+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
 
-	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/.cvsignore

@@ -1,11 +0,0 @@
-Makefile
-Makefile.in
-.libs
-.deps
-testanimation
-test-inline-pixbufs.h
-testpixbuf-drawable
-testpixbuf-scale
-testpixbuf-save
-testpixbuf
-pixbuf-demo

demos/Makefile.am

@@ -1,78 +0,0 @@
-## Makefile.am for gtk+/demos
-
-SUBDIRS = gtk-demo
-
-INCLUDES = @STRIP_BEGIN@ \
-	-I$(top_srcdir) 				\
-	-I$(top_builddir)/gdk				\
-	-DG_DISABLE_DEPRECATED	 			\
-	-DGDK_DISABLE_DEPRECATED			\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
-	-DGTK_DISABLE_DEPRECATED			\
-	@GTK_DEBUG_FLAGS@				\
-	@GTK_DEP_CFLAGS@				\
-@STRIP_END@
-
-DEPS = \
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/@gdktargetlib@ 				\
-	$(top_builddir)/gtk/@gtktargetlib@
-
-LDADDS = @STRIP_BEGIN@ 							\
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/@gdktargetlib@        			\
-	$(top_builddir)/gtk/@gtktargetlib@ 				\
-@STRIP_END@
-
-noinst_PROGRAMS = 		\
-	testpixbuf 		\
-	testpixbuf-drawable 	\
-	testanimation 		\
-	testpixbuf-save		\
-	testpixbuf-scale 	\
-	pixbuf-demo
-
-if CROSS_COMPILING
-pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
-else
-pixbuf_csource=GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs $$topdir/gdk-pixbuf/gdk-pixbuf-csource
-endif
-
-test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource apple-red.png gnome-foot.png
-	(topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \
-	  cd $(srcdir) &&				     \
-	      $(pixbuf_csource) --build-list \
-	        apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h)
-
-testpixbuf_DEPENDENCIES = $(DEPS)
-testpixbuf_drawable_DEPENDENCIES = $(DEPS)
-testpixbuf_save_DEPENDENCIES = $(DEPS)
-testpixbuf_scale_DEPENDENCIES = $(DEPS)
-testanimation_DEPENDENCIES = $(DEPS)
-pixbuf_demo_DEPENDENCIES = $(DEPS)
-
-testpixbuf_LDADD = $(LDADDS)
-testpixbuf_drawable_LDADD = $(LDADDS)
-testpixbuf_save_LDADD = $(LDADDS)
-testpixbuf_scale_LDADD = $(LDADDS)
-testanimation_LDADD = $(LDADDS)
-pixbuf_demo_LDADD = $(LDADDS)
-
-testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c
-$(testpixbuf_OBJECTS): test-inline-pixbufs.h
-testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c
-testpixbuf_save_SOURCES = testpixbuf-save.c
-testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
-testanimation_SOURCES = testanimation.c pixbuf-init.c
-pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c
-
-EXTRA_DIST =			\
-	apple-red.png		\
-	background.jpg		\
-	gnome-applets.png	\
-	gnome-calendar.png	\
-	gnome-foot.png		\
-	gnome-gimp.png		\
-	gnome-gmush.png		\
-	gnome-gsame.png		\
-	gnu-keys.png

demos/gtk-demo/.cvsignore

@@ -1,7 +0,0 @@
-Makefile
-Makefile.in
-.libs
-.deps
-gtk-demo
-demos.h
-

demos/gtk-demo/Makefile.am

@@ -1,82 +0,0 @@
-## Makefile.am for gtk+/demos
-
-democodedir=$(datadir)/gtk-2.0/demo
-
-## These should be in the order you want them to appear in the 
-## demo app, which means alphabetized by demo title, not filename
-demos = @STRIP_BEGIN@	\
-	appwindow.c	\
-	button_box.c	\
-	colorsel.c	\
-	dialog.c	\
-	drawingarea.c	\
-	editable_cells.c \
-	images.c	\
-	item_factory.c	\
-	list_store.c	\
-	menus.c		\
-	panes.c		\
-	pixbufs.c	\
-	sizegroup.c	\
-	stock_browser.c	\
-	textview.c	\
-	tree_store.c	\
-@STRIP_END@
-
-INCLUDES = @STRIP_BEGIN@ \
-	-DDEMOCODEDIR="\"$(democodedir)\""		\
-	-I$(top_srcdir) 				\
-	-I$(top_builddir)/gdk				\
-	-DG_DISABLE_DEPRECATED	 			\
-	-DGDK_DISABLE_DEPRECATED			\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
-	-DGTK_DISABLE_DEPRECATED 			\
-	@GTK_DEBUG_FLAGS@				\
-	@GTK_DEP_CFLAGS@				\
-@STRIP_END@
-
-DEPS = \
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/@gdktargetlib@ 				\
-	$(top_builddir)/gtk/@gtktargetlib@
-
-LDADDS = @STRIP_BEGIN@ 							\
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/@gdktargetlib@        			\
-	$(top_builddir)/gtk/@gtktargetlib@ 				\
-@STRIP_END@
-
-bin_PROGRAMS = gtk-demo
-
-BUILT_SOURCES = demos.h
-
-EXTRA_DIST = 		\
-	geninclude.pl	\
-	$(IMAGEFILES)
-
-demos.h: $(demos) geninclude.pl
-	(cd $(srcdir) && $(PERL) ./geninclude.pl $(demos) > demos.h)
-
-gtk_demo_SOURCES = 		\
-	$(demos)		\
-	demo-common.h		\
-	main.c			\
-	demos.h
-
-gtk_demo_DEPENDENCIES = $(DEPS)
-gtk_demo_LDADD = $(LDADDS)
-
-IMAGEFILES=	alphatest.png		\
-	        apple-red.png		\
-		background.jpg		\
-		floppybuddy.gif		\
-		gnome-applets.png	\
-		gnome-calendar.png	\
-		gnome-foot.png		\
-		gnome-gimp.png		\
-		gnome-gmush.png		\
-		gnome-gsame.png		\
-		gnu-keys.png		\
-		gtk-logo-rgb.gif
-
-democode_DATA = $(demos) $(IMAGEFILES)

demos/gtk-demo/appwindow.c

@@ -1,351 +0,0 @@
-/* Application main window
- *
- * Demonstrates a typical application window, with menubar, toolbar, statusbar.
- */
-
-#include <gtk/gtk.h>
-#include "demo-common.h"
-
-static GtkWidget *window = NULL;
-
-
-static void
-menuitem_cb (gpointer             callback_data,
-             guint                callback_action,
-             GtkWidget           *widget)
-{
-  GtkWidget *dialog;
-  
-  dialog = gtk_message_dialog_new (GTK_WINDOW (callback_data),
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_INFO,
-                                   GTK_BUTTONS_CLOSE,
-                                   "You selected or toggled the menu item: \"%s\"",
-                                    gtk_item_factory_path_from_widget (widget));
-
-  /* Close dialog on user response */
-  g_signal_connect (G_OBJECT (dialog),
-                    "response",
-                    G_CALLBACK (gtk_widget_destroy),
-                    NULL);
-  
-  gtk_widget_show (dialog);
-}
-
-
-static GtkItemFactoryEntry menu_items[] =
-{
-  { "/_File",            NULL,         0,                     0, "<Branch>" },
-  { "/File/_New",        "<control>N", menuitem_cb,       0, "<StockItem>", GTK_STOCK_NEW },
-  { "/File/_Open",       "<control>O", menuitem_cb,       0, "<StockItem>", GTK_STOCK_OPEN },
-  { "/File/_Save",       "<control>S", menuitem_cb,       0, "<StockItem>", GTK_STOCK_SAVE },
-  { "/File/Save _As...", NULL,         menuitem_cb,       0, "<StockItem>", GTK_STOCK_SAVE },
-  { "/File/sep1",        NULL,         menuitem_cb,       0, "<Separator>" },
-  { "/File/_Quit",       "<control>Q", menuitem_cb,       0, "<StockItem>", GTK_STOCK_QUIT },
-
-  { "/_Preferences",                    NULL, 0,               0, "<Branch>" },
-  { "/_Preferences/_Color",             NULL, 0,               0, "<Branch>" },
-  { "/_Preferences/Color/_Red",         NULL, menuitem_cb, 0, "<RadioItem>" },
-  { "/_Preferences/Color/_Green",       NULL, menuitem_cb, 0, "/Preferences/Color/Red" },
-  { "/_Preferences/Color/_Blue",        NULL, menuitem_cb, 0, "/Preferences/Color/Red" },
-  { "/_Preferences/_Shape",             NULL, 0,               0, "<Branch>" },
-  { "/_Preferences/Shape/_Square",      NULL, menuitem_cb, 0, "<RadioItem>" },
-  { "/_Preferences/Shape/_Rectangle",   NULL, menuitem_cb, 0, "/Preferences/Shape/Square" },
-  { "/_Preferences/Shape/_Oval",        NULL, menuitem_cb, 0, "/Preferences/Shape/Rectangle" },
-
-  /* If you wanted this to be right justified you would use "<LastBranch>", not "<Branch>".
-   * Right justified help menu items are generally considered a bad idea now days.
-   */
-  { "/_Help",            NULL,         0,                     0, "<Branch>" },
-  { "/Help/_About",      NULL,         menuitem_cb,       0 },
-};
-
-static void
-toolbar_cb (GtkWidget *button,
-            gpointer   data)
-{
-  GtkWidget *dialog;
-  
-  dialog = gtk_message_dialog_new (GTK_WINDOW (data),
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_INFO,
-                                   GTK_BUTTONS_CLOSE,
-                                   "You selected a toolbar button");
-
-  /* Close dialog on user response */
-  g_signal_connect (G_OBJECT (dialog),
-                    "response",
-                    G_CALLBACK (gtk_widget_destroy),
-                    NULL);
-  
-  gtk_widget_show (dialog);
-}
-
-/* This function registers our custom toolbar icons, so they can be themed.
- *
- * It's totally optional to do this, you could just manually insert icons
- * and have them not be themeable, especially if you never expect people
- * to theme your app.
- */
-static void
-register_stock_icons (void)
-{
-  static gboolean registered = FALSE;
-  
-  if (!registered)
-    {
-      GdkPixbuf *pixbuf;
-      GtkIconFactory *factory;
-      char *filename;
-
-      static GtkStockItem items[] = {
-        { "demo-gtk-logo",
-          "_GTK!",
-          0, 0, NULL }
-      };
-      
-      registered = TRUE;
-
-      /* Register our stock items */
-      gtk_stock_add (items, G_N_ELEMENTS (items));
-      
-      /* Add our custom icon factory to the list of defaults */
-      factory = gtk_icon_factory_new ();
-      gtk_icon_factory_add_default (factory);
-
-      /* demo_find_file() looks in the the current directory first,
-       * so you can run gtk-demo without installing GTK, then looks
-       * in the location where the file is installed.
-       */
-      pixbuf = NULL;
-      filename = demo_find_file ("gtk-logo-rgb.gif", NULL);
-      if (filename)
-	{
-	  pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-	  g_free (filename);
-	}
-
-      /* Register icon to accompany stock item */
-      if (pixbuf != NULL)
-        {
-          GtkIconSet *icon_set;
-          GdkPixbuf *transparent;
-
-          /* The gtk-logo-rgb icon has a white background, make it transparent */
-          transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff);
-          
-          icon_set = gtk_icon_set_new_from_pixbuf (transparent);
-          gtk_icon_factory_add (factory, "demo-gtk-logo", icon_set);
-          gtk_icon_set_unref (icon_set);
-          g_object_unref (G_OBJECT (pixbuf));
-          g_object_unref (G_OBJECT (transparent));
-        }
-      else
-        g_warning ("failed to load GTK logo for toolbar");
-      
-      /* Drop our reference to the factory, GTK will hold a reference. */
-      g_object_unref (G_OBJECT (factory));
-    }
-}
-
-static void
-update_statusbar (GtkTextBuffer *buffer,
-                  GtkStatusbar  *statusbar)
-{
-  gchar *msg;
-  gint row, col;
-  gint count;
-  GtkTextIter iter;
-  
-  gtk_statusbar_pop (statusbar, 0); /* clear any previous message, underflow is allowed */
-
-  count = gtk_text_buffer_get_char_count (buffer);
-
-  gtk_text_buffer_get_iter_at_mark (buffer,
-                                    &iter,
-                                    gtk_text_buffer_get_insert (buffer));
-
-  row = gtk_text_iter_get_line (&iter);
-  col = gtk_text_iter_get_line_offset (&iter);
-
-  msg = g_strdup_printf ("Cursor at row %d column %d - %d chars in document",
-                         row, col, count);
-
-  gtk_statusbar_push (statusbar, 0, msg);
-
-  g_free (msg);
-}
-
-static void
-mark_set_callback (GtkTextBuffer     *buffer,
-                   const GtkTextIter *new_location,
-                   GtkTextMark       *mark,
-                   gpointer           data)
-{
-  update_statusbar (buffer, GTK_STATUSBAR (data));
-}
-
-GtkWidget *
-do_appwindow (void)
-{  
-  if (!window)
-    {
-      GtkWidget *table;
-      GtkWidget *toolbar;
-      GtkWidget *statusbar;
-      GtkWidget *contents;
-      GtkWidget *sw;
-      GtkTextBuffer *buffer;
-      GtkAccelGroup *accel_group;      
-      GtkItemFactory *item_factory;
-
-      register_stock_icons ();
-      
-      /* Create the toplevel window
-       */
-      
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Application Window");
-
-      /* NULL window variable when window is closed */
-      g_signal_connect (G_OBJECT (window), "destroy",
-                        G_CALLBACK (gtk_widget_destroyed),
-                        &window);
-
-      table = gtk_table_new (1, 4, FALSE);
-      
-      gtk_container_add (GTK_CONTAINER (window), table);
-      
-      /* Create the menubar
-       */
-      
-      accel_group = gtk_accel_group_new ();
-      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-      g_object_unref (accel_group);
-      
-      item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);
-
-      /* Set up item factory to go away with the window */
-      g_object_ref (item_factory);
-      gtk_object_sink (GTK_OBJECT (item_factory));
-      g_object_set_data_full (G_OBJECT (window),
-                              "<main>",
-                              item_factory,
-                              (GDestroyNotify) g_object_unref);
-
-      /* create menu items */
-      gtk_item_factory_create_items (item_factory, G_N_ELEMENTS (menu_items),
-                                     menu_items, window);
-
-      gtk_table_attach (GTK_TABLE (table),
-			gtk_item_factory_get_widget (item_factory, "<main>"),
-                        /* X direction */          /* Y direction */
-                        0, 1,                      0, 1,
-                        GTK_EXPAND | GTK_FILL,     0,
-                        0,                         0);
-
-      /* Create the toolbar
-       */
-      toolbar = gtk_toolbar_new ();
-
-      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
-                                GTK_STOCK_OPEN,
-                                "This is a demo button with an 'open' icon",
-                                NULL,
-                                G_CALLBACK (toolbar_cb),
-                                window, /* user data for callback */
-                                -1);  /* -1 means "append" */
-
-      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
-                                GTK_STOCK_QUIT,
-                                "This is a demo button with a 'quit' icon",
-                                NULL,
-                                G_CALLBACK (toolbar_cb),
-                                window, /* user data for callback */
-                                -1);  /* -1 means "append" */
-
-      gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
-
-      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
-                                "demo-gtk-logo",
-                                "This is a demo button with a 'gtk' icon",
-                                NULL,
-                                G_CALLBACK (toolbar_cb),
-                                window, /* user data for callback */
-                                -1);  /* -1 means "append" */
-
-      gtk_table_attach (GTK_TABLE (table),
-                        toolbar,
-                        /* X direction */       /* Y direction */
-                        0, 1,                   1, 2,
-                        GTK_EXPAND | GTK_FILL,  0,
-                        0,                      0);
-
-      /* Create document
-       */
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_AUTOMATIC);
-
-      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                           GTK_SHADOW_IN);
-      
-      gtk_table_attach (GTK_TABLE (table),
-                        sw,
-                        /* X direction */       /* Y direction */
-                        0, 1,                   2, 3,
-                        GTK_EXPAND | GTK_FILL,  GTK_EXPAND | GTK_FILL,
-                        0,                      0);
-
-      gtk_window_set_default_size (GTK_WINDOW (window),
-                                   200, 200);
-      
-      contents = gtk_text_view_new ();
-
-      gtk_container_add (GTK_CONTAINER (sw),
-                         contents);
-
-      /* Create statusbar */
-
-      statusbar = gtk_statusbar_new ();
-      gtk_table_attach (GTK_TABLE (table),
-                        statusbar,
-                        /* X direction */       /* Y direction */
-                        0, 1,                   3, 4,
-                        GTK_EXPAND | GTK_FILL,  0,
-                        0,                      0);
-
-      /* Show text widget info in the statusbar */
-      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (contents));
-      
-      g_signal_connect_object (buffer,
-                               "changed",
-                               G_CALLBACK (update_statusbar),
-                               statusbar,
-                               0);
-
-      g_signal_connect_object (buffer,
-                               "mark_set", /* cursor moved */
-                               G_CALLBACK (mark_set_callback),
-                               statusbar,
-                               0);
-      
-      update_statusbar (buffer, GTK_STATUSBAR (statusbar));
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {    
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-

demos/gtk-demo/button_box.c

@@ -1,125 +0,0 @@
-/* Button Boxes
- *
- * The Button Box widgets are used to arrange buttons with padding.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *
-create_bbox (gint  horizontal,
-	     char *title, 
-	     gint  spacing,
-	     gint  layout)
-{
-  GtkWidget *frame;
-  GtkWidget *bbox;
-  GtkWidget *button;
-	
-  frame = gtk_frame_new (title);
-
-  if (horizontal)
-    bbox = gtk_hbutton_box_new ();
-  else
-    bbox = gtk_vbutton_box_new ();
-
-  gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
-  gtk_container_add (GTK_CONTAINER (frame), bbox);
-
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
-  gtk_box_set_spacing (GTK_BOX (bbox), spacing);
-  
-  button = gtk_button_new_from_stock (GTK_STOCK_OK);
-  gtk_container_add (GTK_CONTAINER (bbox), button);
-  
-  button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
-  gtk_container_add (GTK_CONTAINER (bbox), button);
-  
-  button = gtk_button_new_from_stock (GTK_STOCK_HELP);
-  gtk_container_add (GTK_CONTAINER (bbox), button);
-
-  return frame;
-}
-
-GtkWidget *
-do_button_box (void)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *main_vbox;
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *frame_horz;
-  GtkWidget *frame_vert;
-	
-  if (!window)
-  {
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_title (GTK_WINDOW (window), "Button Boxes");
-    
-    g_signal_connect (window, "destroy",
-		      G_CALLBACK (gtk_widget_destroyed),
-		      &window);
-    
-    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-    main_vbox = gtk_vbox_new (FALSE, 0);
-    gtk_container_add (GTK_CONTAINER (window), main_vbox);
-    
-    frame_horz = gtk_frame_new ("Horizontal Button Boxes");
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10);
-    
-    vbox = gtk_vbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
-    gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
-
-    gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD),
-			TRUE, TRUE, 0);
-
-    gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE),
-			TRUE, TRUE, 5);
-    
-    gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START),
-			TRUE, TRUE, 5);
-    
-    gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END),
-			TRUE, TRUE, 5);
-
-    frame_vert = gtk_frame_new ("Vertical Button Boxes");
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
-    
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
-    gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
-
-    gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "Spread", 30, GTK_BUTTONBOX_SPREAD),
-			TRUE, TRUE, 0);
-
-    gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "Edge", 30, GTK_BUTTONBOX_EDGE),
-			TRUE, TRUE, 5);
-
-    gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "Start", 30, GTK_BUTTONBOX_START),
-			TRUE, TRUE, 5);
-
-    gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "End", 30, GTK_BUTTONBOX_END),
-			TRUE, TRUE, 5);
-  }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {	 
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/colorsel.c

@@ -1,110 +0,0 @@
-/* Color Selector
- *
- * GtkColorSelection lets the user choose a color. GtkColorSelectionDialog is
- * a prebuilt dialog containing a GtkColorSelection.
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-static GtkWidget *da;
-static GdkColor color;
-static GtkWidget *frame;
-
-static void
-change_color_callback (GtkWidget *button,
-		       gpointer	  data)
-{
-  GtkWidget *dialog;
-  GtkColorSelection *colorsel;
-  gint response;
-  
-  dialog = gtk_color_selection_dialog_new ("Changing color");
-
-  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
-  
-  colorsel = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (dialog)->colorsel);
-
-  gtk_color_selection_set_previous_color (colorsel, &color);
-  gtk_color_selection_set_current_color (colorsel, &color);
-  gtk_color_selection_set_has_palette (colorsel, TRUE);
-  
-  response = gtk_dialog_run (GTK_DIALOG (dialog));
-
-  if (response == GTK_RESPONSE_OK)
-    {
-      gtk_color_selection_get_current_color (colorsel,
-					     &color);
-      
-      gtk_widget_modify_bg (da, GTK_STATE_NORMAL, &color);
-    }
-  
-  gtk_widget_destroy (dialog);
-}
-
-GtkWidget *
-do_colorsel (void)
-{
-  GtkWidget *vbox;
-  GtkWidget *button;
-  GtkWidget *alignment;
-  
-  if (!window)
-    {
-      color.red = 0;
-      color.blue = 65535;
-      color.green = 0;
-      
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Color Selection");
-
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      /*
-       * Create the color swatch area
-       */
-      
-      
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-      
-      da = gtk_drawing_area_new ();
-      /* set a minimum size */
-      gtk_widget_set_size_request (da, 200, 200);
-      /* set the color */
-      gtk_widget_modify_bg (da, GTK_STATE_NORMAL, &color);
-      
-      gtk_container_add (GTK_CONTAINER (frame), da);
-
-      alignment = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
-      
-      button = gtk_button_new_with_mnemonic ("_Change the above color");
-      gtk_container_add (GTK_CONTAINER (alignment), button);
-      
-      gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
-      
-      g_signal_connect (button, "clicked",
-			G_CALLBACK (change_color_callback), NULL);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/demo-common.h

@@ -1,11 +0,0 @@
-#ifndef __DEMO_COMMON_H__
-#define __DEMO_COMMON_H__
-
-G_BEGIN_DECLS
-
-gchar *demo_find_file (const gchar  *base,
-		       GError      **err);
-
-G_END_DECLS
-
-#endif /* __DEMO_COMMON_H__ */

demos/gtk-demo/dialog.c

@@ -1,178 +0,0 @@
-/* Dialog and Message Boxes
- *
- * Dialog widgets are used to pop up a transient window for user feedback.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-static GtkWidget *entry1 = NULL;
-static GtkWidget *entry2 = NULL;
-
-static void
-message_dialog_clicked (GtkButton *button,
-			gpointer   user_data)
-{
-  GtkWidget *dialog;
-  static gint i = 1;
-
-  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-				   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-				   GTK_MESSAGE_INFO,
-				   GTK_BUTTONS_OK,
-				   "This message box has been popped up the following\n"
-				   "number of times:\n\n"
-				   "%d", i);
-  gtk_dialog_run (GTK_DIALOG (dialog));
-  gtk_widget_destroy (dialog);
-  i++;
-}
-
-static void
-interactive_dialog_clicked (GtkButton *button,
-			    gpointer   user_data)
-{
-  GtkWidget *dialog;
-  GtkWidget *hbox;
-  GtkWidget *stock;
-  GtkWidget *table;
-  GtkWidget *local_entry1;
-  GtkWidget *local_entry2;
-  GtkWidget *label;
-  gint response;
-
-  dialog = gtk_dialog_new_with_buttons ("Interactive Dialog",
-					GTK_WINDOW (window),
-					GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT,
-					GTK_STOCK_OK,
-					GTK_RESPONSE_OK,
-                                        "_Non-stock Button",
-                                        GTK_RESPONSE_CANCEL,
-					NULL);
-
-  hbox = gtk_hbox_new (FALSE, 8);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
-
-  stock = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
-  gtk_box_pack_start (GTK_BOX (hbox), stock, FALSE, FALSE, 0);
-
-  table = gtk_table_new (2, 2, FALSE);
-  gtk_table_set_row_spacings (GTK_TABLE (table), 4);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 4);
-  gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE, 0);
-  label = gtk_label_new_with_mnemonic ("_Entry 1");
-  gtk_table_attach_defaults (GTK_TABLE (table),
-			     label,
-			     0, 1, 0, 1);
-  local_entry1 = gtk_entry_new ();
-  gtk_entry_set_text (GTK_ENTRY (local_entry1), gtk_entry_get_text (GTK_ENTRY (entry1)));
-  gtk_table_attach_defaults (GTK_TABLE (table), local_entry1, 1, 2, 0, 1);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry1);
-
-  label = gtk_label_new_with_mnemonic ("E_ntry 2");
-  gtk_table_attach_defaults (GTK_TABLE (table),
-			     label,
-			     0, 1, 1, 2);
-
-  local_entry2 = gtk_entry_new ();
-  gtk_entry_set_text (GTK_ENTRY (local_entry2), gtk_entry_get_text (GTK_ENTRY (entry2)));
-  gtk_table_attach_defaults (GTK_TABLE (table), local_entry2, 1, 2, 1, 2);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry2);
-  
-  gtk_widget_show_all (hbox);
-  response = gtk_dialog_run (GTK_DIALOG (dialog));
-
-  if (response == GTK_RESPONSE_OK)
-    {
-      gtk_entry_set_text (GTK_ENTRY (entry1), gtk_entry_get_text (GTK_ENTRY (local_entry1)));
-      gtk_entry_set_text (GTK_ENTRY (entry2), gtk_entry_get_text (GTK_ENTRY (local_entry2)));
-    }
-
-  gtk_widget_destroy (dialog);
-}
-
-GtkWidget *
-do_dialog (void)
-{
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *vbox2;
-  GtkWidget *hbox;
-  GtkWidget *button;
-  GtkWidget *table;
-  GtkWidget *label;
-  
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Dialogs");
-
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      frame = gtk_frame_new ("Dialogs");
-      gtk_container_add (GTK_CONTAINER (window), frame);
-
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-      gtk_container_add (GTK_CONTAINER (frame), vbox);
-
-      /* Standard message dialog */
-      hbox = gtk_hbox_new (FALSE, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-      button = gtk_button_new_with_mnemonic ("_Message Dialog");
-      g_signal_connect (button, "clicked",
-			G_CALLBACK (message_dialog_clicked), NULL);
-      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-
-      gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, 0);
-
-      /* Interactive dialog*/
-      hbox = gtk_hbox_new (FALSE, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-      vbox2 = gtk_vbox_new (FALSE, 0);
-
-      button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
-      g_signal_connect (button, "clicked",
-			G_CALLBACK (interactive_dialog_clicked), NULL);
-      gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
-
-      table = gtk_table_new (2, 2, FALSE);
-      gtk_table_set_row_spacings (GTK_TABLE (table), 4);
-      gtk_table_set_col_spacings (GTK_TABLE (table), 4);
-      gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0);
-
-      label = gtk_label_new_with_mnemonic ("_Entry 1");
-      gtk_table_attach_defaults (GTK_TABLE (table),
-				 label,
-				 0, 1, 0, 1);
-
-      entry1 = gtk_entry_new ();
-      gtk_table_attach_defaults (GTK_TABLE (table), entry1, 1, 2, 0, 1);
-      gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry1);
-
-      label = gtk_label_new_with_mnemonic ("E_ntry 2");
-      
-      gtk_table_attach_defaults (GTK_TABLE (table),
-				 label,
-				 0, 1, 1, 2);
-
-      entry2 = gtk_entry_new ();
-      gtk_table_attach_defaults (GTK_TABLE (table), entry2, 1, 2, 1, 2);
-      gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry2);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {	 
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/drawingarea.c

@@ -1,320 +0,0 @@
-/* Drawing Area
- *
- * GtkDrawingArea is a blank area where you can draw custom displays
- * of various kinds.
- *
- * This demo has two drawing areas. The checkerboard area shows
- * how you can just draw something; all you have to do is write
- * a signal handler for expose_event, as shown here.
- *
- * The "scribble" area is a bit more advanced, and shows how to handle
- * events such as button presses and mouse motion. Click the mouse
- * and drag in the scribble area to draw squiggles. Resize the window
- * to clear the area.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-/* Pixmap for scribble area, to store current scribbles */
-static GdkPixmap *pixmap = NULL;
-
-/* Create a new pixmap of the appropriate size to store our scribbles */
-static gboolean
-scribble_configure_event (GtkWidget	    *widget,
-			  GdkEventConfigure *event,
-			  gpointer	     data)
-{
-  if (pixmap)
-    g_object_unref (G_OBJECT (pixmap));
-
-  pixmap = gdk_pixmap_new (widget->window,
-			   widget->allocation.width,
-			   widget->allocation.height,
-			   -1);
-
-  /* Initialize the pixmap to white */
-  gdk_draw_rectangle (pixmap,
-		      widget->style->white_gc,
-		      TRUE,
-		      0, 0,
-		      widget->allocation.width,
-		      widget->allocation.height);
-
-  /* We've handled the configure event, no need for further processing. */
-  return TRUE;
-}
-
-/* Redraw the screen from the pixmap */
-static gboolean
-scribble_expose_event (GtkWidget      *widget,
-		       GdkEventExpose *event,
-		       gpointer	       data)
-{
-  /* We use the "foreground GC" for the widget since it already exists,
-   * but honestly any GC would work. The only thing to worry about
-   * is whether the GC has an inappropriate clip region set.
-   */
-  
-  gdk_draw_drawable (widget->window,
-		     widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-		     pixmap,
-		     /* Only copy the area that was exposed. */
-		     event->area.x, event->area.y,
-		     event->area.x, event->area.y,
-		     event->area.width, event->area.height);
-  
-  return FALSE;
-}
-
-/* Draw a rectangle on the screen */
-static void
-draw_brush (GtkWidget *widget,
-	    gdouble    x,
-	    gdouble    y)
-{
-  GdkRectangle update_rect;
-
-  update_rect.x = x - 3;
-  update_rect.y = y - 3;
-  update_rect.width = 6;
-  update_rect.height = 6;
-
-  /* Paint to the pixmap, where we store our state */
-  gdk_draw_rectangle (pixmap,
-		      widget->style->black_gc,
-		      TRUE,
-		      update_rect.x, update_rect.y,
-		      update_rect.width, update_rect.height);
-
-  /* Now invalidate the affected region of the drawing area. */
-  gdk_window_invalidate_rect (widget->window,
-			      &update_rect,
-			      FALSE);
-}
-
-static gboolean
-scribble_button_press_event (GtkWidget	    *widget,
-			     GdkEventButton *event,
-			     gpointer	     data)
-{
-  if (pixmap == NULL)
-    return FALSE; /* paranoia check, in case we haven't gotten a configure event */
-  
-  if (event->button == 1)
-    draw_brush (widget, event->x, event->y);
-
-  /* We've handled the event, stop processing */
-  return TRUE;
-}
-
-static gboolean
-scribble_motion_notify_event (GtkWidget	     *widget,
-			      GdkEventMotion *event,
-			      gpointer	      data)
-{
-  int x, y;
-  GdkModifierType state;
-
-  if (pixmap == NULL)
-    return FALSE; /* paranoia check, in case we haven't gotten a configure event */
-
-  /* This call is very important; it requests the next motion event.
-   * If you don't call gdk_window_get_pointer() you'll only get
-   * a single motion event. The reason is that we specified
-   * GDK_POINTER_MOTION_HINT_MASK to gtk_widget_set_events().
-   * If we hadn't specified that, we could just use event->x, event->y
-   * as the pointer location. But we'd also get deluged in events.
-   * By requesting the next event as we handle the current one,
-   * we avoid getting a huge number of events faster than we
-   * can cope.
-   */
-  
-  gdk_window_get_pointer (event->window, &x, &y, &state);
-    
-  if (state & GDK_BUTTON1_MASK)
-    draw_brush (widget, x, y);
-
-  /* We've handled it, stop processing */
-  return TRUE;
-}
-
-
-static gboolean
-checkerboard_expose (GtkWidget	    *da,
-		     GdkEventExpose *event,
-		     gpointer	     data)
-{
-  gint i, j, xcount, ycount;
-  GdkGC *gc1, *gc2;
-  GdkColor color;
-  
-#define CHECK_SIZE 10
-#define SPACING 2
-  
-  /* At the start of an expose handler, a clip region of event->area
-   * is set on the window, and event->area has been cleared to the
-   * widget's background color. The docs for
-   * gdk_window_begin_paint_region() give more details on how this
-   * works.
-   */
-
-  /* It would be a bit more efficient to keep these
-   * GC's around instead of recreating on each expose, but
-   * this is the lazy/slow way.
-   */
-  gc1 = gdk_gc_new (da->window);
-  color.red = 30000;
-  color.green = 0;
-  color.blue = 30000;
-  gdk_gc_set_rgb_fg_color (gc1, &color);
-
-  gc2 = gdk_gc_new (da->window);
-  color.red = 65535;
-  color.green = 65535;
-  color.blue = 65535;
-  gdk_gc_set_rgb_fg_color (gc2, &color);
-  
-  xcount = 0;
-  i = SPACING;
-  while (i < da->allocation.width)
-    {
-      j = SPACING;
-      ycount = xcount % 2; /* start with even/odd depending on row */
-      while (j < da->allocation.height)
-	{
-	  GdkGC *gc;
-	  
-	  if (ycount % 2)
-	    gc = gc1;
-	  else
-	    gc = gc2;
-
-	  /* If we're outside event->area, this will do nothing.
-	   * It might be mildly more efficient if we handled
-	   * the clipping ourselves, but again we're feeling lazy.
-	   */
-	  gdk_draw_rectangle (da->window,
-			      gc,
-			      TRUE,
-			      i, j,
-			      CHECK_SIZE,
-			      CHECK_SIZE);
-
-	  j += CHECK_SIZE + SPACING;
-	  ++ycount;
-	}
-
-      i += CHECK_SIZE + SPACING;
-      ++xcount;
-    }
-  
-  g_object_unref (G_OBJECT (gc1));
-  g_object_unref (G_OBJECT (gc2));
-  
-  /* return TRUE because we've handled this event, so no
-   * further processing is required.
-   */
-  return TRUE;
-}
-
-GtkWidget *
-do_drawingarea (void)
-{
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *da;
-  GtkWidget *label;
-  
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Drawing Area");
-
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      /*
-       * Create the checkerboard area
-       */
-      
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-			    "<u>Checkerboard pattern</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-      
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-      
-      da = gtk_drawing_area_new ();
-      /* set a minimum size */
-      gtk_widget_set_size_request (da, 100, 100);
-
-      gtk_container_add (GTK_CONTAINER (frame), da);
-
-      g_signal_connect (da, "expose_event",
-			G_CALLBACK (checkerboard_expose), NULL);
-
-      /*
-       * Create the scribble area
-       */
-      
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-			    "<u>Scribble area</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-      
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-      
-      da = gtk_drawing_area_new ();
-      /* set a minimum size */
-      gtk_widget_set_size_request (da, 100, 100);
-
-      gtk_container_add (GTK_CONTAINER (frame), da);
-
-      /* Signals used to handle backing pixmap */
-      
-      g_signal_connect (da, "expose_event",
-			G_CALLBACK (scribble_expose_event), NULL);
-      g_signal_connect (da,"configure_event",
-			G_CALLBACK (scribble_configure_event), NULL);
-      
-      /* Event signals */
-      
-      g_signal_connect (da, "motion_notify_event",
-			G_CALLBACK (scribble_motion_notify_event), NULL);
-      g_signal_connect (da, "button_press_event",
-			G_CALLBACK (scribble_button_press_event), NULL);
-
-
-      /* Ask to receive events the drawing area doesn't normally
-       * subscribe to
-       */
-      gtk_widget_set_events (da, gtk_widget_get_events (da)
-			     | GDK_LEAVE_NOTIFY_MASK
-			     | GDK_BUTTON_PRESS_MASK
-			     | GDK_POINTER_MOTION_MASK
-			     | GDK_POINTER_MOTION_HINT_MASK);
-
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/editable_cells.c

@@ -1,301 +0,0 @@
-/* Tree View/Editable Cells
- *
- * This demo demonstrates the use of editable cells in a GtkTreeView. If
- * you're new to the GtkTreeView widgets and associates, look into
- * the GtkListStore example first.
- *
- */
-
-#include <gtk/gtk.h>
-#include <string.h>
-#include <stdlib.h>
-
-static GtkWidget *window = NULL;
-
-typedef struct
-{
-  gint     number;
-  gchar   *product;
-  gboolean editable;
-}
-Item;
-
-enum
-{
-  COLUMN_NUMBER,
-  COLUMN_PRODUCT,
-  COLUMN_EDITABLE,
-  NUM_COLUMNS
-};
-
-static GArray *articles = NULL;
-
-static void
-add_items (void)
-{
-  Item foo;
-
-  g_return_if_fail (articles != NULL);
-
-  foo.number = 3;
-  foo.product = g_strdup ("bottles of coke");
-  foo.editable = TRUE;
-  g_array_append_vals (articles, &foo, 1);
-
-  foo.number = 5;
-  foo.product = g_strdup ("packages of noodles");
-  foo.editable = TRUE;
-  g_array_append_vals (articles, &foo, 1);
-
-  foo.number = 2;
-  foo.product = g_strdup ("packages of chocolate chip cookies");
-  foo.editable = TRUE;
-  g_array_append_vals (articles, &foo, 1);
-
-  foo.number = 1;
-  foo.product = g_strdup ("can vanilla ice cream");
-  foo.editable = TRUE;
-  g_array_append_vals (articles, &foo, 1);
-
-  foo.number = 6;
-  foo.product = g_strdup ("eggs");
-  foo.editable = TRUE;
-  g_array_append_vals (articles, &foo, 1);
-}
-
-static GtkTreeModel *
-create_model (void)
-{
-  gint i = 0;
-  GtkListStore *model;
-  GtkTreeIter iter;
-
-  /* create array */
-  articles = g_array_sized_new (FALSE, FALSE, sizeof (Item), 1);
-
-  add_items ();
-
-  /* create list store */
-  model = gtk_list_store_new (NUM_COLUMNS, G_TYPE_INT, G_TYPE_STRING,
-			      G_TYPE_BOOLEAN);
-
-  /* add items */
-  for (i = 0; i < articles->len; i++)
-    {
-      gtk_list_store_append (model, &iter);
-
-      gtk_list_store_set (model, &iter,
-			  COLUMN_NUMBER,
-			  g_array_index (articles, Item, i).number,
-			  COLUMN_PRODUCT,
-			  g_array_index (articles, Item, i).product,
-			  COLUMN_EDITABLE,
-			  g_array_index (articles, Item, i).editable,
-			  -1);
-    }
-
-  return GTK_TREE_MODEL (model);
-}
-
-static void
-add_item (GtkWidget *button, gpointer data)
-{
-  Item foo;
-  GtkTreeIter iter;
-  GtkTreeModel *model = (GtkTreeModel *)data;
-
-  g_return_if_fail (articles != NULL);
-
-  foo.number = 0;
-  foo.product = g_strdup ("Description here");
-  foo.editable = TRUE;
-  g_array_append_vals (articles, &foo, 1);
-
-  gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-		      COLUMN_NUMBER, foo.number,
-		      COLUMN_PRODUCT, foo.product,
-		      COLUMN_EDITABLE, foo.editable,
-		      -1);
-}
-
-static void
-remove_item (GtkWidget *widget, gpointer data)
-{
-  GtkTreeIter iter;
-  GtkTreeView *treeview = (GtkTreeView *)data;
-  GtkTreeModel *model = gtk_tree_view_get_model (treeview);
-  GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview);
-
-  if (gtk_tree_selection_get_selected (selection, NULL, &iter))
-    {
-      gint i;
-      GtkTreePath *path;
-
-      path = gtk_tree_model_get_path (model, &iter);
-      i = gtk_tree_path_get_indices (path)[0];
-      gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
-
-      g_array_remove_index (articles, i);
-
-      gtk_tree_path_free (path);
-    }
-}
-
-static void
-cell_edited (GtkCellRendererText *cell,
-	     const gchar         *path_string,
-	     const gchar         *new_text,
-	     gpointer             data)
-{
-  GtkTreeModel *model = (GtkTreeModel *)data;
-  GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
-  GtkTreeIter iter;
-
-  gint *column;
-
-  column = g_object_get_data (G_OBJECT (cell), "column");
-
-  gtk_tree_model_get_iter (model, &iter, path);
-
-  switch (GPOINTER_TO_INT (column))
-    {
-    case COLUMN_NUMBER:
-      {
-	gint i;
-
-	i = gtk_tree_path_get_indices (path)[0];
-	g_array_index (articles, Item, i).number = atoi (new_text);
-
-	gtk_list_store_set (GTK_LIST_STORE (model), &iter, column,
-			    g_array_index (articles, Item, i).number, -1);
-      }
-      break;
-
-    case COLUMN_PRODUCT:
-      {
-	gint i;
-	gchar *old_text;
-
-        gtk_tree_model_get (model, &iter, column, &old_text, -1);
-	g_free (old_text);
-
-	i = gtk_tree_path_get_indices (path)[0];
-	g_free (g_array_index (articles, Item, i).product);
-	g_array_index (articles, Item, i).product = g_strdup (new_text);
-
-	gtk_list_store_set (GTK_LIST_STORE (model), &iter, column,
-                            g_array_index (articles, Item, i).product, -1);
-      }
-      break;
-    }
-
-  gtk_tree_path_free (path);
-}
-
-static void
-add_columns (GtkTreeView *treeview)
-{
-  GtkCellRenderer *renderer;
-  GtkTreeModel *model = gtk_tree_view_get_model (treeview);
-
-  /* number column */
-  renderer = gtk_cell_renderer_text_new ();
-  g_signal_connect (G_OBJECT (renderer), "edited",
-		    G_CALLBACK (cell_edited), model);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_NUMBER);
-
-  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-					       -1, "Number", renderer,
-					       "text", COLUMN_NUMBER,
-					       "editable", COLUMN_EDITABLE,
-					       NULL);
-
-  /* product column */
-  renderer = gtk_cell_renderer_text_new ();
-  g_signal_connect (G_OBJECT (renderer), "edited",
-		    G_CALLBACK (cell_edited), model);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_PRODUCT);
-
-  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-					       -1, "Product", renderer,
-					       "text", COLUMN_PRODUCT,
-					       "editable", COLUMN_EDITABLE,
-					       NULL);
-}
-
-GtkWidget *
-do_editable_cells (void)
-{
-  if (!window)
-    {
-      GtkWidget *vbox;
-      GtkWidget *hbox;
-      GtkWidget *sw;
-      GtkWidget *treeview;
-      GtkWidget *button;
-      GtkTreeModel *model;
-
-      /* create window, etc */
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Shopping list");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 5);
-      g_signal_connect (G_OBJECT (window), "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-
-      vbox = gtk_vbox_new (FALSE, 5);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      gtk_box_pack_start (GTK_BOX (vbox),
-			  gtk_label_new ("Shopping list (you can edit the cells!)"),
-			  FALSE, FALSE, 0);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-					   GTK_SHADOW_ETCHED_IN);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-				      GTK_POLICY_AUTOMATIC,
-				      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
-
-      /* create model */
-      model = create_model ();
-
-      /* create tree view */
-      treeview = gtk_tree_view_new_with_model (model);
-      g_object_unref (G_OBJECT (model));
-      gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
-      gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
-				   GTK_SELECTION_SINGLE);
-
-      add_columns (GTK_TREE_VIEW (treeview));
-
-      gtk_container_add (GTK_CONTAINER (sw), treeview);
-
-      /* some buttons */
-      hbox = gtk_hbox_new (TRUE, 4);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-
-      button = gtk_button_new_with_label ("Add item");
-      g_signal_connect (G_OBJECT (button), "clicked",
-			G_CALLBACK (add_item), model);
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
-
-      button = gtk_button_new_with_label ("Remove item");
-      g_signal_connect (G_OBJECT (button), "clicked",
-			G_CALLBACK (remove_item), treeview);
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
-
-      gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/geninclude.pl.in

@@ -1,163 +0,0 @@
-#!@PERL@ -w
-
-print <<EOT;
-typedef	GtkWidget *(*GDoDemoFunc) (void);
-
-typedef struct _Demo Demo;
-
-struct _Demo 
-{
-  gchar *title;
-  gchar *filename;
-  GDoDemoFunc func;
-  Demo *children;
-};
-
-EOT
-
-for $file (@ARGV) {
-    my %demo;
-    
-    ($basename = $file) =~ s/\.c$//;
-
-    open INFO_FILE, $file or die "Cannot open '$file'\n";
-    $title = <INFO_FILE>;
-    $title =~ s@^\s*/\*\s*@@;
-    $title =~ s@\s*$@@;
-
-    close INFO_FILE;
-
-    print "GtkWidget *do_$basename (void);\n";
-
-    push @demos, {"title" => $title, "file" => $file,
-		  "func"  => "do_$basename"};
-}
-
-# generate a list of 'parent names'
-foreach $href (@demos) {
-    if ($href->{"title"} =~ m|^([\w\s]+)/[\w\s]+$|) {
-	my $parent_name = $1;
-	my $do_next = 0;
-
-	# parent detected
-	if (defined @parents) {
-	    foreach $foo (@parents) {
-		if ($foo eq $parent_name) {
-		    $do_next = 1;
-		}
-	    }
-	    
-	    if ($do_next) {
-		next;
-	    }
-	}
-
-	push @parents, $parent_name;
-
-	$tmp = (defined @child_arrays)?($#child_arrays + 1):0;
-	push @child_arrays, "child$tmp";
-
-	push @demos, {"title" => $parent_name, "file" => "NULL",
-		      "func" => "NULL"};
-    }
-}
-
-if (defined @parents) {
-    $i = 0;
-    for ($i = 0; $i <= $#parents; $i++) {
-	$first = 1;
-	
-	print "\nDemo ", $child_arrays[$i], "[] = {\n";
-	
-	$j = 0;
-	for ($j = 0; $j <= $#demos; $j++) {
-	    $href = $demos[$j];
-	    
-	    if (!defined $demos[$j]) {
-		next;
-	    }
-	    
-	    if ($demos[$j]{"title"} =~ m|^$parents[$i]/([\w\s]+)$|) {
-		if ($first) {
-		    $first = 0;
-		} else {
-		    print ",\n";
-		}
-		
-		print qq (  { "$1", "$demos[$j]{file}", $demos[$j]{func}, NULL });
-
-		# hack ... ugly
-		$demos[$j]{"title"} = "foo";
-	    }
-	}
-
-	print ",\n";
-	print qq (  { NULL } );
-	print "\n};\n";
-    }   
-}
-
-# sort @demos
-@demos_old = @demos;
-
-@demos = sort {
-    $a->{"title"} cmp $b->{"title"};
-} @demos_old;
-
-# sort the child arrays
-if (defined @child_arrays) {
-    for ($i = 0; $i <= $#child_arrays; $i++) {
-	@foo_old = @{$child_arrays[$i]};
-
-	@{$child_arrays[$i]} = sort {
-	    $a->{"title"} cmp $b->{"title"};
-	} @foo_old;
-    }
-}
-
-# toplevel
-print "\nDemo testgtk_demos[] = {\n";
-
-$first = 1;
-foreach $href (@demos) {
-    $handled = 0;
-
-    # ugly evil hack
-    if ($href->{title} eq "foo") {
-	next;
-    }
-
-    if ($first) {
-	$first = 0;
-    } else {
-	print ", \n";
-    }
-
-    if (defined @parents) {
-	for ($i = 0; $i <= $#parents; $i++) {
-	    if ($parents[$i] eq $href->{title}) {
-
-		if ($href->{file} eq 'NULL') {
-		    print qq (  { "$href->{title}", NULL, $href->{func}, $child_arrays[$i] });
-		} else {
-		    print qq (  { "$href->{title}", "$href->{file}", $href->{func}, $child_arrays[$i] });
-		}
-		
-		$handled = 1;
-		last;
-	    }
-	}
-    }
-    
-    if ($handled) {
-	next;
-    }
-    
-    print qq (  { "$href->{title}", "$href->{file}", $href->{func}, NULL });
-}
-
-print ",\n";
-print qq (  { NULL } );
-print "\n};\n";
-
-exit 0;

demos/gtk-demo/images.c

@@ -1,461 +0,0 @@
-/* Images
- *
- * GtkImage is used to display an image; the image can be in a number of formats.
- * Typically, you load an image into a GdkPixbuf, then display the pixbuf.
- *
- * This demo code shows some of the more obscure cases, in the simple
- * case a call to gtk_image_new_from_file() is all you need.
- *
- * If you want to put image data in your program as a C variable,
- * use the make-inline-pixbuf program that comes with GTK+.
- * This way you won't need to depend on loading external files, your
- * application binary can be self-contained.
- */
-
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <errno.h>
-#include "demo-common.h"
-
-static GtkWidget *window = NULL;
-static GdkPixbufLoader *pixbuf_loader = NULL;
-static guint load_timeout = 0;
-static FILE* image_stream = NULL;
-
-static void
-progressive_prepared_callback (GdkPixbufLoader *loader,
-			       gpointer		data)
-{
-  GdkPixbuf *pixbuf;
-  GtkWidget *image;
-
-  image = GTK_WIDGET (data);
-  
-  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-
-  /* Avoid displaying random memory contents, since the pixbuf
-   * isn't filled in yet.
-   */
-  gdk_pixbuf_fill (pixbuf, 0xaaaaaaff);
-  
-  gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
-}
-
-static void
-progressive_updated_callback (GdkPixbufLoader *loader,
-                              gint		   x,
-                              gint		   y,
-                              gint		   width,
-                              gint		   height,
-                              gpointer	   data)
-{
-  GtkWidget *image;
-  
-  image = GTK_WIDGET (data);
-
-  /* We know the pixbuf inside the GtkImage has changed, but the image
-   * itself doesn't know this; so queue a redraw.  If we wanted to be
-   * really efficient, we could use a drawing area or something
-   * instead of a GtkImage, so we could control the exact position of
-   * the pixbuf on the display, then we could queue a draw for only
-   * the updated area of the image.
-   */
-  
-  gtk_widget_queue_draw (image);
-}
-
-static gint
-progressive_timeout (gpointer data)
-{
-  GtkWidget *image;
-
-  image = GTK_WIDGET (data);
-  
-  /* This shows off fully-paranoid error handling, so looks scary.
-   * You could factor out the error handling code into a nice separate
-   * function to make things nicer.
-   */
-  
-  if (image_stream)
-    {
-      size_t bytes_read;
-      guchar buf[256];
-      GError *error = NULL;
-      
-      bytes_read = fread (buf, 1, 256, image_stream);
-
-      if (ferror (image_stream))
-	{
-	  GtkWidget *dialog;
-	  
-	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-					   GTK_DIALOG_DESTROY_WITH_PARENT,
-					   GTK_MESSAGE_ERROR,
-					   GTK_BUTTONS_CLOSE,
-					   "Failure reading image file 'alphatest.png': %s",
-					   g_strerror (errno));
-
-	  g_signal_connect (dialog, "response",
-			    G_CALLBACK (gtk_widget_destroy), NULL);
-
-	  fclose (image_stream);
-	  image_stream = NULL;
-
-	  gtk_widget_show (dialog);
-	  
-	  load_timeout = 0;
-
-	  return FALSE; /* uninstall the timeout */
-	}
-
-      if (!gdk_pixbuf_loader_write (pixbuf_loader,
-				    buf, bytes_read,
-				    &error))
-	{
-	  GtkWidget *dialog;
-	  
-	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-					   GTK_DIALOG_DESTROY_WITH_PARENT,
-					   GTK_MESSAGE_ERROR,
-					   GTK_BUTTONS_CLOSE,
-					   "Failed to load image: %s",
-					   error->message);
-
-	  g_error_free (error);
-	  
-	  g_signal_connect (dialog, "response",
-			    G_CALLBACK (gtk_widget_destroy), NULL);
-
-	  fclose (image_stream);
-	  image_stream = NULL;
-	  
-	  gtk_widget_show (dialog);
-
-	  load_timeout = 0;
-
-	  return FALSE; /* uninstall the timeout */
-	}
-
-      if (feof (image_stream))
-	{
-	  fclose (image_stream);
-	  image_stream = NULL;
-
-	  /* Errors can happen on close, e.g. if the image
-	   * file was truncated we'll know on close that
-	   * it was incomplete.
-	   */
-	  error = NULL;
-	  if (!gdk_pixbuf_loader_close (pixbuf_loader,
-					&error))
-	    {
-	      GtkWidget *dialog;
-	      
-	      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-					       GTK_DIALOG_DESTROY_WITH_PARENT,
-					       GTK_MESSAGE_ERROR,
-					       GTK_BUTTONS_CLOSE,
-					       "Failed to load image: %s",
-					       error->message);
-	      
-	      g_error_free (error);
-	      
-	      g_signal_connect (dialog, "response",
-				G_CALLBACK (gtk_widget_destroy), NULL);
-	      
-	      gtk_widget_show (dialog);
-
-	      g_object_unref (G_OBJECT (pixbuf_loader));
-	      pixbuf_loader = NULL;
-	      
-	      load_timeout = 0;
-	      
-	      return FALSE; /* uninstall the timeout */
-	    }
-	  
-	  g_object_unref (G_OBJECT (pixbuf_loader));
-	  pixbuf_loader = NULL;
-	}
-    }
-  else
-    {
-      gchar *filename;
-      gchar *error_message = NULL;
-      GError *error = NULL; 
-
-      /* demo_find_file() looks in the the current directory first,
-       * so you can run gtk-demo without installing GTK, then looks
-       * in the location where the file is installed.
-       */
-      filename = demo_find_file ("alphatest.png", &error);
-      if (error)
-	{
-	  error_message = g_strdup (error->message);
-	  g_error_free (error);
-	}
-      else
-	{
-	  image_stream = fopen (filename, "r");
-	  g_free (filename);
-
-	  if (!image_stream)
-	    error_message = g_strdup_printf ("Unable to open image file 'alphatest.png': %s",
-					     g_strerror (errno));
-	}
-
-      if (image_stream == NULL)
-	{
-	  GtkWidget *dialog;
-	  
-	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-					   GTK_DIALOG_DESTROY_WITH_PARENT,
-					   GTK_MESSAGE_ERROR,
-					   GTK_BUTTONS_CLOSE,
-					   "%s", error_message);
-	  g_free (error_message);
-
-	  g_signal_connect (dialog, "response",
-			    G_CALLBACK (gtk_widget_destroy), NULL);
-	  
-	  gtk_widget_show (dialog);
-
-	  load_timeout = 0;
-
-	  return FALSE; /* uninstall the timeout */
-	}
-
-      if (pixbuf_loader)
-	{
-	  gdk_pixbuf_loader_close (pixbuf_loader, NULL);
-	  g_object_unref (G_OBJECT (pixbuf_loader));
-	  pixbuf_loader = NULL;
-	}
-      
-      pixbuf_loader = gdk_pixbuf_loader_new ();
-      
-      g_signal_connect (G_OBJECT (pixbuf_loader), "area_prepared",
-			G_CALLBACK (progressive_prepared_callback), image);
-      
-      g_signal_connect (G_OBJECT (pixbuf_loader), "area_updated",
-			G_CALLBACK (progressive_updated_callback), image);
-    }
-
-  /* leave timeout installed */
-  return TRUE;
-}
-
-static void
-start_progressive_loading (GtkWidget *image)
-{
-  /* This is obviously totally contrived (we slow down loading
-   * on purpose to show how incremental loading works).
-   * The real purpose of incremental loading is the case where
-   * you are reading data from a slow source such as the network.
-   * The timeout simply simulates a slow data source by inserting
-   * pauses in the reading process.
-   */
-  load_timeout = g_timeout_add (150,
-				progressive_timeout,
-				image);
-}
-
-static void
-cleanup_callback (GtkObject *object,
-		  gpointer   data)
-{
-  if (load_timeout)
-    {
-      g_source_remove (load_timeout);
-      load_timeout = 0;
-    }
-  
-  if (pixbuf_loader)
-    {
-      gdk_pixbuf_loader_close (pixbuf_loader, NULL);
-      g_object_unref (G_OBJECT (pixbuf_loader));
-      pixbuf_loader = NULL;
-    }
-
-  if (image_stream)
-    fclose (image_stream);
-  image_stream = NULL;
-}
-
-static void
-toggle_sensitivity_callback (GtkWidget *togglebutton,
-                             gpointer   user_data)
-{
-  GtkContainer *container = user_data;
-  GList *list;
-  GList *tmp;
-  
-  list = gtk_container_get_children (container);
-
-  tmp = list;
-  while (tmp != NULL)
-    {
-      /* don't disable our toggle */
-      if (GTK_WIDGET (tmp->data) != togglebutton)
-        gtk_widget_set_sensitive (GTK_WIDGET (tmp->data),
-                                  !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton)));
-      
-      tmp = tmp->next;
-    }
-
-  g_list_free (list);
-}
-  
-
-GtkWidget *
-do_images (void)
-{
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *image;
-  GtkWidget *label;
-  GtkWidget *align;
-  GtkWidget *button;
-  GdkPixbuf *pixbuf;
-  GError *error = NULL;
-  char *filename;
-  
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Images");
-
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (cleanup_callback), NULL);
-
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-			    "<u>Image loaded from a file</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-      
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      /* The alignment keeps the frame from growing when users resize
-       * the window
-       */
-      align = gtk_alignment_new (0.5, 0.5, 0, 0);
-      gtk_container_add (GTK_CONTAINER (align), frame);
-      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
-
-      /* demo_find_file() looks in the the current directory first,
-       * so you can run gtk-demo without installing GTK, then looks
-       * in the location where the file is installed.
-       */
-      pixbuf = NULL;
-      filename = demo_find_file ("gtk-logo-rgb.gif", &error);
-      if (filename)
-	{
-	  pixbuf = gdk_pixbuf_new_from_file (filename, &error);
-	  g_free (filename);
-	}
-
-      if (error)
-	{
-	  /* This code shows off error handling. You can just use
-	   * gtk_image_new_from_file() instead if you don't want to report
-	   * errors to the user. If the file doesn't load when using
-	   * gtk_image_new_from_file(), a "missing image" icon will
-	   * be displayed instead.
-	   */
-	  GtkWidget *dialog;
-	  
-	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-					   GTK_DIALOG_DESTROY_WITH_PARENT,
-					   GTK_MESSAGE_ERROR,
-					   GTK_BUTTONS_CLOSE,
-					   "Unable to open image file 'gtk-logo-rgb.gif': %s",
-					   error->message);
-	  g_error_free (error);
-	  
-	  g_signal_connect (dialog, "response",
-			    G_CALLBACK (gtk_widget_destroy), NULL);
-	  
-	  gtk_widget_show (dialog);
-	}
-	  
-      image = gtk_image_new_from_pixbuf (pixbuf);
-
-      gtk_container_add (GTK_CONTAINER (frame), image);
-
-
-      /* Animation */
-
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-			    "<u>Animation loaded from a file</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-      
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      /* The alignment keeps the frame from growing when users resize
-       * the window
-       */
-      align = gtk_alignment_new (0.5, 0.5, 0, 0);
-      gtk_container_add (GTK_CONTAINER (align), frame);
-      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
-
-      filename = demo_find_file ("floppybuddy.gif", NULL);
-      image = gtk_image_new_from_file (filename);
-      g_free (filename);
-
-      gtk_container_add (GTK_CONTAINER (frame), image);
-      
-
-      /* Progressive */
-      
-      
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-			    "<u>Progressive image loading</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-      
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      /* The alignment keeps the frame from growing when users resize
-       * the window
-       */
-      align = gtk_alignment_new (0.5, 0.5, 0, 0);
-      gtk_container_add (GTK_CONTAINER (align), frame);
-      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
-
-      /* Create an empty image for now; the progressive loader
-       * will create the pixbuf and fill it in.
-       */
-      image = gtk_image_new_from_pixbuf (NULL);
-      gtk_container_add (GTK_CONTAINER (frame), image);
-
-      start_progressive_loading (image);
-
-      /* Sensitivity control */
-      button = gtk_toggle_button_new_with_mnemonic ("_Insensitive");
-      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
-      g_signal_connect (G_OBJECT (button), "toggled",
-                        G_CALLBACK (toggle_sensitivity_callback),
-                        vbox);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/item_factory.c

@@ -1,120 +0,0 @@
-/* Item Factory
- *
- * The GtkItemFactory object allows the easy creation of menus
- * from an array of descriptions of menu items.
- */
-
-#include <gtk/gtk.h>
-
-static void
-gtk_ifactory_cb (gpointer   callback_data,
-		 guint      callback_action,
-		 GtkWidget *widget)
-{
-  g_message ("ItemFactory: activated \"%s\"",
-	     gtk_item_factory_path_from_widget (widget));
-}
-
-static GtkItemFactoryEntry menu_items[] =
-{
-  { "/_File",		 NULL,	       0,		      0, "<Branch>" },
-  { "/File/tearoff1",	 NULL,	       gtk_ifactory_cb,	      0, "<Tearoff>" },
-  { "/File/_New",	 "<control>N", gtk_ifactory_cb,	      0 },
-  { "/File/_Open",	 "<control>O", gtk_ifactory_cb,	      0 },
-  { "/File/_Save",	 "<control>S", gtk_ifactory_cb,	      0 },
-  { "/File/Save _As...", NULL,	       gtk_ifactory_cb,	      0 },
-  { "/File/sep1",	 NULL,	       gtk_ifactory_cb,	      0, "<Separator>" },
-  { "/File/_Quit",	 "<control>Q", gtk_ifactory_cb,	      0 },
-
-  { "/_Preferences",			NULL, 0,	       0, "<Branch>" },
-  { "/_Preferences/_Color",		NULL, 0,	       0, "<Branch>" },
-  { "/_Preferences/Color/_Red",		NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
-  { "/_Preferences/Color/_Green",	NULL, gtk_ifactory_cb, 0, "/Preferences/Color/Red" },
-  { "/_Preferences/Color/_Blue",	NULL, gtk_ifactory_cb, 0, "/Preferences/Color/Red" },
-  { "/_Preferences/_Shape",		NULL, 0,	       0, "<Branch>" },
-  { "/_Preferences/Shape/_Square",	NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
-  { "/_Preferences/Shape/_Rectangle",	NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Square" },
-  { "/_Preferences/Shape/_Oval",	NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Rectangle" },
-
-  { "/_Help",		 NULL,	       0,		      0, "<LastBranch>" },
-  { "/Help/_About",	 NULL,	       gtk_ifactory_cb,	      0 },
-};
-
-static int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
-
-GtkWidget *
-do_item_factory (void)
-{
-  static GtkWidget *window = NULL;
-  
-  if (!window)
-    {
-      GtkWidget *box1;
-      GtkWidget *box2;
-      GtkWidget *separator;
-      GtkWidget *label;
-      GtkWidget *button;
-      GtkAccelGroup *accel_group;
-      GtkItemFactory *item_factory;
-      
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-      g_signal_connect (window, "delete-event",
-			G_CALLBACK (gtk_true), NULL);
-      
-      accel_group = gtk_accel_group_new ();
-      item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);
-      g_object_set_data_full (G_OBJECT (window), "<main>",
-			      item_factory, (GDestroyNotify) g_object_unref);
-      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-      gtk_window_set_title (GTK_WINDOW (window), "Item Factory");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-      gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, NULL);
-
-      /* preselect /Preferences/Shape/Oval over the other radios
-       */
-      gtk_check_menu_item_set_active
-	(GTK_CHECK_MENU_ITEM (gtk_item_factory_get_item (item_factory,
-							 "/Preferences/Shape/Oval")),
-	 TRUE);
-
-      box1 = gtk_vbox_new (FALSE, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
-      
-      gtk_box_pack_start (GTK_BOX (box1),
-			  gtk_item_factory_get_widget (item_factory, "<main>"),
-			  FALSE, FALSE, 0);
-
-      label = gtk_label_new ("Type\n<alt>\nto start");
-      gtk_widget_set_size_request (label, 200, 200);
-      gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
-      gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE, 0);
-
-
-      separator = gtk_hseparator_new ();
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
-
-
-      box2 = gtk_vbox_new (FALSE, 10);
-      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
-
-      button = gtk_button_new_with_label ("close");
-      g_signal_connect_swapped (button, "clicked",
-				G_CALLBACK (gtk_widget_destroy), window);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-      gtk_widget_grab_default (button);
-
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/list_store.c

@@ -1,219 +0,0 @@
-/* Tree View/List Store
- *
- * The GtkListStore is used to store data in list form, to be used
- * later on by a GtkTreeView to display it. This demo builds a
- * simple GtkListStore and displays it. See the Stock Browser
- * demo for a more advanced example.
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-typedef struct
-{
-  const gboolean  fixed;
-  const guint     number;
-  const gchar    *severity;
-  const gchar    *description;
-}
-Bug;
-
-enum
-{
-  COLUMN_FIXED,
-  COLUMN_NUMBER,
-  COLUMN_SEVERITY,
-  COLUMN_DESCRIPTION,
-  NUM_COLUMNS
-};
-
-static Bug data[] =
-{
-  { FALSE, 60482, "Normal",     "scrollable notebooks and hidden tabs" },
-  { FALSE, 60620, "Critical",   "gdk_window_clear_area (gdkwindow-win32.c) is not thread-safe" },
-  { FALSE, 50214, "Major",      "Xft support does not clean up correctly" },
-  { TRUE,  52877, "Major",      "GtkFileSelection needs a refresh method. " },
-  { FALSE, 56070, "Normal",     "Can't click button after setting in sensitive" },
-  { TRUE,  56355, "Normal",     "GtkLabel - Not all changes propagate correctly" },
-  { FALSE, 50055, "Normal",     "Rework width/height computations for TreeView" },
-  { FALSE, 58278, "Normal",     "gtk_dialog_set_response_sensitive () doesn't work" },
-  { FALSE, 55767, "Normal",     "Getters for all setters" },
-  { FALSE, 56925, "Normal",     "Gtkcalender size" },
-  { FALSE, 56221, "Normal",     "Selectable label needs right-click copy menu" },
-  { TRUE,  50939, "Normal",     "Add shift clicking to GtkTextView" },
-  { FALSE, 6112,  "Enhancement","netscape-like collapsable toolbars" },
-  { FALSE, 1,     "Normal",     "First bug :=)" },
-};
-
-static GtkTreeModel *
-create_model (void)
-{
-  gint i = 0;
-  GtkListStore *store;
-  GtkTreeIter iter;
-
-  /* create list store */
-  store = gtk_list_store_new (NUM_COLUMNS,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_UINT,
-			      G_TYPE_STRING,
-			      G_TYPE_STRING);
-
-  /* add data to the list store */
-  for (i = 0; i < G_N_ELEMENTS (data); i++)
-    {
-      gtk_list_store_append (store, &iter);
-      gtk_list_store_set (store, &iter,
-			  COLUMN_FIXED, data[i].fixed,
-			  COLUMN_NUMBER, data[i].number,
-			  COLUMN_SEVERITY, data[i].severity,
-			  COLUMN_DESCRIPTION, data[i].description,
-			  -1);
-    }
-
-  return GTK_TREE_MODEL (store);
-}
-
-static void
-fixed_toggled (GtkCellRendererToggle *cell,
-	       gchar                 *path_str,
-	       gpointer               data)
-{
-  GtkTreeModel *model = (GtkTreeModel *)data;
-  GtkTreeIter  iter;
-  GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
-  gboolean fixed;
-
-  /* get toggled iter */
-  gtk_tree_model_get_iter (model, &iter, path);
-  gtk_tree_model_get (model, &iter, COLUMN_FIXED, &fixed, -1);
-
-  /* do something with the value */
-  fixed ^= 1;
-
-  /* set new value */
-  gtk_list_store_set (GTK_LIST_STORE (model), &iter, COLUMN_FIXED, fixed, -1);
-
-  /* clean up */
-  gtk_tree_path_free (path);
-}
-
-static void
-add_columns (GtkTreeView *treeview)
-{
-  GtkCellRenderer *renderer;
-  GtkTreeViewColumn *column;
-  GtkTreeModel *model = gtk_tree_view_get_model (treeview);
-
-  /* column for fixed toggles */
-  renderer = gtk_cell_renderer_toggle_new ();
-  g_signal_connect (G_OBJECT (renderer), "toggled",
-		    G_CALLBACK (fixed_toggled), model);
-
-  column = gtk_tree_view_column_new_with_attributes ("Fixed?",
-						     renderer,
-						     "active", COLUMN_FIXED,
-						     NULL);
-
-  /* set this column to a fixed sizing (of 50 pixels) */
-  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
-  gtk_tree_view_append_column (treeview, column);
-
-  /* column for bug numbers */
-  renderer = gtk_cell_renderer_text_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Bug number",
-						     renderer,
-						     "text",
-						     COLUMN_NUMBER,
-						     NULL);
-  gtk_tree_view_column_set_sort_column_id (column, COLUMN_NUMBER);
-  gtk_tree_view_append_column (treeview, column);
-
-  /* column for severities */
-  renderer = gtk_cell_renderer_text_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Severity",
-						     renderer,
-						     "text",
-						     COLUMN_SEVERITY,
-						     NULL);
-  gtk_tree_view_column_set_sort_column_id (column, COLUMN_SEVERITY);
-  gtk_tree_view_append_column (treeview, column);
-
-  /* column for description */
-  renderer = gtk_cell_renderer_text_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Description",
-						     renderer,
-						     "text",
-						     COLUMN_DESCRIPTION,
-						     NULL);
-  gtk_tree_view_column_set_sort_column_id (column, COLUMN_DESCRIPTION);
-  gtk_tree_view_append_column (treeview, column);
-}
-
-GtkWidget *
-do_list_store (void)
-{
-  if (!window)
-    {
-      GtkWidget *vbox;
-      GtkWidget *label;
-      GtkWidget *sw;
-      GtkTreeModel *model;
-      GtkWidget *treeview;
-
-      /* create window, etc */
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "GtkListStore demo");
-
-      g_signal_connect (G_OBJECT (window), "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-					   GTK_SHADOW_ETCHED_IN);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-				      GTK_POLICY_NEVER,
-				      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
-
-      /* create tree model */
-      model = create_model ();
-
-      /* create tree view */
-      treeview = gtk_tree_view_new_with_model (model);
-      gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
-      gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview),
-				       COLUMN_DESCRIPTION);
-
-      g_object_unref (G_OBJECT (model));
-
-      gtk_container_add (GTK_CONTAINER (sw), treeview);
-
-      /* add columns to the tree view */
-      add_columns (GTK_TREE_VIEW (treeview));
-
-      /* finish & show */
-      gtk_window_set_default_size (GTK_WINDOW (window), 280, 250);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/main.c

@@ -1,880 +0,0 @@
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-
-#include <demos.h>
-
-static GtkTextBuffer *info_buffer;
-static GtkTextBuffer *source_buffer;
-
-static gchar *current_file = NULL;
-
-
-enum {
-  TITLE_COLUMN,
-  FILENAME_COLUMN,
-  FUNC_COLUMN,
-  ITALIC_COLUMN,
-  NUM_COLUMNS
-};
-
-typedef struct _CallbackData CallbackData;
-struct _CallbackData
-{
-  GtkTreeModel *model;
-  GtkTreePath *path;
-};
-
-/**
- * demo_find_file:
- * @base: base filename
- * @err:  location to store error, or %NULL.
- * 
- * Looks for @base first in the current directory, then in the
- * location GTK+ where it will be installed on make install,
- * returns the first file found.
- * 
- * Return value: the filename, if found or %NULL
- **/
-gchar *
-demo_find_file (const char *base,
-		GError    **err)
-{
-  g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
-  
-  if (g_file_test (base, G_FILE_TEST_EXISTS))
-    return g_strdup (base);
-  else
-    {
-      char *filename = g_build_filename (DEMOCODEDIR, base, NULL);
-      if (!g_file_test (filename, G_FILE_TEST_EXISTS))
-	{
-	  g_set_error (err, G_FILE_ERROR, G_FILE_ERROR_NOENT,
-		       "Cannot find demo data file \"%s\"", base);
-	  g_free (filename);
-	  return NULL;
-	}
-      return filename;
-    }
-}
-
-static void
-window_closed_cb (GtkWidget *window, gpointer data)
-{
-  CallbackData *cbdata = data;
-  GtkTreeIter iter;
-  gboolean italic;
-
-  gtk_tree_model_get_iter (cbdata->model, &iter, cbdata->path);
-  gtk_tree_model_get (GTK_TREE_MODEL (cbdata->model), &iter,
-		      ITALIC_COLUMN, &italic,
-		      -1);
-  if (italic)
-    gtk_tree_store_set (GTK_TREE_STORE (cbdata->model), &iter,
-			ITALIC_COLUMN, !italic,
-			-1);
-
-  gtk_tree_path_free (cbdata->path);
-  g_free (cbdata);
-}
-
-gboolean
-read_line (FILE *stream, GString *str)
-{
-  int n_read = 0;
-  
-#ifdef HAVE_FLOCKFILE
-  flockfile (stream);
-#endif
-
-  g_string_truncate (str, 0);
-  
-  while (1)
-    {
-      int c;
-      
-#ifndef G_OS_WIN32
-      c = getc_unlocked (stream);
-#else
-      c = getc (stream);
-#endif
-
-      if (c == EOF)
-	goto done;
-      else
-	n_read++;
-
-      switch (c)
-	{
-	case '\r':
-	case '\n':
-	  {
-#ifdef HAVE_FLOCKFILE
-	    int next_c = getc_unlocked (stream);
-#else
-	    int next_c = getc (stream);
-#endif
-	    
-	    if (!(next_c == EOF ||
-		  (c == '\r' && next_c == '\n') ||
-		  (c == '\n' && next_c == '\r')))
-	      ungetc (next_c, stream);
-	    
-	    goto done;
-	  }
-	default:
-	  g_string_append_c (str, c);
-	}
-    }
-
- done:
-
-#ifdef HAVE_FLOCKFILE
-  funlockfile (stream);
-#endif
-
-  return n_read > 0;
-}
-
-
-/* Stupid syntax highlighting.
- *
- * No regex was used in the making of this highlighting.
- * It should only work for simple cases.  This is good, as
- * that's all we should have in the demos.
- */
-/* This code should not be used elsewhere, except perhaps as an example of how
- * to iterate through a text buffer.
- */
-enum {
-  STATE_NORMAL,
-  STATE_IN_COMMENT
-};
-
-static gchar *tokens[] =
-{
-  "/*",
-  "\"",
-  NULL
-};
-
-static gchar *types[] =
-{
-  "static",
-  "const ",
-  "void",
-  "gint",
-  "int ",
-  "char ",
-  "gchar ",
-  "gfloat",
-  "float",
-  "gint8",
-  "gint16",
-  "gint32",
-  "guint",
-  "guint8",
-  "guint16",
-  "guint32",
-  "guchar",
-  "glong",
-  "gboolean" ,
-  "gshort",
-  "gushort",
-  "gulong",
-  "gdouble",
-  "gldouble",
-  "gpointer",
-  "NULL",
-  "GList",
-  "GSList",
-  "FALSE",
-  "TRUE",
-  "FILE ",
-  "GtkObject ",
-  "GtkColorSelection ",
-  "GtkWidget ",
-  "GtkButton ",
-  "GdkColor ",
-  "GdkRectangle ",
-  "GdkEventExpose ",
-  "GdkGC ",
-  "GdkPixbufLoader ",
-  "GdkPixbuf ",
-  "GError",
-  "size_t",
-  NULL
-};
-
-static gchar *control[] =
-{
-  " if ",
-  " while ",
-  " else",
-  " do ",
-  " for ",
-  "?",
-  ":",
-  "return ",
-  "goto ",
-  NULL
-};
-void
-parse_chars (gchar     *text,
-	     gchar    **end_ptr,
-	     gint      *state,
-	     gchar    **tag,
-	     gboolean   start)
-{
-  gint i;
-  gchar *next_token;
-
-  /* Handle comments first */
-  if (*state == STATE_IN_COMMENT)
-    {
-      *end_ptr = strstr (text, "*/");
-      if (*end_ptr)
-	{
-	  *end_ptr += 2;
-	  *state = STATE_NORMAL;
-	  *tag = "comment";
-	}
-      return;
-    }
-
-  *tag = NULL;
-  *end_ptr = NULL;
-
-  /* check for comment */
-  if (!strncmp (text, "/*", 2))
-    {
-      *end_ptr = strstr (text, "*/");
-      if (*end_ptr)
-	*end_ptr += 2;
-      else
-	*state = STATE_IN_COMMENT;
-      *tag = "comment";
-      return;
-    }
-
-  /* check for preprocessor defines */
-  if (*text == '#' && start)
-    {
-      *end_ptr = NULL;
-      *tag = "preprocessor";
-      return;
-    }
-
-  /* functions */
-  if (start && * text != '\t' && *text != ' ' && *text != '{' && *text != '}')
-    {
-      if (strstr (text, "("))
-	{
-	  *end_ptr = strstr (text, "(");
-	  *tag = "function";
-	  return;
-	}
-    }
-  /* check for types */
-  for (i = 0; types[i] != NULL; i++)
-    if (!strncmp (text, types[i], strlen (types[i])))
-      {
-	*end_ptr = text + strlen (types[i]);
-	*tag = "type";
-	return;
-      }
-
-  /* check for control */
-  for (i = 0; control[i] != NULL; i++)
-    if (!strncmp (text, control[i], strlen (control[i])))
-      {
-	*end_ptr = text + strlen (control[i]);
-	*tag = "control";
-	return;
-      }
-
-  /* check for string */
-  if (text[0] == '"')
-    {
-      gint maybe_escape = FALSE;
-
-      *end_ptr = text + 1;
-      *tag = "string";
-      while (**end_ptr != '\000')
-	{
-	  if (**end_ptr == '\"' && !maybe_escape)
-	    {
-	      *end_ptr += 1;
-	      return;
-	    }
-	  if (**end_ptr == '\\')
-	    maybe_escape = TRUE;
-	  else
-	    maybe_escape = FALSE;
-	  *end_ptr += 1;
-	}
-      return;
-    }
-
-  /* not at the start of a tag.  Find the next one. */
-  for (i = 0; tokens[i] != NULL; i++)
-    {
-      next_token = strstr (text, tokens[i]);
-      if (next_token)
-	{
-	  if (*end_ptr)
-	    *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-	  else
-	    *end_ptr = next_token;
-	}
-    }
-
-  for (i = 0; types[i] != NULL; i++)
-    {
-      next_token = strstr (text, types[i]);
-      if (next_token)
-	{
-	  if (*end_ptr)
-	    *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-	  else
-	    *end_ptr = next_token;
-	}
-    }
-
-  for (i = 0; control[i] != NULL; i++)
-    {
-      next_token = strstr (text, control[i]);
-      if (next_token)
-	{
-	  if (*end_ptr)
-	    *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-	  else
-	    *end_ptr = next_token;
-	}
-    }
-}
-
-/* While not as cool as c-mode, this will do as a quick attempt at highlighting */
-static void
-fontify ()
-{
-  GtkTextIter start_iter, next_iter, tmp_iter;
-  gint state;
-  gchar *text;
-  gchar *start_ptr, *end_ptr;
-  gchar *tag;
-
-  state = STATE_NORMAL;
-
-  gtk_text_buffer_get_iter_at_offset (source_buffer, &start_iter, 0);
-
-  next_iter = start_iter;
-  while (gtk_text_iter_forward_line (&next_iter))
-    {
-      gboolean start = TRUE;
-      start_ptr = text = gtk_text_iter_get_text (&start_iter, &next_iter);
-
-      do
-	{
-	  parse_chars (start_ptr, &end_ptr, &state, &tag, start);
-
-	  start = FALSE;
-	  if (end_ptr)
-	    {
-	      tmp_iter = start_iter;
-	      gtk_text_iter_forward_chars (&tmp_iter, end_ptr - start_ptr);
-	    }
-	  else
-	    {
-	      tmp_iter = next_iter;
-	    }
-	  if (tag)
-	    gtk_text_buffer_apply_tag_by_name (source_buffer, tag, &start_iter, &tmp_iter);
-
-	  start_iter = tmp_iter;
-	  start_ptr = end_ptr;
-	}
-      while (end_ptr);
-
-      g_free (text);
-      start_iter = next_iter;
-    }
-}
-
-void
-load_file (const gchar *filename)
-{
-  FILE *file;
-  GtkTextIter start, end;
-  char *full_filename;
-  GError *err = NULL;
-  GString *buffer = g_string_new (NULL);
-  int state = 0;
-  gboolean in_para = 0;
-
-  if (current_file && !strcmp (current_file, filename))
-    {
-      g_string_free (buffer, TRUE);
-      return;
-    }
-
-  g_free (current_file);
-  current_file = g_strdup (filename);
-  
-  gtk_text_buffer_get_bounds (info_buffer, &start, &end);
-  gtk_text_buffer_delete (info_buffer, &start, &end);
-
-  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
-  gtk_text_buffer_delete (source_buffer, &start, &end);
-
-  full_filename = demo_find_file (filename, &err);
-  if (!full_filename)
-    {
-      g_warning ("%s", err->message);
-      g_error_free (err);
-      return;
-    }
-
-  file = fopen (full_filename, "r");
-
-  if (!file)
-    g_warning ("Cannot open %s: %s\n", full_filename, g_strerror (errno));
-
-  g_free (full_filename);
-
-  if (!file)
-    return;
-
-  gtk_text_buffer_get_iter_at_offset (info_buffer, &start, 0);
-  while (read_line (file, buffer))
-    {
-      gchar *p = buffer->str;
-      gchar *q;
-      gchar *r;
-      
-      switch (state)
-	{
-	case 0:
-	  /* Reading title */
-	  while (*p == '/' || *p == '*' || g_ascii_isspace (*p))
-	    p++;
-	  r = p;
-	  while (*r != '/' && strlen (r))
-	    r++;
-	  if (strlen (r) > 0)
-	    p = r + 1;
-	  q = p + strlen (p);
-	  while (q > p && g_ascii_isspace (*(q - 1)))
-	    q--;
-
-	  if (q > p)
-	    {
-	      int len_chars = g_utf8_pointer_to_offset (p, q);
-
-	      end = start;
-
-	      g_assert (strlen (p) >= q - p);
-	      gtk_text_buffer_insert (info_buffer, &end, p, q - p);
-	      start = end;
-
-	      gtk_text_iter_backward_chars (&start, len_chars);
-	      gtk_text_buffer_apply_tag_by_name (info_buffer, "title", &start, &end);
-
-	      start = end;
-	      
-	      state++;
-	    }
-	  break;
-	    
-	case 1:
-	  /* Reading body of info section */
-	  while (g_ascii_isspace (*p))
-	    p++;
-	  if (*p == '*' && *(p + 1) == '/')
-	    {
-	      gtk_text_buffer_get_iter_at_offset (source_buffer, &start, 0);
-	      state++;
-	    }
-	  else
-	    {
-	      int len;
-	      
-	      while (*p == '*' || g_ascii_isspace (*p))
-		p++;
-
-	      len = strlen (p);
-	      while (g_ascii_isspace (*(p + len - 1)))
-		len--;
-	      
-	      if (len > 0)
-		{
-		  if (in_para)
-		    gtk_text_buffer_insert (info_buffer, &start, " ", 1);
-
-		  g_assert (strlen (p) >= len);
-		  gtk_text_buffer_insert (info_buffer, &start, p, len);
-		  in_para = 1;
-		}
-	      else
-		{
-		  gtk_text_buffer_insert (info_buffer, &start, "\n", 1);
-		  in_para = 0;
-		}
-	    }
-	  break;
-
-	case 2:
-	  /* Skipping blank lines */
-	  while (g_ascii_isspace (*p))
-	    p++;
-	  if (*p)
-	    {
-	      p = buffer->str;
-	      state++;
-	      /* Fall through */
-	    }
-	  else
-	    break;
-	  
-	case 3:
-	  /* Reading program body */
-	  gtk_text_buffer_insert (source_buffer, &start, p, -1);
-	  gtk_text_buffer_insert (source_buffer, &start, "\n", 1);
-	  break;
-	}
-    }
-
-  fontify ();
-
-  g_string_free (buffer, TRUE);
-}
-
-void
-row_activated_cb (GtkTreeView       *tree_view,
-                  GtkTreePath       *path,
-		  GtkTreeViewColumn *column)
-{
-  GtkTreeIter iter;
-  gboolean italic;
-  GDoDemoFunc func;
-  GtkWidget *window;
-  GtkTreeModel *model;
-
-  model = gtk_tree_view_get_model (tree_view);
-  
-  gtk_tree_model_get_iter (model, &iter, path);
-  gtk_tree_model_get (GTK_TREE_MODEL (model),
-		      &iter,
-		      FUNC_COLUMN, &func,
-		      ITALIC_COLUMN, &italic,
-		      -1);
-
-  if (func)
-    {
-      gtk_tree_store_set (GTK_TREE_STORE (model),
-			  &iter,
-			  ITALIC_COLUMN, !italic,
-			  -1);
-      window = (func) ();
-      
-      if (window != NULL)
-	{
-	  CallbackData *cbdata;
-	  
-	  cbdata = g_new (CallbackData, 1);
-	  cbdata->model = model;
-	  cbdata->path = gtk_tree_path_copy (path);
-	  
-	  g_signal_connect (window, "destroy",
-			    G_CALLBACK (window_closed_cb), cbdata);
-	}
-    }
-}
-
-static void
-selection_cb (GtkTreeSelection *selection,
-	      GtkTreeModel     *model)
-{
-  GtkTreeIter iter;
-  GValue value = {0, };
-
-  if (! gtk_tree_selection_get_selected (selection, NULL, &iter))
-    return;
-
-  gtk_tree_model_get_value (model, &iter,
-			    FILENAME_COLUMN,
-			    &value);
-  if (g_value_get_string (&value))
-    load_file (g_value_get_string (&value));
-  g_value_unset (&value);
-}
-
-static GtkWidget *
-create_text (GtkTextBuffer **buffer,
-	     gboolean        is_source)
-{
-  GtkWidget *scrolled_window;
-  GtkWidget *text_view;
-  PangoFontDescription *font_desc;
-
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-				  GTK_POLICY_AUTOMATIC,
-				  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
-				       GTK_SHADOW_IN);
-  
-  text_view = gtk_text_view_new ();
-  
-  *buffer = gtk_text_buffer_new (NULL);
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), *buffer);
-  gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
-  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (text_view), FALSE);
-
-  gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
-  
-  if (is_source)
-    {
-      font_desc = pango_font_description_from_string ("Courier 12");
-      gtk_widget_modify_font (text_view, font_desc);
-      pango_font_description_free (font_desc);
-
-      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view),
-                                   GTK_WRAP_NONE);
-    }
-  else
-    {
-      /* Make it a bit nicer for text. */
-      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view),
-                                   GTK_WRAP_WORD);
-      gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW (text_view),
-                                            2);
-      gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (text_view),
-                                            2);
-    }
-  
-  return scrolled_window;
-}
-
-static GtkWidget *
-create_tree (void)
-{
-  GtkTreeSelection *selection;
-  GtkCellRenderer *cell;
-  GtkWidget *tree_view;
-  GtkTreeViewColumn *column;
-  GtkTreeStore *model;
-  GtkTreeIter iter;
-
-  Demo *d = testgtk_demos;
-
-  model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN);
-  tree_view = gtk_tree_view_new ();
-  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (model));
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
-
-  gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection),
-			       GTK_SELECTION_BROWSE);
-  gtk_widget_set_size_request (tree_view, 200, -1);
-
-  /* this code only supports 1 level of children. If we
-   * want more we probably have to use a recursing function.
-   */
-  while (d->title)
-    {
-      Demo *children = d->children;
-
-      gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
-
-      gtk_tree_store_set (GTK_TREE_STORE (model),
-			  &iter,
-			  TITLE_COLUMN, d->title,
-			  FILENAME_COLUMN, d->filename,
-			  FUNC_COLUMN, d->func,
-			  ITALIC_COLUMN, FALSE,
-			  -1);
-
-      d++;
-
-      if (!children)
-	continue;
-      
-      while (children->title)
-	{
-	  GtkTreeIter child_iter;
-
-	  gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter);
-	  
-	  gtk_tree_store_set (GTK_TREE_STORE (model),
-			      &child_iter,
-			      TITLE_COLUMN, children->title,
-			      FILENAME_COLUMN, children->filename,
-			      FUNC_COLUMN, children->func,
-			      ITALIC_COLUMN, FALSE,
-			      -1);
-	  
-	  children++;
-	}
-    }
-
-  cell = gtk_cell_renderer_text_new ();
-
-  g_object_set (G_OBJECT (cell),
-                "style", PANGO_STYLE_ITALIC,
-                NULL);
-  
-  column = gtk_tree_view_column_new_with_attributes ("Widget (double click for demo)",
-						     cell,
-						     "text", TITLE_COLUMN,
-						     "style_set", ITALIC_COLUMN,
-						     NULL);
-  
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
-			       GTK_TREE_VIEW_COLUMN (column));
-
-  g_signal_connect (selection, "changed", G_CALLBACK (selection_cb), model);
-  g_signal_connect (tree_view, "row_activated", G_CALLBACK (row_activated_cb), model);
-
-  gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
-  return tree_view;
-}
-
-static void
-setup_default_icon (void)
-{
-  GdkPixbuf *pixbuf;
-  char *filename;
-  GError *err;
-
-  err = NULL;
-
-  pixbuf = NULL;
-  filename = demo_find_file ("gtk-logo-rgb.gif", &err);
-  if (filename)
-    {
-      pixbuf = gdk_pixbuf_new_from_file (filename, &err);
-      g_free (filename);
-    }
-
-  /* Ignoring this error (passing NULL instead of &err above)
-   * would probably be reasonable for most apps.  We're just
-   * showing off.
-   */
-  if (err)
-    {
-      GtkWidget *dialog;
-      
-      dialog = gtk_message_dialog_new (NULL, 0,
-				       GTK_MESSAGE_ERROR,
-				       GTK_BUTTONS_CLOSE,
-				       "Failed to read icon file: %s",
-				       err->message);
-      g_error_free (err);
-
-      g_signal_connect (dialog, "response",
-			G_CALLBACK (gtk_widget_destroy), NULL);
-    }
-
-  if (pixbuf)
-    {
-      GList *list;      
-      GdkPixbuf *transparent;
-
-      /* The gtk-logo-rgb icon has a white background, make it transparent */
-      transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff);
-
-      list = NULL;
-      list = g_list_append (list, transparent);
-      gtk_window_set_default_icon_list (list);
-      g_list_free (list);
-      g_object_unref (G_OBJECT (pixbuf));
-      g_object_unref (G_OBJECT (transparent));
-    }
-}
-
-int
-main (int argc, char **argv)
-{
-  GtkWidget *window;
-  GtkWidget *notebook;
-  GtkWidget *hbox;
-  GtkWidget *tree;
-  GtkTextTag *tag;
-
-  /* Most code in gtk-demo is intended to be exemplary, but not
-   * these few lines, which are just a hack so gtk-demo will work
-   * in the GTK tree without installing it.
-   */
-  if (g_file_test ("../../gdk-pixbuf/libpixbufloader-pnm.la",
-                   G_FILE_TEST_EXISTS))
-    {
-      putenv ("GDK_PIXBUF_MODULEDIR=../../gdk-pixbuf");
-      putenv ("GTK_IM_MODULE_FILE=../../modules/input/gtk.immodules");
-    }
-  /* -- End of hack -- */
-  
-  gtk_init (&argc, &argv);
-
-  setup_default_icon ();
-  
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "GTK+ Code Demos");
-  g_signal_connect (window, "destroy",
-		    G_CALLBACK (gtk_main_quit), NULL);
-
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_container_add (GTK_CONTAINER (window), hbox);
-
-  tree = create_tree ();
-  gtk_box_pack_start (GTK_BOX (hbox), tree, FALSE, FALSE, 0);
-
-  notebook = gtk_notebook_new ();
-  gtk_box_pack_start (GTK_BOX (hbox), notebook, TRUE, TRUE, 0);
-
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-			    create_text (&info_buffer, FALSE),
-			    gtk_label_new_with_mnemonic ("_Info"));
-
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-			    create_text (&source_buffer, TRUE),
-			    gtk_label_new_with_mnemonic ("_Source"));
-
-  tag = gtk_text_buffer_create_tag (info_buffer, "title",
-                                    "font", "Sans 18",
-                                    NULL);
-
-  tag = gtk_text_buffer_create_tag (source_buffer, "comment",
-				    "foreground", "red",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "type",
-				    "foreground", "ForestGreen",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "string",
-				    "foreground", "RosyBrown",
-				    "weight", PANGO_WEIGHT_BOLD,
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "control",
-				    "foreground", "purple",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "preprocessor",
-				    "style", PANGO_STYLE_OBLIQUE,
- 				    "foreground", "burlywood4",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "function",
-				    "weight", PANGO_WEIGHT_BOLD,
- 				    "foreground", "DarkGoldenrod4",
-                                    NULL);
-  
-  gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-  gtk_widget_show_all (window);
-  
-
-  load_file (testgtk_demos[0].filename);
-  
-  gtk_main ();
-
-  return 0;
-}

demos/gtk-demo/makefile.msc.in

@@ -1,80 +0,0 @@
-## Makefile for building the gtk test apps with Microsoft C
-## Use: nmake -f makefile.msc
-
-## There is no install target, you have to decide where and 
-## how to install for yourself.
-
-TOP = ..\..\..
-!INCLUDE $(TOP)/glib/build/win32/make.msc
-
-!IFNDEF PERL
-PERL = perl
-!ENDIF
-
-################################################################
-
-# Possibly override versions from build/win32/module.defs
-GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@
-GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@
-
-GDK_LIBS = ../../gdk/gdk-win32-$(GTK_VER).lib
-GTK_LIBS = ../../gtk/gtk-win32-$(GTK_VER).lib
-GDK_PIXBUF_LIBS = ../../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
-
-INCLUDES = -FImsvc_recommended_pragmas.h -I . -I ../.. -I ../../gdk -I ../../gdk-pixbuf -I ../../gtk
-DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS)
-LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
-DEFINES = -DG_LOG_DOMAIN=\"GtkDemo\" -DGTK_VERSION=\"$(GTK_VER)\" \
-	-DDEMOCODEDIR=\".\"
-
-TOUCH = copy makefile.msc+nul
-
-all :	\
-	demos.h \
-	gtk-demo.exe
-
-## These should be in the order you want them to appear in the 
-## demo app, which means alphabetized by demo title, not filename
-DEMOS = \
-	appwindow.c	\
-	button_box.c	\
-	colorsel.c	\
-	dialog.c	\
-	drawingarea.c	\
-	editable_cells.c \
-	images.c	\
-	item_factory.c	\
-	list_store.c	\
-	menus.c		\
-	panes.c		\
-	pixbufs.c	\
-	sizegroup.c	\
-	stock_browser.c	\
-	textview.c	\
-	tree_store.c	\
-
-demos.h: $(DEMOS) geninclude.pl
-	$(PERL) geninclude.pl $(DEMOS) > demos.h
-
-OBJECTS = \
-	appwindow.obj	\
-	button_box.obj	\
-	colorsel.obj	\
-	dialog.obj	\
-	drawingarea.obj	\
-	editable_cells.obj \
-	images.obj	\
-	item_factory.obj	\
-	list_store.obj	\
-	menus.obj		\
-	panes.obj		\
-	pixbufs.obj	\
-	sizegroup.obj	\
-	stock_browser.obj	\
-	textview.obj	\
-	tree_store.obj	\
-	main.obj \
-
-gtk-demo.exe : demos.h $(OBJECTS)
-	$(CC) $(CFLAGS) -Fegtk-demo.exe $(OBJECTS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-

demos/gtk-demo/menus.c

@@ -1,214 +0,0 @@
-/* Menus
- *
- * There are several widgets involved in displaying menus. The
- * GtkMenuBar widget is a horizontal menu bar, which normally appears
- * at the top of an application. The GtkMenu widget is the actual menu
- * that pops up. Both GtkMenuBar and GtkMenu are subclasses of
- * GtkMenuShell; a GtkMenuShell contains menu items
- * (GtkMenuItem). Each menu item contains text and/or images and can
- * be selected by the user.
- *
- * There are several kinds of menu item, including plain GtkMenuItem,
- * GtkCheckMenuItem which can be checked/unchecked, GtkRadioMenuItem
- * which is a check menu item that's in a mutually exclusive group,
- * GtkSeparatorMenuItem which is a separator bar, GtkTearoffMenuItem
- * which allows a GtkMenu to be torn off, and GtkImageMenuItem which
- * can place a GtkImage or other widget next to the menu text.
- *
- * A GtkMenuItem can have a submenu, which is simply a GtkMenu to pop
- * up when the menu item is selected. Typically, all menu items in a menu bar
- * have submenus.
- *
- * The GtkOptionMenu widget is a button that pops up a GtkMenu when clicked.
- * It's used inside dialogs and such.
- *
- * GtkItemFactory provides a higher-level interface for creating menu bars
- * and menus; while you can construct menus manually, most people don't
- * do that. There's a separate demo for GtkItemFactory.
- * 
- */
-
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-#include <stdio.h>
-
-static GtkWidget *
-create_menu (gint     depth,
-	     gboolean tearoff)
-{
-  GtkWidget *menu;
-  GtkWidget *menuitem;
-  GSList *group;
-  char buf[32];
-  int i, j;
-
-  if (depth < 1)
-    return NULL;
-
-  menu = gtk_menu_new ();
-  group = NULL;
-
-  if (tearoff)
-    {
-      menuitem = gtk_tearoff_menu_item_new ();
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-      gtk_widget_show (menuitem);
-    }
-
-  for (i = 0, j = 1; i < 5; i++, j++)
-    {
-      sprintf (buf, "item %2d - %d", depth, j);
-      menuitem = gtk_radio_menu_item_new_with_label (group, buf);
-      group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-      gtk_widget_show (menuitem);
-      if (i == 3)
-	gtk_widget_set_sensitive (menuitem, FALSE);
-
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (depth - 1, TRUE));
-    }
-
-  return menu;
-}
-
-GtkWidget *
-do_menus (void)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *box1;
-  GtkWidget *box2;
-  GtkWidget *button;
-  GtkWidget *optionmenu;
-  GtkWidget *separator;
-  
-  if (!window)
-    {
-      GtkWidget *menubar;
-      GtkWidget *menu;
-      GtkWidget *menuitem;
-      GtkAccelGroup *accel_group;
-      
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      
-      g_signal_connect (window, "destroy",
-			G_CALLBACK(gtk_widget_destroyed), &window);
-      g_signal_connect (window, "delete-event",
-			G_CALLBACK (gtk_true), NULL);
-      
-      accel_group = gtk_accel_group_new ();
-      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-
-      gtk_window_set_title (GTK_WINDOW (window), "menus");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-      
-      
-      box1 = gtk_vbox_new (FALSE, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
-      gtk_widget_show (box1);
-      
-      menubar = gtk_menu_bar_new ();
-      gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE, 0);
-      gtk_widget_show (menubar);
-      
-      menu = create_menu (2, TRUE);
-      
-      menuitem = gtk_menu_item_new_with_label ("test\nline2");
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
-      gtk_widget_show (menuitem);
-      
-      menuitem = gtk_menu_item_new_with_label ("foo");
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (3, TRUE));
-      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
-      gtk_widget_show (menuitem);
-
-      menuitem = gtk_menu_item_new_with_label ("bar");
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (4, TRUE));
-      gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
-      gtk_widget_show (menuitem);
-      
-      box2 = gtk_vbox_new (FALSE, 10);
-      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
-      gtk_widget_show (box2);
-      
-      menu = create_menu (1, FALSE);
-      gtk_menu_set_accel_group (GTK_MENU (menu), accel_group);
-      
-      menuitem = gtk_separator_menu_item_new ();
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-      gtk_widget_show (menuitem);
-      
-      menuitem = gtk_check_menu_item_new_with_label ("Accelerate Me");
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-      gtk_widget_show (menuitem);
-      gtk_widget_add_accelerator (menuitem,
-				  "activate",
-				  accel_group,
-				  GDK_F1,
-				  0,
-				  GTK_ACCEL_VISIBLE);
-      menuitem = gtk_check_menu_item_new_with_label ("Accelerator Locked");
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-      gtk_widget_show (menuitem);
-      gtk_widget_add_accelerator (menuitem,
-				  "activate",
-				  accel_group,
-				  GDK_F2,
-				  0,
-				  GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED);
-      menuitem = gtk_check_menu_item_new_with_label ("Accelerators Frozen");
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-      gtk_widget_show (menuitem);
-      gtk_widget_add_accelerator (menuitem,
-				  "activate",
-				  accel_group,
-				  GDK_F2,
-				  0,
-				  GTK_ACCEL_VISIBLE);
-      gtk_widget_add_accelerator (menuitem,
-				  "activate",
-				  accel_group,
-				  GDK_F3,
-				  0,
-				  GTK_ACCEL_VISIBLE);
-      
-      optionmenu = gtk_option_menu_new ();
-      gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
-      gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), 3);
-      gtk_box_pack_start (GTK_BOX (box2), optionmenu, TRUE, TRUE, 0);
-      gtk_widget_show (optionmenu);
-
-      separator = gtk_hseparator_new ();
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
-      gtk_widget_show (separator);
-
-      box2 = gtk_vbox_new (FALSE, 10);
-      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
-      gtk_widget_show (box2);
-
-      button = gtk_button_new_with_label ("close");
-      g_signal_connect_swapped (button, "clicked",
-				G_CALLBACK(gtk_widget_destroy), window);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-      gtk_widget_grab_default (button);
-      gtk_widget_show (button);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/panes.c

@@ -1,192 +0,0 @@
-/* Paned Widgets
- *
- * The GtkHPaned and GtkVPaned Widgets divide their content
- * area into two panes with a divider in between that the
- * user can adjust. A separate child is placed into each
- * pane.
- *
- * There are a number of options that can be set for each pane.
- * This test contains both a horizontal (HPaned) and a vertical
- * (VPaned) widget, and allows you to adjust the options for
- * each side of each widget.
- */
-
-#include <gtk/gtk.h>
-
-void
-toggle_resize (GtkWidget *widget,
-	       GtkWidget *child)
-{
-  GtkPaned *paned = GTK_PANED (child->parent);
-  gboolean is_child1 = (child == paned->child1);
-  gboolean resize, shrink;
-
-  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
-  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
-
-  gtk_widget_ref (child);
-  gtk_container_remove (GTK_CONTAINER (child->parent), child);
-  if (is_child1)
-    gtk_paned_pack1 (paned, child, !resize, shrink);
-  else
-    gtk_paned_pack2 (paned, child, !resize, shrink);
-  gtk_widget_unref (child);
-}
-
-void
-toggle_shrink (GtkWidget *widget,
-	       GtkWidget *child)
-{
-  GtkPaned *paned = GTK_PANED (child->parent);
-  gboolean is_child1 = (child == paned->child1);
-  gboolean resize, shrink;
-
-  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
-  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
-
-  gtk_widget_ref (child);
-  gtk_container_remove (GTK_CONTAINER (child->parent), child);
-  if (is_child1)
-    gtk_paned_pack1 (paned, child, resize, !shrink);
-  else
-    gtk_paned_pack2 (paned, child, resize, !shrink);
-  gtk_widget_unref (child);
-}
-
-GtkWidget *
-create_pane_options (GtkPaned	 *paned,
-		     const gchar *frame_label,
-		     const gchar *label1,
-		     const gchar *label2)
-{
-  GtkWidget *frame;
-  GtkWidget *table;
-  GtkWidget *label;
-  GtkWidget *check_button;
-  
-  frame = gtk_frame_new (frame_label);
-  gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
-  
-  table = gtk_table_new (3, 2, TRUE);
-  gtk_container_add (GTK_CONTAINER (frame), table);
-  
-  label = gtk_label_new (label1);
-  gtk_table_attach_defaults (GTK_TABLE (table), label,
-			     0, 1, 0, 1);
-  
-  check_button = gtk_check_button_new_with_mnemonic ("_Resize");
-  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
-			     0, 1, 1, 2);
-  g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_resize), paned->child1);
-  
-  check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
-  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
-			     0, 1, 2, 3);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
-			       TRUE);
-  g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_shrink), paned->child1);
-  
-  label = gtk_label_new (label2);
-  gtk_table_attach_defaults (GTK_TABLE (table), label,
-			     1, 2, 0, 1);
-  
-  check_button = gtk_check_button_new_with_mnemonic ("_Resize");
-  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
-			     1, 2, 1, 2);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
-			       TRUE);
-  g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_resize), paned->child2);
-  
-  check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
-  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
-			     1, 2, 2, 3);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
-			       TRUE);
-  g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_shrink), paned->child2);
-
-  return frame;
-}
-
-GtkWidget *
-do_panes (void)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *frame;
-  GtkWidget *hpaned;
-  GtkWidget *vpaned;
-  GtkWidget *button;
-  GtkWidget *vbox;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_window_set_title (GTK_WINDOW (window), "Panes");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
-      vbox = gtk_vbox_new (FALSE, 0);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-      
-      vpaned = gtk_vpaned_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
-
-      hpaned = gtk_hpaned_new ();
-      gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
-
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_size_request (frame, 60, 60);
-      gtk_paned_add1 (GTK_PANED (hpaned), frame);
-      
-      button = gtk_button_new_with_mnemonic ("_Hi there");
-      gtk_container_add (GTK_CONTAINER(frame), button);
-
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_size_request (frame, 80, 60);
-      gtk_paned_add2 (GTK_PANED (hpaned), frame);
-
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_size_request (frame, 60, 80);
-      gtk_paned_add2 (GTK_PANED (vpaned), frame);
-
-      /* Now create toggle buttons to control sizing */
-
-      gtk_box_pack_start (GTK_BOX (vbox),
-			  create_pane_options (GTK_PANED (hpaned),
-					       "Horizontal",
-					       "Left",
-					       "Right"),
-			  FALSE, FALSE, 0);
-
-      gtk_box_pack_start (GTK_BOX (vbox),
-			  create_pane_options (GTK_PANED (vpaned),
-					       "Vertical",
-					       "Top",
-					       "Bottom"),
-			  FALSE, FALSE, 0);
-
-      gtk_widget_show_all (vbox);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/pixbufs.c

@@ -1,270 +0,0 @@
-/* Pixbufs
- *
- * A GdkPixbuf represents an image, normally in RGB or RGBA format.
- * Pixbufs are normally used to load files from disk and perform
- * image scaling.
- *
- * This demo is not all that educational, but looks cool. It was written
- * by Extreme Pixbuf Hacker Federico Mena Quintero. It also shows
- * off how to use GtkDrawingArea to do a simple animation.
- *
- * Look at the Image demo for additional pixbuf usage examples.
- *
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtk.h>
-#include <math.h>
-
-#include "demo-common.h"
-
-#define FRAME_DELAY 50
-
-#define BACKGROUND_NAME "background.jpg"
-
-static const char *image_names[] = {
-  "apple-red.png",
-  "gnome-applets.png",
-  "gnome-calendar.png",
-  "gnome-foot.png",
-  "gnome-gmush.png",
-  "gnome-gimp.png",
-  "gnome-gsame.png",
-  "gnu-keys.png"
-};
-
-#define N_IMAGES G_N_ELEMENTS (image_names)
-
-/* demo window */
-static GtkWidget *window = NULL;
-
-/* Current frame */
-static GdkPixbuf *frame;
-
-/* Background image */
-static GdkPixbuf *background;
-static gint back_width, back_height;
-
-/* Images */
-static GdkPixbuf *images[N_IMAGES];
-
-/* Widgets */
-static GtkWidget *da;
-
-/* Loads the images for the demo and returns whether the operation succeeded */
-static gboolean
-load_pixbufs (GError **error)
-{
-  gint i;
-  char *filename;
-
-  if (background)
-    return TRUE; /* already loaded earlier */
-
-  /* demo_find_file() looks in the the current directory first,
-   * so you can run gtk-demo without installing GTK, then looks
-   * in the location where the file is installed.
-   */
-  filename = demo_find_file (BACKGROUND_NAME, error);
-  if (!filename)
-    return FALSE; /* note that "error" was filled in and returned */
-
-  background = gdk_pixbuf_new_from_file (filename, error);
-  g_free (filename);
-  
-  if (!background)
-    return FALSE; /* Note that "error" was filled with a GError */
-
-  back_width = gdk_pixbuf_get_width (background);
-  back_height = gdk_pixbuf_get_height (background);
-
-  for (i = 0; i < N_IMAGES; i++)
-    {
-      filename = demo_find_file (image_names[i], error);
-      if (!filename)
-	return FALSE; /* Note that "error" was filled with a GError */
-      
-      images[i] = gdk_pixbuf_new_from_file (filename, error);
-      g_free (filename);
-      
-      if (!images[i])
-	return FALSE; /* Note that "error" was filled with a GError */
-    }
-
-  return TRUE;
-}
-
-/* Expose callback for the drawing area */
-static gint
-expose_cb (GtkWidget	  *widget,
-	   GdkEventExpose *event,
-	   gpointer	   data)
-{
-  guchar *pixels;
-  int rowstride;
-
-  rowstride = gdk_pixbuf_get_rowstride (frame);
-
-  pixels = gdk_pixbuf_get_pixels (frame) + rowstride * event->area.y + event->area.x * 3;
-
-  gdk_draw_rgb_image_dithalign (widget->window,
-				widget->style->black_gc,
-				event->area.x, event->area.y,
-				event->area.width, event->area.height,
-				GDK_RGB_DITHER_NORMAL,
-				pixels, rowstride,
-				event->area.x, event->area.y);
-
-  return TRUE;
-}
-
-#define CYCLE_LEN 60
-
-static int frame_num;
-
-/* Timeout handler to regenerate the frame */
-static gint
-timeout (gpointer data)
-{
-  double f;
-  int i;
-  double xmid, ymid;
-  double radius;
-
-  gdk_pixbuf_copy_area (background, 0, 0, back_width, back_height,
-			frame, 0, 0);
-
-  f = (double) (frame_num % CYCLE_LEN) / CYCLE_LEN;
-
-  xmid = back_width / 2.0;
-  ymid = back_height / 2.0;
-
-  radius = MIN (xmid, ymid) / 2.0;
-
-  for (i = 0; i < N_IMAGES; i++)
-    {
-      double ang;
-      int xpos, ypos;
-      int iw, ih;
-      double r;
-      GdkRectangle r1, r2, dest;
-      double k;
-
-      ang = 2.0 * G_PI * (double) i / N_IMAGES - f * 2.0 * G_PI;
-
-      iw = gdk_pixbuf_get_width (images[i]);
-      ih = gdk_pixbuf_get_height (images[i]);
-
-      r = radius + (radius / 3.0) * sin (f * 2.0 * G_PI);
-
-      xpos = floor (xmid + r * cos (ang) - iw / 2.0 + 0.5);
-      ypos = floor (ymid + r * sin (ang) - ih / 2.0 + 0.5);
-
-      k = (i & 1) ? sin (f * 2.0 * G_PI) : cos (f * 2.0 * G_PI);
-      k = 2.0 * k * k;
-      k = MAX (0.25, k);
-
-      r1.x = xpos;
-      r1.y = ypos;
-      r1.width = iw * k;
-      r1.height = ih * k;
-
-      r2.x = 0;
-      r2.y = 0;
-      r2.width = back_width;
-      r2.height = back_height;
-
-      if (gdk_rectangle_intersect (&r1, &r2, &dest))
-	gdk_pixbuf_composite (images[i],
-			      frame,
-			      dest.x, dest.y,
-			      dest.width, dest.height,
-			      xpos, ypos,
-			      k, k,
-			      GDK_INTERP_NEAREST,
-			      ((i & 1)
-			       ? MAX (127, fabs (255 * sin (f * 2.0 * G_PI)))
-			       : MAX (127, fabs (255 * cos (f * 2.0 * G_PI)))));
-    }
-
-  gtk_widget_queue_draw (da);
-
-  frame_num++;
-  return TRUE;
-}
-
-static guint timeout_id;
-
-static void
-cleanup_callback (GtkObject *object,
-		  gpointer   data)
-{
-  g_source_remove (timeout_id);
-  timeout_id = 0;
-}
-
-GtkWidget *
-do_pixbufs (void)
-{
-  if (!window)
-    {
-      GError *error;
-
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Pixbufs");
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-      g_signal_connect (window, "destroy", G_CALLBACK (cleanup_callback), NULL);
-
-
-      error = NULL;
-      if (!load_pixbufs (&error))
-	{
-	  GtkWidget *dialog;
-
-	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-					   GTK_DIALOG_DESTROY_WITH_PARENT,
-					   GTK_MESSAGE_ERROR,
-					   GTK_BUTTONS_CLOSE,
-					   "Failed to load an image: %s",
-					   error->message);
-
-	  g_error_free (error);
-
-	  g_signal_connect (dialog, "response",
-			    G_CALLBACK (gtk_widget_destroy), NULL);
-
-	  gtk_widget_show (dialog);
-	}
-      else
-	{
-	  gtk_widget_set_size_request (window, back_width, back_height);
-
-	  frame = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, back_width, back_height);
-
-	  da = gtk_drawing_area_new ();
-
-	  g_signal_connect (da, "expose_event",
-			    G_CALLBACK (expose_cb), NULL);
-
-	  gtk_container_add (GTK_CONTAINER (window), da);
-
-	  timeout_id = gtk_timeout_add (FRAME_DELAY, timeout, NULL);
-	}
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/sizegroup.c

@@ -1,173 +0,0 @@
-/* Size Groups
- *
- * GtkSizeGroup provides a mechanism for grouping a number of
- * widgets together so they all request the same amount of space.
- * This is typically useful when you want a column of widgets to 
- * have the same size, but you can't use a GtkTable widget.
- * 
- * Note that size groups only affect the amount of space requested,
- * not the size that the widgets finally receive. If you want the
- * widgets in a GtkSizeGroup to actually be the same size, you need
- * to pack them in such a way that they get the size they request
- * and not more. For example, if you are packing your widgets
- * into a table, you would not include the GTK_FILL flag.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-/* Convenience function to create an option menu holding a number of strings
- */
-GtkWidget *
-create_option_menu (const char **strings)
-{
-  GtkWidget *menu;
-  GtkWidget *option_menu;
-  const char **str;
-
-  menu = gtk_menu_new ();
-  
-  for (str = strings; *str; str++)
-    {
-      GtkWidget *menu_item = gtk_menu_item_new_with_label (*str);
-      gtk_widget_show (menu_item);
-
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-    }
-
-  option_menu = gtk_option_menu_new ();
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
-
-  return option_menu;
-}
-
-static void
-add_row (GtkTable     *table,
-	 int           row,
-	 GtkSizeGroup *size_group,
-	 const char   *label_text,
-	 const char  **options)
-{
-  GtkWidget *option_menu;
-  GtkWidget *label;
-
-  label = gtk_label_new_with_mnemonic (label_text);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 1);
-  gtk_table_attach (GTK_TABLE (table), label,
-		    0, 1,                  row, row + 1,
-		    GTK_EXPAND | GTK_FILL, 0,
-		    0,                     0);
-  
-  option_menu = create_option_menu (options);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), option_menu);
-  gtk_size_group_add_widget (size_group, option_menu);
-  gtk_table_attach (GTK_TABLE (table), option_menu,
-		    1, 2,                  row, row + 1,
-		    0,                     0,
-		    0,                     0);
-}
-
-static void
-toggle_grouping (GtkToggleButton *check_button,
-		 GtkSizeGroup    *size_group)
-{
-  GtkSizeGroupMode new_mode;
-
-  /* GTK_SIZE_GROUP_NONE is not generally useful, but is useful
-   * here to show the effect of GTK_SIZE_GROUP_HORIZONTAL by
-   * contrast.
-   */
-  if (gtk_toggle_button_get_active (check_button))
-    new_mode = GTK_SIZE_GROUP_HORIZONTAL;
-  else
-    new_mode = GTK_SIZE_GROUP_NONE;
-  
-  gtk_size_group_set_mode (size_group, new_mode);
-}
-
-GtkWidget *
-do_sizegroup (void)
-{
-  GtkWidget *table;
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *check_button;
-  GtkSizeGroup *size_group;
-
-  static const char *color_options[] = {
-    "Red", "Green", "Blue", NULL
-  };
-  
-  static const char *dash_options[] = {
-    "Solid", "Dashed", "Dotted", NULL
-  };
-  
-  static const char *end_options[] = {
-    "Square", "Round", "Arrow", NULL
-  };
-  
-  if (!window)
-    {
-      window = gtk_dialog_new_with_buttons ("GtkSizeGroup",
-					    NULL, 0,
-					    GTK_STOCK_CLOSE,
-					    GTK_RESPONSE_NONE,
-					    NULL);
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      
-      g_signal_connect (window, "response",
-			G_CALLBACK (gtk_widget_destroy), NULL);
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-
-      vbox = gtk_vbox_new (FALSE, 5);
-      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-
-      size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-      
-      /* Create one frame holding color options
-       */
-      frame = gtk_frame_new ("Color Options");
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-
-      table = gtk_table_new (2, 2, FALSE);
-      gtk_container_set_border_width (GTK_CONTAINER (table), 5);
-      gtk_table_set_row_spacings (GTK_TABLE (table), 5);
-      gtk_table_set_col_spacings (GTK_TABLE (table), 10);
-      gtk_container_add (GTK_CONTAINER (frame), table);
-
-      add_row (GTK_TABLE (table), 0, size_group, "_Foreground", color_options);
-      add_row (GTK_TABLE (table), 1, size_group, "_Background", color_options);
-
-      /* And another frame holding line style options
-       */
-      frame = gtk_frame_new ("Line Options");
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-
-      table = gtk_table_new (2, 2, FALSE);
-      gtk_container_set_border_width (GTK_CONTAINER (table), 5);
-      gtk_table_set_row_spacings (GTK_TABLE (table), 5);
-      gtk_table_set_col_spacings (GTK_TABLE (table), 10);
-      gtk_container_add (GTK_CONTAINER (frame), table);
-
-      add_row (GTK_TABLE (table), 0, size_group, "_Dashing", dash_options);
-      add_row (GTK_TABLE (table), 1, size_group, "_Line ends", end_options);
-
-      /* And a check button to turn grouping on and off */
-      check_button = gtk_check_button_new_with_mnemonic ("_Enable grouping");
-      gtk_box_pack_start (GTK_BOX (vbox), check_button, FALSE, FALSE, 0);
-      
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
-      g_signal_connect (check_button, "toggled",
-			G_CALLBACK (toggle_grouping), size_group);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/stock_browser.c

@@ -1,563 +0,0 @@
-/* Stock Item and Icon Browser
- *
- * This source code for this demo doesn't demonstrate anything
- * particularly useful in applications. The purpose of the "demo" is
- * just to provide a handy place to browse the available stock icons
- * and stock items.
- */
-
-#include <string.h>
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-typedef struct _StockItemInfo StockItemInfo;
-struct _StockItemInfo
-{
-  gchar *id;
-  GtkStockItem item;
-  GdkPixbuf *small_icon;
-  gchar *macro;
-  gchar *accel_str;
-};
-
-/* Make StockItemInfo a boxed type so we can automatically
- * manage memory
- */
-#define STOCK_ITEM_INFO_TYPE stock_item_info_get_type ()
-
-static void
-stock_item_info_free (StockItemInfo *info)
-{
-  g_free (info->id);
-  g_free (info->macro);
-  g_free (info->accel_str);
-  if (info->small_icon)
-    g_object_unref (G_OBJECT (info->small_icon));
-  
-  g_free (info);
-}
-
-static StockItemInfo*
-stock_item_info_copy (StockItemInfo *src)
-{
-  StockItemInfo *info;
-
-  info = g_new (StockItemInfo, 1);
-  info->id = g_strdup (src->id);
-  info->macro = g_strdup (src->macro);
-  info->accel_str = g_strdup (src->accel_str);
-  
-  info->item = src->item;
-
-  info->small_icon = src->small_icon;
-  if (info->small_icon)
-    g_object_ref (G_OBJECT (info->small_icon));
-
-  return info;
-}
-
-static GType
-stock_item_info_get_type (void)
-{
-  static GType our_type = 0;
-  
-  if (our_type == 0)
-    our_type = g_boxed_type_register_static ("StockItemInfo",
-                                             (GBoxedCopyFunc) stock_item_info_copy,
-                                             (GBoxedFreeFunc) stock_item_info_free);
-
-  return our_type;
-}
-
-typedef struct _StockItemDisplay StockItemDisplay;
-struct _StockItemDisplay
-{
-  GtkWidget *type_label;
-  GtkWidget *macro_label;
-  GtkWidget *id_label;
-  GtkWidget *label_accel_label;
-  GtkWidget *icon_image;
-};
-
-static gchar*
-id_to_macro (const gchar *id)
-{
-  GString *macro = NULL;
-  const gchar *cp;
-
-  /* gtk-foo-bar -> GTK_STOCK_FOO_BAR */
-
-  macro = g_string_new (NULL);
-  
-  cp = id;
-  
-  if (strncmp (cp, "gtk-", 4) == 0)
-    {
-      g_string_append (macro, "GTK_STOCK_");
-      cp += 4;
-    }
-
-  while (*cp)
-    {
-      if (*cp == '-')
-	g_string_append_c (macro, '_');
-      else if (g_ascii_islower (*cp))
-	g_string_append_c (macro, g_ascii_toupper (*cp));
-      else
-	g_string_append_c (macro, *cp);
-
-      cp++;
-    }
-
-  return g_string_free (macro, FALSE);
-}
-
-static GtkTreeModel*
-create_model (void)
-{
-  GtkListStore *store;
-  GSList *ids;
-  GSList *tmp_list;
-  
-  store = gtk_list_store_new (1, STOCK_ITEM_INFO_TYPE);
-
-  ids = gtk_stock_list_ids ();
-  ids = g_slist_sort (ids, (GCompareFunc) strcmp);
-  tmp_list = ids;
-  while (tmp_list != NULL)
-    {
-      StockItemInfo info;
-      GtkStockItem item;
-      GtkTreeIter iter;
-      GtkIconSet *icon_set;
-      
-      info.id = tmp_list->data;
-      
-      if (gtk_stock_lookup (info.id, &item))
-        {
-          info.item = item;
-        }
-      else
-        {
-          info.item.label = NULL;
-          info.item.stock_id = NULL;
-          info.item.modifier = 0;
-          info.item.keyval = 0;
-          info.item.translation_domain = NULL;
-        }
-
-      /* only show icons for stock IDs that have default icons */
-      icon_set = gtk_icon_factory_lookup_default (info.id);
-      if (icon_set)
-        {
-          GtkIconSize *sizes = NULL;
-          gint n_sizes = 0;
-          gint i;
-          GtkIconSize size;
-
-          /* See what sizes this stock icon really exists at */
-          gtk_icon_set_get_sizes (icon_set, &sizes, &n_sizes);
-
-          /* Use menu size if it exists, otherwise first size found */
-          size = sizes[0];
-          i = 0;
-          while (i < n_sizes)
-            {
-              if (sizes[i] == GTK_ICON_SIZE_MENU)
-                {
-                  size = GTK_ICON_SIZE_MENU;
-                  break;
-                }
-              ++i;
-            }
-          g_free (sizes);
-          
-          info.small_icon = gtk_widget_render_icon (window, info.id,
-                                                    size,
-                                                    NULL);
-          
-          if (size != GTK_ICON_SIZE_MENU)
-            {
-              /* Make the result the proper size for our thumbnail */
-              gint w, h;
-              GdkPixbuf *scaled;
-              
-              gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
-              
-              scaled = gdk_pixbuf_scale_simple (info.small_icon,
-                                                w, h,
-                                                GDK_INTERP_BILINEAR);
-
-              g_object_unref (G_OBJECT (info.small_icon));
-              info.small_icon = scaled;
-            }
-        }
-      else
-        info.small_icon = NULL;
-
-      if (info.item.keyval != 0)
-        {
-          info.accel_str = gtk_accelerator_name (info.item.keyval,
-                                                 info.item.modifier);
-        }
-      else
-        {
-          info.accel_str = g_strdup ("");
-        }
-
-      info.macro = id_to_macro (info.id);
-      
-      gtk_list_store_append (store, &iter);
-      gtk_list_store_set (store, &iter, 0, &info, -1);
-
-      g_free (info.macro);
-      g_free (info.accel_str);
-      if (info.small_icon)
-        g_object_unref (G_OBJECT (info.small_icon));
-      
-      tmp_list = g_slist_next (tmp_list);
-    }
-  
-  g_slist_foreach (ids, (GFunc)g_free, NULL);
-  g_slist_free (ids);
-
-  return GTK_TREE_MODEL (store);
-}
-
-/* Finds the largest size at which the given image stock id is
- * available. This would not be useful for a normal application
- */
-static GtkIconSize
-get_largest_size (const char *id)
-{
-  GtkIconSet *set = gtk_icon_factory_lookup_default (id);
-  GtkIconSize *sizes;
-  gint n_sizes, i;
-  GtkIconSize best_size = GTK_ICON_SIZE_INVALID;
-  gint best_pixels = 0;
-
-  gtk_icon_set_get_sizes (set, &sizes, &n_sizes);
-
-  for (i = 0; i < n_sizes; i++)
-    {
-      gint width, height;
-      
-      gtk_icon_size_lookup (sizes[i], &width, &height);
-
-      if (width * height > best_pixels)
-	{
-	  best_size = sizes[i];
-	  best_pixels = width * height;
-	}
-    }
-  
-  g_free (sizes);
-
-  return best_size;
-}
-
-static void
-selection_changed (GtkTreeSelection *selection)
-{
-  GtkTreeView *treeview;
-  StockItemDisplay *display;
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-  
-  treeview = gtk_tree_selection_get_tree_view (selection);
-  display = g_object_get_data (G_OBJECT (treeview), "stock-display");
-
-  if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    {
-      StockItemInfo *info;
-      gchar *str;
-      
-      gtk_tree_model_get (model, &iter,
-                          0, &info,
-                          -1);
-
-      if (info->small_icon && info->item.label)
-        gtk_label_set_text (GTK_LABEL (display->type_label), "Icon and Item");
-      else if (info->small_icon)
-        gtk_label_set_text (GTK_LABEL (display->type_label), "Icon Only");
-      else if (info->item.label)
-        gtk_label_set_text (GTK_LABEL (display->type_label), "Item Only");
-      else
-        gtk_label_set_text (GTK_LABEL (display->type_label), "???????");
-
-      gtk_label_set_text (GTK_LABEL (display->macro_label), info->macro);
-      gtk_label_set_text (GTK_LABEL (display->id_label), info->id);
-
-      if (info->item.label)
-        {
-          str = g_strdup_printf ("%s %s", info->item.label, info->accel_str);
-          gtk_label_set_text_with_mnemonic (GTK_LABEL (display->label_accel_label), str);
-          g_free (str);
-        }
-      else
-        {
-          gtk_label_set_text (GTK_LABEL (display->label_accel_label), "");
-        }
-
-      if (info->small_icon)
-        gtk_image_set_from_stock (GTK_IMAGE (display->icon_image), info->id,
-                                  get_largest_size (info->id));
-      else
-        gtk_image_set_from_pixbuf (GTK_IMAGE (display->icon_image), NULL);
-
-      stock_item_info_free (info);
-    }
-  else
-    {
-      gtk_label_set_text (GTK_LABEL (display->type_label), "No selected item");
-      gtk_label_set_text (GTK_LABEL (display->macro_label), "");
-      gtk_label_set_text (GTK_LABEL (display->id_label), "");
-      gtk_label_set_text (GTK_LABEL (display->label_accel_label), "");
-      gtk_image_set_from_pixbuf (GTK_IMAGE (display->icon_image), NULL);
-    }
-}
-
-static void
-macro_set_func_text (GtkTreeViewColumn *tree_column,
-		     GtkCellRenderer   *cell,
-		     GtkTreeModel      *model,
-		     GtkTreeIter       *iter,
-		     gpointer           data)
-{
-  StockItemInfo *info;
-  
-  gtk_tree_model_get (model, iter,
-                      0, &info,
-                      -1);
-  
-  g_object_set (GTK_CELL_RENDERER (cell),
-                "text", info->macro,
-                NULL);
-  
-  stock_item_info_free (info);
-}
-
-static void
-macro_set_func_pixbuf (GtkTreeViewColumn *tree_column,
-		       GtkCellRenderer   *cell,
-		       GtkTreeModel      *model,
-		       GtkTreeIter       *iter,
-		       gpointer           data)
-{
-  StockItemInfo *info;
-  
-  gtk_tree_model_get (model, iter,
-                      0, &info,
-                      -1);
-  
-  g_object_set (GTK_CELL_RENDERER (cell),
-                "pixbuf", info->small_icon,
-                NULL);
-  
-  stock_item_info_free (info);
-}
-
-static void
-id_set_func (GtkTreeViewColumn *tree_column,
-             GtkCellRenderer   *cell,
-             GtkTreeModel      *model,
-             GtkTreeIter       *iter,
-             gpointer           data)
-{
-  StockItemInfo *info;
-  
-  gtk_tree_model_get (model, iter,
-                      0, &info,
-                      -1);
-  
-  g_object_set (GTK_CELL_RENDERER (cell),
-                "text", info->id,
-                NULL);
-  
-  stock_item_info_free (info);
-}
-
-static void
-accel_set_func (GtkTreeViewColumn *tree_column,
-                GtkCellRenderer   *cell,
-                GtkTreeModel      *model,
-                GtkTreeIter       *iter,
-                gpointer           data)
-{
-  StockItemInfo *info;
-  
-  gtk_tree_model_get (model, iter,
-                      0, &info,
-                      -1);
-  
-  g_object_set (GTK_CELL_RENDERER (cell),
-                "text", info->accel_str,
-                NULL);
-  
-  stock_item_info_free (info);
-}
-
-static void
-label_set_func (GtkTreeViewColumn *tree_column,
-                GtkCellRenderer   *cell,
-                GtkTreeModel      *model,
-                GtkTreeIter       *iter,
-                gpointer           data)
-{
-  StockItemInfo *info;
-  
-  gtk_tree_model_get (model, iter,
-                      0, &info,
-                      -1);
-  
-  g_object_set (GTK_CELL_RENDERER (cell),
-                "text", info->item.label,
-                NULL);
-  
-  stock_item_info_free (info);
-}
-
-GtkWidget *
-do_stock_browser (void)
-{  
-  if (!window)
-    {
-      GtkWidget *frame;
-      GtkWidget *vbox;
-      GtkWidget *hbox;
-      GtkWidget *sw;
-      GtkWidget *treeview;
-      GtkWidget *align;
-      GtkTreeModel *model;
-      GtkCellRenderer *cell_renderer;
-      StockItemDisplay *display;
-      GtkTreeSelection *selection;
-      GtkTreeViewColumn *column;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Stock Icons and Items");
-      gtk_window_set_default_size (GTK_WINDOW (window), -1, 500);
-
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      hbox = gtk_hbox_new (FALSE, 8);
-      gtk_container_add (GTK_CONTAINER (window), hbox);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_NEVER,
-                                      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE, FALSE, 0);
-
-      model = create_model ();
-      
-      treeview = gtk_tree_view_new_with_model (model);
-
-      g_object_unref (G_OBJECT (model));
-
-      gtk_container_add (GTK_CONTAINER (sw), treeview);
-      
-      column = gtk_tree_view_column_new ();
-      gtk_tree_view_column_set_title (column, "Macro");
-
-      cell_renderer = gtk_cell_renderer_pixbuf_new ();
-      gtk_tree_view_column_pack_start (column,
-				       cell_renderer,
-				       FALSE);
-      gtk_tree_view_column_set_cell_data_func (column, cell_renderer,
-					       macro_set_func_pixbuf, NULL, NULL);
-      cell_renderer = gtk_cell_renderer_text_new ();
-      gtk_tree_view_column_pack_start (column,
-				       cell_renderer,
-				       TRUE);
-      gtk_tree_view_column_set_cell_data_func (column, cell_renderer,
-					       macro_set_func_text, NULL, NULL);
-
-      gtk_tree_view_append_column (GTK_TREE_VIEW (treeview),
-				   column);
-
-      cell_renderer = gtk_cell_renderer_text_new ();
-
-      gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (treeview),
-                                                  -1,
-                                                  "Label",
-                                                  cell_renderer,
-                                                  label_set_func,
-                                                  NULL,
-                                                  NULL);
-
-      gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (treeview),
-                                                  -1,
-                                                  "Accel",
-                                                  cell_renderer,
-                                                  accel_set_func,
-                                                  NULL,
-                                                  NULL);
-
-      gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (treeview),
-                                                  -1,
-                                                  "ID",
-                                                  cell_renderer,
-                                                  id_set_func,
-                                                  NULL,
-                                                  NULL);
-      
-      align = gtk_alignment_new (0.5, 0.0, 0.0, 0.0);
-      gtk_box_pack_end (GTK_BOX (hbox), align, FALSE, FALSE, 0);
-      
-      frame = gtk_frame_new ("Selected Item");
-      gtk_container_add (GTK_CONTAINER (align), frame);
-
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
-      gtk_container_add (GTK_CONTAINER (frame), vbox);
-
-      display = g_new (StockItemDisplay, 1);
-      g_object_set_data_full (G_OBJECT (treeview),
-                              "stock-display",
-                              display,
-                              g_free); /* free display with treeview */
-      
-      display->type_label = gtk_label_new (NULL);
-      display->macro_label = gtk_label_new (NULL);
-      display->id_label = gtk_label_new (NULL);
-      display->label_accel_label = gtk_label_new (NULL);
-      display->icon_image = gtk_image_new_from_pixbuf (NULL); /* empty image */
-
-      gtk_box_pack_start (GTK_BOX (vbox), display->type_label,
-                          FALSE, FALSE, 0);
-
-      gtk_box_pack_start (GTK_BOX (vbox), display->icon_image,
-                          FALSE, FALSE, 0);
-      
-      gtk_box_pack_start (GTK_BOX (vbox), display->label_accel_label,
-                          FALSE, FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (vbox), display->macro_label,
-                          FALSE, FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (vbox), display->id_label,
-                          FALSE, FALSE, 0);
-
-      selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
-      gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
-      
-      g_signal_connect (G_OBJECT (selection),
-			"changed",
-			G_CALLBACK (selection_changed),
-			NULL);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {	 
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/textview.c

@@ -1,604 +0,0 @@
-/* Text Widget
- *
- * The GtkTextView widget displays a GtkTextBuffer. One GtkTextBuffer
- * can be displayed by multiple GtkTextViews. This demo has two views
- * displaying a single buffer, and shows off the widget's text
- * formatting features.
- *
- */
-
-#include <gtk/gtk.h>
-#include <stdlib.h> /* for exit() */
-
-#include "demo-common.h"
-
-static void easter_egg_callback (GtkWidget *button, gpointer data);
-
-#define gray50_width 2
-#define gray50_height 2
-static char gray50_bits[] = {
-  0x02, 0x01
-};
-
-static void
-create_tags (GtkTextBuffer *buffer)
-{
-  GdkBitmap *stipple;
-
-  /* Create a bunch of tags. Note that it's also possible to
-   * create tags with gtk_text_tag_new() then add them to the
-   * tag table for the buffer, gtk_text_buffer_create_tag() is
-   * just a convenience function. Also note that you don't have
-   * to give tags a name; pass NULL for the name to create an
-   * anonymous tag.
-   *
-   * In any real app, another useful optimization would be to create
-   * a GtkTextTagTable in advance, and reuse the same tag table for
-   * all the buffers with the same tag set, instead of creating
-   * new copies of the same tags for every buffer.
-   *
-   * Tags are assigned default priorities in order of addition to the
-   * tag table.	 That is, tags created later that affect the same text
-   * property affected by an earlier tag will override the earlier
-   * tag.  You can modify tag priorities with
-   * gtk_text_tag_set_priority().
-   */
-
-  gtk_text_buffer_create_tag (buffer, "heading",
-			      "weight", PANGO_WEIGHT_BOLD,
-			      "size", 15 * PANGO_SCALE,
-			      NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "italic",
-			      "style", PANGO_STYLE_ITALIC, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "bold",
-			      "weight", PANGO_WEIGHT_BOLD, NULL);  
-  
-  gtk_text_buffer_create_tag (buffer, "big",
-			      /* points times the PANGO_SCALE factor */
-			      "size", 20 * PANGO_SCALE, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "xx-small",
-			      "scale", PANGO_SCALE_XX_SMALL, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "x-large",
-			      "scale", PANGO_SCALE_X_LARGE, NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "monospace",
-			      "family", "monospace", NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "blue_foreground",
-			      "foreground", "blue", NULL);  
-
-  gtk_text_buffer_create_tag (buffer, "red_background",
-			      "background", "red", NULL);
-
-  stipple = gdk_bitmap_create_from_data (NULL,
-					 gray50_bits, gray50_width,
-					 gray50_height);
-  
-  gtk_text_buffer_create_tag (buffer, "background_stipple",
-			      "background_stipple", stipple, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "foreground_stipple",
-			      "foreground_stipple", stipple, NULL);
-
-  g_object_unref (G_OBJECT (stipple));
-
-  gtk_text_buffer_create_tag (buffer, "big_gap_before_line",
-			      "pixels_above_lines", 30, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "big_gap_after_line",
-			      "pixels_below_lines", 30, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "double_spaced_line",
-			      "pixels_inside_wrap", 10, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "not_editable",
-			      "editable", FALSE, NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "word_wrap",
-			      "wrap_mode", GTK_WRAP_WORD, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "char_wrap",
-			      "wrap_mode", GTK_WRAP_CHAR, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "no_wrap",
-			      "wrap_mode", GTK_WRAP_NONE, NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "center",
-			      "justification", GTK_JUSTIFY_CENTER, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "right_justify",
-			      "justification", GTK_JUSTIFY_RIGHT, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "wide_margins",
-			      "left_margin", 50, "right_margin", 50,
-			      NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "strikethrough",
-			      "strikethrough", TRUE, NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "underline",
-			      "underline", PANGO_UNDERLINE_SINGLE, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "double_underline",
-			      "underline", PANGO_UNDERLINE_DOUBLE, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "superscript",
-			      "rise", 10 * PANGO_SCALE,	  /* 10 pixels */
-			      "size", 8 * PANGO_SCALE,	  /* 8 points */
-			      NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "subscript",
-			      "rise", -10 * PANGO_SCALE,   /* 10 pixels */
-			      "size", 8 * PANGO_SCALE,	   /* 8 points */
-			      NULL);
-
-  gtk_text_buffer_create_tag (buffer, "rtl_quote",
-			      "wrap_mode", GTK_WRAP_WORD,
-			      "direction", GTK_TEXT_DIR_RTL,
-			      "indent", 30,
-			      "left_margin", 20,
-			      "right_margin", 20,
-			      NULL);
-}
-
-static void
-insert_text (GtkTextBuffer *buffer)
-{
-  GtkTextIter iter;
-  GtkTextIter start, end;
-  GdkPixbuf *pixbuf;
-  GdkPixbuf *scaled;
-  GtkTextChildAnchor *anchor;
-  char *filename;
-
-  /* demo_find_file() looks in the the current directory first,
-   * so you can run gtk-demo without installing GTK, then looks
-   * in the location where the file is installed.
-   */
-  pixbuf = NULL;
-  filename = demo_find_file ("gtk-logo-rgb.gif", NULL);
-  if (filename)
-    {
-      pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-      g_free (filename);
-    }
-
-  if (pixbuf == NULL)
-    {
-      g_printerr ("Failed to load image file gtk-logo-rgb.gif\n");
-      exit (1);
-    }
-
-  scaled = gdk_pixbuf_scale_simple (pixbuf, 32, 32, GDK_INTERP_BILINEAR);
-  g_object_unref (G_OBJECT (pixbuf));
-  pixbuf = scaled;
-  
-  /* get start of buffer; each insertion will revalidate the
-   * iterator to point to just after the inserted text.
-   */
-  gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
-
-  gtk_text_buffer_insert (buffer, &iter, "The text widget can display text with all kinds of nifty attributes. It also supports multiple views of the same buffer; this demo is showing the same buffer in two places.\n\n", -1);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Font styles. ", -1,
-					    "heading", NULL);
-  
-  gtk_text_buffer_insert (buffer, &iter, "For example, you can have ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "italic", -1,
-					    "italic", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", ", -1);  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "bold", -1,
-					    "bold", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", or ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "monospace (typewriter)", -1,
-					    "monospace", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", or ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "big", -1,
-					    "big", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " text. ", -1);
-  gtk_text_buffer_insert (buffer, &iter, "It's best not to hardcode specific text sizes; you can use relative sizes as with CSS, such as ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "xx-small", -1,
-					    "xx-small", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " or ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "x-large", -1,
-					    "x-large", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " to ensure that your program properly adapts if the user changes the default font size.\n\n", -1);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Colors. ", -1,
-					    "heading", NULL);
-  
-  gtk_text_buffer_insert (buffer, &iter, "Colors such as ", -1);  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a blue foreground", -1,
-					    "blue_foreground", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " or ", -1);  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a red background", -1,
-					    "red_background", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " or even ", -1);  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a stippled red background", -1,
-					    "red_background",
-					    "background_stipple",
-					    NULL);
-
-  gtk_text_buffer_insert (buffer, &iter, " or ", -1);  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a stippled blue foreground on solid red background", -1,
-					    "blue_foreground",
-					    "red_background",
-					    "foreground_stipple",
-					    NULL);
-  gtk_text_buffer_insert (buffer, &iter, " (select that to read it) can be used.\n\n", -1);  
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Underline, strikethrough, and rise. ", -1,
-					    "heading", NULL);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "Strikethrough", -1,
-					    "strikethrough", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "underline", -1,
-					    "underline", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "double underline", -1, 
-					    "double_underline", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "superscript", -1,
-					    "superscript", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", and ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "subscript", -1,
-					    "subscript", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " are all supported.\n\n", -1);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Images. ", -1,
-					    "heading", NULL);
-  
-  gtk_text_buffer_insert (buffer, &iter, "The buffer can have images in it: ", -1);
-  gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
-  gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
-  gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
-  gtk_text_buffer_insert (buffer, &iter, " for example.\n\n", -1);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Spacing. ", -1,
-					    "heading", NULL);
-
-  gtk_text_buffer_insert (buffer, &iter, "You can adjust the amount of space before each line.\n", -1);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "This line has a whole lot of space before it.\n", -1,
-					    "big_gap_before_line", "wide_margins", NULL);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "You can also adjust the amount of space after each line; this line has a whole lot of space after it.\n", -1,
-					    "big_gap_after_line", "wide_margins", NULL);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "You can also adjust the amount of space between wrapped lines; this line has extra space between each wrapped line in the same paragraph. To show off wrapping, some filler text: the quick brown fox jumped over the lazy dog. Blah blah blah blah blah blah blah blah blah.\n", -1,
-					    "double_spaced_line", "wide_margins", NULL);
-
-  gtk_text_buffer_insert (buffer, &iter, "Also note that those lines have extra-wide margins.\n\n", -1);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Editability. ", -1,
-					    "heading", NULL);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "This line is 'locked down' and can't be edited by the user - just try it! You can't delete this line.\n\n", -1,
-					    "not_editable", NULL);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Wrapping. ", -1,
-					    "heading", NULL);
-
-  gtk_text_buffer_insert (buffer, &iter,
-			  "This line (and most of the others in this buffer) is word-wrapped, using the proper Unicode algorithm. Word wrap should work in all scripts and languages that GTK+ supports. Let's make this a long paragraph to demonstrate: blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah\n\n", -1);  
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "This line has character-based wrapping, and can wrap between any two character glyphs. Let's make this a long paragraph to demonstrate: blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah\n\n", -1,
-					    "char_wrap", NULL);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "This line has all wrapping turned off, so it makes the horizontal scrollbar appear.\n\n\n", -1,
-					    "no_wrap", NULL);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Justification. ", -1,
-					    "heading", NULL);  
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "\nThis line has center justification.\n", -1,
-					    "center", NULL);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "This line has right justification.\n", -1,
-					    "right_justify", NULL);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "\nThis line has big wide margins. Text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text.\n", -1,
-					    "wide_margins", NULL);  
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Internationalization. ", -1,
-					    "heading", NULL);
-	  
-  gtk_text_buffer_insert (buffer, &iter,
-			  "You can put all sorts of Unicode text in the buffer.\n\nGerman (Deutsch Süd) Grüß Gott\nGreek (Ελληνικά) Γειά σας\nHebrew	שלום\nJapanese (日本語)\n\nThe widget properly handles bidirectional text, word wrapping, DOS/UNIX/Unicode paragraph separators, grapheme boundaries, and so on using the Pango internationalization framework.\n", -1);  
-
-  gtk_text_buffer_insert (buffer, &iter, "Here's a word-wrapped quote in a right-to-left language:\n", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "وقد بدأ ثلاث من أكثر المؤسسات تقدما في شبكة اكسيون برامجها كمنظمات لا تسعى للربح، ثم تحولت في السنوات الخمس الماضية إلى مؤسسات مالية منظمة، وباتت جزءا من النظام المالي في بلدانها، ولكنها تتخصص في خدمة قطاع المشروعات الصغيرة. وأحد أكثر هذه المؤسسات نجاحا هو »بانكوسول« في بوليفيا.\n\n", -1,
-						"rtl_quote", NULL);
-      
-  gtk_text_buffer_insert (buffer, &iter, "You can put widgets in the buffer: Here's a button: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
-  gtk_text_buffer_insert (buffer, &iter, " and a menu: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
-  gtk_text_buffer_insert (buffer, &iter, " and a scale: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
-  gtk_text_buffer_insert (buffer, &iter, " and an animation: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
-  gtk_text_buffer_insert (buffer, &iter, " finally a text entry: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
-  gtk_text_buffer_insert (buffer, &iter, ".\n", -1);
-  
-  gtk_text_buffer_insert (buffer, &iter, "\n\nThis demo doesn't demonstrate all the GtkTextBuffer features; it leaves out, for example: invisible/hidden text (doesn't work in GTK 2, but planned), tab stops, application-drawn areas on the sides of the widget for displaying breakpoints and such...", -1);
-
-  /* Apply word_wrap tag to whole buffer */
-  gtk_text_buffer_get_bounds (buffer, &start, &end);
-  gtk_text_buffer_apply_tag_by_name (buffer, "word_wrap", &start, &end);
-
-  g_object_unref (G_OBJECT (pixbuf));
-}
-
-static gboolean
-find_anchor (GtkTextIter *iter)
-{
-  while (gtk_text_iter_forward_char (iter))
-    {
-      if (gtk_text_iter_get_child_anchor (iter))
-        return TRUE;
-    }
-  return FALSE;
-}
-
-static void
-attach_widgets (GtkTextView *text_view)
-{
-  GtkTextIter iter;
-  GtkTextBuffer *buffer;
-  int i;
-  
-  buffer = gtk_text_view_get_buffer (text_view);
-
-  gtk_text_buffer_get_start_iter (buffer, &iter);
-
-  i = 0;
-  while (find_anchor (&iter))
-    {
-      GtkTextChildAnchor *anchor;
-      GtkWidget *widget;
-      
-      anchor = gtk_text_iter_get_child_anchor (&iter);
-
-      if (i == 0)
-        {
-          widget = gtk_button_new_with_label ("Click Me");
-
-          g_signal_connect (G_OBJECT (widget), "clicked",
-                            G_CALLBACK (easter_egg_callback),
-                            NULL);
-        }
-      else if (i == 1)
-        {
-          GtkWidget *menu_item;
-          GtkWidget *menu;
-
-          menu = gtk_menu_new ();
-          
-          widget = gtk_option_menu_new ();
-
-          menu_item = gtk_menu_item_new_with_label ("Option 1");
-          gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-          menu_item = gtk_menu_item_new_with_label ("Option 2");
-          gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-          menu_item = gtk_menu_item_new_with_label ("Option 3");
-          gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-
-          gtk_option_menu_set_menu (GTK_OPTION_MENU (widget), menu);
-        }
-      else if (i == 2)
-        {
-          widget = gtk_hscale_new (NULL);
-          gtk_range_set_range (GTK_RANGE (widget), 0, 100);
-          gtk_widget_set_size_request (widget, 70, -1);
-        }
-      else if (i == 3)
-        {
-	  gchar *filename = demo_find_file ("floppybuddy.gif", NULL);
-	  widget = gtk_image_new_from_file (filename);
-	  g_free (filename);
-        }
-      else if (i == 4)
-        {
-          widget = gtk_entry_new ();
-        }
-      else
-        {
-          widget = NULL; /* avoids a compiler warning */
-          g_assert_not_reached ();
-        }
-
-      gtk_text_view_add_child_at_anchor (text_view,
-                                         widget,
-                                         anchor);
-
-      gtk_widget_show_all (widget);
-
-      ++i;
-    }
-}
-
-GtkWidget *
-do_textview (void)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *vpaned;
-      GtkWidget *view1;
-      GtkWidget *view2;
-      GtkWidget *sw;
-      GtkTextBuffer *buffer;
-      
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_default_size (GTK_WINDOW (window),
-				   450, 450);
-      
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_window_set_title (GTK_WINDOW (window), "TextView");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
-      vpaned = gtk_vpaned_new ();
-      gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
-      gtk_container_add (GTK_CONTAINER (window), vpaned);
-
-      /* For convenience, we just use the autocreated buffer from
-       * the first text view; you could also create the buffer
-       * by itself with gtk_text_buffer_new(), then later create
-       * a view widget.
-       */
-      view1 = gtk_text_view_new ();
-      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view1));
-      view2 = gtk_text_view_new_with_buffer (buffer);
-      
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-				      GTK_POLICY_AUTOMATIC,
-				      GTK_POLICY_AUTOMATIC);
-      gtk_paned_add1 (GTK_PANED (vpaned), sw);
-
-      gtk_container_add (GTK_CONTAINER (sw), view1);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-				      GTK_POLICY_AUTOMATIC,
-				      GTK_POLICY_AUTOMATIC);
-      gtk_paned_add2 (GTK_PANED (vpaned), sw);
-
-      gtk_container_add (GTK_CONTAINER (sw), view2);
-
-      create_tags (buffer);
-      insert_text (buffer);
-
-      attach_widgets (GTK_TEXT_VIEW (view1));
-      attach_widgets (GTK_TEXT_VIEW (view2));
-      
-      gtk_widget_show_all (vpaned);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-
-static void
-recursive_attach_view (int                 depth,
-                       GtkTextView        *view,
-                       GtkTextChildAnchor *anchor)
-{
-  GtkWidget *child_view;
-  GtkWidget *event_box;
-  GdkColor color;
-  GtkWidget *align;
-  
-  if (depth > 4)
-    return;
-  
-  child_view = gtk_text_view_new_with_buffer (gtk_text_view_get_buffer (view));
-
-  /* Event box is to add a black border around each child view */
-  event_box = gtk_event_box_new ();
-  gdk_color_parse ("black", &color);
-  gtk_widget_modify_bg (event_box, GTK_STATE_NORMAL, &color);
-
-  align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
-  gtk_container_set_border_width (GTK_CONTAINER (align), 1);
-  
-  gtk_container_add (GTK_CONTAINER (event_box), align);
-  gtk_container_add (GTK_CONTAINER (align), child_view);
-  
-  gtk_text_view_add_child_at_anchor (view, event_box, anchor);
-
-  recursive_attach_view (depth + 1, GTK_TEXT_VIEW (child_view), anchor);
-}
-
-static void
-easter_egg_callback (GtkWidget *button,
-                     gpointer   data)
-{
-  static GtkWidget *window = NULL;
-  GtkTextBuffer *buffer;
-  GtkWidget     *view;
-  GtkTextIter    iter;
-  GtkTextChildAnchor *anchor;
-  GtkWidget *sw;
-
-  if (window)
-    {
-      gtk_window_present (GTK_WINDOW (window));
-      return;
-    }
-  
-  buffer = gtk_text_buffer_new (NULL);
-
-  gtk_text_buffer_get_start_iter (buffer, &iter);
-
-  gtk_text_buffer_insert (buffer, &iter,
-                          "This buffer is shared by a set of nested text views.\n Nested view:\n", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
-  gtk_text_buffer_insert (buffer, &iter,
-                          "\nDon't do this in real applications, please.\n", -1);
-
-  view = gtk_text_view_new_with_buffer (buffer);
-  
-  recursive_attach_view (0, GTK_TEXT_VIEW (view), anchor);
-  
-  g_object_unref (G_OBJECT (buffer));
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                  GTK_POLICY_AUTOMATIC,
-                                  GTK_POLICY_AUTOMATIC);
-
-  gtk_container_add (GTK_CONTAINER (window), sw);
-  gtk_container_add (GTK_CONTAINER (sw), view);
-
-  g_object_add_weak_pointer (G_OBJECT (window),
-                             (gpointer *) &window);
-
-  gtk_window_set_default_size (GTK_WINDOW (window), 300, 400);
-  
-  gtk_widget_show_all (window);
-}
-

demos/gtk-demo/tree_store.c

@@ -1,448 +0,0 @@
-/* Tree View/Tree Store
- *
- * The GtkTreeStore is used to store data in tree form, to be
- * used later on by a GtkTreeView to display it. This demo builds
- * a simple GtkTreeStore and displays it. If you're new to the
- * GtkTreeView widgets and associates, look into the GtkListStore
- * example first.
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-/* TreeItem structure */
-typedef struct _TreeItem TreeItem;
-struct _TreeItem
-{
-  const gchar    *label;
-  gboolean        alex;
-  gboolean        havoc;
-  gboolean        tim;
-  gboolean        owen;
-  gboolean        dave;
-  gboolean        world_holiday; /* shared by the European hackers */
-  TreeItem       *children;
-};
-
-/* columns */
-enum
-{
-  HOLIDAY_NAME_COLUMN = 0,
-  ALEX_COLUMN,
-  HAVOC_COLUMN,
-  TIM_COLUMN,
-  OWEN_COLUMN,
-  DAVE_COLUMN,
-
-  VISIBLE_COLUMN,
-  WORLD_COLUMN,
-  NUM_COLUMNS
-};
-
-/* tree data */
-static TreeItem january[] =
-{
-  {"New Years Day", TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
-  {"Presidential Inauguration", FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, NULL },
-  {"Martin Luther King Jr. day", FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, NULL },
-  { NULL }
-};
-
-static TreeItem february[] =
-{
-  { "Presidents' Day", FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, NULL },
-  { "Groundhog Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Valentine's Day", FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, NULL },
-  { NULL }
-};
-
-static TreeItem march[] =
-{
-  { "National Tree Planting Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "St Patrick's Day", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { NULL }
-};
-static TreeItem april[] =
-{
-  { "April Fools' Day", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { "Army Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Earth Day", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { "Administrative Professionals' Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { NULL }
-};
-
-static TreeItem may[] =
-{
-  { "Nurses' Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "National Day of Prayer", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Mothers' Day", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { "Armed Forces Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Memorial Day", TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
-  { NULL }
-};
-
-static TreeItem june[] =
-{
-  { "June Fathers' Day", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { "Juneteenth (Liberation of Slaves)", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Flag Day", FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, NULL },
-  { NULL }
-};
-
-static TreeItem july[] =
-{
-  { "Parents' Day", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { "Independence Day", FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, NULL },
-  { NULL }
-};
-
-static TreeItem august[] =
-{
-  { "Air Force Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Coast Guard Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Friendship Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { NULL }
-};
-
-static TreeItem september[] =
-{
-  { "Grandparents' Day", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { "Citizenship Day or Constitution Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Labor Day", TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
-  { NULL }
-};
-
-static TreeItem october[] =
-{
-  { "National Children's Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Bosses' Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Sweetest Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Mother-in-Law's Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Navy Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Columbus Day", FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, NULL },
-  { "Halloween", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { NULL }
-};
-
-static TreeItem november[] =
-{
-  { "Marine Corps Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Veterans' Day", TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
-  { "Thanksgiving", FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, NULL },
-  { NULL }
-};
-
-static TreeItem december[] =
-{
-  { "Pearl Harbor Remembrance Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Christmas", TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
-  { "Kwanzaa", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { NULL }
-};
-
-
-static TreeItem toplevel[] =
-{
-  {"January", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, january},
-  {"February", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, february},
-  {"March", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, march},
-  {"April", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, april},
-  {"May", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, may},
-  {"June", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, june},
-  {"July", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, july},
-  {"August", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, august},
-  {"September", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, september},
-  {"October", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, october},
-  {"November", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, november},
-  {"December", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, december},
-  {NULL}
-};
-
-
-static GtkTreeModel *
-create_model (void)
-{
-  GtkTreeStore *model;
-  GtkTreeIter iter;
-  TreeItem *month = toplevel;
-
-  /* create tree store */
-  model = gtk_tree_store_new (NUM_COLUMNS,
-			      G_TYPE_STRING,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_BOOLEAN);
-
-  /* add data to the tree store */
-  while (month->label)
-    {
-      TreeItem *holiday = month->children;
-
-      gtk_tree_store_append (model, &iter, NULL);
-      gtk_tree_store_set (model, &iter,
-			  HOLIDAY_NAME_COLUMN, month->label,
-			  ALEX_COLUMN, FALSE,
-			  HAVOC_COLUMN, FALSE,
-			  TIM_COLUMN, FALSE,
-			  OWEN_COLUMN, FALSE,
-			  DAVE_COLUMN, FALSE,
-			  VISIBLE_COLUMN, FALSE,
-			  WORLD_COLUMN, FALSE,
-			  -1);
-
-      /* add children */
-      while (holiday->label)
-	{
-	  GtkTreeIter child_iter;
-
-	  gtk_tree_store_append (model, &child_iter, &iter);
-	  gtk_tree_store_set (model, &child_iter,
-			      HOLIDAY_NAME_COLUMN, holiday->label,
-			      ALEX_COLUMN, holiday->alex,
-			      HAVOC_COLUMN, holiday->havoc,
-			      TIM_COLUMN, holiday->tim,
-			      OWEN_COLUMN, holiday->owen,
-			      DAVE_COLUMN, holiday->dave,
-			      VISIBLE_COLUMN, TRUE,
-			      WORLD_COLUMN, holiday->world_holiday,
-			      -1);
-
-	  holiday++;
-	}
-
-      month++;
-    }
-
-  return GTK_TREE_MODEL (model);
-}
-
-static void
-item_toggled (GtkCellRendererToggle *cell,
-	      gchar                 *path_str,
-	      gpointer               data)
-{
-  GtkTreeModel *model = (GtkTreeModel *)data;
-  GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
-  GtkTreeIter iter;
-  gboolean toggle_item;
-
-  gint *column;
-
-  column = g_object_get_data (G_OBJECT (cell), "column");
-
-  /* get toggled iter */
-  gtk_tree_model_get_iter (model, &iter, path);
-  gtk_tree_model_get (model, &iter, column, &toggle_item, -1);
-
-  /* do something with the value */
-  toggle_item ^= 1;
-
-  /* set new value */
-  gtk_tree_store_set (GTK_TREE_STORE (model), &iter, column,
-		      toggle_item, -1);
-
-  /* clean up */
-  gtk_tree_path_free (path);
-}
-
-static void
-add_columns (GtkTreeView *treeview)
-{
-  gint col_offset;
-  GtkCellRenderer *renderer;
-  GtkTreeViewColumn *column;
-  GtkTreeModel *model = gtk_tree_view_get_model (treeview);
-
-  /* column for holiday names */
-  renderer = gtk_cell_renderer_text_new ();
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
-
-  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-							    -1, "Holiday",
-							    renderer, "text",
-							    HOLIDAY_NAME_COLUMN,
-							    NULL);
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
-
-  /* alex column */
-  renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)ALEX_COLUMN);
-
-  g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (item_toggled),
-		    model);
-  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-							    -1, "Alex",
-							    renderer,
-							    "active",
-							    ALEX_COLUMN,
-							    "visible",
-							    VISIBLE_COLUMN,
-							    "activatable",
-							    WORLD_COLUMN, NULL);
-
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
-  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
-
-  /* havoc column */
-  renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)HAVOC_COLUMN);
-
-  g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (item_toggled),
-		    model);
-  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-							    -1, "Havoc",
-							    renderer,
-							    "active",
-							    HAVOC_COLUMN,
-							    "visible",
-							    VISIBLE_COLUMN,
-							    NULL);
-
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
-  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
-
-  /* tim column */
-  renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)TIM_COLUMN);
-
-  g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (item_toggled),
-		    model);
-  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-							    -1, "Tim",
-							    renderer,
-							    "active",
-							    TIM_COLUMN,
-							    "visible",
-							    VISIBLE_COLUMN,
-							    "activatable",
-							    WORLD_COLUMN, NULL);
-
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
-  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
-
-  /* owen column */
-  renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)OWEN_COLUMN);
-
-  g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (item_toggled),
-		    model);
-  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-							    -1, "Owen",
-							    renderer,
-							    "active",
-							    OWEN_COLUMN,
-							    "visible",
-							    VISIBLE_COLUMN,
-							    NULL);
-
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
-  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
-
-  /* dave column */
-  renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)DAVE_COLUMN);
-
-  g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (item_toggled),
-		    model);
-  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-							    -1, "Dave",
-							    renderer,
-							    "active",
-							    DAVE_COLUMN,
-							    "visible",
-							    VISIBLE_COLUMN,
-							    NULL);
-
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
-  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
-}
-
-GtkWidget *
-do_tree_store (void)
-{
-  if (!window)
-    {
-      GtkWidget *vbox;
-      GtkWidget *sw;
-      GtkWidget *treeview;
-      GtkTreeModel *model;
-
-      /* create window, etc */
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet");
-      g_signal_connect (G_OBJECT (window), "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      gtk_box_pack_start (GTK_BOX (vbox),
-			  gtk_label_new ("Jonathan's Holiday Card Planning Sheet"),
-			  FALSE, FALSE, 0);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-					   GTK_SHADOW_ETCHED_IN);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-				      GTK_POLICY_AUTOMATIC,
-				      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
-
-      /* create model */
-      model = create_model ();
-
-      /* create tree view */
-      treeview = gtk_tree_view_new_with_model (model);
-      g_object_unref (G_OBJECT (model));
-      gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
-      gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
-				   GTK_SELECTION_MULTIPLE);
-
-      add_columns (GTK_TREE_VIEW (treeview));
-
-      gtk_container_add (GTK_CONTAINER (sw), treeview);
-
-      /* expand all rows after the treeview widget has been realized */
-      g_signal_connect (G_OBJECT (treeview), "realize",
-			G_CALLBACK (gtk_tree_view_expand_all), NULL);
-      gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/pixbuf-demo.c

@@ -1,234 +0,0 @@
-/* GdkPixbuf library - Scaling and compositing demo
- *
- * Copyright (C) 1999 The Free Software Foundation
- *
- * Authors: Federico Mena-Quintero <federico@gimp.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtk.h>
-#include <math.h>
-
-
-
-#define FRAME_DELAY 50
-
-#define BACKGROUND_NAME "background.jpg"
-
-static const char *image_names[] = {
-	"apple-red.png",
-	"gnome-applets.png",
-	"gnome-calendar.png",
-	"gnome-foot.png",
-	"gnome-gmush.png",
-	"gnome-gimp.png",
-	"gnome-gsame.png",
-	"gnu-keys.png"
-};
-
-#define N_IMAGES (sizeof (image_names) / sizeof (image_names[0]))
-
-/* Current frame */
-static GdkPixbuf *frame;
-
-/* Background image */
-static GdkPixbuf *background;
-static int back_width, back_height;
-
-/* Images */
-static GdkPixbuf *images[N_IMAGES];
-
-/* Widgets */
-static GtkWidget *da;
-
-
-
-/* Loads the images for the demo and returns whether the operation succeeded */
-static gboolean
-load_pixbufs (void)
-{
-	int i;
-
-        /* We pass NULL for the error return location, we don't care
-         * about the error message.
-         */
-        
-	background = gdk_pixbuf_new_from_file (BACKGROUND_NAME, NULL);
-	if (!background)
-		return FALSE;
-
-	back_width = gdk_pixbuf_get_width (background);
-	back_height = gdk_pixbuf_get_height (background);
-
-	for (i = 0; i < N_IMAGES; i++) {
-		images[i] = gdk_pixbuf_new_from_file (image_names[i], NULL);
-		if (!images[i])
-			return FALSE;
-	}
-
-	return TRUE;
-}
-
-/* Expose callback for the drawing area */
-static gint
-expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
-	guchar *pixels;
-	int rowstride;
-
-	rowstride = gdk_pixbuf_get_rowstride (frame);
-
-	pixels = gdk_pixbuf_get_pixels (frame) + rowstride * event->area.y + event->area.x * 3;
-		  
-	gdk_draw_rgb_image_dithalign (widget->window,
-				      widget->style->black_gc,
-				      event->area.x, event->area.y,
-				      event->area.width, event->area.height,
-				      GDK_RGB_DITHER_NORMAL,
-				      pixels, rowstride,
-				      event->area.x, event->area.y);
-
-	return TRUE;
-}
-
-#define CYCLE_LEN 60
-
-static int frame_num;
-
-/* Timeout handler to regenerate the frame */
-static gint
-timeout (gpointer data)
-{
-	double f;
-	int i;
-	double xmid, ymid;
-	double radius;
-
-	gdk_pixbuf_copy_area (background, 0, 0, back_width, back_height,
-			      frame, 0, 0);
-
-	f = (double) (frame_num % CYCLE_LEN) / CYCLE_LEN;
-
-	xmid = back_width / 2.0;
-	ymid = back_height / 2.0;
-
-	radius = MIN (xmid, ymid) / 2.0;
-
-	for (i = 0; i < N_IMAGES; i++) {
-		double ang;
-		int xpos, ypos;
-		int iw, ih;
-		double r;
-		GdkRectangle r1, r2, dest;
-		double k;
-
-		ang = 2.0 * G_PI * (double) i / N_IMAGES - f * 2.0 * G_PI;
-
-		iw = gdk_pixbuf_get_width (images[i]);
-		ih = gdk_pixbuf_get_height (images[i]);
-
-		r = radius + (radius / 3.0) * sin (f * 2.0 * G_PI);
-
-		xpos = floor (xmid + r * cos (ang) - iw / 2.0 + 0.5);
-		ypos = floor (ymid + r * sin (ang) - ih / 2.0 + 0.5);
-
-		k = (i & 1) ? sin (f * 2.0 * G_PI) : cos (f * 2.0 * G_PI);
-		k = 2.0 * k * k;
-		k = MAX (0.25, k);
-
-		r1.x = xpos;
-		r1.y = ypos;
-		r1.width = iw * k;
-		r1.height = ih * k;
-
-		r2.x = 0;
-		r2.y = 0;
-		r2.width = back_width;
-		r2.height = back_height;
-
-		if (gdk_rectangle_intersect (&r1, &r2, &dest))
-			gdk_pixbuf_composite (images[i],
-					      frame,
-					      dest.x, dest.y,
-					      dest.width, dest.height,
-					      xpos, ypos,
-					      k, k,
-					      GDK_INTERP_NEAREST,
-					      ((i & 1)
-					       ? MAX (127, fabs (255 * sin (f * 2.0 * G_PI)))
-					       : MAX (127, fabs (255 * cos (f * 2.0 * G_PI)))));
-	}
-
-	gtk_widget_queue_draw (da);
-
-	frame_num++;
-	return TRUE;
-}
-
-static guint timeout_id;
-
-/* Destroy handler for the window */
-static void
-destroy_cb (GtkObject *object, gpointer data)
-{
-	gtk_timeout_remove (timeout_id);
-	timeout_id = 0;
-
-	gtk_main_quit ();
-}
-
-extern void pixbuf_init();
-
-int
-main (int argc, char **argv)
-{
-	GtkWidget *window;
-
-	pixbuf_init ();
-	gtk_init (&argc, &argv);
-
-	if (!load_pixbufs ()) {
-		g_message ("main(): Could not load all the pixbufs!");
-		exit (EXIT_FAILURE);
-	}
-
-	frame = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, back_width, back_height);
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	gtk_widget_set_size_request (window, back_width, back_height);
-        gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-	g_signal_connect (window, "destroy",
-			  G_CALLBACK (destroy_cb), NULL);
-
-	da = gtk_drawing_area_new ();
-
-	g_signal_connect (da, "expose_event",
-			  G_CALLBACK (expose_cb), NULL);
-
-	gtk_container_add (GTK_CONTAINER (window), da);
-
-	timeout_id = gtk_timeout_add (FRAME_DELAY, timeout, NULL);
-
-	gtk_widget_show_all (window);
-	gtk_main ();
-
-	return 0;
-}