Fixed statement in gtkwindow.c when toplevelness changes.

Fixed a typo when checking if the heirarchy toplevel is a toplevel before firing the hierarchy-changed signal.
Dont show the GtkWindow when removing it from a parent and becomming a toplevel
2011-01-06 14:27:03 +09:00 · 2011-01-04 00:55:04 +09:00 · 2010-12-29 18:22:39 +09:00 · 2010-12-29 18:22:39 +09:00 · 2010-12-29 18:22:39 +09:00 · 2010-12-29 18:22:39 +09:00
557 changed files with 89480 additions and 59783 deletions
@@ -54,40 +54,39 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/ChangeLog \
 	`find "$(srcdir)" -type f -name Makefile.in -print`

-GDKTARGET=@gdktarget@

 ## Copy .pc files to target-specific names
-gtk+-$(GDKTARGET)-3.0.pc: gtk+-3.0.pc
-	rm -f gtk+-$(GDKTARGET)-3.0.pc && \
-	cp gtk+-3.0.pc gtk+-$(GDKTARGET)-3.0.pc
+gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc: gtk+-3.0.pc
+	rm -f $@ && \
+	cp gtk+-3.0.pc $@

-gdk-$(GDKTARGET)-3.0.pc: gdk-3.0.pc
-	rm -f gdk-$(GDKTARGET)-3.0.pc && \
-	cp gdk-3.0.pc gdk-$(GDKTARGET)-3.0.pc
+gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc: gdk-3.0.pc
+	rm -f $@ && \
+	cp gdk-3.0.pc $@

-gtk+-$(GDKTARGET)-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
-	rm -f gtk+-$(GDKTARGET)-3.0-uninstalled.pc && \
-	cp gtk+-3.0-uninstalled.pc gtk+-$(GDKTARGET)-3.0-uninstalled.pc
-
-gdk-$(GDKTARGET)-3.0-uninstalled.pc: gdk-3.0-uninstalled.pc
-	rm -f gdk-$(GDKTARGET)-3.0-uninstalled.pc && \
-	cp gdk-3.0-uninstalled.pc gdk-$(GDKTARGET)-3.0-uninstalled.pc
+gtk+-*-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
+	rm -f $@ && \
+	cp gtk+-3.0-uninstalled.pc $@

 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gdk-$(GDKTARGET)-3.0.pc gtk+-$(GDKTARGET)-3.0.pc gail-3.0.pc
+pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc
+
+pkgconfig_DATA += $(patsubst %,gtk+-%-3.0.pc,@gdktarget@)
+pkgconfig_DATA += $(patsubst %,gdk-%-3.0.pc,@gdktarget@)

 if OS_UNIX
 pkgconfig_DATA += gtk+-unix-print-3.0.pc
 endif

-DISTCLEANFILES =				\
-	gtk+-unix-print-3.0.pc			\
-	gtk+-$(GDKTARGET)-3.0.pc		\
-	gdk-$(GDKTARGET)-3.0.pc			\
-	gail-3.0.pc				\
-	gtk+-$(GDKTARGET)-3.0-uninstalled.pc	\
-	gdk-$(GDKTARGET)-3.0-uninstalled.pc	\
-	gail-3.0-uninstalled.pc			\
+DISTCLEANFILES = \
+	gtk+-unix-print-3.0.pc		\
+	gtk+-3.0.pc			\
+	gtk+-x11-3.0.pc			\
+	gdk-3.0.pc			\
+	gdk-x11-3.0.pc			\
+	gail-3.0.pc			\
+	gtk+-3.0-uninstalled.pc		\
+	gail-3.0-uninstalled.pc		\
 	config.lt

 distclean-local:
@@ -109,20 +108,7 @@ ChangeLog:
 	  echo A git checkout and git-log is required to generate this file >> $@); \
 	fi

-## copy the default target for this platform to gdk-3.0.pc and gtk+-3.0.pc
-DEFAULT_GDKTARGET=x11
-install-data-hook:
-	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 test -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc && \
-	 test -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc && \
-	 rm -f gdk-3.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc gdk-3.0.pc && \
-	 rm -f gtk+-3.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc gtk+-3.0.pc) || \
-	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 rm -f gdk-3.0.pc && cp -f gdk-$(GDKTARGET)-3.0.pc gdk-3.0.pc && \
-	 rm -f gtk+-3.0.pc && cp -f gtk+-$(GDKTARGET)-3.0.pc gtk+-3.0.pc)
-
 uninstall-local:
-	rm -f $(DESTDIR)$(pkgconfigdir)/gdk-3.0.pc
 	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc

 dist-hook:
@@ -1,3 +1,136 @@
+Overview of Changes from GTK+ 2.91.6 to 2.91.7
+==============================================
+
+* The treeview-refactor branch has been merged, bringing more
+  flexible cell arrangement with GtkCellArea, GtkCellAreaBox, etc
+
+* The gdk-backend branch has been merged. This branch cleans up the
+  internal frontend/backend separation in GDK, with the ultimate goal
+  of allowing to build a single gdk library that contains multiple
+  backends (interesting combinations are x11+wayland or quartz+x11).
+
+  For now, GDK is still restricted to a single backend, but
+  as a first step, the libraries no longer include the backend name
+  in their soname, but are just libgdk-3.0.so and libgtk-3.0.so.
+
+  Only the x11 backend has been kept up to date with this cleanup
+  work, other backends are broken in this release.
+
+* Deprecations and removals:
+ - G_SEALed struct members have been removed from GtkWindowGroup,
+   GtkDrawingArea, GtkTreeStore, GtkTreeModelSort, GtkTreeSelection,
+   GtkSocket, GtkPrintJob, GtkSelectionData
+ - Input device handling:
+   - gdk_display_list_devices, gdk_display_get_core_pointer,
+     gdk_input_set_extension_events, gtk_widget_set_extension_events,
+     gdk_devices_list have been removed
+   - gdk_display_warp_device has been replaced by gdk_device_warp
+   - gdk_enable_multidevice has been replaced by gdk_disable_multidevice
+ - Drag-and-Drop:
+   gdk_drag_context_new, gdk_drag_find_window and gdk_drag_get_protocol
+   have been removed
+ - Property handling:
+   Functions that deal with X11-specific encodings such as Compound Text
+   have been moved to backend-specific API:
+   gdk_string_to_compound_text[_for_display],
+   gdk_utf8_to_compound_text[_for_display], gdk_free_compound_text,
+   gdk_text_property_to_text_list[_for_display], gdk_free_text_list,
+   gdk_text_property_to_utf8_list
+ - Foreign windows:
+   Functions for dealing with GdkWindow wrappers around foreign
+   windows have been moved to backend-specific API.
+ - Application launching:
+   The gdk_spawn_* APIs have been removed, since they were trivial
+   wrappers around g_spawn_* on most platforms and can be replaced
+   by GIO GAppInfo APIs.
+ - Misc. other functions: gdk_net_wm_supports, gdk_set_locale,
+   gdkx_visual_get have been either removed, gdk_set_sm_client_id
+   has been moved to backend-specific API.
+
+* A number of GTK+ widgets have been ported to use GtkStyleContext
+  directly for rendering
+
+* The tracker search backend for the file chooser has been updated
+  to work with libtracker-sparql as available in tracker >= 0.9
+
+* The GtkAboutDialog has been given a facelift. It no longer
+  opens second-level dialogs
+
+* The GDK X11 backend now uses XI2 (including multi-device capabilities)
+  by default. Use gdk_disable_multidevice() to switch back to the
+  XI1/Core implementation
+
+* Bug fixes:
+ 629923 Consider always calling unmap() when unsetting MAPPED flag
+ 634657 Dynamically attached calendar does not respond to mouse clicks
+ 635401 Setting conflict warning does not disappear when conflict is fixed
+ 636732 Gtk+ fails to build
+ 636777 Leak in gtk_css_provider_get_named
+ 637018 Add checks for id-column/entry-text-column >= 0
+ 637069 Custom print settings set in custom-widget-apply are lost
+ 637155 Remove vestiges of support for themes using XSHAPE
+ 637156 Optimize gtk_widget_shape_combine_region (widget, NULL, ...)
+ 637189 gtk_cell_renderer_spin_start_editing uses g_ascii_strtod but...
+ 637243 docs: fix link failure on gtk-doc scanner binaries
+ 637256 gtkstylecontext: fix typos in annotations
+ 637464 Fix GdkWindowFilter internal refcounting
+ 637471 GTK2_RC_FILES should be renamed to GTK3_RC_FILES
+ 637520 Gtk+ seems to have broken Mutter
+ 637606 Missing out annotations for gtk_accelerator_parse and...
+ 637608 Problems with the new AboutDialog
+
+* Translation updates:
+ Estonian
+ Hebrew
+ Kazakh
+ Norwegian bokmål
+ Persian
+ Spanish
+ Vietnamese
+
+
+Overview of Changes from GTK+ 2.91.5 to 2.91.6
+==============================================
+
+* Deprecations, cleanups and API changes:
+ - GdkDrawable and some X11-specific APIs have been removed
+ - GtkStyle and GtkRcStyle have been deprecated
+ - The GdkWindowClass enumeration is now GdkWindowWindowClass
+ - gdk_window_get_geometry lost its depth argument
+ - The old, unused gtk_decorated_window_... functions have
+   been removed.
+
+* GtkComboBox has gained an 'active id' property that is
+  intended for easy binding to settings
+
+* GtkAppChooser: A new family of widgets that allow choosing
+  an application to open a file. This is strongly based on
+  the corresponding nautilus dialog, which it is replacing.
+
+* The GtkStyleContext branch has been merged, changing the APIs
+  that are used to do themed drawing, and the theme engine interfaces.
+  Among the new classes are GtkStyleContext (replacing GtkStyle) and
+  GtkCssProvider (replacing the gtkrc parser). The migration guide
+  contains a chapter about porting from GtkStyle to GtkStyleContext.
+
+* Bugs fixed:
+ 549720 Add a way to hide GtkScale's slider
+ 582557 need open with dialog box to use with IBM's Lotus Notes...
+ 619148 "active ID" properties (GtkComboBox)
+ 636060 use ATK_DEFINE_TYPE where possible
+ 636129 invalid uninstantiatable type `(null)' in cast to `GtkSpinner'
+ 636388 gtk3-demo craches (segfault) when pressing a key in the textarea...
+ 636511 New style override functions do not work on textview
+
+* Updated translations:
+ Estonian
+ Galician
+ Hebrew
+ Persian
+ Slovenian
+ Spanish
+
+
 Overview of Changes from GTK+ 2.91.4 to 2.91.5
 ==============================================

@@ -1,130 +1,32 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.

-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.

-ORIGDIR=`pwd`
-cd $srcdir
-PROJECT=Gtk+
-TEST_TYPE=-d
-FILE=gdk
+olddir=`pwd`
+cd "$srcdir"

-DIE=0
-
-have_libtool=false
-if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
-	libtool_version=`libtoolize --version |
-			 head -1 |
-			 sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \
-			     -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
-	case $libtool_version in
-	    2.*)
-		have_libtool=true
-		;;
-	esac
-fi
-if $have_libtool ; then : ; else
-	echo
-	echo "You must have libtool 2.2 installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
-	DIE=1
-fi
-
-(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have gtk-doc installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-	DIE=1
-}
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have autoconf installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
-	DIE=1
-}
-
-if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake-1.11
-    ACLOCAL=aclocal-1.11
-else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake-1.10
-    ACLOCAL=aclocal-1.10
+GTKDOCIZE=`which gtkdocize`
+if test -z $GTKDOCIZE; then
+        echo "*** No GTK-Doc found, please install it ***"
+        exit 1
 else
-	echo
-	echo "You must have automake 1,10.x or 1.11.x installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
-	DIE=1
+        gtkdocize || exit $?
 fi
-fi
-
-if test "$DIE" -eq 1; then
-	exit 1
-fi
-
-test $TEST_TYPE $FILE || {
-	echo "You must run this script in the top-level $PROJECT directory"
-	exit 1
-}
-
-# NOCONFIGURE is used by gnome-common; support both
-if ! test -z "$AUTOGEN_SUBDIR_MODE"; then
-    NOCONFIGURE=1
-fi
-
-if test -z "$NOCONFIGURE"; 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
-fi
-
-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
-
-rm -rf autom4te.cache

 # README and INSTALL are required by automake, but may be deleted by clean
 # up rules. to get automake to work, simply touch these here, they will be
 # regenerated from their corresponding *.in files by ./configure anyway.
 touch README INSTALL

-gtkdocize || exit $?
-
-$ACLOCAL -I m4 $ACLOCAL_FLAGS || exit $?
-
-libtoolize --force || exit $?
-
-autoheader || exit $?
-
-$AUTOMAKE --add-missing || exit $?
-autoconf || exit $?
-cd $ORIGDIR || exit $?
-
-if test -z "$NOCONFIGURE"; then
-        $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
-
-        echo 
-        echo "Now type 'make' to compile $PROJECT."
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+        echo "*** No autoreconf found, please install it ***"
+        exit 1
+else
+        autoreconf --force --install --verbose || exit $?
 fi
+
+cd "$olddir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
@@ -276,12 +276,6 @@
 /* Whether to load modules via .la files rather than directly */
 /* #undef USE_LA_MODULES */

-/* Define to 1 if medialib is available and should be used */
-/* #undef USE_MEDIALIB */
-
-/* Define to 1 if medialib 2.5 is available */
-/* #undef USE_MEDIALIB25 */
-
 /* Define to 1 if XXM is available and should be used */
 #ifndef _MSC_VER
 #  define USE_MMX 1
@@ -10,7 +10,7 @@

 m4_define([gtk_major_version], [2])
 m4_define([gtk_minor_version], [91])
-m4_define([gtk_micro_version], [6])
+m4_define([gtk_micro_version], [8])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -19,7 +19,7 @@ m4_define([gtk_version],
 # This is the X.Y used in -lgtk-FOO-X.Y
 m4_define([gtk_api_version], [3.0])

-AC_PREREQ([2.64])
+AC_PREREQ([2.62])
 AC_INIT([gtk+], [gtk_version],
        [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B],
        [gtk+])
@@ -38,7 +38,7 @@ AC_CONFIG_MACRO_DIR([m4])
 m4_define([gtk_binary_version], [3.0.0])

 # required versions of other packages
-m4_define([glib_required_version], [2.27.3])
+m4_define([glib_required_version], [2.27.5])
 m4_define([pango_required_version], [1.20])
 m4_define([atk_required_version], [1.29.2])
 m4_define([cairo_required_version], [1.10.0])
@@ -267,12 +267,6 @@ case $gdktarget in
  *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz or win32.]);;
 esac

-gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
-gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la
-
-AC_SUBST(gdktargetlib)
-AC_SUBST(gtktargetlib)
-
 if test "x$enable_debug" = "xyes"; then
  test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
@@ -666,53 +660,6 @@ else
    fi
 fi

-# `widechar' tests for gdki18n.h
-AC_MSG_CHECKING(for wchar.h)
-AC_TRY_CPP([#include <wchar.h>], gdk_wchar_h=yes, gdk_wchar_h=no)
-if test $gdk_wchar_h = yes; then
-   AC_DEFINE(HAVE_WCHAR_H, 1, [Have wchar.h include file])
-fi
-AC_MSG_RESULT($gdk_wchar_h)
-
-# Check for wctype.h (for iswalnum)
-AC_MSG_CHECKING(for wctype.h)
-AC_TRY_CPP([#include <wctype.h>], gdk_wctype_h=yes, gdk_wctype_h=no)
-if test $gdk_wctype_h = yes; then
-   AC_DEFINE(HAVE_WCTYPE_H, 1, [Have wctype.h include file])
-fi
-AC_MSG_RESULT($gdk_wctype_h)
-
-# in Solaris 2.5, `iswalnum' is in -lw
-GDK_WLIBS=
-AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS=-lw)])
-
-oLIBS="$LIBS"
-LIBS="$LIBS $GDK_WLIBS"
-# The following is necessary for Linux libc-5.4.38
-AC_MSG_CHECKING(if iswalnum() and friends are properly defined)
-AC_TRY_LINK([#include <stdlib.h>],[
-#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
-#  ifdef HAVE_WCTYPE_H
-#    include <wctype.h>
-#  else
-#    ifdef HAVE_WCHAR_H
-#      include <wchar.h>
-#    endif
-#  endif
-#else
-#  define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
-#endif
-iswalnum((wchar_t) 0);
-], gdk_working_wctype=yes, gdk_working_wctype=no)
-LIBS="$oLIBS"
-
-if test $gdk_working_wctype = no; then
-   AC_DEFINE(HAVE_BROKEN_WCTYPE, 1, [Is the wctype implementation broken])
-   GDK_WLIBS=
-fi
-AC_MSG_RESULT($gdk_working_wctype)
-AC_SUBST(GDK_WLIBS)
-
 # Check for uxtheme.h (for MS-Windows Engine)
 AC_MSG_CHECKING(for uxtheme.h)
 AC_TRY_CPP([#include <uxtheme.h>], gtk_uxtheme_h=yes, gtk_uxtheme_h=no)
@@ -858,28 +805,6 @@ AC_CHECK_HEADER(sys/sysinfo.h,
                AC_DEFINE(HAVE_SYS_SYSINFO_H, 1,
                          [Define to 1 if sys/sysinfo.h is available]))

-AC_MSG_CHECKING(for mediaLib 2.3)
-use_mlib25=no
-# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib
-# patch requires.
-AC_CHECK_LIB(mlib, mlib_ImageSetStruct, use_mlib=yes, use_mlib=no)
-if test $use_mlib = yes; then
-    AC_DEFINE(USE_MEDIALIB, 1,
-              [Define to 1 if medialib is available and should be used])
-    MEDIA_LIB=-lmlib
-
-    AC_MSG_CHECKING(for mediaLib 2.5)
-    # Check for a mediaLib 2.5 function since that is what is needed for
-    # gdk_rgb_convert integration.
-    AC_CHECK_LIB(mlib, mlib_VideoColorRGBint_to_BGRAint, use_mlib25=yes, use_mlib25=no)
-    if test $use_mlib25 = yes; then
-        AC_DEFINE(USE_MEDIALIB25, 1,
-                  [Define to 1 if medialib 2.5 is available])
-    fi
-fi
-AM_CONDITIONAL(USE_MEDIALIB, test $use_mlib = yes)
-AM_CONDITIONAL(USE_MEDIALIB25, test $use_mlib25 = yes)
-
 dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling

 AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
@@ -905,7 +830,7 @@ fi
 # Windowing system checks
 ########################################

-GDK_EXTRA_LIBS="$GDK_WLIBS"
+GDK_EXTRA_LIBS=
 GDK_EXTRA_CFLAGS=

 # GTK+ uses some X calls, so needs to link against X directly
@@ -1488,6 +1413,25 @@ GLIB_GSETTINGS

 GOBJECT_INTROSPECTION_CHECK([0.9.3])

+##################################################
+# Packagekit module
+#################################################
+
+AC_ARG_ENABLE(packagekit,
+	      AC_HELP_STRING([--disable-packagekit],
+			     [build packagekit open with module]))
+
+ENABLE_PACKAGEKIT=
+if test "os_win32" != "yes"; then
+   	if test "x$enable_packagekit" != "xno"; then
+	   	ENABLE_PACKAGEKIT=1
+      	   	AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable packagekit])
+	fi
+fi
+
+AC_SUBST(ENABLE_PACKAGEKIT)
+AM_CONDITIONAL(ENABLE_PACKAGEKIT, test "x$ENABLE_PACKAGEKIT" = "x1")
+
 ##################################################
 # Checks for gtk-doc and docbook-tools
 ##################################################
@@ -1533,12 +1477,16 @@ AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [
 * This is a generated file.  Please modify `configure.ac'
 */

-#ifndef GDKCONFIG_H
-#define GDKCONFIG_H
+#ifndef __GDKCONFIG_H__
+#define __GDKCONFIG_H__

-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
+#include <glib.h>
+
+G_BEGIN_DECLS

 #ifndef GSEAL
 /* introduce GSEAL() here for all of Gdk and Gtk+ without the need to modify GLib */
@@ -1553,16 +1501,13 @@ _______EOF

 	cat >>$outfile <<_______EOF
 $gdk_windowing
-$gdk_wc
 _______EOF

 	cat >>$outfile <<_______EOF

-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS

-#endif /* GDKCONFIG_H */
+#endif  /* __GDKCONFIG_H__ */
 _______EOF


@@ -1573,31 +1518,20 @@ _______EOF
 	  mv $outfile gdk/gdkconfig.h
 	fi
 ],[
-if test "x$gdktarget" = "xx11" ; then
-  gdk_windowing='
+gdk_windowing=''
+if expr "$gdktarget" : ".*x11.*" > /dev/null ; then
+  gdk_windowing='$gdk_windowing
 #define GDK_WINDOWING_X11'
-elif test "x$gdktarget" = "xwin32" ; then
-  gdk_windowing='
+fi
+if expr "$gdktarget" : ".*win32.*" > /dev/null ; then
+  gdk_windowing='$gdk_windowing
 #define GDK_NATIVE_WINDOW_POINTER
-
 #define GDK_WINDOWING_WIN32'
-elif test "x$gdktarget" = "xquartz" ; then
-  gdk_windowing='
+fi
+if expr "$gdktarget" : ".*quartz.*" > /dev/null ; then
+  gdk_windowing='$gdk_windowing
 #define GDK_WINDOWING_QUARTZ'
 fi
-
-if test x$gdk_wchar_h = xyes; then
-  gdk_wc='
-#define GDK_HAVE_WCHAR_H 1'
-fi
-if test x$gdk_wctype_h = xyes; then
-  gdk_wc="\$gdk_wc
-#define GDK_HAVE_WCTYPE_H 1"
-fi
-if test x$gdk_working_wctype = xno; then
-  gdk_wc="\$gdk_wc
-#define GDK_HAVE_BROKEN_WCTYPE 1"
-fi
 ])

 dnl
@@ -1617,7 +1551,7 @@ AC_ARG_ENABLE(Bsymbolic,
                           enable_Bsymbolic=no)
               LDFLAGS="${SAVED_LDFLAGS}"])

-if test "x${enable_Bsymbolic}" == "xyes"; then
+if test "x${enable_Bsymbolic}" = "xyes" ; then
  GTK_LINK_FLAGS=-Wl,-Bsymbolic-functions
 fi
 AC_SUBST(GTK_LINK_FLAGS)
@@ -1630,7 +1564,6 @@ gdk-3.0.pc
 gtk+-3.0.pc
 gtk+-unix-print-3.0.pc
 gail-3.0.pc
-gdk-3.0-uninstalled.pc
 gtk+-3.0-uninstalled.pc
 gail-3.0-uninstalled.pc
 m4macros/Makefile
@@ -11,14 +11,13 @@ INCLUDES = 				\
 	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)

-DEPS = 									\
-	$(top_builddir)/gdk/$(gdktargetlib) 				\
-	$(top_builddir)/gtk/$(gtktargetlib)
+DEPS = \
+	$(top_builddir)/gtk/libgtk-3.0.la

-LDADDS = 								\
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)							\
+LDADDS = \
+	$(top_builddir)/gtk/libgtk-3.0.la	\
+	$(top_builddir)/gdk/libgdk-3.0.la	\
+	$(GTK_DEP_LIBS)				\
 	$(MATH_LIB)

 noinst_PROGRAMS = 		\
@@ -55,13 +55,12 @@ INCLUDES = \
 	$(GTK_DEP_CFLAGS)

 DEPS = \
-	$(top_builddir)/gdk/$(gdktargetlib) 				\
-	$(top_builddir)/gtk/$(gtktargetlib)
+	$(top_builddir)/gtk/libgtk-3.0.la

 LDADDS = \
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)							\
+	$(top_builddir)/gtk/libgtk-3.0.la	\
+	$(top_builddir)/gdk/libgdk-3.0.la	\
+	$(GTK_DEP_LIBS)				\
 	-lm

 bin_PROGRAMS = gtk3-demo
@@ -110,7 +110,7 @@ create_page1 (GtkWidget *assistant)
  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 1");
  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), box, GTK_ASSISTANT_PAGE_INTRO);

-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
  g_object_unref (pixbuf);
 }
@@ -133,7 +133,7 @@ create_page2 (GtkWidget *assistant)
  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 2");

-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
  g_object_unref (pixbuf);
 }
@@ -152,7 +152,7 @@ create_page3 (GtkWidget *assistant)
  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), label, TRUE);
  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), label, "Confirmation");

-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), label, pixbuf);
  g_object_unref (pixbuf);
 }
@@ -151,7 +151,7 @@ query_for_toplevel (GdkScreen  *screen,
 	toplevel = NULL;
    }

-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
  gtk_widget_destroy (popup);
  gdk_flush ();			/* Really release the grab */

@@ -77,8 +77,8 @@ get_image_pixbuf (GtkImage *image)
      return g_object_ref (gtk_image_get_pixbuf (image));
    case GTK_IMAGE_STOCK:
      gtk_image_get_stock (image, &stock_id, &size);
-      return gtk_widget_render_icon (GTK_WIDGET (image),
-                                     stock_id, size, NULL);
+      return gtk_widget_render_icon_pixbuf (GTK_WIDGET (image),
+                                            stock_id, size);
    default:
      g_warning ("Image storage type %d not handled",
                 gtk_image_get_storage_type (image));
@@ -125,7 +125,7 @@ drag_data_received (GtkWidget        *widget,
 {
  GdkPixbuf *pixbuf;

-  if (selection_data->length > 0)
+  if (gtk_selection_data_get_length (selection_data) > 0)
    {
      pixbuf = gtk_selection_data_get_pixbuf (selection_data);
      gtk_image_set_from_pixbuf (GTK_IMAGE (data), pixbuf);
@@ -9,35 +9,37 @@

 static GtkWidget *window = NULL;
 static GtkWidget *da;
-static GdkColor color;
+static GdkRGBA color;
 static GtkWidget *frame;

-/* Expose callback for the drawing area
+/* draw callback for the drawing area
 */
 static gboolean
-draw_callback (GtkWidget *widget, 
+draw_callback (GtkWidget *widget,
               cairo_t   *cr,
               gpointer   data)
 {
-  GtkStyle *style;
+  GtkStyleContext *context;
+  GdkRGBA *bg;

-  style = gtk_widget_get_style (widget);
-
-  gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_get (context, 0, "background-color", &bg, NULL);
+  gdk_cairo_set_source_rgba (cr, bg);
  cairo_paint (cr);
+  gdk_rgba_free (bg);

  return TRUE;
 }

 static void
 change_color_callback (GtkWidget *button,
-		       gpointer	  data)
+                       gpointer   data)
 {
  GtkWidget *dialog;
  GtkColorSelection *colorsel;
  GtkColorSelectionDialog *selection_dialog;
  gint response;
-  
+
  dialog = gtk_color_selection_dialog_new ("Changing color");

  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
@@ -45,20 +47,19 @@ change_color_callback (GtkWidget *button,
  selection_dialog = GTK_COLOR_SELECTION_DIALOG (dialog);
  colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));

-  gtk_color_selection_set_previous_color (colorsel, &color);
-  gtk_color_selection_set_current_color (colorsel, &color);
+  gtk_color_selection_set_previous_rgba (colorsel, &color);
+  gtk_color_selection_set_current_rgba (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_color_selection_get_current_rgba (colorsel, &color);
+
+      gtk_widget_override_background_color (da, 0, &color);
    }
-  
+
  gtk_widget_destroy (dialog);
 }

@@ -68,20 +69,21 @@ do_colorsel (GtkWidget *do_widget)
  GtkWidget *vbox;
  GtkWidget *button;
  GtkWidget *alignment;
-  
+
  if (!window)
    {
      color.red = 0;
-      color.blue = 65535;
+      color.blue = 1;
      color.green = 0;
-      
+      color.alpha = 1;
+
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
+                             gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Color Selection");

      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

@@ -92,33 +94,32 @@ do_colorsel (GtkWidget *do_widget)
      /*
       * 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 ();

-      g_signal_connect (da, "draw",
-			G_CALLBACK (draw_callback), NULL);
+      g_signal_connect (da, "draw", G_CALLBACK (draw_callback), NULL);

      /* 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_widget_override_background_color (da, 0, &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);
+                        G_CALLBACK (change_color_callback), NULL);
    }

  if (!gtk_widget_get_visible (window))
@@ -65,8 +65,8 @@ create_stock_icon_store (void)
    {
      if (stock_id[i])
 	{
-	  pixbuf = gtk_widget_render_icon (cellview, stock_id[i],
-					   GTK_ICON_SIZE_BUTTON, NULL);
+	  pixbuf = gtk_widget_render_icon_pixbuf (cellview, stock_id[i],
+					          GTK_ICON_SIZE_BUTTON);
 	  gtk_stock_lookup (stock_id[i], &item);
 	  label = strip_underscore (item.label);
 	  gtk_list_store_append (store, &iter);
@@ -281,18 +281,18 @@ G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
 static void
 mask_entry_set_background (MaskEntry *entry)
 {
-  static const GdkColor error_color = { 0, 65535, 60000, 60000 };
+  static const GdkRGBA error_color = { 1.0, 0.9, 0.9, 1.0 };

  if (entry->mask)
    {
      if (!g_regex_match_simple (entry->mask, gtk_entry_get_text (GTK_ENTRY (entry)), 0, 0))
 	{
-	  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, &error_color);
+	  gtk_widget_override_color (GTK_WIDGET (entry), 0, &error_color);
 	  return;
 	}
    }

-  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, NULL);
+  gtk_widget_override_color (GTK_WIDGET (entry), 0, NULL);
 }


@@ -751,7 +751,7 @@ create_text (GtkTextBuffer **buffer,
  if (is_source)
    {
      font_desc = pango_font_description_from_string ("monospace");
-      gtk_widget_modify_font (text_view, font_desc);
+      gtk_widget_override_font (text_view, font_desc);
      pango_font_description_free (font_desc);

      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view),
@@ -230,7 +230,7 @@ gtk_rotated_bin_realize (GtkWidget *widget)
 {
  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
  GtkAllocation allocation;
-  GtkStyle *style;
+  GtkStyleContext *context;
  GdkWindow *window;
  GdkWindowAttr attributes;
  gint attributes_mask;
@@ -291,9 +291,9 @@ gtk_rotated_bin_realize (GtkWidget *widget)
                    G_CALLBACK (offscreen_window_from_parent), bin);

  gtk_widget_style_attach (widget);
-  style = gtk_widget_get_style (widget);
-  gtk_style_set_background (style, window, GTK_STATE_NORMAL);
-  gtk_style_set_background (style, bin->offscreen_window, GTK_STATE_NORMAL);
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_set_background (context, window);
+  gtk_style_context_set_background (context, bin->offscreen_window);
  gdk_window_show (bin->offscreen_window);
 }

@@ -542,12 +542,11 @@ gtk_rotated_bin_draw (GtkWidget *widget,
    }
  if (gtk_cairo_should_draw_window (cr, bin->offscreen_window))
    {
-      gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
-                          GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-                          widget, "blah",
-                          0, 0,
-                          gdk_window_get_width (bin->offscreen_window),
-                          gdk_window_get_height (bin->offscreen_window));
+      gtk_render_background (gtk_widget_get_style_context (widget),
+                             cr,
+                             0, 0,
+                             gdk_window_get_width (bin->offscreen_window),
+                             gdk_window_get_height (bin->offscreen_window));

      if (bin->child)
        gtk_container_propagate_draw (GTK_CONTAINER (widget),
@@ -575,7 +574,7 @@ do_offscreen_window (GtkWidget *do_widget)
  if (!window)
    {
      GtkWidget *bin, *vbox, *scale, *button;
-      GdkColor black;
+      GdkRGBA black;

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
@@ -585,8 +584,8 @@ do_offscreen_window (GtkWidget *do_widget)
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

-      gdk_color_parse ("black", &black);
-      gtk_widget_modify_bg (window, GTK_STATE_NORMAL, &black);
+      gdk_rgba_parse (&black, "black");
+      gtk_widget_override_background_color (window, 0, &black);
      gtk_container_set_border_width (GTK_CONTAINER (window), 10);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
@@ -168,7 +168,7 @@ gtk_mirror_bin_realize (GtkWidget *widget)
 {
  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
  GtkAllocation allocation;
-  GtkStyle *style;
+  GtkStyleContext *context;
  GdkWindow *window;
  GdkWindowAttr attributes;
  gint attributes_mask;
@@ -229,9 +229,9 @@ gtk_mirror_bin_realize (GtkWidget *widget)
                    G_CALLBACK (offscreen_window_from_parent), bin);

  gtk_widget_style_attach (widget);
-  style = gtk_widget_get_style (widget);
-  gtk_style_set_background (style, window, GTK_STATE_NORMAL);
-  gtk_style_set_background (style, bin->offscreen_window, GTK_STATE_NORMAL);
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_set_background (context, window);
+  gtk_style_context_set_background (context, bin->offscreen_window);
  gdk_window_show (bin->offscreen_window);
 }

@@ -451,12 +451,11 @@ gtk_mirror_bin_draw (GtkWidget *widget,
    }
  else if (gtk_cairo_should_draw_window (cr, bin->offscreen_window))
    {
-      gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
-                          GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-                          widget, "blah",
-                          0, 0,
-                          gdk_window_get_width (bin->offscreen_window),
-                          gdk_window_get_height (bin->offscreen_window));
+      gtk_render_background (gtk_widget_get_style_context (widget),
+                             cr,
+                             0, 0,
+                             gdk_window_get_width (bin->offscreen_window),
+                             gdk_window_get_height (bin->offscreen_window));

      if (bin->child)
        gtk_container_propagate_draw (GTK_CONTAINER (widget),
@@ -18,17 +18,17 @@ const char text[] = "I ♥ GTK+";

 static void
 fancy_shape_renderer (cairo_t        *cr,
-		      PangoAttrShape *attr,
-		      gboolean        do_path,
-		      gpointer        data)
+                      PangoAttrShape *attr,
+                      gboolean        do_path,
+                      gpointer        data)
 {
  double x, y;
  cairo_get_current_point (cr, &x, &y);
  cairo_translate (cr, x, y);

  cairo_scale (cr,
-	       (double) attr->ink_rect.width  / PANGO_SCALE,
-	       (double) attr->ink_rect.height / PANGO_SCALE);
+               (double) attr->ink_rect.width  / PANGO_SCALE,
+               (double) attr->ink_rect.height / PANGO_SCALE);

  switch (GPOINTER_TO_UINT (attr->data))
    {
@@ -36,9 +36,9 @@ fancy_shape_renderer (cairo_t        *cr,
      {
        cairo_move_to (cr, .5, .0);
        cairo_line_to (cr, .9, -.4);
-	cairo_curve_to (cr, 1.1, -.8, .5, -.9, .5, -.5);
-	cairo_curve_to (cr, .5, -.9, -.1, -.8, .1, -.4);
-	cairo_close_path (cr);
+        cairo_curve_to (cr, 1.1, -.8, .5, -.9, .5, -.5);
+        cairo_curve_to (cr, .5, -.9, -.1, -.8, .1, -.4);
+        cairo_close_path (cr);
      }
      break;
    }
@@ -60,8 +60,8 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)

  /* Get font metrics and prepare fancy shape size */
  metrics = pango_context_get_metrics (pango_layout_get_context (layout),
-				       pango_layout_get_font_description (layout),
-				       NULL);
+                                       pango_layout_get_font_description (layout),
+                                       NULL);
  ascent = pango_font_metrics_get_ascent (metrics);
  logical_rect.x = 0;
  logical_rect.width = ascent;
@@ -77,9 +77,9 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)
      PangoAttribute *attr;
      
      attr = pango_attr_shape_new_with_data (&ink_rect,
-					     &logical_rect,
-					     GUINT_TO_POINTER (g_utf8_get_char (p)),
-					     NULL, NULL);
+                                             &logical_rect,
+                                             GUINT_TO_POINTER (g_utf8_get_char (p)),
+                                             NULL, NULL);

      attr->start_index = p - text;
      attr->end_index = attr->start_index + strlen (HEART);
@@ -93,7 +93,7 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)
 static gboolean
 rotated_text_draw (GtkWidget *widget,
                   cairo_t   *cr,
-		   gpointer   data)
+                   gpointer   data)
 {
 #define RADIUS 150
 #define N_WORDS 5
@@ -119,8 +119,8 @@ rotated_text_draw (GtkWidget *widget,
  height = gtk_widget_get_allocated_height (widget);
  device_radius = MIN (width, height) / 2.;
  cairo_translate (cr,
-		   device_radius + (width - 2 * device_radius) / 2,
-		   device_radius + (height - 2 * device_radius) / 2);
+                   device_radius + (width - 2 * device_radius) / 2,
+                   device_radius + (height - 2 * device_radius) / 2);
  cairo_scale (cr, device_radius / RADIUS, device_radius / RADIUS);

  /* Create and a subtle gradient source and use it. */
@@ -132,8 +132,8 @@ rotated_text_draw (GtkWidget *widget,
  /* Create a PangoContext and set up our shape renderer */
  context = gtk_widget_create_pango_context (widget);
  pango_cairo_context_set_shape_renderer (context,
-					  fancy_shape_renderer,
-					  NULL, NULL);
+                                          fancy_shape_renderer,
+                                          NULL, NULL);

  /* Create a PangoLayout, set the text, font, and attributes */
  layout = pango_layout_new (context);
@@ -181,11 +181,11 @@ do_rotated_text (GtkWidget *do_widget)
      PangoLayout *layout;
      PangoAttrList *attrs;

-      const GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
-      
+      const GdkRGBA white = { 1.0, 1.0, 1.0, 1.0 };
+
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
+                             gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Rotated Text");
      gtk_window_set_default_size (GTK_WINDOW (window), 4 * RADIUS, 2 * RADIUS);
      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
@@ -200,10 +200,10 @@ do_rotated_text (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (box), drawing_area);

      /* This overrides the background color from the theme */
-      gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, &white);
+      gtk_widget_override_background_color (drawing_area, 0, &white);

      g_signal_connect (drawing_area, "draw",
-			G_CALLBACK (rotated_text_draw), NULL);
+                        G_CALLBACK (rotated_text_draw), NULL);

      /* And a label */

@@ -215,8 +215,8 @@ do_rotated_text (GtkWidget *do_widget)
      /* Set up fancy stuff on the label */
      layout = gtk_label_get_layout (GTK_LABEL (label));
      pango_cairo_context_set_shape_renderer (pango_layout_get_context (layout),
-					      fancy_shape_renderer,
-					      NULL, NULL);
+                                              fancy_shape_renderer,
+                                              NULL, NULL);
      attrs = create_fancy_attr_list_for_layout (layout);
      gtk_label_set_attributes (GTK_LABEL (label), attrs);
      pango_attr_list_unref (attrs);
@@ -166,9 +166,9 @@ create_model (void)
            }
          g_free (sizes);
          
-          info.small_icon = gtk_widget_render_icon (window, info.id,
-                                                    size,
-                                                    NULL);
+          info.small_icon = gtk_widget_render_icon_pixbuf (window, 
+                                                           info.id,
+                                                           size);
          
          if (size != GTK_ICON_SIZE_MENU)
            {
@@ -561,7 +561,7 @@ recursive_attach_view (int                 depth,
 {
  GtkWidget *child_view;
  GtkWidget *event_box;
-  GdkColor color;
+  GdkRGBA color;
  GtkWidget *align;

  if (depth > 4)
@@ -571,8 +571,8 @@ recursive_attach_view (int                 depth,

  /* 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);
+  gdk_rgba_parse (&color, "black");
+  gtk_widget_override_background_color (event_box, 0, &color);

  align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
  gtk_container_set_border_width (GTK_CONTAINER (align), 1);
@@ -41,7 +41,7 @@ canvas_item_new (GtkWidget     *widget,
  GdkPixbuf *pixbuf;

  stock_id = gtk_tool_button_get_stock_id (button);
-  pixbuf = gtk_widget_render_icon (widget, stock_id, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (widget, stock_id, GTK_ICON_SIZE_DIALOG);

  if (pixbuf)
    {
@@ -13,40 +13,39 @@ DOC_MAIN_SGML_FILE=gdk-docs.sgml
 SCAN_OPTIONS=--deprecated-guards="GDK_ENABLE_BROKEN|GDK_DISABLE_DEPRECATED"

 # The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../../gdk
+DOC_SOURCE_DIR=../../../gdk ../../../gdk/x11

 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gdk/*.h $(top_srcdir)/gdk/x11/gdkx.h
 CFILE_GLOB=$(top_srcdir)/gdk/*.c

 # Header files to ignore when scanning
-IGNORE_HFILES=			\
+IGNORE_HFILES= 			\
 	gdkintl.h		\
 	gdkmarshalers.h		\
 	gdkkeysyms.h		\
 	gdkinternals.h		\
 	gdkprivate.h		\
-	gdkpoly-generic.h	\
+	gdk*private.h		\
 	keyname-table.h		\
-	win32 			\
+	win32			\
 	x11			\
 	quartz

 # Extra files to add when scanning (relative to $srcdir)
 EXTRA_HFILES=			\
-	../../../gdk/x11/gdkx.h 
+	../../../gdk/x11/gdkx.h

 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
-	-I$(top_srcdir) 	\
-	-I$(top_builddir) 	\
-	-I$(top_builddir)/gdk 	\
+INCLUDES = 			\
+	-I$(top_srcdir)		\
+	-I$(top_builddir)	\
+	-I$(top_builddir)/gdk	\
 	$(GTK_DEBUG_FLAGS)	\
 	$(GDK_DEP_CFLAGS)

-GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib)
-
+GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.0.la $(GDK_DEP_LIBS)

 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdk
@@ -57,86 +56,85 @@ content_files = 		\
 	multihead.sgml

 # Images to copy into HTML directory
-HTML_IMAGES =				\
+HTML_IMAGES = 				\
 	images/rotated-text.png		\
-					\
-	images/X_cursor.png 		\
-	images/arrow.png 		\
-	images/based_arrow_down.png 	\
-	images/based_arrow_up.png 	\
-	images/boat.png 		\
-	images/bogosity.png 		\
-	images/bottom_left_corner.png 	\
-	images/bottom_right_corner.png 	\
-	images/bottom_side.png 		\
-	images/bottom_tee.png 		\
-	images/box_spiral.png 		\
-	images/center_ptr.png 		\
-	images/circle.png 		\
-	images/clock.png 		\
-	images/coffee_mug.png 		\
-	images/cross.png 		\
-	images/cross_reverse.png 	\
-	images/crosshair.png 		\
-	images/diamond_cross.png 	\
-	images/dot.png 			\
-	images/dotbox.png 		\
-	images/double_arrow.png 	\
-	images/draft_large.png 		\
-	images/draft_small.png 		\
-	images/draped_box.png 		\
-	images/exchange.png 		\
-	images/fleur.png 		\
-	images/gobbler.png 		\
-	images/gumby.png 		\
-	images/hand1.png 		\
-	images/hand2.png 		\
-	images/heart.png 		\
-	images/icon.png 		\
-	images/iron_cross.png 		\
-	images/left_ptr.png 		\
-	images/left_side.png 		\
-	images/left_tee.png 		\
-	images/leftbutton.png 		\
-	images/ll_angle.png 		\
-	images/lr_angle.png 		\
-	images/man.png 			\
-	images/middlebutton.png 	\
-	images/mouse.png 		\
-	images/pencil.png 		\
-	images/pirate.png 		\
-	images/plus.png 		\
-	images/question_arrow.png 	\
-	images/right_ptr.png 		\
-	images/right_side.png 		\
-	images/right_tee.png 		\
-	images/rightbutton.png 		\
-	images/rtl_logo.png 		\
-	images/sailboat.png 		\
-	images/sb_down_arrow.png 	\
-	images/sb_h_double_arrow.png 	\
-	images/sb_left_arrow.png 	\
-	images/sb_right_arrow.png 	\
-	images/sb_up_arrow.png 		\
-	images/sb_v_double_arrow.png 	\
-	images/shuttle.png 		\
-	images/sizing.png 		\
-	images/spider.png 		\
-	images/spraycan.png 		\
-	images/star.png 		\
-	images/target.png 		\
-	images/tcross.png 		\
-	images/top_left_arrow.png 	\
-	images/top_left_corner.png 	\
-	images/top_right_corner.png 	\
-	images/top_side.png 		\
-	images/top_tee.png 		\
-	images/trek.png 		\
-	images/ul_angle.png 		\
-	images/umbrella.png 		\
-	images/ur_angle.png 		\
-	images/watch.png 		\
-	images/xterm.png 
+	images/X_cursor.png		\
+	images/arrow.png		\
+	images/based_arrow_down.png	\
+	images/based_arrow_up.png	\
+	images/boat.png			\
+	images/bogosity.png		\
+	images/bottom_left_corner.png	\
+	images/bottom_right_corner.png	\
+	images/bottom_side.png		\
+	images/bottom_tee.png		\
+	images/box_spiral.png		\
+	images/center_ptr.png		\
+	images/circle.png		\
+	images/clock.png		\
+	images/coffee_mug.png		\
+	images/cross.png		\
+	images/cross_reverse.png	\
+	images/crosshair.png		\
+	images/diamond_cross.png	\
+	images/dot.png			\
+	images/dotbox.png		\
+	images/double_arrow.png		\
+	images/draft_large.png		\
+	images/draft_small.png		\
+	images/draped_box.png		\
+	images/exchange.png		\
+	images/fleur.png		\
+	images/gobbler.png		\
+	images/gumby.png		\
+	images/hand1.png		\
+	images/hand2.png		\
+	images/heart.png		\
+	images/icon.png			\
+	images/iron_cross.png		\
+	images/left_ptr.png		\
+	images/left_side.png		\
+	images/left_tee.png		\
+	images/leftbutton.png		\
+	images/ll_angle.png		\
+	images/lr_angle.png		\
+	images/man.png			\
+	images/middlebutton.png		\
+	images/mouse.png		\
+	images/pencil.png		\
+	images/pirate.png		\
+	images/plus.png			\
+	images/question_arrow.png	\
+	images/right_ptr.png		\
+	images/right_side.png		\
+	images/right_tee.png		\
+	images/rightbutton.png		\
+	images/rtl_logo.png		\
+	images/sailboat.png		\
+	images/sb_down_arrow.png	\
+	images/sb_h_double_arrow.png	\
+	images/sb_left_arrow.png	\
+	images/sb_right_arrow.png	\
+	images/sb_up_arrow.png		\
+	images/sb_v_double_arrow.png	\
+	images/shuttle.png		\
+	images/sizing.png		\
+	images/spider.png		\
+	images/spraycan.png		\
+	images/star.png			\
+	images/target.png		\
+	images/tcross.png		\
+	images/top_left_arrow.png	\
+	images/top_left_corner.png	\
+	images/top_right_corner.png	\
+	images/top_side.png		\
+	images/top_tee.png		\
+	images/trek.png			\
+	images/ul_angle.png		\
+	images/umbrella.png		\
+	images/ur_angle.png		\
+	images/watch.png		\
+	images/xterm.png

 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS= \
@@ -20,9 +20,11 @@
    <xi:include href="multihead.sgml" />
    <xi:include href="xml/gdkdisplay.xml" />
    <xi:include href="xml/gdkdisplaymanager.xml" />
+    <xi:include href="xml/gdkdevice.xml" />
+    <xi:include href="xml/gdkdevicemanager.xml" />
    <xi:include href="xml/gdkscreen.xml" />
    <xi:include href="xml/regions.xml" />
-    <xi:include href="xml/drawing.xml" />
+    <xi:include href="xml/pixbufs.xml" />
    <xi:include href="xml/colors.xml" />
    <xi:include href="xml/rgba_colors.xml" />
    <xi:include href="xml/visuals.xml" />
@@ -35,7 +37,6 @@
    <xi:include href="xml/dnd.xml" />
    <xi:include href="xml/properties.xml" />
    <xi:include href="xml/threads.xml" />
-    <xi:include href="xml/gdkdevicemanager.xml" />
    <xi:include href="xml/pango_interaction.xml" />
    <xi:include href="xml/cairo_interaction.xml" />
    <xi:include href="xml/x_interaction.xml" />
@@ -1,27 +1,4 @@

-# GdkPixmap, GdkBitmap and GdkDrawable are the same as GdkWindow.
-<STRUCT>
-<NAME>GdkWindow</NAME>
-struct GdkPixmap
-{
-  gpointer user_data;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkPixmap</NAME>
-struct GdkPixmap
-{
-  gpointer user_data;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkDrawable</NAME>
-struct GdkDrawable
-{
-  gpointer user_data;
-};
-</STRUCT>
-
 # GdkAtom is an opaque typedef
 <STRUCT>
 <NAME>GdkAtom</NAME>
@@ -8,8 +8,6 @@ gdk_init
 gdk_init_check
 gdk_parse_args
 gdk_get_display_arg_name
-gdk_set_locale
-gdk_set_sm_client_id
 gdk_notify_startup_complete
 gdk_notify_startup_complete_with_id

@@ -63,7 +61,6 @@ GdkStatus
 GDKVAR
 gdk_axis_use_get_type
 gdk_byte_order_get_type
-gdk_cap_style_get_type
 gdk_crossing_mode_get_type
 gdk_cursor_type_get_type
 gdk_drag_action_get_type
@@ -79,17 +76,14 @@ gdk_input_mode_get_type
 gdk_input_source_get_type
 gdk_modifier_type_get_type
 gdk_notify_type_get_type
-gdk_overlap_type_get_type
 gdk_property_state_get_type
 gdk_prop_mode_get_type
 gdk_scroll_direction_get_type
 gdk_setting_action_get_type
 gdk_status_get_type
-gdk_subwindow_mode_get_type
 gdk_visibility_state_get_type
 gdk_visual_type_get_type
 gdk_window_attributes_type_get_type
-gdk_window_class_get_type
 gdk_window_edge_get_type
 gdk_window_hints_get_type
 gdk_window_state_get_type
@@ -122,23 +116,21 @@ gdk_display_sync
 gdk_display_flush
 gdk_display_close
 gdk_display_is_closed
-gdk_display_list_devices
 gdk_display_get_event
 gdk_display_peek_event
 gdk_display_put_event
+gdk_display_has_pending
 gdk_display_add_client_message_filter
 gdk_display_set_double_click_time
 gdk_display_set_double_click_distance
 gdk_display_get_pointer
-gdk_display_get_device_state
+gdk_display_list_devices
 gdk_display_get_window_at_pointer
-gdk_display_get_window_at_device_position
 GdkDisplayPointerHooks
 gdk_display_set_pointer_hooks
 GdkDisplayDeviceHooks
 gdk_display_set_device_hooks
 gdk_display_warp_pointer
-gdk_display_warp_device
 gdk_display_supports_cursor_color
 gdk_display_supports_cursor_alpha
 gdk_display_get_default_cursor_size
@@ -151,7 +143,11 @@ gdk_display_store_clipboard
 gdk_display_supports_shapes
 gdk_display_supports_input_shapes
 gdk_display_supports_composite
+gdk_display_get_app_launch_context
+gdk_display_notify_startup_complete
+
 <SUBSECTION Standard>
+GDK_DISPLAY
 GDK_DISPLAY_OBJECT
 GDK_IS_DISPLAY
 GDK_TYPE_DISPLAY
@@ -173,7 +169,8 @@ gdk_display_manager_get
 gdk_display_manager_get_default_display
 gdk_display_manager_set_default_display
 gdk_display_manager_list_displays
-gdk_display_get_core_pointer
+gdk_display_manager_open_display
+
 <SUBSECTION Standard>
 GDK_DISPLAY_MANAGER
 GDK_DISPLAY_MANAGER_CLASS
@@ -219,10 +216,6 @@ gdk_screen_get_resolution
 gdk_screen_set_resolution
 gdk_screen_get_active_window
 gdk_screen_get_window_stack
-<SUBSECTION Spawning>
-gdk_spawn_on_screen
-gdk_spawn_on_screen_with_pipes
-gdk_spawn_command_line_on_screen

 <SUBSECTION Standard>
 GDK_SCREEN
@@ -257,6 +250,8 @@ gdk_color_to_string
 <SUBSECTION Standard>
 GDK_TYPE_COLOR

+<SUBSECTION Private>
+gdk_color_get_type
 </SECTION>

 <SECTION>
@@ -272,25 +267,9 @@ gdk_rgba_to_string

 <SUBSECTION Standard>
 GDK_TYPE_RGBA
-</SECTION>
-
-<SECTION>
-<TITLE>Drawing Primitives</TITLE>
-<FILE>drawing</FILE>
-GdkDrawable
-gdk_drawable_get_clip_region
-gdk_drawable_get_visible_region
-
-<SUBSECTION Standard>
-GDK_DRAWABLE
-GDK_DRAWABLE_GET_CLASS
-GDK_TYPE_DRAWABLE
-GDK_IS_DRAWABLE
-GDK_DRAWABLE_CLASS
-GDK_IS_DRAWABLE_CLASS

 <SUBSECTION Private>
-GdkDrawableClass
+gdk_rgba_get_type
 </SECTION>

 <SECTION>
@@ -339,7 +318,7 @@ gdk_visual_get_type
 <FILE>windows</FILE>
 GdkWindow
 GdkWindowType
-GdkWindowClass
+GdkWindowWindowClass
 GdkWindowHints
 GdkGeometry
 GdkGravity
@@ -397,9 +376,11 @@ gdk_window_constrain_size
 gdk_window_beep

 <SUBSECTION>
+gdk_window_get_clip_region
 gdk_window_begin_paint_rect
 gdk_window_begin_paint_region
 gdk_window_end_paint
+gdk_window_get_visible_region

 <SUBSECTION>
 gdk_window_invalidate_rect
@@ -489,6 +470,8 @@ gdk_window_get_device_cursor
 gdk_window_set_device_cursor
 gdk_window_get_device_events
 gdk_window_set_device_events
+gdk_window_get_source_events
+gdk_window_set_source_events

 <SUBSECTION>
 GdkPointerHooks
@@ -515,7 +498,6 @@ GDK_TYPE_FILTER_RETURN
 GDK_TYPE_GRAVITY
 GDK_TYPE_MODIFIER_TYPE
 GDK_TYPE_WINDOW_ATTRIBUTES_TYPE
-GDK_TYPE_WINDOW_CLASS
 GDK_TYPE_WINDOW_EDGE
 GDK_TYPE_WINDOW_HINTS
 GDK_TYPE_WINDOW_TYPE
@@ -524,12 +506,11 @@ GDK_TYPE_WM_DECORATION
 GDK_TYPE_WM_FUNCTION

 <SUBSECTION Private>
-gdk_window_object_get_type
-gdk_drawable_get_type
-GdkWindowObject
-GdkWindowObjectClass
+gdk_window_get_type
+gdk_window_window_class_get_type
+GdkWindowClass
 GdkWindowImpl
-GdkWindowImplIface
+GdkWindowImplClass
 GdkWindowRedirect
 gdk_window_impl_get_type
 gdk_window_freeze_toplevel_updates_libgtk_only
@@ -572,17 +553,8 @@ GdkAtom
 GDK_ATOM_TO_POINTER
 GDK_POINTER_TO_ATOM
 GDK_NONE
-gdk_text_property_to_text_list
-gdk_text_property_to_text_list_for_display
-gdk_free_text_list
-gdk_text_property_to_utf8_list
 gdk_text_property_to_utf8_list_for_display
-gdk_string_to_compound_text
-gdk_string_to_compound_text_for_display
-gdk_free_compound_text
 gdk_utf8_to_string_target
-gdk_utf8_to_compound_text
-gdk_utf8_to_compound_text_for_display
 gdk_atom_intern
 gdk_atom_intern_static_string
 gdk_atom_name
@@ -616,7 +588,6 @@ gdk_cairo_set_source_pixbuf
 gdk_cairo_set_source_window
 gdk_cairo_rectangle
 gdk_cairo_region
-gdk_cairo_reset_clip
 gdk_cairo_region_create_from_surface
 </SECTION>

@@ -649,10 +620,6 @@ gdk_threads_add_timeout
 gdk_threads_add_timeout_full
 gdk_threads_add_timeout_seconds
 gdk_threads_add_timeout_seconds_full
-
-<SUBSECTION Private>
-gdk_threads_lock
-gdk_threads_unlock
 </SECTION>

 <SECTION>
@@ -702,25 +669,17 @@ gdk_keymap_get_type
 </SECTION>

 <SECTION>
-<TITLE>GdkDeviceManager</TITLE>
-<FILE>gdkdevicemanager</FILE>
-GdkDeviceManager
+<TITLE>GdkDevice</TITLE>
+<FILE>gdkdevice</FILE>
 GdkDevice
-GdkDeviceType
 GdkInputSource
 GdkInputMode
-GdkDeviceKey
-GdkDeviceAxis
 GdkAxisUse
+GdkDeviceType
 GdkGrabOwnership
-gdk_enable_multidevice
-gdk_device_manager_get_display
-gdk_device_manager_list_devices
-gdk_device_manager_get_client_pointer

 <SUBSECTION>
 gdk_device_get_name
-gdk_device_set_source
 gdk_device_get_source
 gdk_device_set_mode
 gdk_device_get_mode
@@ -729,10 +688,13 @@ gdk_device_get_key
 gdk_device_set_axis_use
 gdk_device_get_axis_use
 gdk_device_get_associated_device
+gdk_device_list_slave_devices
 gdk_device_get_device_type
 gdk_device_get_display
 gdk_device_get_has_cursor
 gdk_device_get_n_axes
+gdk_device_get_n_keys
+gdk_device_warp

 <SUBSECTION>
 gdk_device_grab
@@ -740,6 +702,8 @@ gdk_device_ungrab

 <SUBSECTION>
 gdk_device_get_state
+gdk_device_get_position
+gdk_device_get_window_at_position
 gdk_device_get_history
 gdk_device_free_history
 GdkTimeCoord
@@ -747,14 +711,6 @@ gdk_device_get_axis
 gdk_device_list_axes
 gdk_device_get_axis_value

-<SUBSECTION>
-gdk_input_set_extension_events
-GdkExtensionMode
-
-<SUBSECTION>
-gdk_devices_list
-gdk_device_get_core_pointer
-
 <SUBSECTION Standard>
 GDK_TYPE_AXIS_USE
 GDK_TYPE_EXTENSION_MODE
@@ -762,12 +718,6 @@ GDK_TYPE_INPUT_MODE
 GDK_TYPE_INPUT_SOURCE
 GDK_TYPE_DEVICE_TYPE
 GDK_TYPE_GRAB_OWNERSHIP
-GDK_DEVICE_MANAGER
-GDK_DEVICE_MANAGER_CLASS
-GDK_DEVICE_MANAGER_GET_CLASS
-GDK_IS_DEVICE_MANAGER
-GDK_IS_DEVICE_MANAGER_CLASS
-GDK_TYPE_DEVICE_MANAGER
 GDK_DEVICE
 GDK_DEVICE_CLASS
 GDK_DEVICE_GET_CLASS
@@ -777,15 +727,33 @@ GDK_TYPE_DEVICE

 <SUBSECTION Private>
 GdkDeviceClass
-GdkDevicePrivate
-GdkDeviceManagerClass
-GdkDeviceManagerPrivate
 gdk_device_get_type
-gdk_device_manager_get_type
 gdk_device_type_get_type
 GDK_MAX_TIMECOORD_AXES
 </SECTION>

+<SECTION>
+<TITLE>GdkDeviceManager</TITLE>
+<FILE>gdkdevicemanager</FILE>
+GdkDeviceManager
+gdk_disable_multidevice
+gdk_device_manager_get_display
+gdk_device_manager_list_devices
+gdk_device_manager_get_client_pointer
+
+<SUBSECTION Standard>
+GDK_DEVICE_MANAGER
+GDK_DEVICE_MANAGER_CLASS
+GDK_DEVICE_MANAGER_GET_CLASS
+GDK_IS_DEVICE_MANAGER
+GDK_IS_DEVICE_MANAGER_CLASS
+GDK_TYPE_DEVICE_MANAGER
+
+<SUBSECTION Private>
+GdkDeviceManagerClass
+gdk_device_manager_get_type
+</SECTION>
+
 <SECTION>
 <TITLE>Events</TITLE>
 <FILE>events</FILE>
@@ -795,7 +763,6 @@ GDK_CURRENT_TIME
 GDK_PRIORITY_EVENTS
 GDK_PRIORITY_REDRAW

-
 <SUBSECTION>
 gdk_events_pending
 gdk_event_peek
@@ -831,6 +798,8 @@ gdk_event_set_screen
 gdk_event_get_screen
 gdk_event_get_device
 gdk_event_set_device
+gdk_event_get_source_device
+gdk_event_set_source_device

 <SUBSECTION>
 gdk_setting_get
@@ -862,7 +831,6 @@ GdkNativeWindow
 GdkEventDND
 GdkEventProximity
 GdkEventClient
-GdkEventNoExpose
 GdkEventWindowState
 GdkEventSetting
 GdkEventOwnerChange
@@ -921,30 +889,31 @@ gdk_cursor_get_type
 <SECTION>
 <TITLE>Drag and Drop</TITLE>
 <FILE>dnd</FILE>
+GdkDragContext
 gdk_drag_get_selection
 gdk_drag_abort
 gdk_drop_reply
-gdk_drag_context_new
 gdk_drag_drop
-gdk_drag_find_window
 gdk_drag_find_window_for_screen
-gdk_drag_context_get_source_window
 gdk_drag_begin
+gdk_drag_begin_for_device
 gdk_drag_motion
 gdk_drop_finish
-gdk_drag_get_protocol
 gdk_drag_get_protocol_for_display
 GdkDragProtocol
-GdkDragContext
 GdkDragAction
 gdk_drag_status
 gdk_drag_drop_succeeded
+
 gdk_drag_context_get_actions
 gdk_drag_context_get_suggested_action
 gdk_drag_context_get_selected_action
 gdk_drag_context_list_targets
 gdk_drag_context_get_device
 gdk_drag_context_set_device
+gdk_drag_context_get_source_window
+gdk_drag_context_get_dest_window
+gdk_drag_context_get_protocol

 <SUBSECTION Standard>
 GDK_DRAG_CONTEXT
@@ -966,38 +935,19 @@ gdk_drag_context_get_type
 <TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
 GDK_ROOT_WINDOW
-GDK_WINDOW_XDISPLAY
 GDK_WINDOW_XID
 GDK_DISPLAY_XDISPLAY
-GDK_DRAWABLE_XDISPLAY
-GDK_DRAWABLE_XID
 GDK_SCREEN_XDISPLAY
 GDK_SCREEN_XNUMBER
 GDK_SCREEN_XSCREEN
 GDK_CURSOR_XCURSOR
 GDK_CURSOR_XDISPLAY
-GDK_WINDOW_XWINDOW
-gdkx_visual_get
-gdk_window_foreign_new
-gdk_window_foreign_new_for_display
-gdk_xid_table_lookup
-gdk_xid_table_lookup_for_display
-gdk_window_lookup
-gdk_window_lookup_for_display
 gdk_x11_lookup_xdisplay
 gdk_x11_get_server_time
-gdk_net_wm_supports
-gdk_x11_screen_supports_net_wm_hint
-gdk_x11_screen_get_window_manager_name
-gdk_x11_screen_get_monitor_output
-gdk_x11_screen_lookup_visual
-gdk_x11_window_set_user_time
-gdk_x11_window_move_to_current_desktop
 gdk_x11_display_get_user_time
-gdk_x11_cursor_get_xcursor
-gdk_x11_cursor_get_xdisplay
 gdk_x11_display_broadcast_startup_message
 gdk_x11_display_get_startup_notification_id
+gdk_x11_display_set_startup_notification_id
 gdk_x11_display_get_xdisplay
 gdk_x11_display_grab
 gdk_x11_display_ungrab
@@ -1006,15 +956,24 @@ gdk_x11_display_error_trap_pop
 gdk_x11_display_error_trap_pop_ignored
 gdk_x11_display_set_cursor_theme
 gdk_x11_register_standard_event_type
-gdk_x11_drawable_get_xdisplay
-gdk_x11_drawable_get_xid
+gdk_x11_screen_get_screen_number
+gdk_x11_screen_get_xscreen
+gdk_x11_screen_get_window_manager_name
+gdk_x11_screen_get_monitor_output
+gdk_x11_screen_lookup_visual
+gdk_x11_screen_supports_net_wm_hint
+gdk_x11_window_foreign_new_for_display
+gdk_x11_window_lookup_for_display
+gdk_x11_window_get_xid
+gdk_x11_window_set_user_time
+gdk_x11_window_move_to_current_desktop
 gdk_x11_get_default_root_xwindow
 gdk_x11_get_default_screen
 gdk_x11_get_default_xdisplay
 gdk_x11_grab_server
-gdk_x11_screen_get_screen_number
-gdk_x11_screen_get_xscreen
 gdk_x11_ungrab_server
+gdk_x11_cursor_get_xcursor
+gdk_x11_cursor_get_xdisplay
 gdk_x11_visual_get_xvisual
 gdk_x11_atom_to_xatom
 gdk_x11_atom_to_xatom_for_display
@@ -1024,11 +983,30 @@ gdk_x11_get_xatom_by_name
 gdk_x11_get_xatom_by_name_for_display
 gdk_x11_get_xatom_name
 gdk_x11_get_xatom_name_for_display
+gdk_x11_set_sm_client_id
+gdk_x11_display_text_property_to_text_list
+gdk_x11_free_text_list
+gdk_x11_display_string_to_compound_text
+gdk_x11_display_utf8_to_compound_text
+gdk_x11_free_compound_text

 <SUBSECTION Private>
-GDK_HAVE_WCHAR_H
-GDK_HAVE_WCTYPE_H
-gdk_x11_window_get_drawable_impl
+gdk_x11_app_launch_context_get_type
+gdk_x11_cursor_get_type
+gdk_x11_device_core_get_type
+gdk_x11_device_manager_core_get_type
+gdk_x11_device_manager_xi2_get_type
+gdk_x11_device_manager_xi_get_type
+gdk_x11_device_xi2_get_type
+gdk_x11_device_xi_get_type
+gdk_x11_display_get_type
+gdk_x11_display_manager_get_type
+gdk_x11_drag_context_get_type
+gdk_x11_keymap_get_type
+gdk_x11_screen_get_type
+gdk_x11_visual_get_type
+gdk_x11_window_get_type
+gdk_window_impl_x11_get_type
 </SECTION>

 <SECTION>
@@ -1050,7 +1028,6 @@ GDK_IS_APP_LAUNCH_CONTEXT
 GDK_IS_APP_LAUNCH_CONTEXT_CLASS
 GDK_TYPE_APP_LAUNCH_CONTEXT
 GdkAppLaunchContextClass
-GdkAppLaunchContextPrivate
 <SUBSECTION Private>
 gdk_app_launch_context_get_type
 </SECTION>
@@ -1,10 +1,13 @@
 #include <gdk/gdk.h>

-gdk_display_get_type
-gdk_display_manager_get_type
-gdk_screen_get_type
-gdk_drawable_get_type
-gdk_window_object_get_type
-gdk_keymap_get_type
+gdk_app_launch_context_get_type
+gdk_cursor_get_type
 gdk_device_get_type
 gdk_device_manager_get_type
+gdk_display_get_type
+gdk_display_manager_get_type
+gdk_drag_context_get_type
+gdk_keymap_get_type
+gdk_screen_get_type
+gdk_visual_get_type
+gdk_window_get_type
@@ -22,6 +22,8 @@ CFILE_GLOB=$(top_srcdir)/gtk/*.c
 # Header files to ignore when scanning
 IGNORE_HFILES=				\
 	fnmatch.h			\
+	gtk9slice.h			\
+	gtkanimationdescription.h	\
 	gtkdebug.h			\
 	gtkbuilderprivate.h		\
 	gtkdndcursors.h			\
@@ -77,6 +79,7 @@ IGNORE_HFILES=				\
 	gtktexttagprivate.h		\
 	gtktexttypes.h			\
 	gtktextutil.h			\
+	gtktimeline.h			\
 	gtkthemes.h			\
 	gtktrayicon.h			\
 	gtktreedatalist.h		\
@@ -104,8 +107,8 @@ CPPFLAGS += \
 	-UGTK_DISABLE_SINGLE_INCLUDES

 GTKDOC_LIBS = \
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)
+	$(top_builddir)/gtk/libgtk-3.0.la				\
+	$(GTK_DEP_LIBS)


 # Extra options to supply to gtkdoc-mkdb
@@ -122,6 +125,7 @@ content_files =					\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
 	migrating-GtkApplication.xml		\
+	migrating-GtkStyleContext.xml		\
 	objects_grouped.sgml			\
 	osx.sgml				\
 	question_index.sgml			\
@@ -144,6 +148,7 @@ expand_content_files = 				\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
 	migrating-GtkApplication.xml		\
+	migrating-GtkStyleContext.xml		\
 	question_index.sgml			\
 	text_widget.sgml			\
 	tree_widget.sgml
@@ -323,7 +328,31 @@ HTML_IMAGES = \
 	$(srcdir)/images/layout-tbrl.png				\
 	$(srcdir)/images/window-default.png				\
 	$(srcdir)/images/hello-world.png				\
-	$(srcdir)/images/switch.png
+	$(srcdir)/images/switch.png					\
+	$(srcdir)/images/linear.png					\
+	$(srcdir)/images/ease.png					\
+	$(srcdir)/images/ease-in-out.png				\
+	$(srcdir)/images/ease-in.png					\
+	$(srcdir)/images/ease-out.png					\
+	$(srcdir)/images/gradient1.png					\
+	$(srcdir)/images/gradient2.png					\
+	$(srcdir)/images/gradient3.png					\
+	$(srcdir)/images/gradient4.png					\
+	$(srcdir)/images/border1.png					\
+	$(srcdir)/images/border2.png					\
+	$(srcdir)/images/border3.png					\
+	$(srcdir)/images/slices.png					\
+	$(srcdir)/images/checks.png					\
+	$(srcdir)/images/options.png					\
+	$(srcdir)/images/arrows.png					\
+	$(srcdir)/images/expanders.png					\
+	$(srcdir)/images/background.png					\
+	$(srcdir)/images/frames.png					\
+	$(srcdir)/images/frame-gap.png					\
+	$(srcdir)/images/sliders.png					\
+	$(srcdir)/images/focus.png					\
+	$(srcdir)/images/handles.png					\
+	$(srcdir)/images/extensions.png

 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk/html \
@@ -32,7 +32,7 @@ your system may be different):
 $ pkg-config --cflags gtk+-3.0
 -pthread -I/usr/include/gtk-3.0 -I/usr/lib64/gtk-3.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
 $ pkg-config --libs gtk+-3.0
- -pthread -lgtk-x11-3.0 -lgdk-x11-3.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-3.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
+ -pthread -lgtk-3.0 -lgdk-3.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-3.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
 </programlisting>
 </para>
 <para>
@@ -3,6 +3,8 @@
               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 <!ENTITY version SYSTEM "version.xml">
+<!ENTITY pi "&#960;">
+<!ENTITY solidus "&#8260;">
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
  <bookinfo>
@@ -38,19 +40,31 @@
    <xi:include href="xml/gtkaccelmap.xml" />
    <xi:include href="xml/gtkclipboard.xml" />
    <xi:include href="xml/gtkdnd.xml" />
-    <xi:include href="xml/gtkicontheme.xml" />
    <xi:include href="xml/gtkstock.xml" />
-    <xi:include href="xml/gtkiconfactory.xml" />
-    <xi:include href="xml/gtkrc.xml" />
    <xi:include href="xml/gtksettings.xml" />
    <xi:include href="xml/gtkbindings.xml" />
    <xi:include href="xml/gtkenums.xml" />
-    <xi:include href="xml/gtkstyle.xml" />
    <xi:include href="xml/gtkselection.xml" />
    <xi:include href="xml/gtktesting.xml" />
    <xi:include href="xml/filesystem.xml" />
  </part>

+  <part id="theming">
+    <title>Theming in GTK+</title>
+    <xi:include href="xml/gtkstylecontext.xml" />
+    <xi:include href="xml/gtkcssprovider.xml" />
+    <xi:include href="xml/gtkstyleprovider.xml" />
+    <xi:include href="xml/gtkstyleproperties.xml" />
+    <xi:include href="xml/gtkthemingengine.xml" />
+    <xi:include href="xml/gtkwidgetpath.xml" />
+    <xi:include href="xml/gtksymboliccolor.xml" />
+    <xi:include href="xml/gtkgradient.xml" />
+    <xi:include href="xml/gtkicontheme.xml" />
+    <xi:include href="xml/gtkiconfactory.xml" />
+    <xi:include href="xml/gtkrc.xml" />
+    <xi:include href="xml/gtkstyle.xml" />
+  </part>
+
  <part id="gtkobjects">
    <title>GTK+ Widgets and Objects</title>

@@ -137,6 +151,9 @@
      <xi:include href="xml/gtktreemodelsort.xml" />
      <xi:include href="xml/gtktreemodelfilter.xml" />
      <xi:include href="xml/gtkcelllayout.xml" />
+      <xi:include href="xml/gtkcellarea.xml" />
+      <xi:include href="xml/gtkcellareabox.xml" />
+      <xi:include href="xml/gtkcellareacontext.xml" />
      <xi:include href="xml/gtkcellrenderer.xml" />
      <xi:include href="xml/gtkcelleditable.xml" />
      <xi:include href="xml/gtkcellrendereraccel.xml" />
@@ -297,6 +314,14 @@
      <xi:include href="xml/gtkrecentfilter.xml" />
    </chapter>

+    <chapter id="ApplicationChoosing">
+      <title>Choosing from installed applications</title>
+      <xi:include href="xml/gtkappchooser.xml" />
+      <xi:include href="xml/gtkappchooserbutton.xml" />
+      <xi:include href="xml/gtkappchooserdialog.xml" />
+      <xi:include href="xml/gtkappchooserwidget.xml" />
+    </chapter>
+
    <chapter id="Builder">
      <title>Interface builder</title>
      <xi:include href="xml/gtkbuildable.xml" />
@@ -325,6 +350,7 @@
    <xi:include href="xml/migrating-checklist.sgml" />
    <xi:include href="xml/migrating-2to3.xml" />
    <xi:include href="xml/migrating-GtkApplication.xml" />
+    <xi:include href="xml/migrating-GtkStyleContext.xml" />
  </part>

  <part>
@@ -881,6 +881,7 @@ gtk_container_set_resize_mode
 gtk_container_check_resize
 gtk_container_foreach
 gtk_container_get_children
+gtk_container_get_path_for_child
 gtk_container_set_reallocate_redraws
 gtk_container_get_focus_child
 gtk_container_set_focus_child
@@ -993,9 +994,6 @@ gtk_editable_get_editable
 GTK_EDITABLE
 GTK_IS_EDITABLE
 GTK_TYPE_EDITABLE
-GTK_EDITABLE_CLASS
-GTK_IS_EDITABLE_CLASS
-GTK_EDITABLE_GET_CLASS
 GTK_EDITABLE_GET_IFACE
 <SUBSECTION Private>
 gtk_editable_get_type
@@ -1118,6 +1116,7 @@ gtk_entry_buffer_get_type
 GtkEntryCompletion
 GtkEntryCompletionMatchFunc
 gtk_entry_completion_new
+gtk_entry_completion_new_with_area
 gtk_entry_completion_get_entry
 gtk_entry_completion_set_model
 gtk_entry_completion_get_model
@@ -1735,9 +1734,7 @@ GTK_IMAGE_GET_CLASS
 GtkImagePrivate
 gtk_image_get_type
 GtkImageIconSetData
-GtkImageImageData
 GtkImagePixbufData
-GtkImagePixmapData
 GtkImageStockData
 GtkImageAnimationData
 GtkImageIconNameData
@@ -2119,6 +2116,8 @@ gtk_menu_shell_activate_item
 gtk_menu_shell_cancel
 gtk_menu_shell_set_take_focus
 gtk_menu_shell_get_take_focus
+gtk_menu_shell_get_selected_item
+gtk_menu_shell_get_parent_shell
 GtkMenuDirectionType
 <SUBSECTION Standard>
 GTK_MENU_SHELL
@@ -2481,8 +2480,6 @@ GTK_RANGE_GET_CLASS
 <SUBSECTION Private>
 gtk_range_get_type
 GtkRangePrivate
-GtkRangeLayout
-GtkRangeStepTimer
 </SECTION>

 <SECTION>
@@ -2771,13 +2768,11 @@ gtk_scrollable_set_vscroll_policy


 <SUBSECTION Standard>
-GtkScrollableIface
-GTK_IS_SCROLLABLE
-GTK_IS_SCROLLABLE_CLASS
-GTK_SCROLLABLE
-GTK_SCROLLABLE_CLASS
-GTK_SCROLLABLE_GET_IFACE
+GtkScrollableInterface
 GTK_TYPE_SCROLLABLE
+GTK_SCROLLABLE
+GTK_IS_SCROLLABLE
+GTK_SCROLLABLE_GET_IFACE

 <SUBSECTION Private>
 gtk_scrollable_get_type
@@ -3000,7 +2995,7 @@ GTK_SPINNER
 GTK_IS_SPINNER
 GTK_TYPE_SPINNER
 GTK_SPINNER_CLASS
-GTK_IS_SPINER_CLASS
+GTK_IS_SPINNER_CLASS
 GTK_SPINNER_GET_CLASS
 GTK_IS_SPINNER_CLASS

@@ -3226,7 +3221,6 @@ GTK_TEXT_BUFFER_GET_CLASS
 <SUBSECTION Private>
 GtkTextBufferPrivate
 gtk_text_buffer_get_type
-GtkTextLogAttrCache
 </SECTION>

 <SECTION>
@@ -3495,8 +3489,6 @@ GtkTextViewPrivate
 gtk_text_view_get_type
 gtk_text_child_anchor_get_type
 GtkTextBTree
-GtkTextWindow
-GtkTextPendingScroll
 </SECTION>

 <SECTION>
@@ -4144,6 +4136,7 @@ GtkTreeViewColumnSizing
 GtkTreeCellDataFunc
 GtkTreeViewColumn
 gtk_tree_view_column_new
+gtk_tree_view_column_new_with_area
 gtk_tree_view_column_new_with_attributes
 gtk_tree_view_column_pack_start
 gtk_tree_view_column_pack_end
@@ -4363,6 +4356,7 @@ GtkCellLayoutIface
 GtkCellLayoutDataFunc
 gtk_cell_layout_pack_start
 gtk_cell_layout_pack_end
+gtk_cell_layout_get_area
 gtk_cell_layout_get_cells
 gtk_cell_layout_reorder
 gtk_cell_layout_clear
@@ -4379,6 +4373,120 @@ GTK_CELL_LAYOUT_GET_IFACE
 gtk_cell_layout_get_type
 </SECTION>

+<SECTION>
+<FILE>gtkcellarea</FILE>
+<TITLE>GtkCellArea</TITLE>
+GtkCellArea
+GtkCellAreaClass
+GtkCellCallback
+GtkCellAllocCallback
+GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID
+gtk_cell_area_add
+gtk_cell_area_remove
+gtk_cell_area_has_renderer
+gtk_cell_area_foreach
+gtk_cell_area_foreach_alloc
+gtk_cell_area_event
+gtk_cell_area_render
+gtk_cell_area_set_style_detail
+gtk_cell_area_get_style_detail
+gtk_cell_area_get_cell_allocation
+gtk_cell_area_get_cell_at_position
+gtk_cell_area_create_context
+gtk_cell_area_copy_context
+gtk_cell_area_get_request_mode
+gtk_cell_area_get_preferred_width
+gtk_cell_area_get_preferred_height_for_width
+gtk_cell_area_get_preferred_height
+gtk_cell_area_get_preferred_width_for_height
+gtk_cell_area_get_current_path_string
+gtk_cell_area_apply_attributes
+gtk_cell_area_attribute_connect
+gtk_cell_area_attribute_disconnect
+gtk_cell_area_class_install_cell_property
+gtk_cell_area_class_find_cell_property
+gtk_cell_area_class_list_cell_properties
+gtk_cell_area_add_with_properties
+gtk_cell_area_cell_set
+gtk_cell_area_cell_get
+gtk_cell_area_cell_set_valist
+gtk_cell_area_cell_get_valist
+gtk_cell_area_cell_set_property
+gtk_cell_area_cell_get_property
+gtk_cell_area_is_activatable
+gtk_cell_area_activate
+gtk_cell_area_focus
+gtk_cell_area_set_focus_cell
+gtk_cell_area_get_focus_cell
+gtk_cell_area_add_focus_sibling
+gtk_cell_area_remove_focus_sibling
+gtk_cell_area_is_focus_sibling
+gtk_cell_area_get_focus_siblings
+gtk_cell_area_get_focus_from_sibling
+gtk_cell_area_get_edited_cell
+gtk_cell_area_get_edit_widget
+gtk_cell_area_activate_cell
+gtk_cell_area_stop_editing
+gtk_cell_area_inner_cell_area
+gtk_cell_area_request_renderer
+<SUBSECTION Standard>
+GTK_CELL_AREA
+GTK_IS_CELL_AREA
+GTK_TYPE_CELL_AREA
+gtk_cell_area_get_type
+GTK_CELL_AREA_CLASS
+GTK_IS_CELL_AREA_CLASS
+GTK_CELL_AREA_GET_CLASS
+GtkCellAreaPrivate
+</SECTION>
+
+<SECTION>
+<FILE>gtkcellareacontext</FILE>
+<TITLE>GtkCellAreaContext</TITLE>
+GtkCellAreaContextClass
+GtkCellAreaContext
+gtk_cell_area_context_get_area
+gtk_cell_area_context_allocate
+gtk_cell_area_context_reset
+gtk_cell_area_context_get_preferred_width
+gtk_cell_area_context_get_preferred_height
+gtk_cell_area_context_get_preferred_height_for_width
+gtk_cell_area_context_get_preferred_width_for_height
+gtk_cell_area_context_get_allocation
+gtk_cell_area_context_push_preferred_width
+gtk_cell_area_context_push_preferred_height
+<SUBSECTION Standard>
+GTK_CELL_AREA_CONTEXT
+GTK_IS_CELL_AREA_CONTEXT
+GTK_TYPE_CELL_AREA_CONTEXT
+gtk_cell_area_context_get_type
+GTK_CELL_AREA_CONTEXT_CLASS
+GTK_IS_CELL_AREA_CONTEXT_CLASS
+GTK_CELL_AREA_CONTEXT_GET_CLASS
+GtkCellAreaContextPrivate
+</SECTION>
+
+<SECTION>
+<FILE>gtkcellareabox</FILE>
+<TITLE>GtkCellAreaBox</TITLE>
+GtkCellAreaBox
+GtkCellAreaBoxClass
+gtk_cell_area_box_new
+gtk_cell_area_box_pack_start
+gtk_cell_area_box_pack_end
+gtk_cell_area_box_get_spacing
+gtk_cell_area_box_set_spacing
+<SUBSECTION Standard>
+GTK_CELL_AREA_BOX
+GTK_IS_CELL_AREA_BOX
+GTK_TYPE_CELL_AREA_BOX
+gtk_cell_area_box_get_type
+GTK_CELL_AREA_BOX_CLASS
+GTK_IS_CELL_AREA_BOX_CLASS
+GTK_CELL_AREA_BOX_GET_CLASS
+GtkCellAreaBoxPrivate
+</SECTION>
+
 <SECTION>
 <FILE>gtkcellrenderer</FILE>
 <TITLE>GtkCellRenderer</TITLE>
@@ -4386,6 +4494,7 @@ GtkCellRendererState
 GtkCellRendererMode
 GtkCellRenderer
 GtkCellRendererClass
+gtk_cell_renderer_get_aligned_area
 gtk_cell_renderer_get_size
 gtk_cell_renderer_render
 gtk_cell_renderer_activate
@@ -4401,6 +4510,7 @@ gtk_cell_renderer_get_alignment
 gtk_cell_renderer_set_alignment
 gtk_cell_renderer_get_padding
 gtk_cell_renderer_set_padding
+gtk_cell_renderer_is_activatable

 <SUBSECTION Width-for-height>
 gtk_cell_renderer_get_preferred_height
@@ -4817,8 +4927,6 @@ gtk_widget_get_parent_window
 gtk_widget_set_events
 gtk_widget_get_events
 gtk_widget_add_events
-gtk_widget_set_extension_events
-gtk_widget_get_extension_events
 gtk_widget_set_device_events
 gtk_widget_get_device_events
 gtk_widget_add_device_events
@@ -4845,6 +4953,11 @@ gtk_widget_input_shape_combine_region
 gtk_widget_path
 gtk_widget_class_path
 gtk_widget_get_composite_name
+gtk_widget_override_background_color
+gtk_widget_override_color
+gtk_widget_override_font
+gtk_widget_override_symbolic_color
+gtk_widget_override_cursor
 gtk_widget_modify_style
 gtk_widget_get_modifier_style
 gtk_widget_modify_fg
@@ -4853,16 +4966,15 @@ gtk_widget_modify_text
 gtk_widget_modify_base
 gtk_widget_modify_font
 gtk_widget_modify_cursor
-gtk_widget_modify_symbolic_color
 gtk_widget_create_pango_context
 gtk_widget_get_pango_context
 gtk_widget_create_pango_layout
 gtk_widget_render_icon
+gtk_widget_render_icon_pixbuf
 gtk_widget_pop_composite_child
 gtk_widget_push_composite_child
 gtk_widget_queue_draw_area
 gtk_widget_queue_draw_region
-gtk_widget_reset_shapes
 gtk_widget_set_app_paintable
 gtk_widget_set_double_buffered
 gtk_widget_set_redraw_on_allocate
@@ -4932,6 +5044,9 @@ gtk_widget_is_sensitive
 gtk_widget_get_state
 gtk_widget_get_visible
 gtk_widget_set_visible
+gtk_widget_set_state_flags
+gtk_widget_unset_state_flags
+gtk_widget_get_state_flags
 gtk_widget_has_default
 gtk_widget_has_focus
 gtk_widget_has_grab
@@ -4950,6 +5065,11 @@ gtk_widget_get_mapped
 gtk_widget_get_requisition
 gtk_widget_device_is_shadowed

+<SUBSECTION>
+gtk_widget_get_path
+gtk_widget_get_style_context
+gtk_widget_reset_style
+
 <SUBSECTION>
 gtk_requisition_new
 gtk_requisition_copy
@@ -5059,8 +5179,6 @@ gtk_window_begin_resize_drag
 gtk_window_begin_move_drag
 gtk_window_set_decorated
 gtk_window_set_deletable
-gtk_window_set_frame_dimensions
-gtk_window_set_has_frame
 gtk_window_set_mnemonic_modifier
 gtk_window_set_type_hint
 gtk_window_set_skip_taskbar_hint
@@ -5076,8 +5194,6 @@ gtk_window_get_default_icon_list
 gtk_window_get_default_icon_name
 gtk_window_get_default_size
 gtk_window_get_destroy_with_parent
-gtk_window_get_frame_dimensions
-gtk_window_get_has_frame
 gtk_window_get_icon
 gtk_window_get_icon_list
 gtk_window_get_icon_name
@@ -5164,7 +5280,6 @@ gtk_window_group_get_type
 <SECTION>
 <FILE>gtkmain</FILE>
 <TITLE>General</TITLE>
-gtk_set_locale
 gtk_disable_setlocale
 gtk_get_default_language
 gtk_parse_args
@@ -5246,6 +5361,327 @@ GTK_INTERFACE_AGE
 GTK_CHECK_VERSION
 </SECTION>

+<SECTION>
+<FILE>gtkwidgetpath</FILE>
+<TITLE>GtkWidgetPath</TITLE>
+GtkWidgetPath
+gtk_widget_path_append_type
+gtk_widget_path_copy
+gtk_widget_path_free
+gtk_widget_path_get_object_type
+gtk_widget_path_has_parent
+gtk_widget_path_is_type
+gtk_widget_path_iter_add_class
+gtk_widget_path_iter_add_region
+gtk_widget_path_iter_clear_classes
+gtk_widget_path_iter_clear_regions
+gtk_widget_path_iter_get_name
+gtk_widget_path_iter_get_object_type
+gtk_widget_path_iter_has_class
+gtk_widget_path_iter_has_name
+gtk_widget_path_iter_has_qclass
+gtk_widget_path_iter_has_qname
+gtk_widget_path_iter_has_qregion
+gtk_widget_path_iter_has_region
+gtk_widget_path_iter_list_classes
+gtk_widget_path_iter_list_regions
+gtk_widget_path_iter_remove_class
+gtk_widget_path_iter_remove_region
+gtk_widget_path_iter_set_name
+gtk_widget_path_iter_set_object_type
+gtk_widget_path_length
+gtk_widget_path_new
+gtk_widget_path_prepend_type
+
+<SUBSECTION Standard>
+GTK_TYPE_WIDGET_PATH
+
+<SUBSECTION Private>
+gtk_widget_path_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkstyleprovider</FILE>
+<TITLE>GtkStyleProvider</TITLE>
+GtkStyleProviderIface
+GtkStyleProvider
+GTK_STYLE_PROVIDER_PRIORITY_FALLBACK
+GTK_STYLE_PROVIDER_PRIORITY_THEME
+GTK_STYLE_PROVIDER_PRIORITY_SETTINGS
+GTK_STYLE_PROVIDER_PRIORITY_APPLICATION
+GTK_STYLE_PROVIDER_PRIORITY_USER
+gtk_style_provider_get_icon_factory
+gtk_style_provider_get_style
+gtk_style_provider_get_style_property
+<SUBSECTION Standard>
+GTK_TYPE_STYLE_PROVIDER
+GTK_STYLE_PROVIDER
+GTK_IS_STYLE_PROVIDER
+GTK_STYLE_PROVIDER_GET_IFACE
+<SUBSECTION Private>
+gtk_style_provider_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkstyleproperties</FILE>
+<TITLE>GtkStyleProperties</TITLE>
+GtkStyleProperties
+gtk_style_properties_clear
+gtk_style_properties_get
+gtk_style_properties_get_property
+gtk_style_properties_get_valist
+gtk_style_properties_lookup_color
+gtk_style_properties_lookup_property
+gtk_style_properties_map_color
+gtk_style_properties_merge
+gtk_style_properties_new
+GtkStylePropertyParser
+gtk_style_properties_register_property
+gtk_style_properties_set
+gtk_style_properties_set_property
+gtk_style_properties_set_valist
+gtk_style_properties_unset_property
+<SUBSECTION Standard>
+GTK_TYPE_STYLE_PROPERTIES
+GTK_IS_STYLE_PROPERTIES
+GTK_IS_STYLE_PROPERTIES_CLASS
+GTK_STYLE_PROPERTIES
+GTK_STYLE_PROPERTIES_CLASS
+GTK_STYLE_PROPERTIES_GET_CLASS
+<SUBSECTION Private>
+gtk_style_properties_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkstylecontext</FILE>
+<TITLE>GtkStyleContext</TITLE>
+<SUBSECTION>
+GTK_STYLE_PROPERTY_BACKGROUND_COLOR
+GTK_STYLE_PROPERTY_COLOR
+GTK_STYLE_PROPERTY_FONT
+GTK_STYLE_PROPERTY_MARGIN
+GTK_STYLE_PROPERTY_PADDING
+GTK_STYLE_PROPERTY_BORDER_WIDTH
+GTK_STYLE_PROPERTY_BORDER_RADIUS
+GTK_STYLE_PROPERTY_BORDER_STYLE
+GTK_STYLE_PROPERTY_BORDER_COLOR
+GTK_STYLE_PROPERTY_BACKGROUND_IMAGE
+<SUBSECTION>
+GTK_STYLE_CLASS_BACKGROUND
+GTK_STYLE_CLASS_BUTTON
+GTK_STYLE_CLASS_CALENDAR
+GTK_STYLE_CLASS_CELL
+GTK_STYLE_CLASS_CHECK
+GTK_STYLE_CLASS_DEFAULT
+GTK_STYLE_CLASS_ENTRY
+GTK_STYLE_CLASS_HEADER
+GTK_STYLE_CLASS_MENU
+GTK_STYLE_CLASS_RADIO
+GTK_STYLE_CLASS_RUBBERBAND
+GTK_STYLE_CLASS_SCROLLBAR
+GTK_STYLE_CLASS_SLIDER
+GTK_STYLE_CLASS_TOOLTIP
+GTK_STYLE_CLASS_TROUGH
+GTK_STYLE_CLASS_ACCELERATOR
+GTK_STYLE_CLASS_DOCK
+GTK_STYLE_CLASS_GRIP
+GTK_STYLE_CLASS_MENUBAR
+GTK_STYLE_CLASS_MENUITEM
+GTK_STYLE_CLASS_PROGRESSBAR
+GTK_STYLE_CLASS_SPINNER
+GTK_STYLE_CLASS_TOOLBAR
+GTK_STYLE_REGION_COLUMN
+GTK_STYLE_REGION_COLUMN_HEADER
+GTK_STYLE_REGION_ROW
+GTK_STYLE_REGION_TAB
+<SUBSECTION>
+GtkStyleContext
+gtk_style_context_new
+gtk_style_context_add_provider
+gtk_style_context_add_provider_for_screen
+gtk_style_context_get
+gtk_style_context_get_direction
+gtk_style_context_get_junction_sides
+gtk_style_context_get_path
+gtk_style_context_get_property
+gtk_style_context_get_screen
+gtk_style_context_get_state
+gtk_style_context_get_style
+gtk_style_context_get_style_property
+gtk_style_context_get_style_valist
+gtk_style_context_get_valist
+gtk_style_context_get_color
+gtk_style_context_get_background_color
+gtk_style_context_get_border_color
+gtk_style_context_get_border
+gtk_style_context_get_padding
+gtk_style_context_get_margin
+gtk_style_context_get_font
+gtk_style_context_invalidate
+gtk_style_context_state_is_running
+gtk_style_context_lookup_color
+gtk_style_context_lookup_icon_set
+gtk_style_context_notify_state_change
+gtk_style_context_pop_animatable_region
+gtk_style_context_push_animatable_region
+gtk_style_context_remove_provider
+gtk_style_context_remove_provider_for_screen
+gtk_style_context_reset_widgets
+gtk_style_context_set_background
+gtk_style_context_restore
+gtk_style_context_save
+gtk_style_context_set_direction
+gtk_style_context_set_junction_sides
+gtk_style_context_set_path
+gtk_style_context_add_class
+gtk_style_context_remove_class
+gtk_style_context_has_class
+gtk_style_context_list_classes
+gtk_style_context_add_region
+gtk_style_context_remove_region
+gtk_style_context_has_region
+gtk_style_context_list_regions
+gtk_style_context_set_screen
+gtk_style_context_set_state
+
+<SUBSECTION>
+GtkBorder
+gtk_border_new
+gtk_border_copy
+gtk_border_free
+
+<SUBSECTION>
+gtk_render_arrow
+gtk_render_background
+gtk_render_check
+gtk_render_expander
+gtk_render_extension
+gtk_render_focus
+gtk_render_frame
+gtk_render_frame_gap
+gtk_render_handle
+gtk_render_layout
+gtk_render_line
+gtk_render_option
+gtk_render_slider
+gtk_render_activity
+gtk_render_icon_pixbuf
+
+<SUBSECTION Standard>
+GTK_TYPE_STYLE_CONTEXT
+GTK_STYLE_CONTEXT
+GTK_STYLE_CONTEXT_CLASS
+GTK_STYLE_CONTEXT_GET_CLASS
+GTK_IS_STYLE_CONTEXT
+GTK_IS_STYLE_CONTEXT_CLASS
+GTK_TYPE_BORDER
+
+<SUBSECTION Private>
+gtk_style_context_get_type
+gtk_border_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkcssprovider</FILE>
+<TITLE>GtkCssProvider</TITLE>
+GtkCssProvider
+gtk_css_provider_get_default
+gtk_css_provider_get_named
+gtk_css_provider_load_from_data
+gtk_css_provider_load_from_file
+gtk_css_provider_load_from_path
+gtk_css_provider_new
+GTK_CSS_PROVIDER_ERROR
+GtkCssProviderError
+<SUBSECTION Standard>
+GTK_TYPE_CSS_PROVIDER
+GTK_CSS_PROVIDER
+GTK_CSS_PROVIDER_CLASS
+GTK_CSS_PROVIDER_GET_CLASS
+GTK_IS_CSS_PROVIDER
+GTK_IS_CSS_PROVIDER_CLASS
+<SUBSECTION Private>
+gtk_css_provider_get_type
+gtk_css_provider_error_quark
+</SECTION>
+
+<SECTION>
+<FILE>gtkthemingengine</FILE>
+<TITLE>GtkThemingEngine</TITLE>
+GtkThemingEngineClass
+GtkThemingEngine
+gtk_theming_engine_get
+gtk_theming_engine_get_direction
+gtk_theming_engine_get_junction_sides
+gtk_theming_engine_get_path
+gtk_theming_engine_get_property
+gtk_theming_engine_get_screen
+gtk_theming_engine_get_state
+gtk_theming_engine_get_style
+gtk_theming_engine_get_style_property
+gtk_theming_engine_get_style_valist
+gtk_theming_engine_get_valist
+gtk_theming_engine_get_color
+gtk_theming_engine_get_background_color
+gtk_theming_engine_get_border_color
+gtk_theming_engine_get_border
+gtk_theming_engine_get_padding
+gtk_theming_engine_get_margin
+gtk_theming_engine_get_font
+gtk_theming_engine_has_class
+gtk_theming_engine_has_region
+gtk_theming_engine_lookup_color
+gtk_theming_engine_state_is_running
+gtk_theming_engine_load
+gtk_theming_engine_register_property
+<SUBSECTION Standard>
+GTK_THEMING_ENGINE
+GTK_THEMING_ENGINE_CLASS
+GTK_THEMING_ENGINE_GET_CLASS
+GTK_IS_THEMING_ENGINE
+GTK_IS_THEMING_ENGINE_CLASS
+<SUBSECTION Private>
+GTK_TYPE_THEMING_ENGINE
+gtk_theming_engine_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtksymboliccolor</FILE>
+<TITLE>GtkSymbolicColor</TITLE>
+GtkSymbolicColor
+gtk_symbolic_color_new_literal
+gtk_symbolic_color_new_name
+gtk_symbolic_color_new_shade
+gtk_symbolic_color_new_alpha
+gtk_symbolic_color_new_mix
+gtk_symbolic_color_ref
+gtk_symbolic_color_unref
+gtk_symbolic_color_resolve
+
+<SUBSECTION Standard>
+GTK_TYPE_SYMBOLIC_COLOR
+
+<SUBSECTION Private>
+gtk_symbolic_color_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkgradient</FILE>
+<TITLE>GtkGradient</TITLE>
+GtkGradient
+gtk_gradient_new_linear
+gtk_gradient_new_radial
+gtk_gradient_add_color_stop
+gtk_gradient_ref
+gtk_gradient_unref
+gtk_gradient_resolve
+
+<SUBSECTION Standard>
+GTK_TYPE_GRADIENT
+
+gtk_gradient_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkstyle</FILE>
 <TITLE>GtkStyle</TITLE>
@@ -5285,12 +5721,6 @@ gtk_paint_layout
 gtk_paint_resize_grip
 gtk_draw_insertion_cursor

-<SUBSECTION>
-GtkBorder
-gtk_border_new
-gtk_border_copy
-gtk_border_free
-
 <SUBSECTION>
 GtkRcProperty
 GtkRcPropertyParser
@@ -5303,10 +5733,8 @@ GTK_TYPE_STYLE
 GTK_STYLE_CLASS
 GTK_IS_STYLE_CLASS
 GTK_STYLE_GET_CLASS
-GTK_TYPE_BORDER
-<SUBSECTION Private>
+
 gtk_style_get_type
-gtk_border_get_type
 GtkThemeEngine
 </SECTION>

@@ -5556,12 +5984,16 @@ GtkScrollType
 GtkSelectionMode
 GtkShadowType
 GtkStateType
+GtkStateFlags
 GtkToolbarStyle
 GtkUpdateType
 GtkWindowPosition
 GtkWindowType
 GtkSortType
 GtkDragResult
+GtkJunctionSides
+GtkBorderStyle
+GtkRegionFlags

 <SUBSECTION Private>
 GTK_PATH_PRIO_MASK
@@ -5723,6 +6155,7 @@ gtk_icon_info_get_builtin_pixbuf
 gtk_icon_info_load_icon
 gtk_icon_info_load_symbolic
 gtk_icon_info_load_symbolic_for_style
+gtk_icon_info_load_symbolic_for_context
 gtk_icon_info_set_raw_coordinates
 gtk_icon_info_get_embedded_rect
 gtk_icon_info_get_attach_points
@@ -5764,6 +6197,7 @@ gtk_icon_set_new
 gtk_icon_set_new_from_pixbuf
 gtk_icon_set_ref
 gtk_icon_set_render_icon
+gtk_icon_set_render_icon_pixbuf
 gtk_icon_set_unref
 gtk_icon_size_lookup
 gtk_icon_size_lookup_for_settings
@@ -6231,6 +6665,26 @@ gtk_print_job_get_surface
 gtk_print_job_send
 gtk_print_job_set_track_print_status
 gtk_print_job_get_track_print_status
+gtk_print_job_get_pages
+gtk_print_job_set_pages
+gtk_print_job_get_page_ranges
+gtk_print_job_set_page_ranges
+gtk_print_job_get_page_set
+gtk_print_job_set_page_set
+gtk_print_job_get_num_copies
+gtk_print_job_set_num_copies
+gtk_print_job_get_scale
+gtk_print_job_set_scale
+gtk_print_job_get_n_up
+gtk_print_job_set_n_up
+gtk_print_job_get_n_up_layout
+gtk_print_job_set_n_up_layout
+gtk_print_job_get_rotate
+gtk_print_job_set_rotate
+gtk_print_job_get_collate
+gtk_print_job_set_collate
+gtk_print_job_get_reverse
+gtk_print_job_set_reverse

 <SUBSECTION Standard>
 GTK_TYPE_PRINT_JOB
@@ -6410,3 +6864,99 @@ GTK_SWITCH_GET_CLASS
 GtkSwitchPrivate
 gtk_switch_get_type
 </SECTION>
+
+<SECTION>
+<FILE>gtkappchooser</FILE>
+<TITLE>GtkAppChooser</TITLE>
+GtkAppChooser
+gtk_app_chooser_get_app_info
+gtk_app_chooser_get_content_type
+gtk_app_chooser_refresh
+
+<SUBSECTION Standard>
+GTK_TYPE_APP_CHOOSER
+GTK_APP_CHOOSER
+GTK_IS_APP_CHOOSER
+
+<SUBSECTION Private>
+gtk_app_chooser_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkappchooserbutton</FILE>
+<TITLE>GtkAppChooserButton</TITLE>
+GtkAppChooserButton
+gtk_app_chooser_button_new
+gtk_app_chooser_button_append_custom_item
+gtk_app_chooser_button_append_separator
+gtk_app_chooser_button_set_active_custom_item
+gtk_app_chooser_button_get_show_dialog_item
+gtk_app_chooser_button_set_show_dialog_item
+
+<SUBSECTION Standard>
+GtkAppChooserButtonClass
+GTK_TYPE_APP_CHOOSER_BUTTON
+GTK_APP_CHOOSER_BUTTON
+GTK_APP_CHOOSER_BUTTON_CLASS
+GTK_IS_APP_CHOOSER_BUTTON
+GTK_IS_APP_CHOOSER_BUTTON_CLASS
+GTK_APP_CHOOSER_BUTTON_GET_CLASS
+
+<SUBSECTION Private>
+GtkAppChooserButtonPrivate
+gtk_app_chooser_button_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkappchooserdialog</FILE>
+<TITLE>GtkAppChooserDialog</TITLE>
+GtkAppChooserDialog
+gtk_app_chooser_dialog_new
+gtk_app_chooser_dialog_new_for_content_type
+gtk_app_chooser_dialog_get_widget
+
+<SUBSECTION Standard>
+GtkAppChooserDialogClass
+GTK_TYPE_APP_CHOOSER_DIALOG
+GTK_APP_CHOOSER_DIALOG
+GTK_APP_CHOOSER_DIALOG_CLASS
+GTK_IS_APP_CHOOSER_DIALOG
+GTK_IS_APP_CHOOSER_DIALOG_CLASS
+GTK_APP_CHOOSER_DIALOG_GET_CLASS
+
+<SUBSECTION Private>
+GtkAppChooserDialogPrivate
+gtk_app_chooser_dialog_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkappchooserwidget</FILE>
+<TITLE>GtkAppChooserWidget</TITLE>
+GtkAppChooserWidget
+gtk_app_chooser_widget_new
+gtk_app_chooser_widget_set_show_default
+gtk_app_chooser_widget_get_show_default
+gtk_app_chooser_widget_set_show_recommended
+gtk_app_chooser_widget_get_show_recommended
+gtk_app_chooser_widget_set_show_fallback
+gtk_app_chooser_widget_get_show_fallback
+gtk_app_chooser_widget_set_show_other
+gtk_app_chooser_widget_get_show_other
+gtk_app_chooser_widget_set_show_all
+gtk_app_chooser_widget_get_show_all
+gtk_app_chooser_widget_set_default_text
+gtk_app_chooser_widget_get_default_text
+
+<SUBSECTION Standard>
+GtkAppChooserWidgetClass
+GTK_TYPE_APP_CHOOSER_WIDGET
+GTK_APP_CHOOSER_WIDGET
+GTK_APP_CHOOSER_WIDGET_CLASS
+GTK_IS_APP_CHOOSER_WIDGET
+GTK_IS_APP_CHOOSER_WIDGET_CLASS
+GTK_APP_CHOOSER_WIDGET_GET_CLASS
+
+<SUBSECTION Private>
+GtkAppChooserWidgetPrivate
+gtk_app_chooser_widget_get_type
+</SECTION>
@@ -11,6 +11,10 @@ gtk_action_group_get_type
 gtk_activatable_get_type
 gtk_adjustment_get_type
 gtk_alignment_get_type
+gtk_app_chooser_get_type
+gtk_app_chooser_button_get_type
+gtk_app_chooser_dialog_get_type
+gtk_app_chooser_widget_get_type
 gtk_application_get_type
 gtk_arrow_get_type
 gtk_aspect_frame_get_type
@@ -22,6 +26,9 @@ gtk_buildable_get_type
 gtk_button_box_get_type
 gtk_button_get_type
 gtk_calendar_get_type
+gtk_cell_area_get_type
+gtk_cell_area_box_get_type
+gtk_cell_area_context_get_type
 gtk_cell_editable_get_type
 gtk_cell_layout_get_type
 gtk_cell_renderer_accel_get_type
@@ -43,6 +50,7 @@ gtk_color_selection_get_type
 gtk_combo_box_get_type
 gtk_combo_box_text_get_type
 gtk_container_get_type
+gtk_css_provider_get_type
 gtk_dialog_get_type
 gtk_drawing_area_get_type
 gtk_editable_get_type
@@ -137,6 +145,8 @@ gtk_statusbar_get_type
 gtk_status_icon_get_type
 gtk_switch_get_type
 gtk_style_get_type
+gtk_style_context_get_type
+gtk_style_provider_get_type
 gtk_table_get_type
 gtk_tearoff_menu_item_get_type
 gtk_text_buffer_get_type
@@ -146,6 +156,7 @@ gtk_text_mark_get_type
 gtk_text_tag_get_type
 gtk_text_tag_table_get_type
 gtk_text_view_get_type
+gtk_theming_engine_get_type
 gtk_toggle_action_get_type
 gtk_toggle_button_get_type
 gtk_toggle_tool_button_get_type
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 ]>
 <chapter id="gtk-migrating-2-to-3">
  <title>Migrating from GTK+ 2.x to GTK+ 3</title>
@@ -122,6 +123,53 @@

  </section>

+  <section>
+    <title>Use GIO for launching applications</title>
+    <para>
+      The <literal>gdk_spawn</literal> family of functions has been
+      deprecated in GDK 2.24 and removed from GDK 3. Various replacements
+      exist; the best replacement depends on the circumstances:
+      <itemizedlist>
+        <listitem>If you are opening a document or URI by launching a command
+        like <literal>firefox http://my-favourite-website.com</literal> or
+        <literal>gnome-open ghelp:epiphany</literal>, it is best to just use
+        gtk_show_uri(); as an added benefit, your application will henceforth
+        respect the users preference for what application to use.</listitem>
+        <listitem>If you are launching a regular, installed application that
+        has a desktop file, it is best to use GIOs #GAppInfo with a suitable
+        launch context.
+        <informalexample><programlisting>
+        GAppInfo *info;
+        GAppLaunchContext *context;
+        GError *error = NULL;
+
+        info = g_desktop_app_info_new ("epiphany.desktop");
+        context = gdk_display_get_app_launch_context (display);
+        g_app_info_launch (info, NULL, context, &amp;error);
+
+        if (error)
+          {
+            g_warning ("Failed to launch epiphany: %s", error-&gt;message);
+            g_error_free (error);
+          }
+
+        g_object_unref (info);
+        g_object_unref (context);
+        </programlisting></informalexample>
+        </listitem>
+        <listitem>If you are launching a custom commandline, you can
+        still use g_app_info_launch() with a GAppInfo that is constructed
+        with g_app_info_create_from_commandline(), or you can use the
+        more lowlevel <literal>g_spawn</literal> family of functions
+        (e.g. g_spawn_command_line_async()), and pass <envar>DISPLAY</envar>
+        in the environment. gdk_screen_make_display_name() can be
+        used to find the right value for the <envar>DISPLAY</envar>
+        environment variable.
+        </listitem>
+      </itemizedlist>
+    </para>
+  </section>
+
  <section>
    <title>Use cairo for drawing</title>
    <para>
@@ -134,7 +182,7 @@
      them, are gone. This includes the <literal>gdk_draw</literal> family
      of functions like gdk_draw_rectangle() and gdk_draw_drawable(). As
      #GdkGC is roughly equivalent to #cairo_t and #GdkImage was used for
-      drawing images to GdkDrawables, which cairo supports automatically,
+      drawing images to GdkWindows, which cairo supports automatically,
      a transition is usually straightforward.
    </para>
    <para>
@@ -143,7 +191,7 @@
      was replaced.
    </para>
    <example>
-       <title>Drawing a GdkPixbuf onto a GdkDrawable</title>
+       <title>Drawing a GdkPixbuf onto a GdkWindow</title>
         <para>
           Drawing a pixbuf onto a drawable used to be done like this:
 <programlisting><![CDATA[
@@ -170,7 +218,7 @@ cairo_destroy (cr);
         </para>
      </example>
      <example>
-        <title>Drawing a tiled GdkPixmap to a GdkDrawable</title>
+        <title>Drawing a tiled GdkPixmap to a GdkWindow</title>
        <para>
          Tiled pixmaps are often used for drawing backgrounds.
          Old code looked something like this:
@@ -954,6 +1002,8 @@ gtk_arrow_draw (GtkWidget *widget,
  </para>
  </section>

+  <xi:include href="migrating-GtkStyleContext.xml" />
+
  </section>

 </chapter>
@@ -13,7 +13,7 @@
    longer correct to assume that each window has an associated XID.
    Code that makes this assumption can sometimes be fixed by calling
    gdk_window_ensure_native() on the windows in question.
-    Calling gdk_x11_drawable_get_xid() (or GDK_WINDOW_XID()) from the
+    Calling gdk_x11_window_get_xid() (or GDK_WINDOW_XID()) from the
    X11-specific API on a non-native window will explicitly call
    gdk_window_ensure_native(), so old code using this will continue to
    work. A small gotcha is that the GDK_WINDOW_XID() call is no longer a
@@ -46,15 +46,9 @@

  <para>
    Problems can also occur when using cairo for drawing. One thing that can
-    go wrong is clip handling. If you ever need to reset the clip region on
-    a cairo_t (i.e. use cairo_reset_clip()), you have to to use
-    gdk_cairo_reset_clip() instead. The reason for this is that the cairo_reset_clip() call will remove the initial clip region that limits your drawing to
-    the client-side window at hand, so you will end up drawing over stuff
-    outside the window. You also need to use gdk_cairo_reset_clip() if you
-    use a cairo_t that was not allocated in a double-buffered expose handler
-    and keep it in use after window hierarchy changes (resizing, moving,
-    stacking order changes). The easiest fix for this kind of problem is to
-    simply create a new cairo context for each expose event.
+    go wrong is clip handling. You may not use cairo_reset_clip() on a
+    cairo_t on a cairo context created via gdk_cairo_create() or passed to
+    the GtkWidget::draw signal.
  </para>

  <para>
@@ -0,0 +1,659 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<section id="gtk-migrating-GtkStyleContext">
+  <title>Theming changes</title>
+
+  <para>
+    In GTK+ 3.0, #GtkStyleContext was added to replace #GtkStyle and
+    the theming infrastructure available in 2.x. GtkStyleContext is an
+    object similar in spirit to GtkStyle, as it contains theming information,
+    although in a more complete and tokenized fashion. There are two aspects
+    to switching to GtkStyleContext: porting themes and theme engines, and
+    porting applications, libraries and widgets.
+  </para>
+
+  <section id="gtk-migrating-GtkStyleContext-themes">
+    <title>Migrating themes</title>
+
+    <para>
+      From GTK+ 3.0 on, theme engines must implement #GtkThemingEngine and be
+      installed in <filename>$libdir/gtk+-3.0/$GTK_VERSION/theming-engines</filename>,
+      and the files containing style information must be written in the CSS-like
+      format that is understood by #GtkCssProvider. For a theme named
+      "Clearlooks", the CSS file parsed by default is
+      <filename>$datadir/themes/Clearlooks/gtk-3.0/gtk.css</filename>,
+      with possible variants such as the dark theme being named
+      <filename>gtk-dark.css</filename> in the same directory.
+    </para>
+  </section>
+
+  <section id="gtk-migrating-theme-GtkStyleContext-engines">
+    <title>Migrating theme engines</title>
+
+    <para>
+      Migrating a #GtkStyle based engine to a #GtkThemingEngine based one
+      should be straightforward for most of the vfuncs. Besides a cleanup
+      in the available paint methods and a simplification in the passed
+      arguments (in favor of #GtkStyleContext containing all the information),
+      the available render methods resemble those of #GtkStyle quite
+      evidently. Notable differences include:
+    </para>
+
+    <orderedlist>
+      <listitem>
+        All variations of gtk_paint_box(), gtk_paint_flat_box(),
+        gtk_paint_shadow(), gtk_paint_box_gap() and gtk_paint_shadow_gap()
+        are replaced by gtk_render_background(), gtk_render_frame() and
+        gtk_render_frame_gap(). The first function renders frameless
+        backgrounds and the last two render frames in various forms.
+      </listitem>
+      <listitem>
+        gtk_paint_resize_grip() has been subsumed by gtk_render_handle()
+        with a #GTK_STYLE_CLASS_GRIP class set in the style context.
+      </listitem>
+      <listitem>
+        gtk_paint_spinner() disappears in favor of gtk_render_activity()
+        with a #GTK_STYLE_CLASS_SPINNER class set in the style context.
+      </listitem>
+    </orderedlist>
+
+    <para>
+      The list of available render methods is:
+    </para>
+
+    <simplelist>
+      <member>
+        gtk_render_background(): Renders a widget/area background.
+      </member>
+      <member>
+        gtk_render_frame(): Renders a frame border around the given rectangle.
+        Usually the detail of the border depends on the theme information,
+        plus the current widget state.
+      </member>
+      <member>
+        gtk_render_frame_gap(): Renders a frame border with a gap on one side.
+      </member>
+      <member>
+        gtk_render_layout(): Renders a #PangoLayout.
+      </member>
+      <member>
+        gtk_render_handle(): Renders all kind of handles and resize grips,
+        depending on the style class.
+      </member>
+      <member>
+        gtk_render_check(): Render checkboxes.
+      </member>
+      <member>
+        gtk_render_option(): Render radiobuttons.
+      </member>
+      <member>
+        gtk_render_arrow(): Renders an arrow pointing to a direction.
+      </member>
+      <member>
+        gtk_render_expander(): Renders an expander indicator, such as in
+        #GtkExpander.
+      </member>
+      <member>
+        gtk_render_focus(): Renders the indication that a widget has the
+        keyboard focus.
+      </member>
+      <member>
+        gtk_render_line(): Renders a line from one coordinate to another.
+      </member>
+      <member>
+        gtk_render_slider(): Renders a slider, such as in #GtkScale.
+      </member>
+      <member>
+        gtk_render_extension(): Renders an extension that protrudes from
+        a UI element, such as a notebook tab.
+      </member>
+      <member>
+        gtk_render_activity(): Renders an area displaying activity, be it
+        a progressbar or a spinner.
+      </member>
+      <member>
+        gtk_render_icon_pixbuf(): Renders an icon into a #GdkPixbuf.
+      </member>
+    </simplelist>
+
+    <para>
+      One of the main differences to #GtkStyle-based engines is that the
+      rendered widget is totally isolated from the theme engine, all style
+      information is meant to be retrieved from the #GtkThemingEngine API,
+      or from the #GtkWidgetPath obtained from gtk_theming_engine_get_path(),
+      which fully represents the rendered widget's hierarchy from a styling
+      point of view.
+    </para>
+
+    <para>
+      The detail string available in #GtkStyle-based engines has been
+      replaced by widget regions and style classes. Regions are a way for
+      complex widgets to associate different styles with different areas,
+      such as even and odd rows in a treeview. Style classes allow sharing
+      of style information between widgets, regardless of their type.
+      Regions and style classes can be used in style sheets to associate
+      styles, and them engines can also access them. There are several
+      predefined classes and regions such as %GTK_STYLE_CLASS_BUTTON or
+      %GTK_STYLE_REGION_TAB in <filename>gtkstylecontext.h</filename>,
+      although custom widgets may define their own, which themes may
+      attempt to handle.
+    </para>
+
+  </section>
+
+  <section id="gtk-migrating-GtkStyleContext-parser-extensions">
+    <title>Extending the CSS parser</title>
+
+    <para>
+      In #GtkStyle-based engines, #GtkRCStyle provided ways to extend the
+      gtkrc parser with engine-specific extensions. This has been replaced
+      by gtk_theming_engine_register_property(), which lets a theme engine
+      register new properties with an arbitrary type. While there is built-in
+      support for most basic types, it is possible to use a custom parser
+      for the property.
+    </para>
+
+    <para>
+      The installed properties depend on the #GtkThemeEngine::name property,
+      so they should be added in the <literal>constructed()</literal> vfunc.
+      For example, if an engine with the name "Clearlooks" installs a
+      "focus-color" property with the type #GdkRGBA, the property
+      <literal>-Clearlooks-focus-color</literal> will be registered and
+      accepted in CSS like this:
+      <informalexample><programlisting>
+      GtkEntry {
+        -Clearlooks-focus-color: rgba(255, 0, 0, 1.0);
+      }
+      </programlisting></informalexample>
+    </para>
+
+    <para>
+      Widget style properties also follow a similar syntax, with the widget
+      type name used as a prefix. For example, the #GtkWidget:focus-line-width
+      style property can be modified in CSS as
+      <literal>-GtkWidget-focus-line-width</literal>.
+    </para>
+  </section>
+
+  <section id="gtk-migrating-GtkStyleContext-css">
+    <title>Using the CSS file format</title>
+
+    <para>
+      The syntax of RC and CSS files formats is obviously different.
+      The CSS-like syntax will hopefully be much more familiar to many
+      people, lowering the barrier for custom theming.
+    </para>
+    <para>
+      Instead of going through the syntax differences one-by-one, we
+      will present a more or less comprehensive example and discuss
+      how it can be translated into CSS:
+    </para>
+
+    <example>
+      <title>Sample RC code</title>
+      <programlisting>
+        style "default" {
+                xthickness = 1
+                ythickness = 1
+
+                GtkButton::child-displacement-x = 1
+                GtkButton::child-displacement-y = 1
+                GtkCheckButton::indicator-size = 14
+
+                bg[NORMAL]        = @bg_color
+                bg[PRELIGHT]      = shade (1.02, @bg_color)
+                bg[SELECTED]      = @selected_bg_color
+                bg[INSENSITIVE]   = @bg_color
+                bg[ACTIVE]        = shade (0.9, @bg_color)
+
+                fg[NORMAL]        = @fg_color
+                fg[PRELIGHT]      = @fg_color
+                fg[SELECTED]      = @selected_fg_color
+                fg[INSENSITIVE]   = darker (@bg_color)
+                fg[ACTIVE]        = @fg_color
+
+                text[NORMAL]      = @text_color
+                text[PRELIGHT]    = @text_color
+                text[SELECTED]    = @selected_fg_color
+                text[INSENSITIVE] = darker (@bg_color)
+                text[ACTIVE]      = @selected_fg_color
+
+                base[NORMAL]      = @base_color
+                base[PRELIGHT]    = shade (0.95, @bg_color)
+                base[SELECTED]    = @selected_bg_color
+                base[INSENSITIVE] = @bg_color
+                base[ACTIVE]      = shade (0.9, @selected_bg_color)
+
+                engine "clearlooks" {
+                        colorize_scrollbar = TRUE
+                        style = CLASSIC
+                }
+        }
+
+        style "tooltips" {
+                xthickness = 4
+                ythickness = 4
+
+                bg[NORMAL]        = @tooltip_bg_color
+                fg[NORMAL]        = @tooltip_fg_color
+        }
+
+        style "button" {
+                xthickness = 3
+                ythickness = 3
+
+                bg[NORMAL]        = shade (1.04, @bg_color)
+                bg[PRELIGHT]      = shade (1.06, @bg_color)
+                bg[ACTIVE]        = shade (0.85, @bg_color)
+        }
+
+        style "entry" {
+                xthickness = 3
+                ythickness = 3
+
+                bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
+                fg[SELECTED] = @text_color
+
+                engine "clearlooks" {
+                        focus_color = shade (0.65, @selected_bg_color)
+                }
+        }
+
+        style "other" {
+                bg[NORMAL] = &num;fff;
+        }
+
+        class "GtkWidget" style "default"
+        class "GtkEntry" style "entry"
+        widget_class "*&lt;GtkButton&gt;" style "button"
+        widget "gtk-tooltip*" style "tooltips"
+        widget_class "window-name.*.GtkButton" style "other"
+      </programlisting>
+    </example>
+
+    <para>
+      would roughly translate to this CSS:
+    </para>
+
+    <example>
+      <title>CSS translation</title>
+      <programlisting>
+        * {
+          padding: 1;
+          -GtkButton-child-displacement-x: 1;
+          -GtkButton-child-displacement-y: 1;
+          -GtkCheckButton-indicator-size: 14;
+
+          background-color: @bg_color;
+          color: @fg_color;
+
+          -Clearlooks-colorize-scrollbar: true;
+          -Clearlooks-style: classic;
+        }
+
+        *:hover {
+          background-color: shade (@bg_color, 1.02);
+        }
+
+        *:selected {
+          background-color: @selected_bg_color;
+          color: @selected_fg_color;
+        }
+
+        *:insensitive {
+          color: shade (@bg_color, 0.7);
+        }
+
+        *:active {
+          background-color: shade (@bg_color, 0.9);
+        }
+
+        .tooltip {
+          padding: 4;
+
+          background-color: @tooltip_bg_color;
+          color: @tooltip_fg_color;
+        }
+
+        .button {
+          padding: 3;
+          background-color: shade (@bg_color, 1.04);
+        }
+
+        .button:hover {
+          background-color: shade (@bg_color, 1.06);
+        }
+
+        .button:active {
+          background-color: shade (@bg_color, 0.85);
+        }
+
+        .entry {
+          padding: 3;
+
+          background-color: @base_color;
+          color: @text_color;
+        }
+
+        .entry:selected {
+          background-color: mix (@selected_bg_color, @base_color, 0.4);
+          -Clearlooks-focus-color: shade (0.65, @selected_bg_color)
+        }
+
+        /* The latter selector is an specification of the first,
+           since any widget may use the same classes or names */
+        &num;window-name .button,
+        GtkWindow&num;window-name GtkButton.button {
+          background-color: &num;fff;
+        }
+      </programlisting>
+    </example>
+
+    <para>
+      One notable difference is the reduction from fg/bg/text/base colors
+      to only foreground/background, in exchange the widget is able to render
+      its various elements with different CSS classes, which can be themed
+      independently.
+    </para>
+
+    <para>
+      In the same vein, the light, dark and mid color variants that
+      were available in GtkStyle should be replaced by a combination of
+      symbolic colors and custom CSS, where necessary. text_aa should
+      really not be used anywhere, anyway, and the white and black colors
+      that were available in GtkStyle can just be replaced by literal
+      GdkRGBA structs.
+    </para>
+
+    <para>
+      Access to colors has also changed a bit. With #GtkStyle, the common
+      way to access colors is:
+      <informalexample><programlisting>
+      GdkColor *color1;
+      GdkColor color2;
+
+      color1 = &amp;style->bg[GTK_STATE_PRELIGHT];
+      gtk_style_lookup_color (style, "focus_color", &amp;color2);
+      </programlisting></informalexample>
+      With #GtkStyleContext, you generally use #GdkRGBA instead of #GdkColor
+      and the code looks like this:
+      <informalexample><programlisting>
+      GdkRGBA *color1;
+      GdkRGBA  color2;
+
+      gtk_style_context_get (context, GTK_STATE_FLAG_PRELIGHT,
+                             "background-color", &amp;color1,
+                             NULL);
+      gtk_style_context_lookup_color (context, "focus_color", &amp;color2);
+
+      ...
+
+      gdk_rgba_free (color1);
+      </programlisting></informalexample>
+      Note that the memory handling here is different: gtk_style_context_get()
+      expects the address of a GdkRGBA* and returns a newly allocated struct,
+      gtk_style_context_lookup_color() expects the address of an existing
+      struct, and fills it.
+    </para>
+
+    <para>
+      It is worth mentioning that the new file format does not support
+      custom keybindings nor stock icon mappings as the RC format did.
+    </para>
+  </section>
+
+  <section id="gtk-migrating-GtkStyleContext-checklist">
+    <title>A checklist for widgets</title>
+
+    <para>
+      When porting your widgets to use #GtkStyleContext, this checklist
+      might be useful.
+    </para>
+
+    <orderedlist>
+      <listitem>
+        Replace <literal>style_set()</literal> calls with
+        <literal>style_updated()</literal>.
+      </listitem>
+
+      <listitem>
+        <para>
+          Try to identify the role of what you're rendering with any number
+          of classes. This will replace the detail string. There is a predefined
+          set of CSS classes which you can reuse where appropriate. Doing so
+          will give you theming 'for free', whereas custom classes will require
+          extra work in the theme. Note that complex widgets are likely to
+          need different styles when rendering different parts, and style
+          classes are one way to achieve this. This could result in code like
+          the following (simplified) examples:
+        </para>
+
+        <example>
+          <title>Setting a permanent CSS class</title>
+          <programlisting>
+            static void
+            gtk_button_init (GtkButton *button)
+            {
+              GtkStyleContext *context;
+
+              ...
+
+              context = gtk_widget_get_style_context (GTK_WIDGET (button));
+
+              /* Set the "button" class */
+              gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
+            }
+          </programlisting>
+        </example>
+
+        <para>
+          Or
+        </para>
+
+        <example>
+          <title>Using dynamic CSS classes for different elements</title>
+          <programlisting>
+            static gboolean
+            gtk_spin_button_draw (GtkSpinButton *spin,
+                                  cairo_t       *cr)
+            {
+              GtkStyleContext *context;
+
+              ...
+
+              context = gtk_widget_get_style_context (GTK_WIDGET (spin));
+
+              gtk_style_context_save (context);
+              gtk_style_context_add_class (context, GTK_STYLE_CLASS_ENTRY);
+
+              /* Call to entry draw impl with "entry" class */
+              parent_class->draw (spin, cr);
+
+              gtk_style_context_restore (context);
+              gtk_style_context_save (context);
+
+              /* Render up/down buttons with the "button" class */
+              gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
+              draw_up_button (spin, cr);
+              draw_down_button (spin, cr);
+
+              gtk_style_context_restore (context);
+
+              ...
+            }
+          </programlisting>
+        </example>
+
+        <para>
+          Note that #GtkStyleContext only provides fg/bg colors, so text/base
+          is done through distinctive theming of the different classes. For
+          example, an entry would usually be black on white while a button
+          would usually be black on light grey.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Replace all <literal>gtk_paint_*()</literal> calls with corresponding
+          <literal>gtk_render_*()</literal> calls.
+        </para>
+        <para>
+          The most distinctive changes are the use of #GtkStateFlags to
+          represent the widget state and the lack of #GtkShadowType. Note
+          that widget state is now passed implicitly via the context, so
+          to render in a certain state, you have to temporarily set the
+          state on the context, as in the following example:
+        </para>
+        <example>
+          <title>Rendering with a specific state</title>
+          <programlisting>
+            gtk_style_context_save (context);
+            gtk_style_context_set_state (context, GTK_STATE_FLAG_ACTIVE);
+            gtk_render_check (context, cr, x, y, width, height);
+            gtk_style_context_restore (context);
+          </programlisting>
+        </example>
+        <para>
+          For gtk_render_check() and gtk_render_option(), the @shadow_type
+          parameter is replaced by the #GTK_STATE_FLAG_ACTIVE and
+          #GTK_STATE_FLAG_INCONSISTENT state flags. For things such as
+          pressed/unpressed button states, #GTK_STATE_FLAG_ACTIVE is used,
+          and the CSS may style normal/active states differently to render
+          outset/inset borders, respectively.
+        </para>
+      </listitem>
+
+      <listitem>
+        The various <literal>gtk_widget_modify_*()</literal> functions to
+        override colors or fonts for individual widgets have been replaced
+        by similar <literal>gtk_widget_override_*()</literal> functions.
+      </listitem>
+
+      <listitem>
+        It is no longer necessary to call gtk_widget_style_attach(),
+        gtk_style_attach(), gtk_style_detach() or gtk_widget_ensure_style().
+      </listitem>
+
+      <listitem>
+        Replace all uses of xthickness/ythickness. #GtkStyleContext uses the
+        CSS box model, and there are border-width/padding/margin properties to
+        replace the different applications of X and Y thickness. Note that all
+        of this is merely a guideline. Widgets may choose to follow it or not.
+      </listitem>
+    </orderedlist>
+  </section>
+
+  <section id="gtk-migrating-GtkStyleContext-parsing">
+    <title>Parsing of custom resources</title>
+    <para>
+      As a consequence of the RC format going away, calling gtk_rc_parse() or
+      gtk_rc_parse_string() won't have any effect on a widgets appearance.
+      The way to replace these calls is using a custom #GtkStyleProvider,
+      either for an individual widget through gtk_style_context_add_provider()
+      or for all widgets on a screen through gtk_style_context_add_provider_for_screen().
+      Typically, the provider will be a #GtkCssProvider, which parse CSS
+      information from a file or from a string.
+    </para>
+
+    <para>
+      Notice that you can also get style information from custom resources
+      by implementing the #GtkStyleProvider interface yourself. This is
+      an advanced feature that should be rarely used.
+    </para>
+  </section>
+
+  <section id="gtk-migrating-GtkStyleContext-bonus-points">
+    <title>Bonus points</title>
+
+    <para>
+      There are some features in #GtkStyleContext that were not available in
+      #GtkStyle, or were made available over time for certain widgets through
+      extending the detail string in obscure ways. There is a lot more
+      information available when rendering UI elements, and it is accessible
+      in more uniform, less hacky ways. By going through this list you'll
+      ensure your widget is a good citizen in a fully themable user interface.
+    </para>
+
+    <orderedlist>
+      <listitem>
+        If your widget renders a series of similar elements, such as tabs
+        in a #GtkNotebook or rows/column in a #GtkTreeView, consider adding
+        regions through gtk_style_context_add_region(). These regions can be
+        referenced in CSS and the :nth-child pseudo-class may be used to match
+        the elements depending on the flags passed.
+
+        <example>
+          <title>Theming widget regions</title>
+          <programlisting>
+            GtkNotebook tab {
+              background-color: &num;f3329d;
+            }
+
+            GtkTreeView row::nth-child (even) {
+              background-color: &num;dddddd;
+            }
+          </programlisting>
+        </example>
+      </listitem>
+
+      <listitem>
+        <para>
+          If your container renders child widgets within different regions,
+          make it implement GtkContainer::get_path_for_child(). This function
+          lets containers assign a special #GtkWidgetPath to child widgets
+          depending on their role/region. This is necessary to extend the
+          concept above throughout the widget hierarchy.
+        </para>
+
+        <para>
+          For example, a #GtkNotebook modifies the tab labels' #GtkWidgetPath
+          so the "tab" region is added. This makes it possible to theme tab
+          labels through:
+        </para>
+
+        <example>
+          <title>Theming a widget within a parent container region</title>
+          <programlisting>
+            GtkNotebook tab GtkLabel {
+              font: Sans 8;
+            }
+          </programlisting>
+        </example>
+
+      </listitem>
+
+      <listitem>
+        If you intend several visual elements to look interconnected,
+        make sure you specify rendered elements' connection areas with
+        gtk_style_context_set_junction_sides(). It is of course up to the
+        theme to make use of this information or not.
+      </listitem>
+
+      <listitem>
+        <para>
+          #GtkStyleContext supports implicit animations on state changes for
+          the most simple case out-of-the-box: widgets with a single animatable
+          area, whose state is changed with gtk_widget_set_state_flags() or
+          gtk_widget_unset_state_flags(). These functions trigger animated
+          transitions for the affected state flags. Examples of widgets for
+          which this kind of animation may be sufficient are #GtkButton or
+          #GtkEntry.
+        </para>
+        <para>
+          If your widget consists of more than a simple area, and these areas
+          may be rendered with different states, make sure to mark the rendered
+          areas with gtk_style_context_push_animatable_region() and
+          gtk_style_context_pop_animatable_region().
+        </para>
+
+        <para>
+          gtk_style_context_notify_state_change() may be used to trigger a
+          transition for a given state. The region ID will determine the
+          animatable region that is affected by this transition.
+        </para>
+      </listitem>
+    </orderedlist>
+  </section>
+</section>
@@ -267,15 +267,6 @@ additional environment variables.
  </para>
 </formalpara>

-<formalpara>
-  <title><envar>GTK2_RC_FILES</envar></title>
-
-  <para>
-    Specifies a list of RC files to parse instead of the default ones;
-    see <link linkend="gtk-Resource-Files">Resource Files</link>.
-  </para>
-</formalpara>
-
 <formalpara>
  <title><envar>GTK_EXE_PREFIX</envar></title>

@@ -377,6 +368,15 @@ nevertheless.
  </para>
 </formalpara>

+<formalpara>
+  <title><envar>GDK_SYNCHRONIZE</envar></title>
+
+  <para>
+    If set, GDK makes all X requests synchronously. This is a useful
+    option for debugging, but it will slow down the performance considerably.
+  </para>
+</formalpara>
+
 <formalpara>
  <title><envar>XDG_DATA_HOME</envar>, <envar>XDG_DATA_DIRS</envar></title>

@@ -1,186 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCellLayout
-
-<!-- ##### SECTION Short_Description ##### -->
-An interface for packing cells
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkCellLayout is an interface to be implemented by all objects which
-want to provide a #GtkTreeViewColumn-like API for packing cells, setting
-attributes and data funcs. 
-</para>
-
-<para>
-One of the notable features provided by implementations of GtkCellLayout
-are <emphasis>attributes</emphasis>. Attributes let you set the properties
-in flexible ways. They can just be set to constant values like regular
-properties. But they can also be mapped to a column of the underlying 
-tree model with gtk_cell_layout_set_attributes(), which means that the value 
-of the attribute can change from cell to cell as they are rendered by the 
-cell renderer. Finally, it is possible to specify a function with 
-gtk_cell_layout_set_cell_data_func() that is called to determine the value 
-of the attribute for each cell that is rendered.
-</para>
-
-<refsect2 id="GtkCellLayout-BUILDER-UI">
-<title>GtkCellLayouts as GtkBuildable</title>
-<para>
-Implementations of GtkCellLayout which also implement the GtkBuildable 
-interface (#GtkCellView, #GtkIconView, #GtkComboBox, #GtkComboBoxEntry, 
-#GtkEntryCompletion, #GtkTreeViewColumn) accept GtkCellRenderer objects
-as &lt;child&gt; elements in UI definitions. They support a custom 
-&lt;attributes&gt; element for their children, which can contain 
-multiple &lt;attribute&gt; elements. Each &lt;attribute&gt; element has 
-a name attribute which specifies a property of the cell renderer; the 
-content of the element is the attribute value.
-</para>
-<example>
-<title>A UI definition fragment specifying attributes</title>
-<programlisting><![CDATA[
-<object class="GtkCellView">
-  <child>
-    <object class="GtkCellRendererText"/>
-    <attributes>
-      <attribute name="text">0</attribute>
-    </attributes>
-  </child>"
-</object>
-]]></programlisting>
-</example>
-</refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkCellLayout ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT GtkCellLayoutIface ##### -->
-<para>
-
-</para>
-
-@g_iface: 
-@pack_start: 
-@pack_end: 
-@clear: 
-@add_attribute: 
-@set_cell_data_func: 
-@clear_attributes: 
-@reorder: 
-@get_cells: 
-
-<!-- ##### USER_FUNCTION GtkCellLayoutDataFunc ##### -->
-<para>
-A function which should set the value of @cell_layout's cell renderer(s)
-as appropriate. 
-</para>
-
-@cell_layout: a #GtkCellLayout
-@cell: the cell renderer whose value is to be set
-@tree_model: the model
-@iter: a #GtkTreeIter indicating the row to set the value for
-@data: user data passed to gtk_cell_layout_set_cell_data_func()
-
-
-<!-- ##### FUNCTION gtk_cell_layout_pack_start ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@cell: 
-@expand: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_pack_end ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@cell: 
-@expand: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_get_cells ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_reorder ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@cell: 
-@position: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_clear ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_set_attributes ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@cell: 
-@Varargs: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_add_attribute ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@cell: 
-@attribute: 
-@column: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_set_cell_data_func ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@cell: 
-@func: 
-@func_data: 
-@destroy: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_clear_attributes ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@cell: 
-
-
@@ -30,20 +30,8 @@ toggles the value.

 <!-- ##### STRUCT GtkCheckMenuItem ##### -->
 <para>
-The #GtkCheckMenuItem-struct struct contains the following fields.
-(These fields should be considered read-only. They should never be set by
-an application.)
-
-<informaltable pgwide="1" frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
-<tbody>
-
-<row>
-<entry>#guint active;</entry>
-<entry>TRUE if the check box is active.</entry>
-</row>
-
-</tbody></tgroup></informaltable>
+The #GtkCheckMenuItem-struct struct contains only private fields that
+should not be directly accessed.
 </para>


@@ -53,8 +41,8 @@ This signal is emitted when the state of the check box is changed.
 </para>

 <para>
-A signal handler can examine the <structfield>active</structfield> 
-field of the #GtkCheckMenuItem-struct struct to discover the new state.
+A signal handler can use gtk_check_menu_item_get_active()
+to discover the new state.
 </para>

@checkmenuitem: the object which received the signal.
@@ -35,8 +35,8 @@ the application may want to connect to:
  </listitem>
  <listitem>
    <para>
-    The "expose_event" signal to handle redrawing the
-    contents of the widget.
+    The "draw" signal to handle redrawing the contents of the
+    widget.
    </para>
  </listitem>
 </itemizedlist>
@@ -53,40 +53,49 @@ that drawing is implicitly clipped to the exposed area.
 <title>Simple <structname>GtkDrawingArea</structname> usage.</title>
 <programlisting>
 gboolean
-expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+draw_callback (GtkWidget *widget, cairo_t *cr, gpointer data)
 {
-  cairo_t *cr;
-  
-  cr = gdk_cairo_create (event->window);
+  guint width, height;
+  GdkRGBA color;

-  cairo_set_source_rgb (cr, 0.0, 0.0, 1.0);
-  cairo_paint (cr);
+  width = gtk_widget_get_allocated_width (widget);
+  height = gtk_widget_get_allocated_height (widget);
+  cairo_arc (cr,
+             width / 2.0, height / 2.0,
+             MIN (width, height) / 2.0,
+             0, 2 * G_PI);

-  cairo_destroy (cr);
- 
-  return TRUE;
+  gtk_style_context_get_color (gtk_widget_get_style_context (widget),
+                               0,
+                               &amp;color);
+  gdk_cairo_set_source_rgba (cr, &amp;color);
+
+  cairo_fill (cr);
+
+  return FALSE;
 }
-[...]
+
+ /* ... */
+
  GtkWidget *drawing_area = gtk_drawing_area_new (<!-- -->);
  gtk_widget_set_size_request (drawing_area, 100, 100);
-  g_signal_connect (G_OBJECT (drawing_area), "expose_event",  
-                    G_CALLBACK (expose_event_callback), NULL);
+  g_signal_connect (G_OBJECT (drawing_area), "draw",
+                    G_CALLBACK (draw_callback), NULL);
 </programlisting>
 </example>

 <para>
-Expose events are normally delivered when a drawing area first comes
-onscreen, or when it's covered by another window and then uncovered
-(exposed). You can also force an expose event by adding to the "damage
-region" of the drawing area's window; gtk_widget_queue_draw_area() and
-gdk_window_invalidate_rect() are equally good ways to do this. You'll
-then get an expose event for the invalid region.
+Draw signals are normally delivered when a drawing area first comes
+onscreen, or when it's covered by another window and then uncovered.
+You can also force a redraw by adding to the "damage region" of the
+drawing area's window; use gtk_widget_queue_draw_area() to do this. 
+You'll then get a draw event for the invalid region.
 </para>

 <para>
 The available routines for drawing are documented on the <link
-linkend="gdk-Drawing-Primitives">GDK Drawing Primitives</link> page.
-See also gdk_draw_pixbuf() for drawing a #GdkPixbuf.
+linkend="gdk3-Cairo-Interaction">GDK Drawing Primitives</link> page
+and the cairo documentation.
 </para>

 <para>
@@ -315,19 +315,28 @@ Used to change the appearance of an outline typically provided by a #GtkFrame.

 <!-- ##### ENUM GtkStateType ##### -->
 <para>
-This type indicates the current state of a widget; the state determines how
-the widget is drawn. The #GtkStateType enumeration is also used to
-identify different colors in a #GtkStyle for drawing, so states can be
-used for subparts of a widget as well as entire widgets.
+
 </para>

-@GTK_STATE_NORMAL: State during normal operation.
-@GTK_STATE_ACTIVE: State of a currently active widget, such as a depressed button.
-@GTK_STATE_PRELIGHT: State indicating that the mouse pointer is over
-the widget and the widget will respond to mouse clicks.
-@GTK_STATE_SELECTED: State of a selected item, such the selected row in a list.
-@GTK_STATE_INSENSITIVE: State indicating that the widget is
-unresponsive to user actions.
+@GTK_STATE_NORMAL: 
+@GTK_STATE_ACTIVE: 
+@GTK_STATE_PRELIGHT: 
+@GTK_STATE_SELECTED: 
+@GTK_STATE_INSENSITIVE: 
+@GTK_STATE_INCONSISTENT: 
+@GTK_STATE_FOCUSED: 
+
+<!-- ##### ENUM GtkStateFlags ##### -->
+<para>
+
+</para>
+
+@GTK_STATE_FLAG_ACTIVE: 
+@GTK_STATE_FLAG_PRELIGHT: 
+@GTK_STATE_FLAG_SELECTED: 
+@GTK_STATE_FLAG_INSENSITIVE: 
+@GTK_STATE_FLAG_INCONSISTENT: 
+@GTK_STATE_FLAG_FOCUSED: 

 <!-- ##### ENUM GtkToolbarStyle ##### -->
 <para>
@@ -411,3 +420,39 @@ The value can by obtained by connecting to the
@GTK_DRAG_RESULT_ERROR: The drag operation failed due to some 
   unspecified error

+<!-- ##### ENUM GtkJunctionSides ##### -->
+<para>
+
+</para>
+
+@GTK_JUNCTION_NONE: 
+@GTK_JUNCTION_CORNER_TOPLEFT: 
+@GTK_JUNCTION_CORNER_TOPRIGHT: 
+@GTK_JUNCTION_CORNER_BOTTOMLEFT: 
+@GTK_JUNCTION_CORNER_BOTTOMRIGHT: 
+@GTK_JUNCTION_TOP: 
+@GTK_JUNCTION_BOTTOM: 
+@GTK_JUNCTION_LEFT: 
+@GTK_JUNCTION_RIGHT: 
+
+<!-- ##### ENUM GtkBorderStyle ##### -->
+<para>
+
+</para>
+
+@GTK_BORDER_STYLE_NONE: 
+@GTK_BORDER_STYLE_SOLID: 
+@GTK_BORDER_STYLE_INSET: 
+@GTK_BORDER_STYLE_OUTSET: 
+
+<!-- ##### ENUM GtkRegionFlags ##### -->
+<para>
+
+</para>
+
+@GTK_REGION_EVEN: 
+@GTK_REGION_ODD: 
+@GTK_REGION_FIRST: 
+@GTK_REGION_LAST: 
+@GTK_REGION_SORTED: 
+
@@ -279,6 +279,17 @@ This attribute is optional.</para>
@Returns: 


+<!-- ##### FUNCTION gtk_icon_set_render_icon_pixbuf ##### -->
+<para>
+
+</para>
+
+@icon_set: 
+@context: 
+@size: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_icon_set_unref ##### -->
 <para>

@@ -449,6 +449,18 @@ The #GQuark used for #GtkIconThemeError errors.
@Returns: 


+<!-- ##### FUNCTION gtk_icon_info_load_symbolic_for_context ##### -->
+<para>
+
+</para>
+
+@icon_info: 
+@context: 
+@was_symbolic: 
+@error: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_icon_info_set_raw_coordinates ##### -->
 <para>

@@ -10,6 +10,10 @@ GTK+ provides resource file mechanism for configuring
 various aspects of the operation of a GTK+ program
 at runtime.
 </para>
+<para>
+In GTK+ 3.0, resource files have been deprecated and replaced
+by CSS-like style sheets, which are understood by #GtkCssProvider.
+</para>

 <refsect2><title>Default files</title>
 <para>
@@ -20,13 +20,13 @@ X11 aspects of using GTK+
 <title>GTK+ for the X Window System</title>

 <para>
-On UNIX, the X backend is the default build for GTK+. So 
-you don't need to do anything special when compiling it,
+On UNIX, the X backend is the default build for GTK+.
+So you don't need to do anything special when compiling it,
 and everything should "just work."
 </para>

 <para>
-To mix low-level Xlib routines into a GTK program, 
+To mix low-level Xlib routines into a GTK program,
 see <link linkend="gdk-X-Window-System-Interaction">GDK X Window
 System interaction</link> in the GDK manual.
 </para>
@@ -35,8 +35,7 @@ System interaction</link> in the GDK manual.
 <title>X11-specific commandline options</title>

 <para>
-The X backend understands some additional command line 
-arguments.
+The X backend understands some additional command line arguments.
 </para>

 <formalpara>
@@ -44,34 +43,7 @@ arguments.

 <para>
 The name of the X display to open instead of the one specified
-in the <envar>DISPLAY</envar> environment variable. 
-</para>
-</formalpara>
-
-<formalpara>
-<title><systemitem>--screen <replaceable>screen_number</replaceable></systemitem></title>
-
-<para>
-  The number of the screen within the default display. This overrides
-  any screen number specified in the display name specified by
-  by he <systemitem>--display</systemitem> command line option or
-  the <envar>DISPLAY</envar> environment variable. If this screen
-  cannot be opened, then GTK+ will fall back to the screen
-  specified in the display name. This option is not useful
-  interactively; the intended purposes is that when a program
-  registers its command line with a <firstterm>session
-  manager</firstterm> for later restarting, it can save the
-  screen it is on, without having to worry if it might be
-  restarted on a different display.
-</para>
-</formalpara>
-
-<formalpara>
-<title><systemitem>--sync</systemitem></title>
-
-<para>
-Makes all X requests synchronously. This is a useful option for 
-debugging, but it will slow down the performance considerably.
+in the <envar>DISPLAY</envar> environment variable.
 </para>
 </formalpara>

@@ -1,22 +1,21 @@
 include $(top_srcdir)/Makefile.decl

-INCLUDES = 						\
-	-I$(top_srcdir)				\
-	-I$(top_builddir)/gdk				\
-	-I$(top_srcdir)/gdk				\
-	-I$(top_srcdir)/gdk/x11				\
-	$(GTK_DEBUG_FLAGS)				\
+INCLUDES = \
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/gdk		\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_srcdir)/gdk/x11		\
+	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)

-DEPS = 									\
-	$(top_builddir)/gdk/$(gdktargetlib)				\
-	$(top_builddir)/gtk/$(gtktargetlib)
+DEPS = \
+	$(top_builddir)/gtk/libgtk-3.0.la

-LDADDS = 								\
-	$(top_builddir)/gdk/$(gdktargetlib)				\
-	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)							\
-	$(GDK_DEP_LIBS)							\
+LDADDS = \
+	$(top_builddir)/gtk/libgtk-3.0.la	\
+	$(top_builddir)/gdk/libgdk-3.0.la	\
+	$(GTK_DEP_LIBS)				\
+	$(GDK_DEP_LIBS)				\
 	-lm

 if USE_X11
@@ -138,7 +138,7 @@ take_window_shot (Window   child,
  else
    xid = child;

-  window = gdk_window_foreign_new (xid);
+  window = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), xid);

  width = gdk_window_get_width (window);
  height = gdk_window_get_height (window);
@@ -224,7 +224,7 @@ int main (int argc, char **argv)
 	  gtk_main_iteration ();
 	}

-      id = gdk_x11_drawable_get_xid (GDK_DRAWABLE (window));
+      id = gdk_x11_window_get_xid (window);
      screenshot = take_window_shot (id, info->include_decorations);
      filename = g_strdup_printf ("./%s.png", info->name);
      gdk_pixbuf_save (screenshot, filename, "png", NULL, NULL);
@@ -255,7 +255,7 @@ In the following

   widget->parent && GTK_WIDGET_MAPPED (widget->parent) && 
     GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_CHILD_VISIBLE 
-       => GTK_WIDGET_MAPPED (widget)
+       <=> GTK_WIDGET_MAPPED (widget)

 Note:, the definition

@@ -45,8 +45,7 @@ INCLUDES = \
 	$(GTK_DEP_CFLAGS)

 LDADD = \
-	$(top_builddir)/gdk/$(gdktargetlib)		\
-	$(top_builddir)/gtk/$(gtktargetlib)		\
+	$(top_builddir)/gtk/libgtk-3.0.la	\
 	$(GTK_DEP_LIBS)

 noinst_PROGRAMS = hello-world window-default
@@ -1,8 +0,0 @@
-target=@gdktarget@
-
-Name: GDK Uninstalled
-Description: GTK+ Drawing Kit (${target} target), Not Installed
-Version: @VERSION@
-Requires: gdk-pixbuf-@GTK_API_VERSION@-uninstalled @GDK_PACKAGES@
-Libs: ${pc_top_builddir}/${pcfiledir}/gdk/libgdk-${target}-@GTK_API_VERSION@.la @GDK_EXTRA_LIBS@
-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gdk -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GDK_EXTRA_CFLAGS@
@@ -5,8 +5,8 @@ includedir=@includedir@
 target=@gdktarget@

 Name: GDK
-Description: GTK+ Drawing Kit (${target} target)
+Description: GTK+ Drawing Kit
 Version: @VERSION@
 Requires: @GDK_PACKAGES@
-Libs: -L${libdir} -lgdk-${target}-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@
-Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ -I${libdir}/gtk-@GTK_API_VERSION@/include @GDK_EXTRA_CFLAGS@ -DGSEAL_ENABLE
+Libs: -L${libdir} -lgdk-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@
+Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GDK_EXTRA_CFLAGS@
@@ -13,15 +13,15 @@ DIST_SUBDIRS = win32 x11 quartz tests

 CLEANFILES =

-EXTRA_DIST +=			\
+EXTRA_DIST += 			\
 	keynames.txt		\
 	keyname-table.h		\
+	gdkkeynames.c		\
 	gen-keyname-table.pl	\
-	gdkconfig.h.win32 	\
+	gdkconfig.h.win32	\
 	gdkkeysyms-update.pl	\
-	gdk.def 		\
+	gdk.def			\
 	gdkmarshalers.list	\
-	gdkmedialib.h		\
 	gdkwindowimpl.h		\
 	makeenums.pl		\
 	makefile.msc		\
@@ -30,12 +30,12 @@ EXTRA_DIST +=			\
 	gdkenumtypes.h.template	\
 	abicheck.sh

-INCLUDES =                              \
+INCLUDES = 				\
 	-DG_LOG_DOMAIN=\"Gdk\"		\
 	-DGDK_COMPILATION		\
 	-I$(top_srcdir)			\
 	-I$(top_builddir)/gdk		\
-	$(GTK_DEBUG_FLAGS) 		\
+	$(GTK_DEBUG_FLAGS)		\
 	$(GDK_DEP_CFLAGS)

 gtarget=$(gdktarget)
@@ -47,28 +47,21 @@ endif
 # libtool stuff: set version and export symbols for resolving
 # since automake doesn't support conditionalized libsomething_la_LDFLAGS
 # we use the general approach here
-LDADD = \
-	$(GTK_LINK_FLAGS)						\
-	-version-info $(LT_VERSION_INFO)		 		\
-	-export-dynamic 						\
-	-rpath $(libdir) 						\
-	$(no_undefined)							\
+LDADD = 					\
+	$(GTK_LINK_FLAGS)			\
+	-version-info $(LT_VERSION_INFO)	\
+	-export-dynamic 			\
+	-rpath $(libdir) 			\
+	$(no_undefined)				\
 	$(LIBTOOL_EXPORT_OPTIONS)

-if USE_MEDIALIB
-medialib_sources =  \
-    gdkmedialib.c
-else
-medialib_sources =
-endif
-
 #
 # setup source file variables
 #
 #
 # GDK header files for public installation (non-generated)
 #
-gdk_public_h_sources =				\
+gdk_public_h_sources = 				\
 	gdk.h					\
 	gdkapplaunchcontext.h			\
 	gdkcairo.h				\
@@ -79,9 +72,7 @@ gdk_public_h_sources =				\
 	gdkdisplay.h				\
 	gdkdisplaymanager.h			\
 	gdkdnd.h				\
-	gdkdrawable.h				\
 	gdkevents.h				\
-	gdkinput.h				\
 	gdkkeys.h				\
 	gdkkeysyms.h				\
 	gdkkeysyms-compat.h			\
@@ -94,51 +85,57 @@ gdk_public_h_sources =				\
 	gdkrgba.h				\
 	gdkscreen.h				\
 	gdkselection.h				\
-	gdkspawn.h				\
 	gdktestutils.h				\
 	gdkthreads.h				\
 	gdktypes.h				\
 	gdkvisual.h				\
 	gdkwindow.h

-gdk_built_public_sources =			\
+gdk_built_public_sources = 			\
+	gdkconfig.h				\
 	gdkenumtypes.h

-gdk_private_headers =				\
-	gdkinternals.h				\
+gdk_private_headers = 				\
+	gdkapplaunchcontextprivate.h		\
+	gdkcursorprivate.h			\
+	gdkdevicemanagerprivate.h		\
 	gdkdeviceprivate.h			\
+	gdkdisplaymanagerprivate.h		\
+	gdkdisplayprivate.h			\
+	gdkdndprivate.h				\
+	gdkscreenprivate.h			\
+	gdkinternals.h				\
 	gdkintl.h				\
-	gdkpoly-generic.h
+	gdkkeysprivate.h			\
+	gdkvisualprivate.h

-gdk_c_sources =                 \
-	$(medialib_sources)     \
-	gdk.c			\
-	gdkapplaunchcontext.c	\
-	gdkcairo.c		\
-	gdkcolor.c		\
-	gdkcursor.c		\
-	gdkdevice.c		\
-	gdkdevicemanager.c	\
-	gdkdisplay.c		\
-	gdkdisplaymanager.c	\
-	gdkdnd.c		\
-	gdkdraw.c		\
-	gdkevents.c     	\
-	gdkglobals.c		\
-	gdkkeys.c		\
-	gdkkeyuni.c		\
-	gdkoffscreenwindow.c	\
-	gdkpango.c		\
-	gdkpixbuf-drawable.c	\
-	gdkrectangle.c		\
-	gdkrgba.c		\
-	gdkscreen.c		\
-	gdkselection.c		\
-	gdkvisual.c		\
-	gdkwindow.c		\
+gdk_c_sources = 				\
+	gdk.c					\
+	gdkapplaunchcontext.c			\
+	gdkcairo.c				\
+	gdkcolor.c				\
+	gdkcursor.c				\
+	gdkdevice.c				\
+	gdkdevicemanager.c			\
+	gdkdisplay.c				\
+	gdkdisplaymanager.c			\
+	gdkdnd.c				\
+	gdkevents.c     			\
+	gdkglobals.c				\
+	gdkkeys.c				\
+	gdkkeyuni.c				\
+	gdkoffscreenwindow.c			\
+	gdkpango.c				\
+	gdkpixbuf-drawable.c			\
+	gdkrectangle.c				\
+	gdkrgba.c				\
+	gdkscreen.c				\
+	gdkselection.c				\
+	gdkvisual.c				\
+	gdkwindow.c				\
 	gdkwindowimpl.c

-gdk_built_sources =				\
+gdk_built_sources = 				\
 	gdkenumtypes.c				\
 	gdkmarshalers.h 			\
 	gdkmarshalers.c				\
@@ -158,18 +155,24 @@ common_sources = 		\
 	gdkmarshalers.c		\
 	gdkmarshalers.h

-libgdk_x11_3_0_la_SOURCES = $(common_sources)
-libgdk_x11_3_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS)
-libgdk_x11_3_0_la_LDFLAGS = $(LDADD)
+libgdk_3_0_la_SOURCES = $(common_sources)
+libgdk_3_0_la_LIBADD = $(GDK_DEP_LIBS)
+libgdk_3_0_la_LDFLAGS = $(LDADD)

-libgdk_quartz_3_0_la_SOURCES = $(common_sources) gdkkeynames.c
-libgdk_quartz_3_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS)
-libgdk_quartz_3_0_la_LDFLAGS = $(LDADD)
+if USE_X11
+libgdk_3_0_la_LIBADD += x11/libgdk-x11.la
+endif # USE_X11

-libgdk_win32_3_0_la_SOURCES = $(common_sources) gdkkeynames.c
-libgdk_win32_3_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS)
-libgdk_win32_3_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
-libgdk_win32_3_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD)
+if USE_QUARTZ
+libgdk_3_0_la_LIBADD += quartz/libgdk-quartz.la
+endif # USE_QUARTZ
+
+if USE_WIN32
+libgdk_3_0_la_SOURCES += gdkkeynames.c
+libgdk_3_0_la_LIBADD += win32/libgdk-win32.la
+libgdk_3_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
+libgdk_3_0_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
+endif # USE_WIN32

 if HAVE_INTROSPECTION

@@ -179,10 +182,10 @@ introspection_files = 		\
        gdkenumtypes.c		\
        gdkenumtypes.h

-Gdk-3.0.gir: $(gdktargetlib) Makefile
+Gdk-3.0.gir: libgdk-3.0.la Makefile
 Gdk_3_0_gir_SCANNERFLAGS = --warn-all
 Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
-Gdk_3_0_gir_LIBS = $(gdktargetlib)
+Gdk_3_0_gir_LIBS = libgdk-3.0.la
 Gdk_3_0_gir_FILES = $(introspection_files)
 Gdk_3_0_gir_CFLAGS = $(INCLUDES)
 INTROSPECTION_GIRS += Gdk-3.0.gir
@@ -193,29 +196,24 @@ x11_introspection_files = 		\
 	x11/gdkapplaunchcontext-x11.c	\
 	x11/gdkasync.c			\
 	x11/gdkcursor-x11.c		\
-	x11/gdkdevice-core.c		\
-	x11/gdkdevicemanager-core.c	\
+	x11/gdkdevice-core-x11.c	\
+	x11/gdkdevicemanager-core-x11.c	\
 	x11/gdkdevicemanager-x11.c	\
-	x11/gdkdevicemanager-xi2.c	\
 	x11/gdkdevicemanager-xi.c	\
+	x11/gdkdevicemanager-xi2.c	\
 	x11/gdkdevice-xi2.c		\
 	x11/gdkdevice-xi.c		\
 	x11/gdkdisplay-x11.c		\
 	x11/gdkdnd-x11.c		\
-	x11/gdkdrawable-x11.c		\
 	x11/gdkeventsource.c		\
 	x11/gdkeventtranslator.c	\
 	x11/gdkgeometry-x11.c		\
-	x11/gdkglobals-x11.c		\
-	x11/gdkim-x11.c			\
-	x11/gdkinput.c			\
 	x11/gdkkeys-x11.c		\
 	x11/gdkmain-x11.c		\
 	x11/gdkproperty-x11.c		\
 	x11/gdkscreen-x11.c		\
 	x11/gdkselection-x11.c		\
 	x11/gdksettings.c		\
-	x11/gdkspawn-x11.c		\
 	x11/gdktestutils-x11.c		\
 	x11/gdkvisual-x11.c		\
 	x11/gdkwindow-x11.c		\
@@ -223,12 +221,20 @@ x11_introspection_files = 		\
 	x11/gdkxid.c			\
 	x11/xsettings-client.c		\
 	x11/xsettings-common.c		\
-        x11/gdkx.h
+        x11/gdkx.h			\
+	x11/gdkx11cursor.h		\
+	x11/gdkx11display.h		\
+	x11/gdkx11property.h		\
+	x11/gdkx11screen.h		\
+	x11/gdkx11selection.h		\
+	x11/gdkx11utils.h		\
+	x11/gdkx11visual.h		\
+	x11/gdkx11window.h

-GdkX11-3.0.gir: $(gdktargetlib) Gdk-3.0.gir Makefile
+GdkX11-3.0.gir: libgdk-3.0.la Gdk-3.0.gir Makefile
 GdkX11_3_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk
 GdkX11_3_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
-GdkX11_3_0_gir_LIBS = $(gdktargetlib)
+GdkX11_3_0_gir_LIBS = libgdk-3.0.la
 GdkX11_3_0_gir_FILES = $(x11_introspection_files)
 GdkX11_3_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
 INTROSPECTION_GIRS += GdkX11-3.0.gir
@@ -285,30 +291,15 @@ if OS_LINUX
 TESTS = abicheck.sh
 endif

-
-lib_LTLIBRARIES = $(gdktargetlib)
-
-EXTRA_LTLIBRARIES = libgdk-x11-3.0.la libgdk-win32-3.0.la libgdk-quartz-3.0.la
+lib_LTLIBRARIES = libgdk-3.0.la

 MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
 EXTRA_DIST += $(gdk_built_sources)
 EXTRA_HEADERS =

-#
-# Rule to install gdkconfig.h header file
-#
-configexecincludedir = $(libdir)/gtk-3.0/include
-#configexecinclude_DATA = gdkconfig.h
-
-install-exec-local: gdkconfig.h
-	$(mkinstalldirs) $(DESTDIR)$(configexecincludedir)
-	file=$(DESTDIR)$(configexecincludedir)/gdkconfig.h; \
-	if test -r $$file && cmp -s gdkconfig.h $$file; then :; \
-	else $(INSTALL_DATA) gdkconfig.h $$file; fi
-
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
-	$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gdktargetlib)
+	$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.0.la
 endif

 #note: not gdkconfig.h
@@ -1,5 +1,5 @@
 #! /bin/sh

-cpp -P -DGDK_ENABLE_BROKEN -include ../config.h -include ./gdkconfig.h ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
-nm -D -g --defined-only .libs/libgdk-x11-3.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
+cpp -P -DGDK_ENABLE_BROKEN -include ../config.h ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
+nm -D -g --defined-only .libs/libgdk-3.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
 diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
@@ -8,7 +8,7 @@
 *
 * 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
+ * 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
@@ -48,6 +48,48 @@
 * utility functions.
 */

+/**
+ * GDK_WINDOWING_X11:
+ *
+ * The #GDK_WINDOWING_X11 macro is defined if the X11 backend
+ * is supported.
+ *
+ * Use this macro to guard code that is specific to the X11-backend.
+ * Since GDK may be configured with multiple backends, an additional
+ * runtime check for the used backend is recommended:
+ *
+ * |[
+ * #ifdef GDK_WINDOWING_X11
+ *   if (GDK_IS_X11_DISPLAY (display))
+ *     {
+ *       /&ast; make X11-specific calls here &ast;/
+ *     }
+ *   else
+ * #endif
+ * #ifdef GDK_WINDOWING_QUARTZ
+ *   if (GDK_IS_QUARTZ_DISPLAY (display))
+ *     {
+ *       /&ast; make Quartz-specific calls here &ast/
+ *     }
+ *   else
+ * #endif
+ *   g_error ("Unsupported GDK backend");
+ * ]|
+ */
+
+/**
+ * GDK_WINDOWING_WIN32:
+ *
+ * The #GDK_WINDOWING_WIN32 macro is defined if the Win32 backend
+ * is supported.
+ */
+
+/**
+ * GDK_WINDOWING_QUARTZ:
+ *
+ * The #GDK_WINDOWING_QUARTZ macro is defined if the Quartz backend
+ * is supported.
+ */

 typedef struct _GdkPredicate  GdkPredicate;

@@ -69,9 +111,9 @@ struct _GdkThreadsDispatch

 /* Private variable declarations
 */
-static int gdk_initialized = 0;			    /* 1 if the library is initialized,
-						     * 0 otherwise.
-						     */
+static int gdk_initialized = 0;                     /* 1 if the library is initialized,
+                                                     * 0 otherwise.
+                                                     */

 static gchar  *gdk_progclass = NULL;

@@ -82,37 +124,32 @@ static GCallback gdk_threads_unlock = NULL;

 #ifdef G_ENABLE_DEBUG
 static const GDebugKey gdk_debug_keys[] = {
-  {"events",	    GDK_DEBUG_EVENTS},
-  {"misc",	    GDK_DEBUG_MISC},
-  {"dnd",	    GDK_DEBUG_DND},
-  {"xim",	    GDK_DEBUG_XIM},
+  {"events",        GDK_DEBUG_EVENTS},
+  {"misc",          GDK_DEBUG_MISC},
+  {"dnd",           GDK_DEBUG_DND},
+  {"xim",           GDK_DEBUG_XIM},
  {"nograbs",       GDK_DEBUG_NOGRABS},
-  {"colormap",	    GDK_DEBUG_COLORMAP},
-  {"input",	    GDK_DEBUG_INPUT},
-  {"cursor",	    GDK_DEBUG_CURSOR},
-  {"multihead",	    GDK_DEBUG_MULTIHEAD},
-  {"xinerama",	    GDK_DEBUG_XINERAMA},
-  {"draw",	    GDK_DEBUG_DRAW},
-  {"eventloop",	    GDK_DEBUG_EVENTLOOP}
+  {"colormap",      GDK_DEBUG_COLORMAP},
+  {"input",         GDK_DEBUG_INPUT},
+  {"cursor",        GDK_DEBUG_CURSOR},
+  {"multihead",     GDK_DEBUG_MULTIHEAD},
+  {"xinerama",      GDK_DEBUG_XINERAMA},
+  {"draw",          GDK_DEBUG_DRAW},
+  {"eventloop",     GDK_DEBUG_EVENTLOOP}
 };

-static const int gdk_ndebug_keys = G_N_ELEMENTS (gdk_debug_keys);
-
-#endif /* G_ENABLE_DEBUG */
-
-#ifdef G_ENABLE_DEBUG
 static gboolean
 gdk_arg_debug_cb (const char *key, const char *value, gpointer user_data, GError **error)
 {
  guint debug_value = g_parse_debug_string (value,
-					    (GDebugKey *) gdk_debug_keys,
-					    gdk_ndebug_keys);
+                                            (GDebugKey *) gdk_debug_keys,
+                                            G_N_ELEMENTS (gdk_debug_keys));

  if (debug_value == 0 && value != NULL && strcmp (value, "") != 0)
    {
-      g_set_error (error, 
-		   G_OPTION_ERROR, G_OPTION_ERROR_FAILED,
-		   _("Error parsing option --gdk-debug"));
+      g_set_error (error,
+                   G_OPTION_ERROR, G_OPTION_ERROR_FAILED,
+                   _("Error parsing option --gdk-debug"));
      return FALSE;
    }

@@ -125,14 +162,14 @@ static gboolean
 gdk_arg_no_debug_cb (const char *key, const char *value, gpointer user_data, GError **error)
 {
  guint debug_value = g_parse_debug_string (value,
-					    (GDebugKey *) gdk_debug_keys,
-					    gdk_ndebug_keys);
+                                            (GDebugKey *) gdk_debug_keys,
+                                            G_N_ELEMENTS (gdk_debug_keys));

  if (debug_value == 0 && value != NULL && strcmp (value, "") != 0)
    {
-      g_set_error (error, 
-		   G_OPTION_ERROR, G_OPTION_ERROR_FAILED,
-		   _("Error parsing option --gdk-no-debug"));
+      g_set_error (error,
+                   G_OPTION_ERROR, G_OPTION_ERROR_FAILED,
+                   _("Error parsing option --gdk-no-debug"));
      return FALSE;
    }

@@ -168,9 +205,6 @@ static const GOptionEntry gdk_args[] = {
  { "display",      0, G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING,   &_gdk_display_name,
    /* Description of --display=DISPLAY in --help output */    N_("X display to use"),
    /* Placeholder in --display=DISPLAY in --help output */    N_("DISPLAY") },
-  { "screen",       0, 0, G_OPTION_ARG_INT,      &_gdk_screen_number,
-    /* Description of --screen=SCREEN in --help output */      N_("X screen to use"),
-    /* Placeholder in --screen=SCREEN in --help output */      N_("SCREEN") },
 #ifdef G_ENABLE_DEBUG
  { "gdk-debug",    0, 0, G_OPTION_ARG_CALLBACK, gdk_arg_debug_cb,  
    /* Description of --gdk-debug=FLAGS in --help output */    N_("GDK debugging flags to set"),
@@ -185,15 +219,14 @@ static const GOptionEntry gdk_args[] = {
 /**
 * gdk_add_option_entries_libgtk_only:
 * @group: An option group.
- * 
+ *
 * Appends gdk option entries to the passed in option group. This is
 * not public API and must not be used by applications.
- **/
+ */
 void
 gdk_add_option_entries_libgtk_only (GOptionGroup *group)
 {
  g_option_group_add_entries (group, gdk_args);
-  g_option_group_add_entries (group, _gdk_windowing_args);
 }

 void
@@ -213,24 +246,22 @@ gdk_pre_parse_libgtk_only (void)
    gchar *debug_string = getenv("GDK_DEBUG");
    if (debug_string != NULL)
      _gdk_debug_flags = g_parse_debug_string (debug_string,
-					      (GDebugKey *) gdk_debug_keys,
-					      gdk_ndebug_keys);
+                                              (GDebugKey *) gdk_debug_keys,
+                                              G_N_ELEMENTS (gdk_debug_keys));
  }
-#endif	/* G_ENABLE_DEBUG */
+#endif  /* G_ENABLE_DEBUG */

  if (getenv ("GDK_NATIVE_WINDOWS"))
    {
      _gdk_native_windows = TRUE;
-      /* Ensure that this is not propagated
-	 to spawned applications */
+      /* Ensure that this is not propagated to spawned applications */
      g_unsetenv ("GDK_NATIVE_WINDOWS");
    }

  g_type_init ();

-  /* Do any setup particular to the windowing system
-   */
-  _gdk_windowing_init ();  
+  /* Do any setup particular to the windowing system */
+  gdk_display_manager_get ();
 }

  
@@ -252,7 +283,7 @@ gdk_pre_parse_libgtk_only (void)
 **/
 void
 gdk_parse_args (int    *argc,
-		char ***argv)
+                char ***argv)
 {
  GOptionContext *option_context;
  GOptionGroup *option_group;
@@ -262,15 +293,14 @@ gdk_parse_args (int    *argc,
    return;

  gdk_pre_parse_libgtk_only ();
-  
+
  option_context = g_option_context_new (NULL);
  g_option_context_set_ignore_unknown_options (option_context, TRUE);
  g_option_context_set_help_enabled (option_context, FALSE);
  option_group = g_option_group_new (NULL, NULL, NULL, NULL, NULL);
  g_option_context_set_main_group (option_context, option_group);
-  
+
  g_option_group_add_entries (option_group, gdk_args);
-  g_option_group_add_entries (option_group, _gdk_windowing_args);

  if (!g_option_context_parse (option_context, argc, argv, &error))
    {
@@ -282,7 +312,7 @@ gdk_parse_args (int    *argc,
  GDK_NOTE (MISC, g_message ("progname: \"%s\"", g_get_prgname ()));
 }

-/** 
+/**
 * gdk_get_display_arg_name:
 *
 * Gets the display name specified in the command line arguments passed
@@ -297,25 +327,20 @@ G_CONST_RETURN gchar *
 gdk_get_display_arg_name (void)
 {
  if (!_gdk_display_arg_name)
-    {
-      if (_gdk_screen_number >= 0)
-	_gdk_display_arg_name = _gdk_windowing_substitute_screen_number (_gdk_display_name, _gdk_screen_number);
-      else
-	_gdk_display_arg_name = g_strdup (_gdk_display_name);
-   }
+    _gdk_display_arg_name = g_strdup (_gdk_display_name);

   return _gdk_display_arg_name;
 }

 /**
 * gdk_display_open_default_libgtk_only:
- * 
+ *
 * Opens the default display specified by command line arguments or
 * environment variables, sets it as the default display, and returns
 * it.  gdk_parse_args must have been called first. If the default
 * display has previously been set, simply returns that. An internal
 * function that should not be used by applications.
- * 
+ *
 * Return value: (transfer none): the default display, if it could be
 *   opened, otherwise %NULL.
 **/
@@ -325,25 +350,13 @@ gdk_display_open_default_libgtk_only (void)
  GdkDisplay *display;

  g_return_val_if_fail (gdk_initialized, NULL);
-  
+
  display = gdk_display_get_default ();
  if (display)
    return display;

  display = gdk_display_open (gdk_get_display_arg_name ());

-  if (!display && _gdk_screen_number >= 0)
-    {
-      g_free (_gdk_display_arg_name);
-      _gdk_display_arg_name = g_strdup (_gdk_display_name);
-      
-      display = gdk_display_open (_gdk_display_name);
-    }
-  
-  if (display)
-    gdk_display_manager_set_default_display (gdk_display_manager_get (),
-					     display);
-  
  return display;
 }

@@ -352,20 +365,20 @@ gdk_display_open_default_libgtk_only (void)
 * @argc: (inout): the number of command line arguments.
 * @argv: (array length=argc) (inout): the array of command line arguments.
 *
- * Initializes the GDK library and connects to the X server, returning %TRUE on
- * success.
+ * Initializes the GDK library and connects to the windowing system,
+ * returning %TRUE on success.
 *
- * Any arguments used by GDK are removed from the array and @argc and @argv are
- * updated accordingly.
+ * Any arguments used by GDK are removed from the array and @argc and @argv
+ * are updated accordingly.
 *
- * GTK+ initializes GDK in gtk_init() and so this function is not usually needed
- * by GTK+ applications.
+ * GTK+ initializes GDK in gtk_init() and so this function is not usually
+ * needed by GTK+ applications.
 *
 * Returns: %TRUE if initialization succeeded.
 */
 gboolean
 gdk_init_check (int    *argc,
-		char ***argv)
+                char ***argv)
 {
  gdk_parse_args (argc, argv);

@@ -378,15 +391,15 @@ gdk_init_check (int    *argc,
 * @argc: (inout): the number of command line arguments.
 * @argv: (array length=argc) (inout): the array of command line arguments.
 *
- * Initializes the GDK library and connects to the X server.
+ * Initializes the GDK library and connects to the windowing system.
 * If initialization fails, a warning message is output and the application
 * terminates with a call to <literal>exit(1)</literal>.
 *
- * Any arguments used by GDK are removed from the array and @argc and @argv are
- * updated accordingly.
+ * Any arguments used by GDK are removed from the array and @argc and @argv
+ * are updated accordingly.
 *
- * GTK+ initializes GDK in gtk_init() and so this function is not usually needed
- * by GTK+ applications.
+ * GTK+ initializes GDK in gtk_init() and so this function is not usually
+ * needed by GTK+ applications.
 */
 void
 gdk_init (int *argc, char ***argv)
@@ -549,28 +562,28 @@ gdk_init (int *argc, char ***argv)
 *       say_something = (yes_or_no != data->what);
 *
 *       if(say_something)
- * 	{
- * 	  /<!---->* set the variable *<!---->/
- * 	  yes_or_no = data->what;
- * 	}
+ *      {
+ *        /<!---->* set the variable *<!---->/
+ *        yes_or_no = data->what;
+ *      }
 *
 *       /<!---->* Unlock the yes_or_no variable *<!---->/
 *       G_UNLOCK (yes_or_no);
 *
 *       if (say_something)
- * 	{
- * 	  /<!---->* get GTK thread lock *<!---->/
- * 	  gdk_threads_enter (<!-- -->);
+ *      {
+ *        /<!---->* get GTK thread lock *<!---->/
+ *        gdk_threads_enter (<!-- -->);
 *
- *	  /<!---->* set label text *<!---->/
- * 	  if(data->what == YES_IT_IS)
- * 	    gtk_label_set_text (GTK_LABEL (data->label), "O yes, it is!");
- * 	  else
- * 	    gtk_label_set_text (GTK_LABEL (data->label), "O no, it isn't!");
+ *        /<!---->* set label text *<!---->/
+ *        if(data->what == YES_IT_IS)
+ *          gtk_label_set_text (GTK_LABEL (data->label), "O yes, it is!");
+ *        else
+ *          gtk_label_set_text (GTK_LABEL (data->label), "O no, it isn't!");
 *
- * 	  /<!---->* release GTK thread lock *<!---->/
- * 	  gdk_threads_leave (<!-- -->);
- * 	}
+ *        /<!---->* release GTK thread lock *<!---->/
+ *        gdk_threads_leave (<!-- -->);
+ *      }
 *     }
 *
 *   return NULL;
@@ -724,10 +737,10 @@ gdk_threads_init (void)
 **/
 void
 gdk_threads_set_lock_functions (GCallback enter_fn,
-				GCallback leave_fn)
+                                GCallback leave_fn)
 {
  g_return_if_fail (gdk_threads_lock == NULL &&
-		    gdk_threads_unlock == NULL);
+                    gdk_threads_unlock == NULL);

  gdk_threads_lock = enter_fn;
  gdk_threads_unlock = leave_fn;
@@ -817,9 +830,9 @@ gdk_threads_dispatch_free (gpointer data)
 */
 guint
 gdk_threads_add_idle_full (gint           priority,
-		           GSourceFunc    function,
-		           gpointer       data,
-		           GDestroyNotify notify)
+                           GSourceFunc    function,
+                           gpointer       data,
+                           GDestroyNotify notify)
 {
  GdkThreadsDispatch *dispatch;

@@ -852,7 +865,7 @@ gdk_threads_add_idle_full (gint           priority,
 */
 guint
 gdk_threads_add_idle (GSourceFunc    function,
-		      gpointer       data)
+                      gpointer       data)
 {
  return gdk_threads_add_idle_full (G_PRIORITY_DEFAULT_IDLE,
                                    function, data, NULL);
@@ -973,9 +986,9 @@ gdk_threads_add_timeout (guint       interval,
 * @interval: the time between calls to the function, in seconds
 * @function: function to call
 * @data:     data to pass to @function
- * @notify: (allow-none):   function to call when the timeout is removed, or %NULL
+ * @notify: (allow-none): function to call when the timeout is removed, or %NULL
 *
- * A variant of gdk_threads_add_timout_full() with second-granularity.
+ * A variant of gdk_threads_add_timeout_full() with second-granularity.
 * See g_timeout_add_seconds_full() for a discussion of why it is
 * a good idea to use this function if you don't need finer granularity.
 *
@@ -1063,24 +1076,24 @@ gdk_set_program_class (const char *program_class)
 }

 /**
- * gdk_enable_multidevice:
+ * gdk_disable_multidevice:
 *
- * Enables multidevice support in GDK. This call must happen prior
+ * Disables multidevice support in GDK. This call must happen prior
 * to gdk_display_open(), gtk_init(), gtk_init_with_args() or
 * gtk_init_check() in order to take effect.
 *
- * Note that individual #GdkWindow<!-- -->s still need to explicitly
- * enable multidevice awareness through gdk_window_set_support_multidevice().
- *
- * This function must be called before initializing GDK.
+ * Most common GTK+ applications won't ever need to call this. Only
+ * applications that do mixed GDK/Xlib calls could want to disable
+ * multidevice support if such Xlib code deals with input devices in
+ * any way and doesn't observe the presence of XInput 2.
 *
 * Since: 3.0
- **/
+ */
 void
-gdk_enable_multidevice (void)
+gdk_disable_multidevice (void)
 {
  if (gdk_initialized)
    return;

-  _gdk_enable_multidevice = TRUE;
+  _gdk_disable_multidevice = TRUE;
 }
@@ -29,6 +29,7 @@

 #define __GDK_H_INSIDE__

+#include <gdk/gdkconfig.h>
 #include <gdk/gdkapplaunchcontext.h>
 #include <gdk/gdkcairo.h>
 #include <gdk/gdkcolor.h>
@@ -38,10 +39,8 @@
 #include <gdk/gdkdisplay.h>
 #include <gdk/gdkdisplaymanager.h>
 #include <gdk/gdkdnd.h>
-#include <gdk/gdkdrawable.h>
 #include <gdk/gdkenumtypes.h>
 #include <gdk/gdkevents.h>
-#include <gdk/gdkinput.h>
 #include <gdk/gdkkeys.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkmain.h>
@@ -52,7 +51,6 @@
 #include <gdk/gdkrgba.h>
 #include <gdk/gdkscreen.h>
 #include <gdk/gdkselection.h>
-#include <gdk/gdkspawn.h>
 #include <gdk/gdktestutils.h>
 #include <gdk/gdkthreads.h>
 #include <gdk/gdktypes.h>
@@ -22,7 +22,6 @@ gdk_cairo_get_clip_rectangle
 gdk_cairo_rectangle
 gdk_cairo_region
 gdk_cairo_region_create_from_surface
-gdk_cairo_reset_clip
 gdk_cairo_set_source_color
 gdk_cairo_set_source_pixbuf
 gdk_cairo_set_source_rgba
@@ -51,7 +50,6 @@ gdk_device_get_associated_device
 gdk_device_get_axis
 gdk_device_get_axis_use
 gdk_device_get_axis_value
-gdk_device_get_core_pointer
 gdk_device_get_device_type
 gdk_device_get_display
 gdk_device_get_has_cursor
@@ -61,38 +59,37 @@ gdk_device_get_mode
 gdk_device_get_name
 gdk_device_get_n_axes
 gdk_device_get_n_keys
+gdk_device_get_position
 gdk_device_get_source
 gdk_device_get_state
 gdk_device_get_type G_GNUC_CONST
+gdk_device_get_window_at_position
 gdk_device_grab
 gdk_device_grab_info_libgtk_only
 gdk_device_list_axes
-gdk_device_manager_core_get_type
+gdk_device_list_slave_devices
 gdk_device_manager_get_client_pointer
 gdk_device_manager_get_display
 gdk_device_manager_get_type G_GNUC_CONST
 gdk_device_manager_list_devices
-gdk_device_manager_xi2_get_type
-gdk_device_manager_xi_get_type
 gdk_device_set_axis_use
 gdk_device_set_key
 gdk_device_set_mode
-gdk_device_set_source
-gdk_devices_list
 gdk_device_type_get_type G_GNUC_CONST
 gdk_device_ungrab
+gdk_device_warp
+gdk_disable_multidevice
 gdk_display_add_client_message_filter
 gdk_display_beep
 gdk_display_close
 gdk_display_device_is_grabbed
 gdk_display_flush
-gdk_display_get_core_pointer
+gdk_display_get_app_launch_context
 gdk_display_get_default
 gdk_display_get_default_cursor_size
 gdk_display_get_default_group
 gdk_display_get_default_screen
 gdk_display_get_device_manager
-gdk_display_get_device_state
 gdk_display_get_event
 gdk_display_get_maximal_cursor_size
 gdk_display_get_name
@@ -100,8 +97,8 @@ gdk_display_get_n_screens
 gdk_display_get_pointer
 gdk_display_get_screen
 gdk_display_get_type G_GNUC_CONST
-gdk_display_get_window_at_device_position
 gdk_display_get_window_at_pointer
+gdk_display_has_pending
 gdk_display_is_closed
 gdk_display_keyboard_ungrab
 gdk_display_list_devices
@@ -109,7 +106,9 @@ gdk_display_manager_get
 gdk_display_manager_get_default_display
 gdk_display_manager_get_type G_GNUC_CONST
 gdk_display_manager_list_displays
+gdk_display_manager_open_display
 gdk_display_manager_set_default_display
+gdk_display_notify_startup_complete
 gdk_display_open
 gdk_display_open_default_libgtk_only
 gdk_display_peek_event
@@ -130,36 +129,31 @@ gdk_display_supports_input_shapes
 gdk_display_supports_selection_notification
 gdk_display_supports_shapes
 gdk_display_sync
-gdk_display_warp_device
 gdk_display_warp_pointer
 gdk_drag_abort
 gdk_drag_action_get_type G_GNUC_CONST
 gdk_drag_begin
+gdk_drag_begin_for_device
 gdk_drag_context_get_actions
+gdk_drag_context_get_dest_window
 gdk_drag_context_get_device
+gdk_drag_context_get_protocol
 gdk_drag_context_get_selected_action
 gdk_drag_context_get_source_window
 gdk_drag_context_get_suggested_action
 gdk_drag_context_get_type G_GNUC_CONST
 gdk_drag_context_list_targets
-gdk_drag_context_new
 gdk_drag_context_set_device
 gdk_drag_drop
 gdk_drag_drop_succeeded
-gdk_drag_find_window
 gdk_drag_find_window_for_screen
-gdk_drag_get_protocol
 gdk_drag_get_protocol_for_display
 gdk_drag_get_selection
 gdk_drag_motion
 gdk_drag_protocol_get_type G_GNUC_CONST
 gdk_drag_status
-gdk_drawable_get_clip_region
-gdk_drawable_get_type G_GNUC_CONST
-gdk_drawable_get_visible_region
 gdk_drop_finish
 gdk_drop_reply
-gdk_enable_multidevice
 gdk_error_trap_pop
 gdk_error_trap_pop_ignored
 gdk_error_trap_push
@@ -171,6 +165,7 @@ gdk_event_get_coords
 gdk_event_get_device
 gdk_event_get_root_coords
 gdk_event_get_screen
+gdk_event_get_source_device
 gdk_event_get_state
 gdk_event_get_time
 gdk_event_get_type G_GNUC_CONST
@@ -185,20 +180,15 @@ gdk_event_send_client_message_for_display
 gdk_event_send_clientmessage_toall
 gdk_event_set_device
 gdk_event_set_screen
+gdk_event_set_source_device
 gdk_events_get_angle
 gdk_events_get_center
 gdk_events_get_distance
 gdk_events_pending
-gdk_event_translator_get_handled_events
-gdk_event_translator_get_type G_GNUC_CONST
-gdk_event_translator_select_window_events
-gdk_event_translator_translate
 gdk_event_type_get_type G_GNUC_CONST
 gdk_extension_mode_get_type G_GNUC_CONST
 gdk_filter_return_get_type G_GNUC_CONST
 gdk_flush
-gdk_free_compound_text
-gdk_free_text_list
 gdk_get_default_root_window
 gdk_get_display
 gdk_get_display_arg_name
@@ -210,7 +200,6 @@ gdk_gravity_get_type G_GNUC_CONST
 gdk_init
 gdk_init_check
 gdk_input_mode_get_type G_GNUC_CONST
-gdk_input_set_extension_events
 gdk_input_source_get_type G_GNUC_CONST
 gdk_keyboard_grab
 gdk_keyboard_ungrab
@@ -237,7 +226,6 @@ gdk_keyval_to_unicode G_GNUC_CONST
 gdk_keyval_to_upper G_GNUC_CONST
 gdk_list_visuals
 gdk_modifier_type_get_type G_GNUC_CONST
-gdk_net_wm_supports
 gdk_notify_startup_complete
 gdk_notify_startup_complete_with_id
 gdk_notify_type_get_type G_GNUC_CONST
@@ -319,26 +307,16 @@ gdk_selection_property_get
 gdk_selection_send_notify
 gdk_selection_send_notify_for_display
 gdk_set_double_click_time
-gdk_set_locale
 gdk_set_pointer_hooks
 gdk_set_program_class
 gdk_set_show_events
-gdk_set_sm_client_id
 gdk_setting_action_get_type G_GNUC_CONST
 gdk_setting_get
-gdk_spawn_command_line_on_screen
-gdk_spawn_on_screen
-gdk_spawn_on_screen_with_pipes
 gdk_status_get_type G_GNUC_CONST
-gdk_string_to_compound_text
-gdk_string_to_compound_text_for_display
 gdk_synthesize_window_state
 gdk_test_render_sync
 gdk_test_simulate_button
 gdk_test_simulate_key
-gdk_text_property_to_text_list
-gdk_text_property_to_text_list_for_display
-gdk_text_property_to_utf8_list
 gdk_text_property_to_utf8_list_for_display
 gdk_threads_add_idle
 gdk_threads_add_idle_full
@@ -351,8 +329,6 @@ gdk_threads_init
 gdk_threads_leave
 gdk_threads_set_lock_functions
 gdk_unicode_to_keyval G_GNUC_CONST
-gdk_utf8_to_compound_text
-gdk_utf8_to_compound_text_for_display
 gdk_utf8_to_string_target
 gdk_visibility_state_get_type G_GNUC_CONST
 gdk_visual_get_best
@@ -390,7 +366,7 @@ gdk_window_begin_move_drag
 gdk_window_begin_paint_rect
 gdk_window_begin_paint_region
 gdk_window_begin_resize_drag
-gdk_window_class_get_type G_GNUC_CONST
+gdk_window_window_class_get_type G_GNUC_CONST
 gdk_window_configure_finished
 gdk_window_constrain_size
 gdk_window_coords_from_parent
@@ -405,8 +381,6 @@ gdk_window_end_paint
 gdk_window_ensure_native
 gdk_window_flush
 gdk_window_focus
-gdk_window_foreign_new
-gdk_window_foreign_new_for_display
 gdk_window_freeze_toplevel_updates_libgtk_only
 gdk_window_freeze_updates
 gdk_window_fullscreen
@@ -414,6 +388,7 @@ gdk_window_geometry_changed
 gdk_window_get_accept_focus
 gdk_window_get_background_pattern
 gdk_window_get_children
+gdk_window_get_clip_region
 gdk_window_get_composited
 gdk_window_get_cursor
 gdk_window_get_decorations
@@ -437,12 +412,15 @@ gdk_window_get_position
 gdk_window_get_root_coords
 gdk_window_get_root_origin
 gdk_window_get_screen
+gdk_window_get_source_events
 gdk_window_get_state
 gdk_window_get_support_multidevice
 gdk_window_get_toplevel
+gdk_window_get_type G_GNUC_CONST
 gdk_window_get_type_hint
 gdk_window_get_update_area
 gdk_window_get_user_data
+gdk_window_get_visible_region
 gdk_window_get_visual
 gdk_window_get_width
 gdk_window_get_window_type
@@ -461,8 +439,6 @@ gdk_window_is_input_only
 gdk_window_is_shaped
 gdk_window_is_viewable
 gdk_window_is_visible
-gdk_window_lookup
-gdk_window_lookup_for_display
 gdk_window_lower
 gdk_window_maximize
 gdk_window_merge_child_input_shapes
@@ -471,7 +447,6 @@ gdk_window_move
 gdk_window_move_region
 gdk_window_move_resize
 gdk_window_new
-gdk_window_object_get_type G_GNUC_CONST
 gdk_window_peek_children
 gdk_window_process_all_updates
 gdk_window_process_updates
@@ -509,6 +484,7 @@ gdk_window_set_override_redirect
 gdk_window_set_role
 gdk_window_set_skip_pager_hint
 gdk_window_set_skip_taskbar_hint
+gdk_window_set_source_events
 gdk_window_set_startup_id
 gdk_window_set_static_gravities
 gdk_window_set_support_multidevice
@@ -532,23 +508,37 @@ gdk_window_unstick
 gdk_window_withdraw
 gdk_wm_decoration_get_type G_GNUC_CONST
 gdk_wm_function_get_type G_GNUC_CONST
+gdk_x11_app_launch_context_get_type
 gdk_x11_atom_to_xatom
 gdk_x11_atom_to_xatom_for_display
+gdk_x11_cursor_get_type
 gdk_x11_cursor_get_xcursor
 gdk_x11_cursor_get_xdisplay
+gdk_x11_device_core_get_type
+gdk_x11_device_manager_core_get_type
+gdk_x11_device_manager_xi2_get_type
+gdk_x11_device_manager_xi_get_type
+gdk_x11_device_xi2_get_type
+gdk_x11_device_xi_get_type
 gdk_x11_display_broadcast_startup_message
 gdk_x11_display_error_trap_pop
 gdk_x11_display_error_trap_pop_ignored
 gdk_x11_display_error_trap_push
 gdk_x11_display_get_startup_notification_id
+gdk_x11_display_get_type
 gdk_x11_display_get_user_time
 gdk_x11_display_get_xdisplay
 gdk_x11_display_grab
+gdk_x11_display_manager_get_type
 gdk_x11_display_set_cursor_theme
 gdk_x11_display_set_startup_notification_id
+gdk_x11_display_string_to_compound_text
+gdk_x11_display_text_property_to_text_list
 gdk_x11_display_ungrab
-gdk_x11_drawable_get_xdisplay
-gdk_x11_drawable_get_xid
+gdk_x11_display_utf8_to_compound_text
+gdk_x11_drag_context_get_type
+gdk_x11_free_compound_text
+gdk_x11_free_text_list
 gdk_x11_get_default_root_xwindow
 gdk_x11_get_default_screen
 gdk_x11_get_default_xdisplay
@@ -558,21 +548,25 @@ gdk_x11_get_xatom_by_name_for_display
 gdk_x11_get_xatom_name
 gdk_x11_get_xatom_name_for_display
 gdk_x11_grab_server
+gdk_x11_keymap_get_type
 gdk_x11_lookup_xdisplay
 gdk_x11_register_standard_event_type
 gdk_x11_screen_get_monitor_output
 gdk_x11_screen_get_screen_number
+gdk_x11_screen_get_type
 gdk_x11_screen_get_window_manager_name
 gdk_x11_screen_get_xscreen
 gdk_x11_screen_lookup_visual
 gdk_x11_screen_supports_net_wm_hint
+gdk_x11_set_sm_client_id
 gdk_x11_ungrab_server
+gdk_x11_visual_get_type
 gdk_x11_visual_get_xvisual
-gdk_x11_window_get_drawable_impl
+gdk_x11_window_foreign_new_for_display
+gdk_x11_window_lookup_for_display
+gdk_x11_window_get_type
+gdk_x11_window_get_xid
 gdk_x11_window_move_to_current_desktop
 gdk_x11_window_set_user_time
 gdk_x11_xatom_to_atom
 gdk_x11_xatom_to_atom_for_display
-gdk_xid_table_lookup
-gdk_xid_table_lookup_for_display
-gdkx_visual_get
@@ -22,9 +22,7 @@

 #include "config.h"

-#include "gdkapplaunchcontext.h"
-
-#include "gdkinternals.h"
+#include "gdkapplaunchcontextprivate.h"
 #include "gdkscreen.h"
 #include "gdkintl.h"

@@ -43,9 +41,9 @@
 * <programlisting>
 * GdkAppLaunchContext *context;
 *
- * context = gdk_app_launch_context_new (<!-- -->);
+ * context = gdk_display_get_app_launch_context (display);
 *
- * gdk_app_launch_context_set_screen (my_screen);
+ * gdk_app_launch_context_set_screen (screen);
 * gdk_app_launch_context_set_timestamp (event->time);
 *
 * if (!g_app_info_launch_default_for_uri ("http://www.gtk.org", context, &error))
@@ -61,10 +59,56 @@ static void    gdk_app_launch_context_finalize    (GObject           *object);
 static gchar * gdk_app_launch_context_get_display (GAppLaunchContext *context,
                                                   GAppInfo          *info,
                                                   GList             *files);
+static gchar * gdk_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
+                                                             GAppInfo          *info,
+                                                             GList             *files);
+static void    gdk_app_launch_context_launch_failed (GAppLaunchContext *context,
+                                                     const gchar       *startup_notify_id);


-G_DEFINE_TYPE (GdkAppLaunchContext, gdk_app_launch_context,
-	       G_TYPE_APP_LAUNCH_CONTEXT)
+enum
+{
+  PROP_0,
+  PROP_DISPLAY
+};
+
+G_DEFINE_TYPE (GdkAppLaunchContext, gdk_app_launch_context, G_TYPE_APP_LAUNCH_CONTEXT)
+
+static void
+gdk_app_launch_context_get_property (GObject    *object,
+                                     guint       prop_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  GdkAppLaunchContext *context = GDK_APP_LAUNCH_CONTEXT (object);
+
+  switch (prop_id)
+    {
+    case PROP_DISPLAY:
+      g_value_set_object (value, context->display);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+gdk_app_launch_context_set_property (GObject      *object,
+                                     guint         prop_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GdkAppLaunchContext *context = GDK_APP_LAUNCH_CONTEXT (object);
+
+  switch (prop_id)
+    {
+    case PROP_DISPLAY:
+      context->display = g_value_dup_object (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}

 static void
 gdk_app_launch_context_class_init (GdkAppLaunchContextClass *klass)
@@ -72,44 +116,42 @@ gdk_app_launch_context_class_init (GdkAppLaunchContextClass *klass)
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  GAppLaunchContextClass *context_class = G_APP_LAUNCH_CONTEXT_CLASS (klass);

+  gobject_class->set_property = gdk_app_launch_context_set_property,
+  gobject_class->get_property = gdk_app_launch_context_get_property;
+
  gobject_class->finalize = gdk_app_launch_context_finalize;

  context_class->get_display = gdk_app_launch_context_get_display;
-  context_class->get_startup_notify_id = _gdk_windowing_get_startup_notify_id;
-  context_class->launch_failed = _gdk_windowing_launch_failed;
+  context_class->get_startup_notify_id = gdk_app_launch_context_get_startup_notify_id;
+  context_class->launch_failed = gdk_app_launch_context_launch_failed;

-  g_type_class_add_private (klass, sizeof (GdkAppLaunchContextPrivate));
+  g_object_class_install_property (gobject_class, PROP_DISPLAY,
+    g_param_spec_object ("display", P_("Display"), P_("Display"),
+                         GDK_TYPE_DISPLAY,
+                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 }

 static void
 gdk_app_launch_context_init (GdkAppLaunchContext *context)
 {
-  context->priv = G_TYPE_INSTANCE_GET_PRIVATE (context,
-					       GDK_TYPE_APP_LAUNCH_CONTEXT,
-					       GdkAppLaunchContextPrivate);
-  context->priv->workspace = -1;
+  context->workspace = -1;
 }

 static void
 gdk_app_launch_context_finalize (GObject *object)
 {
-  GdkAppLaunchContext *context;
-  GdkAppLaunchContextPrivate *priv;
+  GdkAppLaunchContext *context = GDK_APP_LAUNCH_CONTEXT (object);

-  context = GDK_APP_LAUNCH_CONTEXT (object);
+  if (context->display)
+    g_object_unref (context->display);

-  priv = context->priv;
+  if (context->screen)
+    g_object_unref (context->screen);

-  if (priv->display)
-    g_object_unref (priv->display);
+  if (context->icon)
+    g_object_unref (context->icon);

-  if (priv->screen)
-    g_object_unref (priv->screen);
-
-  if (priv->icon)
-    g_object_unref (priv->icon);
-
-  g_free (priv->icon_name);
+  g_free (context->icon_name);

  G_OBJECT_CLASS (gdk_app_launch_context_parent_class)->finalize (object);
 }
@@ -119,16 +161,14 @@ gdk_app_launch_context_get_display (GAppLaunchContext *context,
                                    GAppInfo          *info,
                                    GList             *files)
 {
+  GdkAppLaunchContext *ctx = GDK_APP_LAUNCH_CONTEXT (context);
  GdkDisplay *display;
-  GdkAppLaunchContextPrivate *priv;

-  priv = GDK_APP_LAUNCH_CONTEXT (context)->priv;
+  if (ctx->screen)
+    return gdk_screen_make_display_name (ctx->screen);

-  if (priv->screen)
-    return gdk_screen_make_display_name (priv->screen);
-
-  if (priv->display)
-    display = priv->display;
+  if (ctx->display)
+    display = ctx->display;
  else
    display = gdk_display_get_default ();

@@ -144,22 +184,17 @@ gdk_app_launch_context_get_display (GAppLaunchContext *context,
 * using this context. See also gdk_app_launch_context_set_screen().
 *
 * Since: 2.14
+ *
+ * Deprecated: 3.0: Use gdk_display_get_app_launch_context() instead
 */
 void
 gdk_app_launch_context_set_display (GdkAppLaunchContext *context,
-				    GdkDisplay          *display)
+                                    GdkDisplay          *display)
 {
  g_return_if_fail (GDK_IS_APP_LAUNCH_CONTEXT (context));
  g_return_if_fail (display == NULL || GDK_IS_DISPLAY (display));

-  if (context->priv->display)
-    {
-      g_object_unref (context->priv->display);
-      context->priv->display = NULL;
-    }
-
-  if (display)
-    context->priv->display = g_object_ref (display);
+  g_warn_if_fail (display == NULL || display == context->display);
 }

 /**
@@ -178,19 +213,21 @@ gdk_app_launch_context_set_display (GdkAppLaunchContext *context,
 */
 void
 gdk_app_launch_context_set_screen (GdkAppLaunchContext *context,
-				   GdkScreen           *screen)
+                                   GdkScreen           *screen)
 {
  g_return_if_fail (GDK_IS_APP_LAUNCH_CONTEXT (context));
  g_return_if_fail (screen == NULL || GDK_IS_SCREEN (screen));

-  if (context->priv->screen)
+  g_return_if_fail (screen == NULL || gdk_screen_get_display (screen) == context->display);
+
+  if (context->screen)
    {
-      g_object_unref (context->priv->screen);
-      context->priv->screen = NULL;
+      g_object_unref (context->screen);
+      context->screen = NULL;
    }

  if (screen)
-    context->priv->screen = g_object_ref (screen);
+    context->screen = g_object_ref (screen);
 }

 /**
@@ -199,12 +236,12 @@ gdk_app_launch_context_set_screen (GdkAppLaunchContext *context,
 * @desktop: the number of a workspace, or -1
 *
 * Sets the workspace on which applications will be launched when
- * using this context when running under a window manager that 
- * supports multiple workspaces, as described in the 
- * <ulink url="http://www.freedesktop.org/Standards/wm-spec">Extended 
- * Window Manager Hints</ulink>. 
+ * using this context when running under a window manager that
+ * supports multiple workspaces, as described in the
+ * <ulink url="http://www.freedesktop.org/Standards/wm-spec">Extended
+ * Window Manager Hints</ulink>.
 *
- * When the workspace is not specified or @desktop is set to -1, 
+ * When the workspace is not specified or @desktop is set to -1,
 * it is up to the window manager to pick one, typically it will
 * be the current workspace.
 *
@@ -212,11 +249,11 @@ gdk_app_launch_context_set_screen (GdkAppLaunchContext *context,
 */
 void
 gdk_app_launch_context_set_desktop (GdkAppLaunchContext *context,
-				    gint                 desktop)
+                                    gint                 desktop)
 {
  g_return_if_fail (GDK_IS_APP_LAUNCH_CONTEXT (context));

-  context->priv->workspace = desktop;
+  context->workspace = desktop;
 }

 /**
@@ -225,7 +262,7 @@ gdk_app_launch_context_set_desktop (GdkAppLaunchContext *context,
 * @timestamp: a timestamp
 *
 * Sets the timestamp of @context. The timestamp should ideally
- * be taken from the event that triggered the launch. 
+ * be taken from the event that triggered the launch.
 *
 * Window managers can use this information to avoid moving the
 * focus to the newly launched application when the user is busy
@@ -236,11 +273,11 @@ gdk_app_launch_context_set_desktop (GdkAppLaunchContext *context,
 */
 void
 gdk_app_launch_context_set_timestamp (GdkAppLaunchContext *context,
-				      guint32              timestamp)
+                                      guint32              timestamp)
 {
  g_return_if_fail (GDK_IS_APP_LAUNCH_CONTEXT (context));

-  context->priv->timestamp = timestamp;
+  context->timestamp = timestamp;
 }

 /**
@@ -265,14 +302,14 @@ gdk_app_launch_context_set_icon (GdkAppLaunchContext *context,
  g_return_if_fail (GDK_IS_APP_LAUNCH_CONTEXT (context));
  g_return_if_fail (icon == NULL || G_IS_ICON (icon));

-  if (context->priv->icon)
+  if (context->icon)
    {
-      g_object_unref (context->priv->icon);
-      context->priv->icon = NULL;
+      g_object_unref (context->icon);
+      context->icon = NULL;
    }

  if (icon)
-    context->priv->icon = g_object_ref (icon);
+    context->icon = g_object_ref (icon);
 }

 /**
@@ -280,25 +317,25 @@ gdk_app_launch_context_set_icon (GdkAppLaunchContext *context,
 * @context: a #GdkAppLaunchContext
 * @icon_name: (allow-none): an icon name, or %NULL
 *
- * Sets the icon for applications that are launched with this context. 
- * The @icon_name will be interpreted in the same way as the Icon field 
- * in desktop files. See also gdk_app_launch_context_set_icon(). 
+ * Sets the icon for applications that are launched with this context.
+ * The @icon_name will be interpreted in the same way as the Icon field
+ * in desktop files. See also gdk_app_launch_context_set_icon().
 *
 * If both @icon and @icon_name are set, the @icon_name takes priority.
- * If neither @icon or @icon_name is set, the icon is taken from either 
- * the file that is passed to launched application or from the #GAppInfo 
+ * If neither @icon or @icon_name is set, the icon is taken from either
+ * the file that is passed to launched application or from the #GAppInfo
 * for the launched application itself.
- * 
+ *
 * Since: 2.14
 */
 void
 gdk_app_launch_context_set_icon_name (GdkAppLaunchContext *context,
-				      const char          *icon_name)
+                                      const char          *icon_name)
 {
  g_return_if_fail (GDK_IS_APP_LAUNCH_CONTEXT (context));

-  g_free (context->priv->icon_name);
-  context->priv->icon_name = g_strdup (icon_name);
+  g_free (context->icon_name);
+  context->icon_name = g_strdup (icon_name);
 }

 /**
@@ -309,9 +346,25 @@ gdk_app_launch_context_set_icon_name (GdkAppLaunchContext *context,
 * Returns: a new #GdkAppLaunchContext
 *
 * Since: 2.14
+ *
+ * Deprecated: 3.0: Use gdk_display_get_app_launch_context() instead
 */
 GdkAppLaunchContext *
 gdk_app_launch_context_new (void)
 {
-  return g_object_new (GDK_TYPE_APP_LAUNCH_CONTEXT, NULL);
+  return gdk_display_get_app_launch_context (gdk_display_get_default ());
+}
+
+static char *
+gdk_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
+                                              GAppInfo          *info,
+                                              GList             *files)
+{
+ return NULL;
+}
+
+static void
+gdk_app_launch_context_launch_failed (GAppLaunchContext *context,
+                                      const gchar       *startup_notify_id)
+{
 }
@@ -28,48 +28,33 @@
 #define __GDK_APP_LAUNCH_CONTEXT_H__

 #include <gio/gio.h>
+#include <gdk/gdktypes.h>
 #include <gdk/gdkscreen.h>

 G_BEGIN_DECLS

 #define GDK_TYPE_APP_LAUNCH_CONTEXT         (gdk_app_launch_context_get_type ())
 #define GDK_APP_LAUNCH_CONTEXT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContext))
-#define GDK_APP_LAUNCH_CONTEXT_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContextClass))
 #define GDK_IS_APP_LAUNCH_CONTEXT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_APP_LAUNCH_CONTEXT))
-#define GDK_IS_APP_LAUNCH_CONTEXT_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GDK_TYPE_APP_LAUNCH_CONTEXT))
-#define GDK_APP_LAUNCH_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContextClass))

-typedef struct GdkAppLaunchContext	      GdkAppLaunchContext;
-typedef struct GdkAppLaunchContextClass       GdkAppLaunchContextClass;
-typedef struct GdkAppLaunchContextPrivate     GdkAppLaunchContextPrivate;
-
-struct GdkAppLaunchContext
-{
-  GAppLaunchContext parent_instance;
-
-  GdkAppLaunchContextPrivate *priv;
-};
-
-struct GdkAppLaunchContextClass
-{
-  GAppLaunchContextClass parent_class;
-};

 GType                gdk_app_launch_context_get_type      (void);

+#ifndef GDK_DISABLE_DEPRECATED
 GdkAppLaunchContext *gdk_app_launch_context_new           (void);
 void                 gdk_app_launch_context_set_display   (GdkAppLaunchContext *context,
-							   GdkDisplay          *display);
+                                                           GdkDisplay          *display);
+#endif
 void                 gdk_app_launch_context_set_screen    (GdkAppLaunchContext *context,
-							   GdkScreen           *screen);
+                                                           GdkScreen           *screen);
 void                 gdk_app_launch_context_set_desktop   (GdkAppLaunchContext *context,
-							   gint                 desktop);
+                                                           gint                 desktop);
 void                 gdk_app_launch_context_set_timestamp (GdkAppLaunchContext *context,
-							   guint32              timestamp);
+                                                           guint32              timestamp);
 void                 gdk_app_launch_context_set_icon      (GdkAppLaunchContext *context,
-							   GIcon               *icon);
+                                                           GIcon               *icon);
 void                 gdk_app_launch_context_set_icon_name (GdkAppLaunchContext *context,
-							   const char          *icon_name);
+                                                           const char          *icon_name);

 G_END_DECLS

@@ -0,0 +1,50 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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.
+ */
+
+#ifndef __GDK_APP_LAUNCH_CONTEXT_PRIVATE_H__
+#define __GDK_APP_LAUNCH_CONTEXT_PRIVATE_H__
+
+#include <gio/gio.h>
+#include "gdkapplaunchcontext.h"
+#include "gdktypes.h"
+
+G_BEGIN_DECLS
+
+#define GDK_APP_LAUNCH_CONTEXT_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContextClass))
+#define GDK_IS_APP_LAUNCH_CONTEXT_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GDK_TYPE_APP_LAUNCH_CONTEXT))
+#define GDK_APP_LAUNCH_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContextClass))
+
+
+typedef GAppLaunchContextClass GdkAppLaunchContextClass;
+
+struct _GdkAppLaunchContext
+{
+  GAppLaunchContext parent_instance;
+
+  GdkDisplay *display;
+  GdkScreen *screen;
+  gint workspace;
+  guint32 timestamp;
+  GIcon *icon;
+  char *icon_name;
+};
+
+G_END_DECLS
+
+#endif
@@ -21,7 +21,6 @@

 #include "gdkcairo.h"

-#include "gdkdrawable.h"
 #include "gdkinternals.h"

 #include <math.h>
@@ -42,70 +41,6 @@
 */


-/**
- * gdk_cairo_create:
- * @drawable: a #GdkDrawable
- * 
- * Creates a Cairo context for drawing to @drawable.
- *
- * <note><para>
- * Note that due to double-buffering, Cairo contexts created 
- * in a GTK+ expose event handler cannot be cached and reused 
- * between different expose events. 
- * </para></note>
- *
- * Return value: A newly created Cairo context. Free with
- *  cairo_destroy() when you are done drawing.
- * 
- * Since: 2.8
- **/
-cairo_t *
-gdk_cairo_create (GdkDrawable *drawable)
-{
-  cairo_surface_t *surface;
-  cairo_t *cr;
-    
-  g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
-
-  surface = _gdk_drawable_ref_cairo_surface (drawable);
-  cr = cairo_create (surface);
-
-  if (GDK_DRAWABLE_GET_CLASS (drawable)->set_cairo_clip)
-    GDK_DRAWABLE_GET_CLASS (drawable)->set_cairo_clip (drawable, cr);
-    
-  cairo_surface_destroy (surface);
-
-  return cr;
-}
-
-/**
- * gdk_cairo_reset_clip:
- * @cr: a #cairo_t
- * @drawable: a #GdkDrawable
- *
- * Resets the clip region for a Cairo context created by gdk_cairo_create().
- *
- * This resets the clip region to the "empty" state for the given drawable.
- * This is required for non-native windows since a direct call to
- * cairo_reset_clip() would unset the clip region inherited from the
- * drawable (i.e. the window clip region), and thus let you e.g.
- * draw outside your window.
- *
- * This is rarely needed though, since most code just create a new cairo_t
- * using gdk_cairo_create() each time they want to draw something.
- *
- * Since: 2.18
- **/
-void
-gdk_cairo_reset_clip (cairo_t            *cr,
-		      GdkDrawable        *drawable)
-{
-  cairo_reset_clip (cr);
-
-  if (GDK_DRAWABLE_GET_CLASS (drawable)->set_cairo_clip)
-    GDK_DRAWABLE_GET_CLASS (drawable)->set_cairo_clip (drawable, cr);
-}
-
 /**
 * gdk_cairo_get_clip_rectangle:
 * @cr: a cairo context
@@ -149,7 +84,7 @@ gdk_cairo_get_clip_rectangle (cairo_t      *cr,
 * gdk_cairo_set_source_color:
 * @cr: a #cairo_t
 * @color: a #GdkColor
- * 
+ *
 * Sets the specified #GdkColor as the source color of @cr.
 *
 * Since: 2.8
@@ -167,6 +102,15 @@ gdk_cairo_set_source_color (cairo_t        *cr,
 			color->blue / 65535.);
 }

+/**
+ * gdk_cairo_set_source_rgba:
+ * @cr: a #cairo_t
+ * @rgba: a #GdkRGBA
+ *
+ * Sets the specified #GdkRGBA as the source color of @cr.
+ *
+ * Since: 3.0
+ **/
 void
 gdk_cairo_set_source_rgba (cairo_t       *cr,
                           const GdkRGBA *rgba)
@@ -363,7 +307,7 @@ gdk_cairo_set_source_window (cairo_t   *cr,
  g_return_if_fail (cr != NULL);
  g_return_if_fail (GDK_IS_WINDOW (window));

-  surface = _gdk_drawable_ref_cairo_surface (GDK_DRAWABLE (window));
+  surface = _gdk_window_ref_cairo_surface (window);
  cairo_set_source_surface (cr, surface, x, y);
  cairo_surface_destroy (surface);
 }
@@ -31,9 +31,7 @@

 G_BEGIN_DECLS

-cairo_t *gdk_cairo_create            (GdkDrawable        *drawable);
-void     gdk_cairo_reset_clip        (cairo_t            *cr,
-				      GdkDrawable        *drawable);
+cairo_t *gdk_cairo_create            (GdkWindow          *window);
 gboolean gdk_cairo_get_clip_rectangle(cairo_t            *cr,
                                      GdkRectangle       *rect);

@@ -27,8 +27,9 @@
 #include "config.h"

 #include "gdkcursor.h"
-
-#include "gdkdisplay.h"
+#include "gdkcursorprivate.h"
+#include "gdkdisplayprivate.h"
+#include "gdkintl.h"
 #include "gdkinternals.h"


@@ -53,28 +54,112 @@
 * #GdkWindowAttr struct passed to gdk_window_new().
 */

+/**
+ * GdkCursor:
+ *
+ * The #GdkCursor structure represents a cursor. Its contents are private.
+ */

-G_DEFINE_BOXED_TYPE (GdkCursor, gdk_cursor,
-                     gdk_cursor_ref,
-                     gdk_cursor_unref)
+enum {
+  PROP_0,
+  PROP_CURSOR_TYPE,
+  PROP_DISPLAY
+};
+
+G_DEFINE_ABSTRACT_TYPE (GdkCursor, gdk_cursor, G_TYPE_OBJECT)
+
+static void
+gdk_cursor_get_property (GObject    *object,
+                         guint       prop_id,
+                         GValue     *value,
+                         GParamSpec *pspec)
+{
+  GdkCursor *cursor = GDK_CURSOR (object);
+
+  switch (prop_id)
+    {
+    case PROP_CURSOR_TYPE:
+      g_value_set_enum (value, cursor->type);
+      break;
+    case PROP_DISPLAY:
+      g_value_set_object (value, cursor->display);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gdk_cursor_set_property (GObject      *object,
+                         guint         prop_id,
+                         const GValue *value,
+                         GParamSpec   *pspec)
+{
+  GdkCursor *cursor = GDK_CURSOR (object);
+
+  switch (prop_id)
+    {
+    case PROP_CURSOR_TYPE:
+      cursor->type = g_value_get_enum (value);
+      break;
+    case PROP_DISPLAY:
+      cursor->display = g_value_get_object (value);
+      /* check that implementations actually provide the display when constructing */
+      g_assert (cursor->display != NULL);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gdk_cursor_class_init (GdkCursorClass *cursor_class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (cursor_class);
+
+  object_class->get_property = gdk_cursor_get_property;
+  object_class->set_property = gdk_cursor_set_property;
+
+  g_object_class_install_property (object_class,
+				   PROP_CURSOR_TYPE,
+				   g_param_spec_enum ("cursor-type",
+                                                      P_("Cursor type"),
+                                                      P_("Standard cursor type"),
+                                                      GDK_TYPE_CURSOR_TYPE, GDK_X_CURSOR,
+                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class,
+				   PROP_DISPLAY,
+				   g_param_spec_object ("display",
+                                                        P_("Display"),
+                                                        P_("Display of this cursor"),
+                                                        GDK_TYPE_DISPLAY,
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gdk_cursor_init (GdkCursor *cursor)
+{
+}

 /**
 * gdk_cursor_ref:
 * @cursor: a #GdkCursor
- * 
+ *
 * Adds a reference to @cursor.
- * 
+ *
 * Return value: Same @cursor that was passed in
- **/
+ *
+ * Deprecated: 3.0: Use g_object_ref() instead
+ */
 GdkCursor*
 gdk_cursor_ref (GdkCursor *cursor)
 {
  g_return_val_if_fail (cursor != NULL, NULL);
-  g_return_val_if_fail (cursor->ref_count > 0, NULL);

-  cursor->ref_count += 1;
-
-  return cursor;
+  return g_object_ref (cursor);
 }

 /**
@@ -83,31 +168,28 @@ gdk_cursor_ref (GdkCursor *cursor)
 *
 * Removes a reference from @cursor, deallocating the cursor
 * if no references remain.
- * 
- **/
+ *
+ * Deprecated: 3.0: Use g_object_unref() instead
+ */
 void
 gdk_cursor_unref (GdkCursor *cursor)
 {
  g_return_if_fail (cursor != NULL);
-  g_return_if_fail (cursor->ref_count > 0);

-  cursor->ref_count -= 1;
-
-  if (cursor->ref_count == 0)
-    _gdk_cursor_destroy (cursor);
+  g_object_unref (cursor);
 }

 /**
 * gdk_cursor_new:
 * @cursor_type: cursor to create
- * 
+ *
 * Creates a new cursor from the set of builtin cursors for the default display.
 * See gdk_cursor_new_for_display().
 *
 * To make the cursor invisible, use %GDK_BLANK_CURSOR.
- * 
+ *
 * Return value: a new #GdkCursor
- **/
+ */
 GdkCursor*
 gdk_cursor_new (GdkCursorType cursor_type)
 {
@@ -131,3 +213,185 @@ gdk_cursor_get_cursor_type (GdkCursor *cursor)

  return cursor->type;
 }
+
+/**
+ * gdk_cursor_new_for_display:
+ * @display: the #GdkDisplay for which the cursor will be created
+ * @cursor_type: cursor to create
+ *
+ * Creates a new cursor from the set of builtin cursors.
+ * Some useful ones are:
+ * <itemizedlist>
+ * <listitem><para>
+ *  <inlinegraphic format="PNG" fileref="right_ptr.png"></inlinegraphic> #GDK_RIGHT_PTR (right-facing arrow)
+ * </para></listitem>
+ * <listitem><para>
+ *  <inlinegraphic format="PNG" fileref="crosshair.png"></inlinegraphic> #GDK_CROSSHAIR (crosshair)
+ * </para></listitem>
+ * <listitem><para>
+ *  <inlinegraphic format="PNG" fileref="xterm.png"></inlinegraphic> #GDK_XTERM (I-beam)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="PNG" fileref="watch.png"></inlinegraphic> #GDK_WATCH (busy)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="PNG" fileref="fleur.png"></inlinegraphic> #GDK_FLEUR (for moving objects)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="PNG" fileref="hand1.png"></inlinegraphic> #GDK_HAND1 (a right-pointing hand)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="PNG" fileref="hand2.png"></inlinegraphic> #GDK_HAND2 (a left-pointing hand)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="PNG" fileref="left_side.png"></inlinegraphic> #GDK_LEFT_SIDE (resize left side)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="PNG" fileref="right_side.png"></inlinegraphic> #GDK_RIGHT_SIDE (resize right side)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="PNG" fileref="top_left_corner.png"></inlinegraphic> #GDK_TOP_LEFT_CORNER (resize northwest corner)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="PNG" fileref="top_right_corner.png"></inlinegraphic> #GDK_TOP_RIGHT_CORNER (resize northeast corner)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="PNG" fileref="bottom_left_corner.png"></inlinegraphic> #GDK_BOTTOM_LEFT_CORNER (resize southwest corner)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="PNG" fileref="bottom_right_corner.png"></inlinegraphic> #GDK_BOTTOM_RIGHT_CORNER (resize southeast corner)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="PNG" fileref="top_side.png"></inlinegraphic> #GDK_TOP_SIDE (resize top side)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="PNG" fileref="bottom_side.png"></inlinegraphic> #GDK_BOTTOM_SIDE (resize bottom side)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="PNG" fileref="sb_h_double_arrow.png"></inlinegraphic> #GDK_SB_H_DOUBLE_ARROW (move vertical splitter)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="PNG" fileref="sb_v_double_arrow.png"></inlinegraphic> #GDK_SB_V_DOUBLE_ARROW (move horizontal splitter)
+ * </para></listitem>
+ * <listitem><para>
+ * #GDK_BLANK_CURSOR (Blank cursor). Since 2.16
+ * </para></listitem>
+ * </itemizedlist>
+ *
+ * Return value: a new #GdkCursor
+ *
+ * Since: 2.2
+ **/
+GdkCursor*
+gdk_cursor_new_for_display (GdkDisplay    *display,
+                            GdkCursorType  cursor_type)
+{
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+
+  return GDK_DISPLAY_GET_CLASS (display)->get_cursor_for_type (display, cursor_type);
+}
+
+/**
+ * gdk_cursor_new_from_name:
+ * @display: the #GdkDisplay for which the cursor will be created
+ * @name: the name of the cursor
+ *
+ * Creates a new cursor by looking up @name in the current cursor
+ * theme.
+ *
+ * Returns: a new #GdkCursor, or %NULL if there is no cursor with
+ *   the given name
+ *
+ * Since: 2.8
+ */
+GdkCursor*
+gdk_cursor_new_from_name (GdkDisplay  *display,
+                          const gchar *name)
+{
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+
+  return GDK_DISPLAY_GET_CLASS (display)->get_cursor_for_name (display, name);
+}
+
+/**
+ * gdk_cursor_new_from_pixbuf:
+ * @display: the #GdkDisplay for which the cursor will be created
+ * @pixbuf: the #GdkPixbuf containing the cursor image
+ * @x: the horizontal offset of the 'hotspot' of the cursor.
+ * @y: the vertical offset of the 'hotspot' of the cursor.
+ *
+ * Creates a new cursor from a pixbuf.
+ *
+ * Not all GDK backends support RGBA cursors. If they are not
+ * supported, a monochrome approximation will be displayed.
+ * The functions gdk_display_supports_cursor_alpha() and
+ * gdk_display_supports_cursor_color() can be used to determine
+ * whether RGBA cursors are supported;
+ * gdk_display_get_default_cursor_size() and
+ * gdk_display_get_maximal_cursor_size() give information about
+ * cursor sizes.
+ *
+ * If @x or @y are <literal>-1</literal>, the pixbuf must have
+ * options named "x_hot" and "y_hot", resp., containing
+ * integer values between %0 and the width resp. height of
+ * the pixbuf. (Since: 3.0)
+ *
+ * On the X backend, support for RGBA cursors requires a
+ * sufficently new version of the X Render extension.
+ *
+ * Returns: a new #GdkCursor.
+ *
+ * Since: 2.4
+ */
+GdkCursor *
+gdk_cursor_new_from_pixbuf (GdkDisplay *display,
+                            GdkPixbuf  *pixbuf,
+                            gint        x,
+                            gint        y)
+{
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+  g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+
+  return GDK_DISPLAY_GET_CLASS (display)->get_cursor_for_pixbuf (display, pixbuf, x, y);
+}
+
+/** 
+ * gdk_cursor_get_display:
+ * @cursor: a #GdkCursor.
+ *
+ * Returns the display on which the #GdkCursor is defined.
+ *
+ * Returns: (transfer none): the #GdkDisplay associated to @cursor
+ *
+ * Since: 2.2
+ */
+
+GdkDisplay *
+gdk_cursor_get_display (GdkCursor *cursor)
+{
+  g_return_val_if_fail (GDK_IS_CURSOR (cursor), NULL);
+
+  return cursor->display;
+}
+
+/**
+ * gdk_cursor_get_image:
+ * @cursor: a #GdkCursor
+ *
+ * Returns a #GdkPixbuf with the image used to display the cursor.
+ *
+ * Note that depending on the capabilities of the windowing system and 
+ * on the cursor, GDK may not be able to obtain the image data. In this 
+ * case, %NULL is returned.
+ *
+ * Returns: (transfer full): a #GdkPixbuf representing @cursor, or %NULL
+ *
+ * Since: 2.8
+ */
+GdkPixbuf*  
+gdk_cursor_get_image (GdkCursor *cursor)
+{
+  g_return_val_if_fail (GDK_IS_CURSOR (cursor), NULL);
+
+  return GDK_CURSOR_GET_CLASS (cursor)->get_image (cursor);
+}
@@ -36,7 +36,10 @@

 G_BEGIN_DECLS

-#define GDK_TYPE_CURSOR (gdk_cursor_get_type ())
+#define GDK_TYPE_CURSOR              (gdk_cursor_get_type ())
+#define GDK_CURSOR(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_CURSOR, GdkCursor))
+#define GDK_IS_CURSOR(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_CURSOR))
+

 /**
 * GdkCursorType:
@@ -208,18 +211,6 @@ typedef enum
  GDK_CURSOR_IS_PIXMAP 	  = -1
 } GdkCursorType;

-/**
- * GdkCursor:
- *
- * A #GdkCursor structure represents a cursor.
- */
-struct _GdkCursor
-{
-  /*< private >*/
-  GdkCursorType GSEAL (type);
-  guint GSEAL (ref_count);
-};
-
 /* Cursors
 */

@@ -234,11 +225,13 @@ GdkCursor* gdk_cursor_new_from_pixbuf	 (GdkDisplay      *display,
 					  GdkPixbuf       *pixbuf,
 					  gint             x,
 					  gint             y);
-GdkDisplay* gdk_cursor_get_display	 (GdkCursor	  *cursor);
-GdkCursor*  gdk_cursor_ref               (GdkCursor       *cursor);
-void        gdk_cursor_unref             (GdkCursor       *cursor);
 GdkCursor*  gdk_cursor_new_from_name	 (GdkDisplay      *display,
 					  const gchar     *name);
+GdkDisplay* gdk_cursor_get_display	 (GdkCursor	  *cursor);
+#ifndef GDK_DISABLE_DEPRECATED
+GdkCursor*  gdk_cursor_ref               (GdkCursor       *cursor);
+void        gdk_cursor_unref             (GdkCursor       *cursor);
+#endif
 GdkPixbuf*  gdk_cursor_get_image         (GdkCursor       *cursor);
 GdkCursorType gdk_cursor_get_cursor_type (GdkCursor       *cursor);

@@ -24,37 +24,35 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
+#ifndef __GDK_CURSOR_PRIVATE_H__
+#define __GDK_CURSOR_PRIVATE_H__

-#ifndef __GDK_INPUT_H__
-#define __GDK_INPUT_H__
-
-#include <gdk/gdktypes.h>
-#include <gdk/gdkdevice.h>
+#include <gdk/gdkcursor.h>

 G_BEGIN_DECLS

-#if !defined (GDK_MULTIDEVICE_SAFE) && !defined (GDK_DISABLE_DEPRECATED)
+#define GDK_CURSOR_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_CURSOR, GdkCursorClass))
+#define GDK_IS_CURSOR_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_CURSOR))
+#define GDK_CURSOR_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_CURSOR, GdkCursorClass))

-#ifndef GDK_MULTIHEAD_SAFE
+typedef struct _GdkCursorClass GdkCursorClass;

-/* Returns a list of GdkDevice * */
-GList *    gdk_devices_list            (void);
+struct _GdkCursor
+{
+  GObject parent_instance;

-#ifndef GTK_DISABLE_DEPRECATED
-GdkDevice *gdk_device_get_core_pointer (void);
-#endif
+  /*< private >*/
+  GdkCursorType type;
+  GdkDisplay *display;
+};

-#endif /* GDK_MULTIHEAD_SAFE */
+struct _GdkCursorClass
+{
+  GObjectClass parent_class;

-void gdk_input_set_extension_events (GdkWindow        *window,
-				     gint              mask,
-				     GdkExtensionMode  mode);
-
-#endif /* !GDK_MULTIDEVICE_SAFE && GDK_DISABLE_DEPRECATED */
+  GdkPixbuf *   (* get_image)   (GdkCursor *    cursor);
+};

 G_END_DECLS

-#endif /* __GDK_INPUT_H__ */
+#endif /* __GDK_CURSOR_PRIVATE_H__ */
@@ -33,8 +33,6 @@ G_BEGIN_DECLS
 #define GDK_DEVICE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_DEVICE, GdkDevice))
 #define GDK_IS_DEVICE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_DEVICE))

-typedef struct _GdkDevice GdkDevice;
-typedef struct _GdkDevicePrivate GdkDevicePrivate;
 typedef struct _GdkTimeCoord GdkTimeCoord;

 /**
@@ -156,27 +154,17 @@ struct _GdkTimeCoord
  gdouble axes[GDK_MAX_TIMECOORD_AXES];
 };

-struct _GdkDevice
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GdkDevicePrivate *priv;
-};
-
-GType gdk_device_get_type (void) G_GNUC_CONST;
+GType                 gdk_device_get_type       (void) G_GNUC_CONST;

 G_CONST_RETURN gchar *gdk_device_get_name       (GdkDevice *device);
 gboolean              gdk_device_get_has_cursor (GdkDevice *device);

 /* Functions to configure a device */
 GdkInputSource gdk_device_get_source    (GdkDevice      *device);
-void           gdk_device_set_source    (GdkDevice      *device,
-					 GdkInputSource  source);

 GdkInputMode   gdk_device_get_mode      (GdkDevice      *device);
 gboolean       gdk_device_set_mode      (GdkDevice      *device,
-					 GdkInputMode    mode);
+                                         GdkInputMode    mode);

 gint           gdk_device_get_n_keys    (GdkDevice       *device);
 gboolean       gdk_device_get_key       (GdkDevice       *device,
@@ -184,9 +172,9 @@ gboolean       gdk_device_get_key       (GdkDevice       *device,
                                         guint           *keyval,
                                         GdkModifierType *modifiers);
 void           gdk_device_set_key       (GdkDevice      *device,
-					 guint           index_,
-					 guint           keyval,
-					 GdkModifierType modifiers);
+                                         guint           index_,
+                                         guint           keyval,
+                                         GdkModifierType modifiers);

 GdkAxisUse     gdk_device_get_axis_use  (GdkDevice         *device,
                                         guint              index_);
@@ -196,17 +184,26 @@ void           gdk_device_set_axis_use  (GdkDevice         *device,


 void     gdk_device_get_state    (GdkDevice         *device,
-				  GdkWindow         *window,
-				  gdouble           *axes,
-				  GdkModifierType   *mask);
+                                  GdkWindow         *window,
+                                  gdouble           *axes,
+                                  GdkModifierType   *mask);
+void     gdk_device_get_position (GdkDevice         *device,
+                                  GdkScreen        **screen,
+                                  gint              *x,
+                                  gint              *y);
+GdkWindow *
+         gdk_device_get_window_at_position
+                                 (GdkDevice         *device,
+                                  gint              *win_x,
+                                  gint              *win_y);
 gboolean gdk_device_get_history  (GdkDevice         *device,
-				  GdkWindow         *window,
-				  guint32            start,
-				  guint32            stop,
-				  GdkTimeCoord    ***events,
-				  gint              *n_events);
+                                  GdkWindow         *window,
+                                  guint32            start,
+                                  guint32            stop,
+                                  GdkTimeCoord    ***events,
+                                  gint              *n_events);
 void     gdk_device_free_history (GdkTimeCoord     **events,
-				  gint               n_events);
+                                  gint               n_events);

 gint     gdk_device_get_n_axes     (GdkDevice       *device);
 GList *  gdk_device_list_axes      (GdkDevice       *device);
@@ -216,12 +213,13 @@ gboolean gdk_device_get_axis_value (GdkDevice       *device,
                                    gdouble         *value);

 gboolean gdk_device_get_axis     (GdkDevice         *device,
-				  gdouble           *axes,
-				  GdkAxisUse         use,
-				  gdouble           *value);
+                                  gdouble           *axes,
+                                  GdkAxisUse         use,
+                                  gdouble           *value);
 GdkDisplay * gdk_device_get_display (GdkDevice      *device);

 GdkDevice  * gdk_device_get_associated_device (GdkDevice     *device);
+GList *      gdk_device_list_slave_devices    (GdkDevice     *device);

 GdkDeviceType gdk_device_get_device_type (GdkDevice *device);

@@ -236,6 +234,11 @@ GdkGrabStatus gdk_device_grab        (GdkDevice        *device,
 void          gdk_device_ungrab      (GdkDevice        *device,
                                      guint32           time_);

+void          gdk_device_warp        (GdkDevice        *device,
+                                      GdkScreen        *screen,
+                                      gint              x,
+                                      gint              y);
+
 gboolean gdk_device_grab_info_libgtk_only (GdkDisplay  *display,
                                           GdkDevice   *device,
                                           GdkWindow  **grab_window,
@@ -19,74 +19,90 @@

 #include "config.h"

-#include "gdkdevicemanager.h"
-
+#include "gdkdevicemanagerprivate.h"
+#include "gdkdisplay.h"
 #include "gdkintl.h"
-#include "gdkinternals.h"


 /**
 * SECTION:gdkdevicemanager
 * @Short_description: Functions for handling input devices
- * @Long_description: In addition to a single pointer and keyboard for user interface input, GDK
- *                    contains support for a variety of input devices, including graphics tablets,
- *                    touchscreens and multiple pointers/keyboards interacting simultaneously with
- *                    the user interface. Under X, the support for multiple input devices is done
- *                    through the <firstterm>XInput 2</firstterm> extension, which also supports
- *                    additional features such as sub-pixel positioning information and additional
- *                    device-dependent information.
 * @Title: GdkDeviceManager
- * @See_also: #GdkDevice, #GdkEvent, gdk_enable_multidevice()
+ * @See_also: #GdkDevice, #GdkEvent
 *
- * By default, GDK supports the traditional single keyboard/pointer input scheme (Plus additional
- * special input devices such as tablets. In short, backwards compatible with 2.X). Since version 3.0,
- * if gdk_enable_multidevice() is called before gdk_display_open() and the platform supports it, GDK
- * will be aware of multiple keyboard/pointer pairs interacting simultaneously with the user interface.
+ * In addition to a single pointer and keyboard for user interface input,
+ * GDK contains support for a variety of input devices, including graphics
+ * tablets, touchscreens and multiple pointers/keyboards interacting
+ * simultaneously with the user interface. Under X, the support for multiple
+ * input devices is done through the <firstterm>XInput 2</firstterm> extension,
+ * which also supports additional features such as sub-pixel positioning
+ * information and additional device-dependent information.
 *
- * Conceptually, in multidevice mode there are 2 device types, virtual devices (or master devices)
- * are represented by the pointer cursors and keyboard foci that are seen on the screen. physical
- * devices (or slave devices) represent the hardware that is controlling the virtual devices, and
- * thus has no visible cursor on the screen.
+ * By default, and if the platform supports it, GDK is aware of multiple
+ * keyboard/pointer pairs and multitouch devices, this behavior can be
+ * changed by calling gdk_disable_multidevice() before gdk_display_open(),
+ * although there would be rarely a reason to do that. For a widget or
+ * window to be dealt as multipointer aware,
+ * gdk_window_set_support_multidevice() or
+ * gtk_widget_set_support_multidevice() must have been called on it.
 *
- * Virtual devices are always paired, there is a keyboard device for every pointer device,
- * associations between devices may be inspected through gdk_device_get_associated_device().
+ * Conceptually, in multidevice mode there are 2 device types, virtual
+ * devices (or master devices) are represented by the pointer cursors
+ * and keyboard foci that are seen on the screen. Physical devices (or
+ * slave devices) represent the hardware that is controlling the virtual
+ * devices, and thus has no visible cursor on the screen.
 *
- * There may be several virtual devices, and several physical devices could be controlling each of
- * these virtual devices. Physical devices may also be "floating", which means they are not attached
- * to any virtual device.
+ * Virtual devices are always paired, there is a keyboard device for every
+ * pointer device, associations between devices may be inspected through
+ * gdk_device_get_associated_device().
 *
- * By default, GDK will automatically listen for events coming from all master devices, setting the
- * #GdkDevice for all events coming from input devices
+ * There may be several virtual devices, and several physical devices could
+ * be controlling each of these virtual devices. Physical devices may also
+ * be "floating", which means they are not attached to any virtual device.
+ *
+ * By default, GDK will automatically listen for events coming from all
+ * master devices, setting the #GdkDevice for all events coming from input
+ * devices,
 * <footnote>
- *   Events containing device information are #GDK_MOTION_NOTIFY, #GDK_BUTTON_PRESS, #GDK_2BUTTON_PRESS,
- *   #GDK_3BUTTON_PRESS, #GDK_BUTTON_RELEASE, #GDK_SCROLL, #GDK_KEY_PRESS, #GDK_KEY_RELEASE,
- *   #GDK_ENTER_NOTIFY, #GDK_LEAVE_NOTIFY, #GDK_FOCUS_CHANGE, #GDK_PROXIMITY_IN, #GDK_PROXIMITY_OUT,
- *   #GDK_DRAG_ENTER, #GDK_DRAG_LEAVE, #GDK_DRAG_MOTION, #GDK_DRAG_STATUS, #GDK_DROP_START,
- *   #GDK_DROP_FINISHED and #GDK_GRAB_BROKEN.
+ * Events containing device information are #GDK_MOTION_NOTIFY,
+ * #GDK_BUTTON_PRESS, #GDK_2BUTTON_PRESS, #GDK_3BUTTON_PRESS,
+ * #GDK_BUTTON_RELEASE, #GDK_SCROLL, #GDK_KEY_PRESS, #GDK_KEY_RELEASE,
+ * #GDK_ENTER_NOTIFY, #GDK_LEAVE_NOTIFY, #GDK_FOCUS_CHANGE,
+ * #GDK_PROXIMITY_IN, #GDK_PROXIMITY_OUT, #GDK_DRAG_ENTER, #GDK_DRAG_LEAVE,
+ * #GDK_DRAG_MOTION, #GDK_DRAG_STATUS, #GDK_DROP_START, #GDK_DROP_FINISHED
+ * and #GDK_GRAB_BROKEN.
 * </footnote>
- * , although gdk_window_set_support_multidevice() has to be called on #GdkWindow<!-- --> in order to
- * support additional features of multiple pointer interaction, such as multiple, per-device enter/leave
- * events. The default setting will emit just one enter/leave event pair for all devices on the window.
- * See gdk_window_set_support_multidevice() documentation for more information.
+ * although gdk_window_set_support_multidevice() has to be called on
+ * #GdkWindows in order to support additional features of multiple pointer
+ * interaction, such as multiple, per-device enter/leave events. The default
+ * setting will emit just one enter/leave event pair for all devices on the
+ * window. See gdk_window_set_support_multidevice() documentation for more
+ * information.
 *
- * In order to listen for events coming from other than a virtual device, gdk_window_set_device_events()
- * must be called. Generally, this function can be used to modify the event mask for any given device.
+ * In order to listen for events coming from other than a virtual device,
+ * gdk_window_set_device_events() must be called. Generally, this function
+ * can be used to modify the event mask for any given device.
 *
- * Input devices may also provide additional information besides X/Y. For example, graphics tablets may
- * also provide pressure and X/Y tilt information. This information is device-dependent, and may be
- * queried through gdk_device_get_axis(). In multidevice mode, virtual devices will change axes in order
- * to always represent the physical device that is routing events through it. Whenever the physical device
- * changes, the #GdkDevice:n-axes property will be notified, and gdk_device_list_axes() will return the
- * new device axes.
+ * Input devices may also provide additional information besides X/Y.
+ * For example, graphics tablets may also provide pressure and X/Y tilt
+ * information. This information is device-dependent, and may be
+ * queried through gdk_device_get_axis(). In multidevice mode, virtual
+ * devices will change axes in order to always represent the physical
+ * device that is routing events through it. Whenever the physical device
+ * changes, the #GdkDevice:n-axes property will be notified, and
+ * gdk_device_list_axes() will return the new device axes.
 *
- * Devices may also have associated <firstterm>keys</firstterm> or macro buttons. Such keys can be
- * globally set to map into normal X keyboard events. The mapping is set using gdk_device_set_key().
+ * Devices may also have associated <firstterm>keys</firstterm> or
+ * macro buttons. Such keys can be globally set to map into normal X
+ * keyboard events. The mapping is set using gdk_device_set_key().
 *
- * In order to query the device hierarchy and be aware of changes in the device hierarchy (such as
- * virtual devices being created or removed, or physical devices being plugged or unplugged), GDK
- * provides #GdkDeviceManager. On X11, multidevice support is implemented through XInput 2. If
- * gdk_enable_multidevice() is called, the XInput 2.x #GdkDeviceManager implementation will be used
- * as input source, else either the core or XInput 1.x implementations will be used.
+ * In order to query the device hierarchy and be aware of changes in the
+ * device hierarchy (such as virtual devices being created or removed, or
+ * physical devices being plugged or unplugged), GDK provides
+ * #GdkDeviceManager. On X11, multidevice support is implemented through
+ * XInput 2. Unless gdk_disable_multidevice() is called, the XInput 2.x
+ * #GdkDeviceManager implementation will be used as input source, else
+ * either the core or XInput 1.x implementations will be used.
 */

 static void gdk_device_manager_set_property (GObject      *object,
@@ -116,12 +132,6 @@ enum {
 static guint signals [LAST_SIGNAL] = { 0 };


-struct _GdkDeviceManagerPrivate
-{
-  GdkDisplay *display;
-};
-
-
 static void
 gdk_device_manager_class_init (GdkDeviceManagerClass *klass)
 {
@@ -182,12 +192,16 @@ gdk_device_manager_class_init (GdkDeviceManagerClass *klass)
   * @device_manager: the object on which the signal is emitted
   * @device: the #GdkDevice that changed.
   *
-   * The ::device-changed signal is emitted either when some
-   * #GdkDevice has changed the number of either axes or keys.
-   * For example In X this will normally happen when the slave
-   * device routing events through the master device changes,
-   * in that case the master device will change to reflect the
-   * new slave device axes and keys.
+   * The ::device-changed signal is emitted whenever a device
+   * has changed in the hierarchy, either slave devices being
+   * disconnected from their master device or connected to
+   * another one, or master devices being added or removed
+   * a slave device.
+   *
+   * If a slave device is detached from all master devices
+   * (gdk_device_get_associated_device() returns %NULL), its
+   * #GdkDeviceType will change to %GDK_DEVICE_TYPE_FLOATING,
+   * if it's attached, it will change to %GDK_DEVICE_TYPE_SLAVE.
   */
  signals [DEVICE_CHANGED] =
    g_signal_new (g_intern_static_string ("device-changed"),
@@ -198,18 +212,11 @@ gdk_device_manager_class_init (GdkDeviceManagerClass *klass)
                  g_cclosure_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  GDK_TYPE_DEVICE);
-
-  g_type_class_add_private (object_class, sizeof (GdkDeviceManagerPrivate));
 }

 static void
 gdk_device_manager_init (GdkDeviceManager *device_manager)
 {
-  GdkDeviceManagerPrivate *priv;
-
-  device_manager->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (device_manager,
-                                                             GDK_TYPE_DEVICE_MANAGER,
-                                                             GdkDeviceManagerPrivate);
 }

 static void
@@ -218,14 +225,10 @@ gdk_device_manager_set_property (GObject      *object,
                                 const GValue *value,
                                 GParamSpec   *pspec)
 {
-  GdkDeviceManagerPrivate *priv;
-
-  priv = GDK_DEVICE_MANAGER (object)->priv;
-
  switch (prop_id)
    {
    case PROP_DISPLAY:
-      priv->display = g_value_get_object (value);
+      GDK_DEVICE_MANAGER (object)->display = g_value_get_object (value);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -239,14 +242,11 @@ gdk_device_manager_get_property (GObject      *object,
                                 GValue       *value,
                                 GParamSpec   *pspec)
 {
-  GdkDeviceManagerPrivate *priv;
-
-  priv = GDK_DEVICE_MANAGER (object)->priv;

  switch (prop_id)
    {
    case PROP_DISPLAY:
-      g_value_set_object (value, priv->display);
+      g_value_set_object (value, GDK_DEVICE_MANAGER (object)->display);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -269,13 +269,9 @@ gdk_device_manager_get_property (GObject      *object,
 GdkDisplay *
 gdk_device_manager_get_display (GdkDeviceManager *device_manager)
 {
-  GdkDeviceManagerPrivate *priv;
-
  g_return_val_if_fail (GDK_IS_DEVICE_MANAGER (device_manager), NULL);

-  priv = device_manager->priv;
-
-  return priv->display;
+  return device_manager->display;
 }

 /**
@@ -31,47 +31,15 @@ G_BEGIN_DECLS

 #define GDK_TYPE_DEVICE_MANAGER         (gdk_device_manager_get_type ())
 #define GDK_DEVICE_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_DEVICE_MANAGER, GdkDeviceManager))
-#define GDK_DEVICE_MANAGER_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_DEVICE_MANAGER, GdkDeviceManagerClass))
 #define GDK_IS_DEVICE_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_DEVICE_MANAGER))
-#define GDK_IS_DEVICE_MANAGER_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_DEVICE_MANAGER))
-#define GDK_DEVICE_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_DEVICE_MANAGER, GdkDeviceManagerClass))

-typedef struct _GdkDeviceManager GdkDeviceManager;
-typedef struct _GdkDeviceManagerPrivate GdkDeviceManagerPrivate;
-typedef struct _GdkDeviceManagerClass GdkDeviceManagerClass;

-struct _GdkDeviceManager
-{
-  GObject parent_instance;
+GType        gdk_device_manager_get_type           (void) G_GNUC_CONST;

-  /*< private >*/
-  GdkDeviceManagerPrivate *priv;
-};
-
-struct _GdkDeviceManagerClass
-{
-  GObjectClass parent_class;
-
-  /* Signals */
-  void (* device_added)   (GdkDeviceManager *device_manager,
-                           GdkDevice        *device);
-  void (* device_removed) (GdkDeviceManager *device_manager,
-                           GdkDevice        *device);
-  void (* device_changed) (GdkDeviceManager *device_manager,
-                           GdkDevice        *device);
-
-  /* VMethods */
-  GList * (* list_devices) (GdkDeviceManager *device_manager,
-                            GdkDeviceType     type);
-  GdkDevice * (* get_client_pointer) (GdkDeviceManager *device_manager);
-};
-
-GType gdk_device_manager_get_type (void) G_GNUC_CONST;
-
-GdkDisplay *             gdk_device_manager_get_display      (GdkDeviceManager *device_manager);
-GList *                  gdk_device_manager_list_devices     (GdkDeviceManager *device_manager,
-                                                              GdkDeviceType     type);
-GdkDevice *              gdk_device_manager_get_client_pointer (GdkDeviceManager *device_manager);
+GdkDisplay * gdk_device_manager_get_display        (GdkDeviceManager *device_manager);
+GList *      gdk_device_manager_list_devices       (GdkDeviceManager *device_manager,
+                                                    GdkDeviceType     type);
+GdkDevice *  gdk_device_manager_get_client_pointer (GdkDeviceManager *device_manager);

 G_END_DECLS

@@ -0,0 +1,63 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2010 Red Hat, Inc
+ *
+ * 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.
+ */
+
+#ifndef __GDK_DEVICE_MANAGER_PRIVATE_H__
+#define __GDK_DEVICE_MANAGER_PRIVATE_H__
+
+#include "gdkdevicemanager.h"
+
+G_BEGIN_DECLS
+
+
+#define GDK_DEVICE_MANAGER_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_DEVICE_MANAGER, GdkDeviceManagerClass))
+#define GDK_IS_DEVICE_MANAGER_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_DEVICE_MANAGER))
+#define GDK_DEVICE_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_DEVICE_MANAGER, GdkDeviceManagerClass))
+
+
+typedef struct _GdkDeviceManagerClass GdkDeviceManagerClass;
+
+struct _GdkDeviceManager
+{
+  GObject parent_instance;
+
+  /*< private >*/
+  GdkDisplay *display;
+};
+
+struct _GdkDeviceManagerClass
+{
+  GObjectClass parent_class;
+
+  /* Signals */
+  void (* device_added)   (GdkDeviceManager *device_manager,
+                           GdkDevice        *device);
+  void (* device_removed) (GdkDeviceManager *device_manager,
+                           GdkDevice        *device);
+  void (* device_changed) (GdkDeviceManager *device_manager,
+                           GdkDevice        *device);
+
+  /* VMethods */
+  GList *     (* list_devices)       (GdkDeviceManager *device_manager,
+                                      GdkDeviceType     type);
+  GdkDevice * (* get_client_pointer) (GdkDeviceManager *device_manager);
+};
+
+G_END_DECLS
+
+#endif
@@ -20,8 +20,9 @@
 #ifndef __GDK_DEVICE_PRIVATE_H__
 #define __GDK_DEVICE_PRIVATE_H__

-#include <gdk/gdkdevice.h>
-#include <gdk/gdkevents.h>
+#include "gdkdevice.h"
+#include "gdkdevicemanager.h"
+#include "gdkevents.h"

 G_BEGIN_DECLS

@@ -30,22 +31,50 @@ G_BEGIN_DECLS
 #define GDK_DEVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_DEVICE, GdkDeviceClass))

 typedef struct _GdkDeviceClass GdkDeviceClass;
+typedef struct _GdkDeviceKey GdkDeviceKey;
+
+struct _GdkDeviceKey
+{
+  guint keyval;
+  GdkModifierType modifiers;
+};
+
+struct _GdkDevice
+{
+  GObject parent_instance;
+
+  gchar *name;
+  GdkInputSource source;
+  GdkInputMode mode;
+  gboolean has_cursor;
+  gint num_keys;
+  GdkDeviceKey *keys;
+  GdkDeviceManager *manager;
+  GdkDisplay *display;
+  /* Paired master for master,
+   * associated master for slaves
+   */
+  GdkDevice *associated;
+  GList *slaves;
+  GdkDeviceType type;
+  GArray *axes;
+};

 struct _GdkDeviceClass
 {
  GObjectClass parent_class;

-  gboolean (* get_history) (GdkDevice      *device,
-                            GdkWindow      *window,
-                            guint32         start,
-                            guint32         stop,
-                            GdkTimeCoord ***events,
-                            gint           *n_events);
+  gboolean (* get_history)   (GdkDevice      *device,
+                              GdkWindow      *window,
+                              guint32         start,
+                              guint32         stop,
+                              GdkTimeCoord ***events,
+                              gint           *n_events);

-  void (* get_state) (GdkDevice       *device,
-                      GdkWindow       *window,
-                      gdouble         *axes,
-                      GdkModifierType *mask);
+  void (* get_state)         (GdkDevice       *device,
+                              GdkWindow       *window,
+                              gdouble         *axes,
+                              GdkModifierType *mask);

  void (* set_window_cursor) (GdkDevice *device,
                              GdkWindow *window,
@@ -55,10 +84,10 @@ struct _GdkDeviceClass
                              GdkScreen  *screen,
                              gint        x,
                              gint        y);
-  gboolean (* query_state)   (GdkDevice        *device,
-                              GdkWindow        *window,
-                              GdkWindow       **root_window,
-                              GdkWindow       **child_window,
+  gboolean (* query_state)   (GdkDevice       *device,
+                              GdkWindow       *window,
+                              GdkWindow      **root_window,
+                              GdkWindow      **child_window,
                              gint             *root_x,
                              gint             *root_y,
                              gint             *win_x,
@@ -123,8 +152,24 @@ gboolean   _gdk_device_translate_axis         (GdkDevice *device,
 GdkTimeCoord ** _gdk_device_allocate_history  (GdkDevice *device,
                                               gint       n_events);

-void _gdk_input_check_extension_events (GdkDevice *device);
-
+void _gdk_device_add_slave (GdkDevice *device,
+                            GdkDevice *slave);
+void _gdk_device_remove_slave (GdkDevice *device,
+                               GdkDevice *slave);
+gboolean   _gdk_device_query_state            (GdkDevice        *device,
+                                               GdkWindow        *window,
+                                               GdkWindow       **root_window,
+                                               GdkWindow       **child_window,
+                                               gint             *root_x,
+                                               gint             *root_y,
+                                               gint             *win_x,
+                                               gint             *win_y,
+                                               GdkModifierType  *mask);
+GdkWindow * _gdk_device_window_at_position    (GdkDevice        *device,
+                                               gint             *win_x,
+                                               gint             *win_y,
+                                               GdkModifierType  *mask,
+                                               gboolean          get_toplevel);

 G_END_DECLS

@@ -1,7 +1,7 @@
 /*
 * gdkdisplay.h
- * 
- * Copyright 2001 Sun Microsystems Inc. 
+ *
+ * Copyright 2001 Sun Microsystems Inc.
 *
 * Erwann Chenede <erwann.chenede@sun.com>
 *
@@ -34,104 +34,16 @@

 G_BEGIN_DECLS

-typedef struct _GdkDisplayClass GdkDisplayClass;
+#define GDK_TYPE_DISPLAY              (gdk_display_get_type ())
+#define GDK_DISPLAY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY, GdkDisplay))
+#define GDK_IS_DISPLAY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY))
+#ifndef GDK_DISABLE_DEPRECATED
+#define GDK_DISPLAY_OBJECT(object)    GDK_DISPLAY(object)
+#endif
+
 typedef struct _GdkDisplayPointerHooks GdkDisplayPointerHooks;
 typedef struct _GdkDisplayDeviceHooks GdkDisplayDeviceHooks;

-#define GDK_TYPE_DISPLAY              (gdk_display_get_type ())
-#define GDK_DISPLAY_OBJECT(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY, GdkDisplay))
-#define GDK_DISPLAY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY, GdkDisplayClass))
-#define GDK_IS_DISPLAY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY))
-#define GDK_IS_DISPLAY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY))
-#define GDK_DISPLAY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY, GdkDisplayClass))
-
-/* Tracks information about the keyboard grab on this display */
-typedef struct
-{
-  GdkWindow *window;
-  GdkWindow *native_window;
-  gulong serial;
-  gboolean owner_events;
-  guint32 time;
-} GdkKeyboardGrabInfo;
-
-/* Tracks information about which window and position the pointer last was in.
- * This is useful when we need to synthesize events later.
- * Note that we track toplevel_under_pointer using enter/leave events,
- * so in the case of a grab, either with owner_events==FALSE or with the
- * pointer in no clients window the x/y coordinates may actually be outside
- * the window.
- */
-typedef struct
-{
-  GdkWindow *toplevel_under_pointer; /* The toplevel window with mouse inside, tracked via native events */
-  GdkWindow *window_under_pointer; /* The window that last got sent a normal enter event */
-  gdouble toplevel_x, toplevel_y; 
-  guint32 state;
-  guint32 button;
-} GdkPointerWindowInfo;
-
-typedef struct
-{
-  guint32 button_click_time[2];	/* The last 2 button click times. */
-  GdkWindow *button_window[2];  /* The last 2 windows to receive button presses. */
-  gint button_number[2];        /* The last 2 buttons to be pressed. */
-  gint button_x[2];             /* The last 2 button click positions. */
-  gint button_y[2];
-} GdkMultipleClickInfo;
-
-struct _GdkDisplay
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GList *GSEAL (queued_events);
-  GList *GSEAL (queued_tail);
-
-  /* Information for determining if the latest button click
-   * is part of a double-click or triple-click
-   */
-  GHashTable *GSEAL (multiple_click_info);
-
-  guint GSEAL (double_click_time);	/* Maximum time between clicks in msecs */
-  GdkDevice *GSEAL (core_pointer);	/* Core pointer device */
-
-  const GdkDisplayDeviceHooks *GSEAL (device_hooks); /* Current hooks for querying pointer */
-  
-  guint GSEAL (closed) : 1;		/* Whether this display has been closed */
-  guint GSEAL (ignore_core_events) : 1; /* Don't send core motion and button event */
-
-  guint GSEAL (double_click_distance);	/* Maximum distance between clicks in pixels */
-
-  GHashTable *GSEAL (device_grabs);
-  GHashTable *GSEAL (motion_hint_info);
-
-  /* Hashtable containing a GdkPointerWindowInfo for each device */
-  GHashTable *GSEAL (pointers_info);
-
-  /* Last reported event time from server */
-  guint32 GSEAL (last_event_time);
-
-  /* Device manager associated to the display */
-  GdkDeviceManager *GSEAL (device_manager);
-};
-
-struct _GdkDisplayClass
-{
-  GObjectClass parent_class;
-  
-  G_CONST_RETURN gchar *     (*get_display_name)   (GdkDisplay *display);
-  gint			     (*get_n_screens)      (GdkDisplay *display);
-  GdkScreen *		     (*get_screen)         (GdkDisplay *display,
-						    gint        screen_num);
-  GdkScreen *		     (*get_default_screen) (GdkDisplay *display);
-
-  
-  /* Signals */
-  void (*closed) (GdkDisplay *display,
-		  gboolean    is_error);
-};
-
 /**
 * GdkDisplayPointerHooks:
 * @get_pointer: Obtains the current pointer position and modifier state.
@@ -157,18 +69,18 @@ struct _GdkDisplayClass
 struct _GdkDisplayPointerHooks
 {
  void (*get_pointer)              (GdkDisplay      *display,
-				    GdkScreen      **screen,
-				    gint            *x,
-				    gint            *y,
-				    GdkModifierType *mask);
+                                    GdkScreen      **screen,
+                                    gint            *x,
+                                    gint            *y,
+                                    GdkModifierType *mask);
  GdkWindow* (*window_get_pointer) (GdkDisplay      *display,
-				    GdkWindow       *window,
-				    gint            *x,
-				    gint            *y,
-				    GdkModifierType *mask);
+                                    GdkWindow       *window,
+                                    gint            *x,
+                                    gint            *y,
+                                    GdkModifierType *mask);
  GdkWindow* (*window_at_pointer)  (GdkDisplay      *display,
-				    gint            *win_x,
-				    gint            *win_y);
+                                    gint            *win_x,
+                                    gint            *win_y);
 };

 /**
@@ -216,15 +128,17 @@ G_CONST_RETURN gchar * gdk_display_get_name (GdkDisplay *display);

 gint        gdk_display_get_n_screens      (GdkDisplay  *display);
 GdkScreen * gdk_display_get_screen         (GdkDisplay  *display,
-					    gint         screen_num);
+                                            gint         screen_num);
 GdkScreen * gdk_display_get_default_screen (GdkDisplay  *display);

 #ifndef GDK_MULTIDEVICE_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 void        gdk_display_pointer_ungrab     (GdkDisplay  *display,
-					    guint32      time_);
+                                            guint32      time_);
 void        gdk_display_keyboard_ungrab    (GdkDisplay  *display,
-					    guint32      time_);
+                                            guint32      time_);
 gboolean    gdk_display_pointer_is_grabbed (GdkDisplay  *display);
+#endif /* GDK_DISABLE_DEPRECATED */
 #endif /* GDK_MULTIDEVICE_SAFE */

 gboolean    gdk_display_device_is_grabbed  (GdkDisplay  *display,
@@ -233,7 +147,7 @@ void        gdk_display_beep               (GdkDisplay  *display);
 void        gdk_display_sync               (GdkDisplay  *display);
 void        gdk_display_flush              (GdkDisplay  *display);

-void	    gdk_display_close		       (GdkDisplay  *display);
+void        gdk_display_close                  (GdkDisplay  *display);
 gboolean    gdk_display_is_closed          (GdkDisplay  *display);

 #ifndef GDK_DISABLE_DEPRECATED
@@ -243,59 +157,38 @@ GList *     gdk_display_list_devices       (GdkDisplay  *display);
 GdkEvent* gdk_display_get_event  (GdkDisplay     *display);
 GdkEvent* gdk_display_peek_event (GdkDisplay     *display);
 void      gdk_display_put_event  (GdkDisplay     *display,
-				  const GdkEvent *event);
+                                  const GdkEvent *event);
+gboolean  gdk_display_has_pending (GdkDisplay  *display);

 void gdk_display_add_client_message_filter (GdkDisplay   *display,
-					    GdkAtom       message_type,
-					    GdkFilterFunc func,
-					    gpointer      data);
+                                            GdkAtom       message_type,
+                                            GdkFilterFunc func,
+                                            gpointer      data);

 void gdk_display_set_double_click_time     (GdkDisplay   *display,
-					    guint         msec);
+                                            guint         msec);
 void gdk_display_set_double_click_distance (GdkDisplay   *display,
-					    guint         distance);
+                                            guint         distance);

 GdkDisplay *gdk_display_get_default (void);

 #ifndef GDK_MULTIDEVICE_SAFE
-
 #ifndef GDK_DISABLE_DEPRECATED
-GdkDevice  *gdk_display_get_core_pointer (GdkDisplay *display);
-#endif /* GDK_DISABLE_DEPRECATED */
-
 void             gdk_display_get_pointer           (GdkDisplay             *display,
-						    GdkScreen             **screen,
-						    gint                   *x,
-						    gint                   *y,
-						    GdkModifierType        *mask);
+                                                    GdkScreen             **screen,
+                                                    gint                   *x,
+                                                    gint                   *y,
+                                                    GdkModifierType        *mask);
 GdkWindow *      gdk_display_get_window_at_pointer (GdkDisplay             *display,
-						    gint                   *win_x,
-						    gint                   *win_y);
+                                                    gint                   *win_x,
+                                                    gint                   *win_y);
 void             gdk_display_warp_pointer          (GdkDisplay             *display,
-						    GdkScreen              *screen,
-						    gint                   x,
-						    gint                   y);
-#endif /* GDK_MULTIDEVICE_SAFE */
-
-void             gdk_display_get_device_state              (GdkDisplay            *display,
-                                                            GdkDevice             *device,
-                                                            GdkScreen            **screen,
-                                                            gint                  *x,
-                                                            gint                  *y,
-                                                            GdkModifierType       *mask);
-GdkWindow *      gdk_display_get_window_at_device_position (GdkDisplay            *display,
-                                                            GdkDevice             *device,
-                                                            gint                  *win_x,
-                                                            gint                  *win_y);
-void             gdk_display_warp_device                   (GdkDisplay            *display,
-                                                            GdkDevice             *device,
-                                                            GdkScreen             *screen,
-                                                            gint                   x,
-                                                            gint                   y);
-
-#ifndef GDK_MULTIDEVICE_SAFE
+                                                    GdkScreen              *screen,
+                                                    gint                   x,
+                                                    gint                   y);
 GdkDisplayPointerHooks *gdk_display_set_pointer_hooks (GdkDisplay                   *display,
-						       const GdkDisplayPointerHooks *new_hooks);
+                                                       const GdkDisplayPointerHooks *new_hooks);
+#endif /* GDK_DISABLE_DEPRECATED */
 #endif /* GDK_MULTIDEVICE_SAFE */

 GdkDisplayDeviceHooks *gdk_display_set_device_hooks (GdkDisplay                  *display,
@@ -307,29 +200,32 @@ gboolean gdk_display_supports_cursor_alpha     (GdkDisplay    *display);
 gboolean gdk_display_supports_cursor_color     (GdkDisplay    *display);
 guint    gdk_display_get_default_cursor_size   (GdkDisplay    *display);
 void     gdk_display_get_maximal_cursor_size   (GdkDisplay    *display,
-						guint         *width,
-						guint         *height);
+                                                guint         *width,
+                                                guint         *height);

 GdkWindow *gdk_display_get_default_group       (GdkDisplay *display); 

 gboolean gdk_display_supports_selection_notification (GdkDisplay *display);
 gboolean gdk_display_request_selection_notification  (GdkDisplay *display,
-						      GdkAtom     selection);
+                                                      GdkAtom     selection);

 gboolean gdk_display_supports_clipboard_persistence (GdkDisplay    *display);
 void     gdk_display_store_clipboard                (GdkDisplay    *display,
-						     GdkWindow     *clipboard_window,
-						     guint32        time_,
-						     const GdkAtom *targets,
-						     gint           n_targets);
+                                                     GdkWindow     *clipboard_window,
+                                                     guint32        time_,
+                                                     const GdkAtom *targets,
+                                                     gint           n_targets);

 gboolean gdk_display_supports_shapes           (GdkDisplay    *display);
 gboolean gdk_display_supports_input_shapes     (GdkDisplay    *display);
 gboolean gdk_display_supports_composite        (GdkDisplay    *display);
+void     gdk_display_notify_startup_complete   (GdkDisplay    *display,
+                                                const gchar   *startup_id);

 GdkDeviceManager * gdk_display_get_device_manager (GdkDisplay *display);

+GdkAppLaunchContext *gdk_display_get_app_launch_context (GdkDisplay *display);

 G_END_DECLS

-#endif	/* __GDK_DISPLAY_H__ */
+#endif  /* __GDK_DISPLAY_H__ */
@@ -21,19 +21,29 @@
 * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
 * file for a list of people on the GTK+ Team.  See the ChangeLog
 * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

 #include "config.h"

-#include "gdkdisplaymanager.h"
-
-#include "gdkscreen.h"
-#include "gdkdisplay.h"
+#include "gdkconfig.h"
+#include "gdkdisplaymanagerprivate.h"
 #include "gdkinternals.h"
 #include "gdkmarshalers.h"
 #include "gdkintl.h"

+#ifdef GDK_WINDOWING_X11
+#include "x11/gdkx.h"
+#endif
+
+#ifdef GDK_WINDOWING_QUARTZ
+/* We immediately include gdkquartzdisplaymanager.h here instead of
+ * gdkquartz.h so that we do not have to enable -xobjective-c for the
+ * "generic" GDK source code.
+ */
+#include "quartz/gdkquartzdisplaymanager.h"
+#endif
+

 /**
 * SECTION:gdkdisplaymanager
@@ -58,18 +68,16 @@ enum {

 static void gdk_display_manager_class_init   (GdkDisplayManagerClass *klass);
 static void gdk_display_manager_set_property (GObject                *object,
-					      guint                   prop_id,
-					      const GValue           *value,
-					      GParamSpec             *pspec);
+                                              guint                   prop_id,
+                                              const GValue           *value,
+                                              GParamSpec             *pspec);
 static void gdk_display_manager_get_property (GObject                *object,
-					      guint                   prop_id,
-					      GValue                 *value,
-					      GParamSpec             *pspec);
+                                              guint                   prop_id,
+                                              GValue                 *value,
+                                              GParamSpec             *pspec);

 static guint signals[LAST_SIGNAL] = { 0 };

-static GdkDisplay *default_display = NULL;
-
 G_DEFINE_TYPE (GdkDisplayManager, gdk_display_manager, G_TYPE_OBJECT)

 static void
@@ -82,32 +90,32 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)

  /**
   * GdkDisplayManager::display-opened:
-   * @display_manager: the object on which the signal is emitted
+   * @manager: the object on which the signal is emitted
   * @display: the opened display
   *
-   * The ::display_opened signal is emitted when a display is opened.
+   * The ::display-opened signal is emitted when a display is opened.
   *
   * Since: 2.2
   */
  signals[DISPLAY_OPENED] =
    g_signal_new (g_intern_static_string ("display-opened"),
-		  G_OBJECT_CLASS_TYPE (object_class),
-		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GdkDisplayManagerClass, display_opened),
-		  NULL, NULL,
-		  _gdk_marshal_VOID__OBJECT,
-		  G_TYPE_NONE,
-		  1,
-		  GDK_TYPE_DISPLAY);
+                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GdkDisplayManagerClass, display_opened),
+                  NULL, NULL,
+                  _gdk_marshal_VOID__OBJECT,
+                  G_TYPE_NONE,
+                  1,
+                  GDK_TYPE_DISPLAY);

  g_object_class_install_property (object_class,
-				   PROP_DEFAULT_DISPLAY,
-				   g_param_spec_object ("default-display",
- 							P_("Default Display"),
- 							P_("The default display for GDK"),
-							GDK_TYPE_DISPLAY,
- 							G_PARAM_READWRITE|G_PARAM_STATIC_NAME|
-							G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
+                                   PROP_DEFAULT_DISPLAY,
+                                   g_param_spec_object ("default-display",
+                                                        P_("Default Display"),
+                                                        P_("The default display for GDK"),
+                                                        GDK_TYPE_DISPLAY,
+                                                        G_PARAM_READWRITE|G_PARAM_STATIC_NAME|
+                                                        G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
 }

 static void
@@ -117,15 +125,15 @@ gdk_display_manager_init (GdkDisplayManager *manager)

 static void
 gdk_display_manager_set_property (GObject      *object,
-				  guint         prop_id,
-				  const GValue *value,
-				  GParamSpec   *pspec)
+                                  guint         prop_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
 {
  switch (prop_id)
    {
    case PROP_DEFAULT_DISPLAY:
      gdk_display_manager_set_default_display (GDK_DISPLAY_MANAGER (object),
-					       g_value_get_object (value));
+                                               g_value_get_object (value));
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -135,14 +143,15 @@ gdk_display_manager_set_property (GObject      *object,

 static void
 gdk_display_manager_get_property (GObject      *object,
-				  guint         prop_id,
-				  GValue       *value,
-				  GParamSpec   *pspec)
+                                  guint         prop_id,
+                                  GValue       *value,
+                                  GParamSpec   *pspec)
 {
  switch (prop_id)
    {
    case PROP_DEFAULT_DISPLAY:
-      g_value_set_object (value, default_display);
+      g_value_set_object (value,
+                          gdk_display_manager_get_default_display (GDK_DISPLAY_MANAGER (object)));
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -155,37 +164,61 @@ gdk_display_manager_get_property (GObject      *object,
 *
 * Gets the singleton #GdkDisplayManager object.
 *
- * Returns: (transfer none): The global #GdkDisplayManager singleton; gdk_parse_pargs(),
- * gdk_init(), or gdk_init_check() must have been called first.
+ * When called for the first time, this function consults the
+ * <envar>GDK_BACKEND</envar> to find out which of the supported
+ * GDK backends to use (in case GDK has been compiled with multiple
+ * backends).
+ *
+ * Returns: (transfer none): The global #GdkDisplayManager singleton;
+ *     gdk_parse_args(), gdk_init(), or gdk_init_check() must have
+ *     been called first.
 *
 * Since: 2.2
 **/
 GdkDisplayManager*
 gdk_display_manager_get (void)
 {
-  static GdkDisplayManager *display_manager = NULL;
+  static GdkDisplayManager *manager = NULL;

-  if (!display_manager)
-    display_manager = g_object_new (GDK_TYPE_DISPLAY_MANAGER, NULL);
+  if (!manager)
+    {
+      const gchar *backend;

-  return display_manager;
+      backend = g_getenv ("GDK_BACKEND");
+#ifdef GDK_WINDOWING_X11
+      if (backend == NULL || strcmp (backend, "x11") == 0)
+        manager = g_object_new (gdk_x11_display_manager_get_type (), NULL);
+      else
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+      if (backend == NULL || strcmp (backend, "quartz") == 0)
+        manager = g_object_new (gdk_quartz_display_manager_get_type (), NULL);
+      else
+#endif
+      if (backend != NULL)
+        g_error ("Unsupported GDK backend: %s", backend);
+      else
+        g_error ("No GDK backend found");
+    }
+
+  return manager;
 }

 /**
 * gdk_display_manager_get_default_display:
- * @display_manager: a #GdkDisplayManager 
+ * @manager: a #GdkDisplayManager
 *
 * Gets the default #GdkDisplay.
 *
- * Returns: (transfer none): a #GdkDisplay, or %NULL if there is no default
- *   display.
+ * Returns: (transfer none): a #GdkDisplay, or %NULL
+ *     if there is no default display.
 *
 * Since: 2.2
 */
 GdkDisplay *
-gdk_display_manager_get_default_display (GdkDisplayManager *display_manager)
+gdk_display_manager_get_default_display (GdkDisplayManager *manager)
 {
-  return default_display;
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->get_default_display (manager);
 }

 /**
@@ -203,7 +236,7 @@ gdk_display_manager_get_default_display (GdkDisplayManager *display_manager)
 GdkDisplay *
 gdk_display_get_default (void)
 {
-  return default_display;
+  return gdk_display_manager_get_default_display (gdk_display_manager_get ());
 }

 /**
@@ -219,6 +252,10 @@ gdk_display_get_default (void)
 GdkScreen *
 gdk_screen_get_default (void)
 {
+  GdkDisplay *default_display;
+
+  default_display = gdk_display_get_default ();
+
  if (default_display)
    return gdk_display_get_default_screen (default_display);
  else
@@ -227,7 +264,7 @@ gdk_screen_get_default (void)

 /**
 * gdk_display_manager_set_default_display:
- * @display_manager: a #GdkDisplayManager
+ * @manager: a #GdkDisplayManager
 * @display: a #GdkDisplay
 * 
 * Sets @display as the default display.
@@ -235,30 +272,113 @@ gdk_screen_get_default (void)
 * Since: 2.2
 **/
 void
-gdk_display_manager_set_default_display (GdkDisplayManager *display_manager,
-					 GdkDisplay        *display)
+gdk_display_manager_set_default_display (GdkDisplayManager *manager,
+                                         GdkDisplay        *display)
 {
-  default_display = display;
+  GDK_DISPLAY_MANAGER_GET_CLASS (manager)->set_default_display (manager, display);

-  _gdk_windowing_set_default_display (display);
-
-  g_object_notify (G_OBJECT (display_manager), "default-display");
+  g_object_notify (G_OBJECT (manager), "default-display");
 }

 /**
 * gdk_display_manager_list_displays:
- * @display_manager: a #GdkDisplayManager 
+ * @manager: a #GdkDisplayManager
 *
 * List all currently open displays.
- * 
- * Return value: (transfer container) (element-type GdkDisplay): a newly allocated
- * #GSList of #GdkDisplay objects. Free this list with g_slist_free() when you
- * are done with it.
+ *
+ * Return value: (transfer container) (element-type GdkDisplay): a newly
+ *     allocated #GSList of #GdkDisplay objects. Free with g_slist_free()
+ *     when you are done with it.
 *
 * Since: 2.2
 **/
 GSList *
-gdk_display_manager_list_displays (GdkDisplayManager *display_manager)
+gdk_display_manager_list_displays (GdkDisplayManager *manager)
 {
-  return g_slist_copy (_gdk_displays);
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->list_displays (manager);
+}
+
+/**
+ * gdk_display_manager_open_display:
+ * @manager: a #GdkDisplayManager
+ * @name: the name of the display to open
+ *
+ * Opens a display.
+ *
+ * Return value: (transfer none): a #GdkDisplay, or %NULL
+ *     if the display could not be opened
+ *
+ * Since: 3.0
+ */
+GdkDisplay *
+gdk_display_manager_open_display (GdkDisplayManager *manager,
+                                  const gchar       *name)
+{
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->open_display (manager, name);
+}
+
+/**
+ * gdk_atom_intern:
+ * @atom_name: a string.
+ * @only_if_exists: if %TRUE, GDK is allowed to not create a new atom, but
+ *   just return %GDK_NONE if the requested atom doesn't already
+ *   exists. Currently, the flag is ignored, since checking the
+ *   existance of an atom is as expensive as creating it.
+ *
+ * Finds or creates an atom corresponding to a given string.
+ *
+ * Returns: the atom corresponding to @atom_name.
+ */
+GdkAtom
+gdk_atom_intern (const gchar *atom_name,
+                 gboolean     only_if_exists)
+{
+  GdkDisplayManager *manager = gdk_display_manager_get ();
+
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->atom_intern (manager, atom_name, TRUE);
+}
+
+/**
+ * gdk_atom_intern_static_string:
+ * @atom_name: a static string
+ *
+ * Finds or creates an atom corresponding to a given string.
+ *
+ * Note that this function is identical to gdk_atom_intern() except
+ * that if a new #GdkAtom is created the string itself is used rather
+ * than a copy. This saves memory, but can only be used if the string
+ * will <emphasis>always</emphasis> exist. It can be used with statically
+ * allocated strings in the main program, but not with statically
+ * allocated memory in dynamically loaded modules, if you expect to
+ * ever unload the module again (e.g. do not use this function in
+ * GTK+ theme engines).
+ *
+ * Returns: the atom corresponding to @atom_name
+ *
+ * Since: 2.10
+ */
+GdkAtom
+gdk_atom_intern_static_string (const gchar *atom_name)
+{
+  GdkDisplayManager *manager = gdk_display_manager_get ();
+
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->atom_intern (manager, atom_name, FALSE);
+}
+
+/**
+ * gdk_atom_name:
+ * @atom: a #GdkAtom.
+ *
+ * Determines the string corresponding to an atom.
+ *
+ * Returns: a newly-allocated string containing the string
+ *   corresponding to @atom. When you are done with the
+ *   return value, you should free it using g_free().
+ */
+gchar *
+gdk_atom_name (GdkAtom atom)
+{
+  GdkDisplayManager *manager = gdk_display_manager_get ();
+
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->get_atom_name (manager, atom);
 }
@@ -8,7 +8,7 @@
 *
 * 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
+ * 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
@@ -39,34 +39,18 @@ G_BEGIN_DECLS

 #define GDK_TYPE_DISPLAY_MANAGER              (gdk_display_manager_get_type ())
 #define GDK_DISPLAY_MANAGER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManager))
-#define GDK_DISPLAY_MANAGER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManagerClass))
 #define GDK_IS_DISPLAY_MANAGER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY_MANAGER))
-#define GDK_IS_DISPLAY_MANAGER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY_MANAGER))
-#define GDK_DISPLAY_MANAGER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManagerClass))

-typedef struct _GdkDisplayManager      GdkDisplayManager;
-typedef struct _GdkDisplayManagerClass GdkDisplayManagerClass;

-struct _GdkDisplayManager
-{
-  GObject parent_instance;
-};
-
-struct _GdkDisplayManagerClass
-{
-  GObjectClass parent_class;
-
-  void (*display_opened) (GdkDisplayManager *display_manager,
-			  GdkDisplay *display);
-};
-
-GType gdk_display_manager_get_type (void) G_GNUC_CONST;
+GType              gdk_display_manager_get_type            (void) G_GNUC_CONST;

 GdkDisplayManager *gdk_display_manager_get                 (void);
-GdkDisplay *       gdk_display_manager_get_default_display (GdkDisplayManager *display_manager);
-void               gdk_display_manager_set_default_display (GdkDisplayManager *display_manager,
-							    GdkDisplay        *display);
-GSList     *       gdk_display_manager_list_displays       (GdkDisplayManager *display_manager);
+GdkDisplay *       gdk_display_manager_get_default_display (GdkDisplayManager *manager);
+void               gdk_display_manager_set_default_display (GdkDisplayManager *manager,
+                                                            GdkDisplay        *display);
+GSList *           gdk_display_manager_list_displays       (GdkDisplayManager *manager);
+GdkDisplay *       gdk_display_manager_open_display        (GdkDisplayManager *manager,
+                                                            const gchar       *name);

 G_END_DECLS

@@ -0,0 +1,71 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2010, Red Hat, Inc
+ *
+ * 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.
+ */
+
+#ifndef __GDK_DISPLAY_MANAGER_PRIVATE_H__
+#define __GDK_DISPLAY_MANAGER_PRIVATE_H__
+
+#include "gdkdisplaymanager.h"
+
+G_BEGIN_DECLS
+
+#define GDK_DISPLAY_MANAGER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManagerClass))
+#define GDK_IS_DISPLAY_MANAGER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY_MANAGER))
+#define GDK_DISPLAY_MANAGER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManagerClass))
+
+typedef struct _GdkDisplayManagerClass GdkDisplayManagerClass;
+
+struct _GdkDisplayManager
+{
+  GObject parent_instance;
+};
+
+struct _GdkDisplayManagerClass
+{
+  GObjectClass parent_class;
+
+  GSList *     (*list_displays)       (GdkDisplayManager *manager);
+  GdkDisplay * (*get_default_display) (GdkDisplayManager *manager);
+  void         (*set_default_display) (GdkDisplayManager *manager,
+                                       GdkDisplay        *display);
+  GdkDisplay * (*open_display)        (GdkDisplayManager *manager,
+                                       const gchar       *name);
+
+  /* FIXME the following should really be frontend-only, not vfuncs */
+  GdkAtom      (*atom_intern)         (GdkDisplayManager *manager,
+                                       const gchar       *atom_name,
+                                       gboolean           copy_name);
+  gchar *      (*get_atom_name)       (GdkDisplayManager *manager,
+                                       GdkAtom            atom);
+  guint        (*lookup_keyval)       (GdkDisplayManager *manager,
+                                       const gchar       *name);
+  gchar *      (*get_keyval_name)     (GdkDisplayManager *manager,
+                                       guint              keyval);
+  void         (*keyval_convert_case) (GdkDisplayManager *manager,
+                                       guint              keyval,
+                                       guint             *lower,
+                                       guint             *upper);
+
+  /* signals */
+  void         (*display_opened)      (GdkDisplayManager *manager,
+                                       GdkDisplay        *display);
+};
+
+G_END_DECLS
+
+#endif
@@ -0,0 +1,301 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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.
+ */
+
+#ifndef __GDK_DISPLAY_PRIVATE_H__
+#define __GDK_DISPLAY_PRIVATE_H__
+
+#include "gdkdisplay.h"
+#include "gdkwindow.h"
+#include "gdkcursor.h"
+
+G_BEGIN_DECLS
+
+#define GDK_DISPLAY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY, GdkDisplayClass))
+#define GDK_IS_DISPLAY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY))
+#define GDK_DISPLAY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY, GdkDisplayClass))
+
+
+typedef struct _GdkDisplayClass GdkDisplayClass;
+
+/* Tracks information about the keyboard grab on this display */
+typedef struct
+{
+  GdkWindow *window;
+  GdkWindow *native_window;
+  gulong serial;
+  gboolean owner_events;
+  guint32 time;
+} GdkKeyboardGrabInfo;
+
+/* Tracks information about the pointer grab on this display */
+typedef struct
+{
+  GdkWindow *window;
+  GdkWindow *native_window;
+  gulong serial_start;
+  gulong serial_end; /* exclusive, i.e. not active on serial_end */
+  gboolean owner_events;
+  guint event_mask;
+  gboolean implicit;
+  guint32 time;
+  GdkGrabOwnership ownership;
+
+  guint activated : 1;
+  guint implicit_ungrab : 1;
+} GdkDeviceGrabInfo;
+
+/* Tracks information about which window and position the pointer last was in.
+ * This is useful when we need to synthesize events later.
+ * Note that we track toplevel_under_pointer using enter/leave events,
+ * so in the case of a grab, either with owner_events==FALSE or with the
+ * pointer in no clients window the x/y coordinates may actually be outside
+ * the window.
+ */
+typedef struct
+{
+  GdkWindow *toplevel_under_pointer; /* toplevel window containing the pointer, */
+                                     /* tracked via native events */
+  GdkWindow *window_under_pointer;   /* window that last got a normal enter event */
+  gdouble toplevel_x, toplevel_y;
+  guint32 state;
+  guint32 button;
+} GdkPointerWindowInfo;
+
+typedef struct
+{
+  guint32 button_click_time[2]; /* last 2 button click times */
+  GdkWindow *button_window[2];  /* last 2 windows to receive button presses */
+  gint button_number[2];        /* last 2 buttons to be pressed */
+  gint button_x[2];             /* last 2 button click positions */
+  gint button_y[2];
+} GdkMultipleClickInfo;
+
+struct _GdkDisplay
+{
+  GObject parent_instance;
+
+  GList *queued_events;
+  GList *queued_tail;
+
+  /* Information for determining if the latest button click
+   * is part of a double-click or triple-click
+   */
+  GHashTable *multiple_click_info;
+  guint double_click_time;  /* Maximum time between clicks in msecs */
+  GdkDevice *core_pointer;  /* Core pointer device */
+
+  const GdkDisplayDeviceHooks *device_hooks; /* Hooks for querying pointer */
+
+  guint closed             : 1;  /* Whether this display has been closed */
+  guint ignore_core_events : 1;  /* Don't send core motion and button event */
+
+  guint double_click_distance;   /* Maximum distance between clicks in pixels */
+
+  GHashTable *device_grabs;
+  GHashTable *motion_hint_info;
+
+  GHashTable *pointers_info;  /* GdkPointerWindowInfo for each device */
+  guint32 last_event_time;    /* Last reported event time from server */
+
+  GdkDeviceManager *device_manager;
+};
+
+struct _GdkDisplayClass
+{
+  GObjectClass parent_class;
+
+  GType window_type;          /* type for native windows for this display, set in class_init */
+
+  G_CONST_RETURN gchar *     (*get_name)           (GdkDisplay *display);
+  gint                       (*get_n_screens)      (GdkDisplay *display);
+  GdkScreen *                (*get_screen)         (GdkDisplay *display,
+                                                    gint        screen_num);
+  GdkScreen *                (*get_default_screen) (GdkDisplay *display);
+  void                       (*beep)               (GdkDisplay *display);
+  void                       (*sync)               (GdkDisplay *display);
+  void                       (*flush)              (GdkDisplay *display);
+  gboolean                   (*has_pending)        (GdkDisplay *display);
+  void                       (*queue_events)       (GdkDisplay *display);
+  GdkWindow *                (*get_default_group)  (GdkDisplay *display);
+  gboolean                   (*supports_selection_notification) (GdkDisplay *display);
+  gboolean                   (*request_selection_notification)  (GdkDisplay *display,
+                                                                 GdkAtom     selection);
+  gboolean                   (*supports_shapes)       (GdkDisplay *display);
+  gboolean                   (*supports_input_shapes) (GdkDisplay *display);
+  gboolean                   (*supports_composite)    (GdkDisplay *display);
+  gboolean                   (*supports_cursor_alpha) (GdkDisplay *display);
+  gboolean                   (*supports_cursor_color) (GdkDisplay *display);
+
+  gboolean                   (*supports_clipboard_persistence)  (GdkDisplay *display);
+  void                       (*store_clipboard)    (GdkDisplay    *display,
+                                                    GdkWindow     *clipboard_window,
+                                                    guint32        time_,
+                                                    const GdkAtom *targets,
+                                                    gint           n_targets);
+
+  void                       (*get_default_cursor_size) (GdkDisplay *display,
+                                                         guint      *width,
+                                                         guint      *height);
+  void                       (*get_maximal_cursor_size) (GdkDisplay *display,
+                                                         guint      *width,
+                                                         guint      *height);
+  GdkCursor *                (*get_cursor_for_type)     (GdkDisplay    *display,
+                                                         GdkCursorType  type);
+  GdkCursor *                (*get_cursor_for_name)     (GdkDisplay    *display,
+                                                         const gchar   *name);
+  GdkCursor *                (*get_cursor_for_pixbuf)   (GdkDisplay    *display,
+                                                         GdkPixbuf     *pixbuf,
+                                                         gint           x,
+                                                         gint           y);
+
+  GList *                    (*list_devices)       (GdkDisplay *display);
+  gboolean                   (*send_client_message) (GdkDisplay     *display,
+                                                     GdkEvent       *event,
+                                                     GdkNativeWindow winid);
+  void                       (*add_client_message_filter) (GdkDisplay   *display,
+                                                           GdkAtom       message_type,
+                                                           GdkFilterFunc func,
+                                                           gpointer      data);
+  GdkAppLaunchContext *      (*get_app_launch_context) (GdkDisplay *display);
+  GdkNativeWindow            (*get_drag_protocol)      (GdkDisplay      *display,
+                                                        GdkNativeWindow  winid,
+                                                        GdkDragProtocol *protocol,
+                                                        guint           *version);
+
+  void                       (*before_process_all_updates) (GdkDisplay *display);
+  void                       (*after_process_all_updates)  (GdkDisplay *display);
+
+  gulong                     (*get_next_serial) (GdkDisplay *display);
+
+  void                       (*notify_startup_complete) (GdkDisplay  *display,
+                                                         const gchar *startup_id);
+  void                       (*event_data_copy) (GdkDisplay     *display,
+                                                 const GdkEvent *event,
+                                                 GdkEvent       *new_event);
+  void                       (*event_data_free) (GdkDisplay     *display,
+                                                 GdkEvent       *event);
+  void                       (*create_window_impl) (GdkDisplay    *display,
+                                                    GdkWindow     *window,
+                                                    GdkWindow     *real_parent,
+                                                    GdkScreen     *screen,
+                                                    GdkEventMask   event_mask,
+                                                    GdkWindowAttr *attributes,
+                                                    gint           attributes_mask);
+
+  GdkKeymap *                (*get_keymap)         (GdkDisplay    *display);
+  void                       (*push_error_trap)    (GdkDisplay    *display);
+  gint                       (*pop_error_trap)     (GdkDisplay    *display,
+                                                    gboolean       ignore);
+
+  GdkWindow *                (*get_selection_owner) (GdkDisplay   *display,
+                                                     GdkAtom       selection);
+  gboolean                   (*set_selection_owner) (GdkDisplay   *display,
+                                                     GdkWindow    *owner,
+                                                     GdkAtom       selection,
+                                                     guint32       time,
+                                                     gboolean      send_event);
+  void                       (*send_selection_notify) (GdkDisplay *dispay,
+                                                       GdkNativeWindow  requestor,
+                                                       GdkAtom          selection,
+                                                       GdkAtom          target,
+                                                       GdkAtom          property,
+                                                       guint32          time);
+  gint                       (*get_selection_property) (GdkDisplay  *display,
+                                                        GdkWindow   *requestor,
+                                                        guchar     **data,
+                                                        GdkAtom     *type,
+                                                        gint        *format);
+  void                       (*convert_selection)      (GdkDisplay  *display,
+                                                        GdkWindow   *requestor,
+                                                        GdkAtom      selection,
+                                                        GdkAtom      target,
+                                                        guint32      time);
+
+  gint                   (*text_property_to_utf8_list) (GdkDisplay     *display,
+                                                        GdkAtom         encoding,
+                                                        gint            format,
+                                                        const guchar   *text,
+                                                        gint            length,
+                                                        gchar        ***list);
+  gchar *                (*utf8_to_string_target)      (GdkDisplay     *display,
+                                                        const gchar    *text);
+
+  /* Signals */
+  void (*closed) (GdkDisplay *display,
+                  gboolean    is_error);
+};
+
+
+typedef void (* GdkDisplayPointerInfoForeach) (GdkDisplay           *display,
+                                               GdkDevice            *device,
+                                               GdkPointerWindowInfo *device_info,
+                                               gpointer              user_data);
+
+void                _gdk_display_device_grab_update   (GdkDisplay *display,
+                                                       GdkDevice  *device,
+                                                       GdkDevice  *source_device,
+                                                       gulong      current_serial);
+GdkDeviceGrabInfo * _gdk_display_get_last_device_grab (GdkDisplay *display,
+                                                       GdkDevice  *device);
+GdkDeviceGrabInfo * _gdk_display_add_device_grab      (GdkDisplay       *display,
+                                                       GdkDevice        *device,
+                                                       GdkWindow        *window,
+                                                       GdkWindow        *native_window,
+                                                       GdkGrabOwnership  grab_ownership,
+                                                       gboolean          owner_events,
+                                                       GdkEventMask      event_mask,
+                                                       gulong            serial_start,
+                                                       guint32           time,
+                                                       gboolean          implicit);
+GdkDeviceGrabInfo * _gdk_display_has_device_grab      (GdkDisplay       *display,
+                                                       GdkDevice        *device,
+                                                       gulong            serial);
+gboolean            _gdk_display_end_device_grab      (GdkDisplay       *display,
+                                                       GdkDevice        *device,
+                                                       gulong            serial,
+                                                       GdkWindow        *if_child,
+                                                       gboolean          implicit);
+gboolean            _gdk_display_check_grab_ownership (GdkDisplay       *display,
+                                                       GdkDevice        *device,
+                                                       gulong            serial);
+void                _gdk_display_enable_motion_hints  (GdkDisplay       *display,
+                                                       GdkDevice        *device);
+GdkPointerWindowInfo * _gdk_display_get_pointer_info  (GdkDisplay       *display,
+                                                       GdkDevice        *device);
+void                _gdk_display_pointer_info_foreach (GdkDisplay       *display,
+                                                       GdkDisplayPointerInfoForeach func,
+                                                       gpointer          user_data);
+gulong              _gdk_display_get_next_serial      (GdkDisplay       *display);
+void                _gdk_display_event_data_copy      (GdkDisplay       *display,
+                                                       const GdkEvent   *event,
+                                                       GdkEvent         *new_event);
+void                _gdk_display_event_data_free      (GdkDisplay       *display,
+                                                       GdkEvent         *event);
+void                _gdk_display_create_window_impl   (GdkDisplay       *display,
+                                                       GdkWindow        *window,
+                                                       GdkWindow        *real_parent,
+                                                       GdkScreen        *screen,
+                                                       GdkEventMask      event_mask,
+                                                       GdkWindowAttr    *attributes,
+                                                       gint              attributes_mask);
+GdkWindow *         _gdk_display_create_window        (GdkDisplay       *display);
+
+G_END_DECLS
+
+#endif  /* __GDK_DISPLAY_PRIVATE_H__ */
@@ -26,8 +26,7 @@

 #include "config.h"

-#include "gdkdnd.h"
-
+#include "gdkdndprivate.h"
 #include "gdkdisplay.h"
 #include "gdkwindow.h"

@@ -48,53 +47,6 @@
 * the GTK+ documentation for more information.
 */

-/**
- * gdk_drag_find_window:
- * @context: a #GdkDragContext.
- * @drag_window: a window which may be at the pointer position, but
- *      should be ignored, since it is put up by the drag source as an icon.
- * @x_root: the x position of the pointer in root coordinates.
- * @y_root: the y position of the pointer in root coordinates.
- * @dest_window: (out): location to store the destination window in.
- * @protocol: (out): location to store the DND protocol in.
- *
- * Finds the destination window and DND protocol to use at the
- * given pointer position.
- *
- * This function is called by the drag source to obtain the 
- * @dest_window and @protocol parameters for gdk_drag_motion().
- **/
-void
-gdk_drag_find_window (GdkDragContext  *context,
-		      GdkWindow       *drag_window,
-		      gint             x_root,
-		      gint             y_root,
-		      GdkWindow      **dest_window,
-		      GdkDragProtocol *protocol)
-{
-  gdk_drag_find_window_for_screen (context, drag_window,
-				   gdk_window_get_screen (context->source_window),
-				   x_root, y_root, dest_window, protocol);
-}
-
-/**
- * gdk_drag_get_protocol:
- * @xid: the windowing system id of the destination window.
- * @protocol: location where the supported DND protocol is returned.
- * 
- * Finds out the DND protocol supported by a window.
- * 
- * Return value: the windowing system specific id for the window where
- *    the drop should happen. This may be @xid or the id of a proxy
- *    window, or zero if @xid doesn't support Drag and Drop.
- **/
-GdkNativeWindow
-gdk_drag_get_protocol (GdkNativeWindow  xid,
-		       GdkDragProtocol *protocol)
-{
-  return gdk_drag_get_protocol_for_display (gdk_display_get_default (), xid, protocol);
-}
-
 /**
 * gdk_drag_context_list_targets:
 * @context: a #GdkDragContext
@@ -185,3 +137,321 @@ gdk_drag_context_get_source_window (GdkDragContext *context)

  return context->source_window;
 }
+
+/**
+ * gdk_drag_context_get_dest_window:
+ * @context: a #GdkDragContext
+ *
+ * Returns the destination windw for the DND operation.
+ *
+ * Return value: (transfer none): a #GdkWindow
+ *
+ * Since: 3.0
+ **/
+GdkWindow *
+gdk_drag_context_get_dest_window (GdkDragContext *context)
+{
+  g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), NULL);
+
+  return context->dest_window;
+}
+
+/**
+ * gdk_drag_context_get_protocol:
+ * @context: a #GdkDragContext
+ *
+ * Returns the drag protocol thats used by this context.
+ *
+ * Returns: the drag protocol
+ *
+ * Since: 3.0
+ */
+GdkDragProtocol
+gdk_drag_context_get_protocol (GdkDragContext *context)
+{
+  g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), GDK_DRAG_PROTO_NONE);
+
+  return context->protocol;
+}
+
+/**
+ * gdk_drag_context_set_device:
+ * @context: a #GdkDragContext
+ * @device: a #GdkDevice
+ *
+ * Associates a #GdkDevice to @context, so all Drag and Drop events
+ * for @context are emitted as if they came from this device.
+ */
+void
+gdk_drag_context_set_device (GdkDragContext *context,
+                             GdkDevice      *device)
+{
+  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
+  g_return_if_fail (GDK_IS_DEVICE (device));
+
+  if (context->device)
+    g_object_unref (context->device);
+
+  context->device = device;
+
+  if (context->device)
+    g_object_ref (context->device);
+}
+
+/**
+ * gdk_drag_context_get_device:
+ * @context: a #GdkDragContext
+ *
+ * Returns the #GdkDevice associated to the drag context.
+ *
+ * Returns: (transfer none): The #GdkDevice associated to @context.
+ **/
+GdkDevice *
+gdk_drag_context_get_device (GdkDragContext *context)
+{
+  g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), NULL);
+
+  return context->device;
+}
+
+G_DEFINE_TYPE (GdkDragContext, gdk_drag_context, G_TYPE_OBJECT)
+
+static void
+gdk_drag_context_init (GdkDragContext *context)
+{
+}
+
+static void
+gdk_drag_context_finalize (GObject *object)
+{
+  GdkDragContext *context = GDK_DRAG_CONTEXT (object);
+
+  g_list_free (context->targets);
+
+  if (context->source_window)
+    g_object_unref (context->source_window);
+
+  if (context->dest_window)
+    g_object_unref (context->dest_window);
+
+  G_OBJECT_CLASS (gdk_drag_context_parent_class)->finalize (object);
+}
+
+static void
+gdk_drag_context_class_init (GdkDragContextClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gdk_drag_context_finalize;
+}
+
+/**
+ * gdk_drag_find_window_for_screen:
+ * @context: a #GdkDragContext
+ * @drag_window: a window which may be at the pointer position, but
+ *     should be ignored, since it is put up by the drag source as an icon
+ * @screen: the screen where the destination window is sought
+ * @x_root: the x position of the pointer in root coordinates
+ * @y_root: the y position of the pointer in root coordinates
+ * @dest_window: (out): location to store the destination window in
+ * @protocol: (out): location to store the DND protocol in
+ *
+ * Finds the destination window and DND protocol to use at the
+ * given pointer position.
+ *
+ * This function is called by the drag source to obtain the
+ * @dest_window and @protocol parameters for gdk_drag_motion().
+ *
+ * Since: 2.2
+ */
+void
+gdk_drag_find_window_for_screen (GdkDragContext  *context,
+                                 GdkWindow       *drag_window,
+                                 GdkScreen       *screen,
+                                 gint             x_root,
+                                 gint             y_root,
+                                 GdkWindow      **dest_window,
+                                 GdkDragProtocol *protocol)
+{
+  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
+
+  *dest_window = GDK_DRAG_CONTEXT_GET_CLASS (context)
+      ->find_window (context, drag_window, screen, x_root, y_root, protocol);
+}
+
+/**
+ * gdk_drag_status:
+ * @context: a #GdkDragContext
+ * @action: the selected action which will be taken when a drop happens,
+ *    or 0 to indicate that a drop will not be accepted
+ * @time_: the timestamp for this operation
+ *
+ * Selects one of the actions offered by the drag source.
+ *
+ * This function is called by the drag destination in response to
+ * gdk_drag_motion() called by the drag source.
+ */
+void
+gdk_drag_status (GdkDragContext *context,
+                 GdkDragAction   action,
+                 guint32         time_)
+{
+  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
+
+  GDK_DRAG_CONTEXT_GET_CLASS (context)->drag_status (context, action, time_);
+}
+
+/**
+ * gdk_drag_motion:
+ * @context: a #GdkDragContext
+ * @dest_window: the new destination window, obtained by
+ *     gdk_drag_find_window()
+ * @protocol: the DND protocol in use, obtained by gdk_drag_find_window()
+ * @x_root: the x position of the pointer in root coordinates
+ * @y_root: the y position of the pointer in root coordinates
+ * @suggested_action: the suggested action
+ * @possible_actions: the possible actions
+ * @time_: the timestamp for this operation
+ *
+ * Updates the drag context when the pointer moves or the
+ * set of actions changes.
+ *
+ * This function is called by the drag source.
+ */
+gboolean
+gdk_drag_motion (GdkDragContext *context,
+                 GdkWindow      *dest_window,
+                 GdkDragProtocol protocol,
+                 gint            x_root,
+                 gint            y_root,
+                 GdkDragAction   suggested_action,
+                 GdkDragAction   possible_actions,
+                 guint32         time_)
+{
+  g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
+
+  return GDK_DRAG_CONTEXT_GET_CLASS (context)
+       ->drag_motion (context,
+                      dest_window,
+                      protocol,
+                      x_root,
+                      y_root,
+                      suggested_action,
+                      possible_actions,
+                      time_);
+}
+
+/**
+ * gdk_drag_abort:
+ * @context: a #GdkDragContext
+ * @time_: the timestamp for this operation
+ *
+ * Aborts a drag without dropping.
+ *
+ * This function is called by the drag source.
+ */
+void
+gdk_drag_abort (GdkDragContext *context,
+                guint32         time_)
+{
+  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
+
+  GDK_DRAG_CONTEXT_GET_CLASS (context)->drag_abort (context, time_);
+}
+
+/**
+ * gdk_drag_drop:
+ * @context: a #GdkDragContext
+ * @time_: the timestamp for this operation
+ *
+ * Drops on the current destination.
+ *
+ * This function is called by the drag source.
+ */
+void
+gdk_drag_drop (GdkDragContext *context,
+               guint32         time_)
+{
+  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
+
+  GDK_DRAG_CONTEXT_GET_CLASS (context)->drag_drop (context, time_);
+}
+
+/**
+ * gdk_drop_reply:
+ * @context: a #GdkDragContext
+ * @accepted: %TRUE if the drop is accepted
+ * @time_: the timestamp for this operation
+ *
+ * Accepts or rejects a drop.
+ *
+ * This function is called by the drag destination in response
+ * to a drop initiated by the drag source.
+ */
+void
+gdk_drop_reply (GdkDragContext *context,
+                gboolean        accepted,
+                guint32         time_)
+{
+  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
+
+  GDK_DRAG_CONTEXT_GET_CLASS (context)->drop_reply (context, accepted, time_);
+}
+
+/**
+ * gdk_drop_finish:
+ * @context: a #GtkDragContext
+ * @success: %TRUE if the data was successfully received
+ * @time_: the timestamp for this operation
+ *
+ * Ends the drag operation after a drop.
+ *
+ * This function is called by the drag destination.
+ */
+void
+gdk_drop_finish (GdkDragContext *context,
+                 gboolean        success,
+                 guint32         time_)
+{
+  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
+
+  GDK_DRAG_CONTEXT_GET_CLASS (context)->drop_finish (context, success, time_);
+}
+
+/**
+ * gdk_drag_drop_succeeded:
+ * @context: a #GdkDragContext
+ *
+ * Returns whether the dropped data has been successfully
+ * transferred. This function is intended to be used while
+ * handling a %GDK_DROP_FINISHED event, its return value is
+ * meaningless at other times.
+ *
+ * Return value: %TRUE if the drop was successful.
+ *
+ * Since: 2.6
+ **/
+gboolean
+gdk_drag_drop_succeeded (GdkDragContext *context)
+{
+  g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
+
+  return GDK_DRAG_CONTEXT_GET_CLASS (context)->drop_status (context);
+}
+
+/**
+ * gdk_drag_get_selection:
+ * @context: a #GdkDragContext.
+ *
+ * Returns the selection atom for the current source window.
+ *
+ * Return value: the selection atom, or %GDK_NONE
+ */
+GdkAtom
+gdk_drag_get_selection (GdkDragContext *context)
+{
+  g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), GDK_NONE);
+  g_return_val_if_fail (context->source_window != NULL, GDK_NONE);
+
+  return GDK_DRAG_CONTEXT_GET_CLASS (context)->get_selection (context);
+}
@@ -36,7 +36,9 @@

 G_BEGIN_DECLS

-typedef struct _GdkDragContext        GdkDragContext;
+#define GDK_TYPE_DRAG_CONTEXT              (gdk_drag_context_get_type ())
+#define GDK_DRAG_CONTEXT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAG_CONTEXT, GdkDragContext))
+#define GDK_IS_DRAG_CONTEXT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAG_CONTEXT))

 /**
 * GdkDragAction:
@@ -81,60 +83,15 @@ typedef enum
 {
  GDK_DRAG_PROTO_MOTIF,
  GDK_DRAG_PROTO_XDND,
-  GDK_DRAG_PROTO_ROOTWIN,	  /* A root window with nobody claiming
-				   * drags */
-  GDK_DRAG_PROTO_NONE,		  /* Not a valid drag window */
-  GDK_DRAG_PROTO_WIN32_DROPFILES, /* The simple WM_DROPFILES dnd */
-  GDK_DRAG_PROTO_OLE2,		  /* The complex OLE2 dnd (not implemented) */
-  GDK_DRAG_PROTO_LOCAL            /* Intra-app */
+  GDK_DRAG_PROTO_ROOTWIN,
+  GDK_DRAG_PROTO_NONE,
+  GDK_DRAG_PROTO_WIN32_DROPFILES,
+  GDK_DRAG_PROTO_OLE2,
+  GDK_DRAG_PROTO_LOCAL
 } GdkDragProtocol;

-/* Object that holds information about a drag in progress.
- * this is used on both source and destination sides.
- */

-typedef struct _GdkDragContextClass GdkDragContextClass;
-
-#define GDK_TYPE_DRAG_CONTEXT              (gdk_drag_context_get_type ())
-#define GDK_DRAG_CONTEXT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAG_CONTEXT, GdkDragContext))
-#define GDK_DRAG_CONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
-#define GDK_IS_DRAG_CONTEXT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAG_CONTEXT))
-#define GDK_IS_DRAG_CONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAG_CONTEXT))
-#define GDK_DRAG_CONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
-
-struct _GdkDragContext {
-  GObject parent_instance;
-
-  /*< public >*/
-  
-  GdkDragProtocol GSEAL (protocol);
-
-  gboolean GSEAL (is_source);
-  
-  GdkWindow *GSEAL (source_window);
-  GdkWindow *GSEAL (dest_window);
-
-  GList *GSEAL (targets);
-  GdkDragAction GSEAL (actions);
-  GdkDragAction GSEAL (suggested_action);
-  GdkDragAction GSEAL (action);
-
-  guint32 GSEAL (start_time);
-
-  /*< private >*/
-  
-  gpointer GSEAL (windowing_data);
-};
-
-struct _GdkDragContextClass {
-  GObjectClass parent_class;
-
-};
-
-/* Drag and Drop */
-
-GType            gdk_drag_context_get_type   (void) G_GNUC_CONST;
-GdkDragContext * gdk_drag_context_new        (void);
+GType            gdk_drag_context_get_type             (void) G_GNUC_CONST;

 void             gdk_drag_context_set_device           (GdkDragContext *context,
                                                        GdkDevice      *device);
@@ -146,61 +103,55 @@ GdkDragAction    gdk_drag_context_get_suggested_action (GdkDragContext *context)
 GdkDragAction    gdk_drag_context_get_selected_action  (GdkDragContext *context);

 GdkWindow       *gdk_drag_context_get_source_window    (GdkDragContext *context);
+GdkWindow       *gdk_drag_context_get_dest_window      (GdkDragContext *context);
+GdkDragProtocol  gdk_drag_context_get_protocol         (GdkDragContext *context);

 /* Destination side */

 void             gdk_drag_status        (GdkDragContext   *context,
-				         GdkDragAction     action,
-					 guint32           time_);
+                                         GdkDragAction     action,
+                                         guint32           time_);
 void             gdk_drop_reply         (GdkDragContext   *context,
-					 gboolean          ok,
-					 guint32           time_);
+                                         gboolean          accepted,
+                                         guint32           time_);
 void             gdk_drop_finish        (GdkDragContext   *context,
-					 gboolean          success,
-					 guint32           time_);
+                                         gboolean          success,
+                                         guint32           time_);
 GdkAtom          gdk_drag_get_selection (GdkDragContext   *context);

 /* Source side */

-GdkDragContext * gdk_drag_begin      (GdkWindow      *window,
-				      GList          *targets);
+GdkDragContext * gdk_drag_begin            (GdkWindow      *window,
+                                            GList          *targets);
+
+GdkDragContext * gdk_drag_begin_for_device (GdkWindow      *window,
+                                            GdkDevice      *device,
+                                            GList          *targets);

 GdkNativeWindow gdk_drag_get_protocol_for_display (GdkDisplay       *display,
-						   GdkNativeWindow   xid,
-						   GdkDragProtocol  *protocol);
+                                                   GdkNativeWindow   xid,
+                                                   GdkDragProtocol  *protocol);

 void    gdk_drag_find_window_for_screen   (GdkDragContext   *context,
-					   GdkWindow        *drag_window,
-					   GdkScreen        *screen,
-					   gint              x_root,
-					   gint              y_root,
-					   GdkWindow       **dest_window,
-					   GdkDragProtocol  *protocol);
-
-#ifndef GDK_MULTIHEAD_SAFE
-GdkNativeWindow gdk_drag_get_protocol (GdkNativeWindow   xid,
-				       GdkDragProtocol  *protocol);
-
-void    gdk_drag_find_window  (GdkDragContext   *context,
-			       GdkWindow        *drag_window,
-			       gint              x_root,
-			       gint              y_root,
-			       GdkWindow       **dest_window,
-			       GdkDragProtocol  *protocol);
-#endif /* GDK_MULTIHEAD_SAFE */
+                                           GdkWindow        *drag_window,
+                                           GdkScreen        *screen,
+                                           gint              x_root,
+                                           gint              y_root,
+                                           GdkWindow       **dest_window,
+                                           GdkDragProtocol  *protocol);

 gboolean        gdk_drag_motion      (GdkDragContext *context,
-				      GdkWindow      *dest_window,
-				      GdkDragProtocol protocol,
-				      gint            x_root, 
-				      gint            y_root,
-				      GdkDragAction   suggested_action,
-				      GdkDragAction   possible_actions,
-				      guint32         time_);
+                                      GdkWindow      *dest_window,
+                                      GdkDragProtocol protocol,
+                                      gint            x_root,
+                                      gint            y_root,
+                                      GdkDragAction   suggested_action,
+                                      GdkDragAction   possible_actions,
+                                      guint32         time_);
 void            gdk_drag_drop        (GdkDragContext *context,
-				      guint32         time_);
+                                      guint32         time_);
 void            gdk_drag_abort       (GdkDragContext *context,
-				      guint32         time_);
+                                      guint32         time_);
 gboolean        gdk_drag_drop_succeeded (GdkDragContext *context);

 G_END_DECLS
@@ -0,0 +1,91 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2010, Red Hat, Inc
+ *
+ * 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.
+ */
+
+#ifndef __GDK_DND_PRIVATE_H__
+#define __GDK_DND_PRIVATE_H__
+
+#include "gdkdnd.h"
+
+G_BEGIN_DECLS
+
+
+#define GDK_DRAG_CONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
+#define GDK_IS_DRAG_CONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAG_CONTEXT))
+#define GDK_DRAG_CONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
+
+typedef struct _GdkDragContextClass GdkDragContextClass;
+
+
+struct _GdkDragContextClass {
+  GObjectClass parent_class;
+
+  GdkWindow * (*find_window)   (GdkDragContext  *context,
+                                GdkWindow       *drag_window,
+                                GdkScreen       *screen,
+                                gint             x_root,
+                                gint             y_root,
+                                GdkDragProtocol *protocol);
+  GdkAtom     (*get_selection) (GdkDragContext  *context);
+  gboolean    (*drag_motion)   (GdkDragContext  *context,
+                                GdkWindow       *dest_window,
+                                GdkDragProtocol  protocol,
+                                gint             root_x,
+                                gint             root_y,
+                                GdkDragAction    suggested_action,
+                                GdkDragAction    possible_actions,
+                                guint32          time_);
+  void        (*drag_status)   (GdkDragContext  *context,
+                                GdkDragAction    action,
+                                guint32          time_);
+  void        (*drag_abort)    (GdkDragContext  *context,
+                                guint32          time_);
+  void        (*drag_drop)     (GdkDragContext  *context,
+                                guint32          time_);
+  void        (*drop_reply)    (GdkDragContext  *context,
+                                gboolean         accept,
+                                guint32          time_);
+  void        (*drop_finish)   (GdkDragContext  *context,
+                                gboolean         success,
+                                guint32          time_);
+  gboolean    (*drop_status)   (GdkDragContext  *context);
+};
+
+struct _GdkDragContext {
+  GObject parent_instance;
+
+  /*< private >*/
+  GdkDragProtocol protocol;
+
+  gboolean is_source;
+  GdkWindow *source_window;
+  GdkWindow *dest_window;
+
+  GList *targets;
+  GdkDragAction actions;
+  GdkDragAction suggested_action;
+  GdkDragAction action;
+
+  guint32 start_time;
+
+  GdkDevice *device;
+};
+
+G_END_DECLS
+
+#endif
@@ -1,123 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#include "config.h"
-
-#include "gdkdrawable.h"
-
-#include "gdkcairo.h"
-#include "gdkinternals.h"
-#include "gdkwindow.h"
-#include "gdkscreen.h"
-#include "gdkpixbuf.h"
-
-#include <pango/pangocairo.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <math.h>
-
-G_DEFINE_ABSTRACT_TYPE (GdkDrawable, gdk_drawable, G_TYPE_OBJECT)
-
-static void
-gdk_drawable_class_init (GdkDrawableClass *klass)
-{
-}
-
-static void
-gdk_drawable_init (GdkDrawable *drawable)
-{
-}
-
-/**
- * gdk_drawable_get_clip_region:
- * @drawable: a #GdkDrawable
- * 
- * Computes the region of a drawable that potentially can be written
- * to by drawing primitives. This region will not take into account
- * the clip region for the GC, and may also not take into account
- * other factors such as if the window is obscured by other windows,
- * but no area outside of this region will be affected by drawing
- * primitives.
- * 
- * Returns: a #cairo_region_t. This must be freed with cairo_region_destroy()
- *          when you are done.
- **/
-cairo_region_t *
-gdk_drawable_get_clip_region (GdkDrawable *drawable)
-{
-  g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
-
-  return GDK_DRAWABLE_GET_CLASS (drawable)->get_clip_region (drawable);
-}
-
-/**
- * gdk_drawable_get_visible_region:
- * @drawable: a #GdkDrawable
- * 
- * Computes the region of a drawable that is potentially visible.
- * This does not necessarily take into account if the window is
- * obscured by other windows, but no area outside of this region
- * is visible.
- * 
- * Returns: a #cairo_region_t. This must be freed with cairo_region_destroy()
- *          when you are done.
- **/
-cairo_region_t *
-gdk_drawable_get_visible_region (GdkDrawable *drawable)
-{
-  g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
-
-  return GDK_DRAWABLE_GET_CLASS (drawable)->get_visible_region (drawable);
-}
-
-/**
- * _gdk_drawable_ref_cairo_surface:
- * @drawable: a #GdkDrawable
- * 
- * Obtains a #cairo_surface_t for the given drawable. If a
- * #cairo_surface_t for the drawable already exists, it will be
- * referenced, otherwise a new surface will be created.
- * 
- * Return value: a newly referenced #cairo_surface_t that points
- *  to @drawable. Unref with cairo_surface_destroy()
- **/
-cairo_surface_t *
-_gdk_drawable_ref_cairo_surface (GdkDrawable *drawable)
-{
-  g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
-
-  return GDK_DRAWABLE_GET_CLASS (drawable)->ref_cairo_surface (drawable);
-}
-
-/************************************************************************/
-
-cairo_surface_t *
-_gdk_drawable_create_cairo_surface (GdkDrawable *drawable,
-				    int width,
-				    int height)
-{
-  return GDK_DRAWABLE_GET_CLASS (drawable)->create_cairo_surface (drawable,
-								  width, height);
-}
--- a/Show More
+++ b/Show More