gdkframeclock: Loop the layout phase if needed

In the case where the layout phase queued a layout we don't want to progress to the paint phase with invalid allocations, so we loop the layout. This shouldn't normally happen, but it may happen in some edge cases like if user/wm resizes clash with natural window size changes from a gtk widget. This should not generally loop though, so we detect this after 4 cycles and print a warning. This was detected because of an issue in GtkWindow where it seems to incorrectly handle the case of a user interactive resize. It seems gtk_window_move_resize() believes that configure_request_size_changed changed due to hitting some corner case so it calls gtk_widget_queue_resize_no_redraw(), marking the window as need_alloc after the layout phase. This commit fixes the issue, but we should also look into if we can fix that.
Change the way we draw (again)
2013-04-24 22:21:06 +02:00 · 2013-04-24 18:20:56 +02:00 · 2013-04-23 19:16:30 +02:00 · 2013-04-21 01:54:05 +02:00 · 2013-04-21 01:35:57 +02:00 · 2013-04-21 01:27:07 +02:00
374 changed files with 58554 additions and 71028 deletions
@@ -1,249 +1,3 @@
-Overview of Changes in GTK+ 3.8.7
-=================================
-
-* Bugs fixed:
- 577642 Selected Printer Does Not Stick Between Sessions
- 699574 gtk_selection_owner_set() breaks mouse wheel scrolling
- 702663 GtkComboBox::appears-as-list does not respect scrolling
- 703784 Epiphany crash during displaying printing dialog
- 705176 Reordering columns in GtkTreeView freezes mutter
- 710666 Frame clock related bug fixes
- 710754 GtkModelMenu: don't leak submenus
- 712213 Nautilus "connect to server" dialog has an incorrect "_"...
-
-
-Overview of Changes in GTK+ 3.8.6
-=================================
-
-* Bugs fixed:
- 698730 tooltip: Fix possible wrong placement
- 709697 Fix a warning in builg gtk+ with clang
- 709967 Double free in gtkicontheme.c
- 710073 Assertion failure because _gtk_icon_info_load...
-
-
-Overview of Changes in GTK+ 3.8.5
-=================================
-
-* Bugs fixed:
- 339539 Ctrl-C, Ctrl-V changes tags
- 341146 reorder lines in configure.in for a better display
- 513812 Optimize gdk_cairo_set_source_pixbuf() alpha multipli...
- 586107 gtkprintbackendpapi.c does not compile on Solaris 10
- 696756 x11: gdk_device_get_source : assertion `GDK_IS_DEVICE...
- 703062 GtkTreeViewColumn returns negative size request on em...
- 706269 Clarify GtkBox, GtkHBox, and GtkVBox documentation
- 706345 GtkExpander's click-and-drag behavior should match th...
- 707872 GtkSwitch shouldn't have a default name
- 707926 GtkSwitch shouldn't have a default accessible description
- 708414 entrycompletion: set the GtkWindow as attached to the...
- 709056 icontheme: use g_file_load_contents() for symbolic icons
- 709264 Fix memory leaks in icons handling 
-
-* Translation updates:
- Scottish Gaelic
- Slovenian
-
-
-Overview of Changes in GTK+ 3.8.3
-=================================
-
-* Bugs fixed:
- 667759 gtkdnd-quartz.c is missing annotations for introspection
- 672271 File chooser seems over-enthusiastic about using subdir...
- 674108 Hard crash due to wrong NSAutoreleasePool stacking
- 680953 set_item_width / text wrapping doesn't work in iconview...
- 688738 GtkMenuButton problem with mnemonics / accelerators
- 691921 GTK+ (quartz) built on Mac OS X 10.5 references [NSMenu...
- 692548 Quartz: Cursor doesn't reset when the mouse leaves a to...
- 694273 Patch to support NSTextInputClient in text widgets
- 694755 When clicking Activities, sometimes gnome-shell crashes.
- 696498 can't set download folder
- 696640 GtkButton: Don't suppress unhandled mouse events
- 698183 Text input is too slow and some keys are broken after c...
- 698758 Wrong limit for "Native Windows wider or taller than 65...
- 700185 GtkWindow: problem with child widget visibility
- 700779 gtk_menu_item_draw puts the arrow too close to the border
- 701332 Patch for minor glitch in NSTextInput
- 701341 Windows only paint once in Weston 1.1
- 701365 Do not assert sm_proxy != NULL in GtkApplication inhibi...
- 701613 XEmbed doesn't work with frame-synced GTK/Mutter
- 702598 Invalid read of size 4 in gtk_icon_info_get_embedded_rect
- 702763 ellipsize placeholder text
- 702913 Reduce hash table lookups in gdk_x11_screen_supports_ne...
- 703069 Opening a big menu activates some menu entry
- 703220 Memory allocation integer overflow in gdk_cairo_set_sou...
- 705181 Annoying beep on arrow keys when using IME on MacOS
- 705182 Reset Cocoa IME state when immodule is reset
- 705320 gtkicontheme: check for GdkPixbuf first
- 705692 Segmentation fault on horizontal slider
- 705750 Quartz input method doesn't work correctly for Chinese...
- 706152 g_object_notify called with NULL priv->focus_widget
-
-* Translation updates:
- Brazilian Portuguese
- Traditional Chinese
-
-
-Overview of Changes in GTK+ 3.8.2
-=================================
-
-* Bugs fixed:
- 504901 GtkCellRendererCombo requires click-and-hold
- 695120 GtkMenu and GdkWindow sizes can get out of sync
- 698051 Typo in documentation comment
- 698181 Document icon-shadow CSS property
- 699104 when nothing is selected, Add to Bookmarks is enabled...
- 699239 Choose DnD/tooltip widget better on GtkOverlay and ot...
- 699750 Print dialog crashes when printer does not provide pr...
- 699901 GTK CSS keybinding broken
- 699929 GtkCheckMenuItem: remove an unused boolean field
- 700007 Various small improvements
- 700079 Fix accels added after the window was shown not working
-
-Translation updates:
- Brazilian Portuguese
- German
- Italian
- Japanese
- Lithuanian
- Norwegian bokmål
- Russian
-
-
-Overview of Changes in GTK+ 3.8.1
-=================================
-
-* Broadway backend improvements:
- - Ensure window sizes are synched right
- - Sync surface updates with paint clock
- - Add support for password authentication
- - Reuse surfaces passed to server
-
-* CSS improvements:
- - Add cycle detection to color resolving
-
-* Bug fixes
- 675649 gtk-demo: Fix typo
- 681446 gtkdnd memory leak
- 685419 gtkprintbackendfile: Infinite loop in _cairo_write()
- 685420 Critical warnings when GtkPrintJob is released too early
- 690275 scrolling on other windows is applied when coming back...
- 696370 GtkOverlay doesn't work on top of GtkClutterEmbed
- 696622 gtk option printer widget segfault in epiphany
- 696623 GtkOverlay with a revealer produces warnings setting a...
- 696882 GtkWindow changes size after hide/show cycle
- 697144 Popup menu mnemonics fixes
- 697263 Impossible to set window transparency on 3.8
- 697427 Unreferencing GtkStatusIcon object causes abort
-
-* Translation updates
- Basque
- British English
- Catalan (Valencian)
- Czech
- Finnish
- Hungarian
- Indonesian
- Interlingua
- Kannada
- Malayalam
- Norwegian bokmål
- Polish
- Simplified Chinese
- Slovak
- Slovenian
-
-
-Overview of Changes in GTK+ 3.8.0
-=================================
-
-* Bug fixes
- 674759 GtkLabel: wrong value of "mnemonic-keyval" when...
- 695493 testgtk: issues with the color selection example
- 696051 vertical grid lines in rtl mode
- 696171 GtkAssistant highlighted font unreadable
- 696202 Add GtkSpinner animation back to Win32 theme
- 696232 win32: do not crash on invalid utf8 conversion
- 696405 appchooserbutton: filter out applications not...
- 696546 Fix a crash in gtk_print_backend_cups_finalize()
- 696553 Fix a crash in avahi_create_browsers()
-        Use natural size to set treeview adjustments
-
-* Translation updates
- Aragonese
- Czech
- French
- Galician
- German
- Gujarati
- Hindi
- Hungarian
- Italian
- Kazakh
- Marathi
- Odia
-  Persian
- Punjabi
- Russian
- Slovenian
- Tamil
- Traditional Chinese
- Ukrainian
-
-
-Overview of Changes in GTK+ 3.7.14
-==================================
-
-* A lot of filechooser button fixes
-
-* Bugs fixed:
- 586367 In local_only mode, file chooser should return native...
- 671939 crash on exit
- 674759 GtkLabel: wrong value of "mnemonic-keyval" when "use-...
- 691040 selection is reported incorrectly in file chooser button
- 694339 Fix build of GTK+ on Windows
- 695200 Switching apps while a combobox open makes the parent...
- 695278 Avoid passing a NULL title to setTitle
- 695304 GtkTextView: don't popdown a bubble if we don't have one
- 695312 Initial 'text' set in the non-numeric-only GtkSpinBut...
- 695375 GtkEntryAccessible: also handle entry icon tooltip NU...
- 695391 wayland documentation section id is "gtk-osx"
- 695473 treeview: fix a critical warning
- 695482 Universal Access panel appears jumbled and horrible a...
- 695682 Cannot build docs for wayland-only build
- 695714 Getting of printer info can hang
- 695715 Use DBus calls instead of Avahi API
- 695772 Different appearance of menus within Audacious
- 695783 GtkApplication: Allow passing windows on non-X11 targets
- 695874 GtkFontChooser docs
- 695948 GtkFontButton sets wrong show-preview-entry
-
-* Translation updates:
- Arabic
- Assamese
- Belarusian
- Brazilian Portuguese
- Catalan
- Danish
- Finnish
- French
- Galician
- German
- Greek
- Indonesian
- Kazakh
- Lithuanian
- Korean
- Polish
- Portuguese
- Punjabi
- Serbian
- Slovenian
- Spanish
- Uyghur
-
-
 Overview of Changes in GTK+ 3.7.12
 ==================================

@@ -69,7 +69,17 @@ to that bug report.
 Otherwise, enter a new bug report that describes the patch,
 and attach the patch to that bug report.

-Patches should be in unified diff form. (The -up option to GNU diff.)
+Patches should be in unified diff form. (The -up option to GNU diff)
+Even better are git-formatted patches. (Use git format-patch)
+
+
+Release notes for 3.10
+======================
+
+* GDK has been changed to allow only a single screen per display.
+  Only the X11 backend had multiple screens before, and multi-screen
+  setups (not multi-monitor!) are very rare nowadays. If you really
+  need multiple X screens, open them as separate displays.

 Release notes for 3.8
 =====================
@@ -75,7 +75,7 @@
      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
@@ -79,7 +79,7 @@
      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
@@ -10,9 +10,9 @@
    <GtkBinaryVersion>3.0.0</GtkBinaryVersion>
    <GtkDummyPrefix>\"/dummy\"</GtkDummyPrefix>
    <GtkPrefixDefine>GTK_PREFIX="\"$(GtkDummyPrefix)\""</GtkPrefixDefine>
-    <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="Gdk"</GdkDefines>
+    <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="\"Gdk\""</GdkDefines>
    <GtkIncludedImmodulesDefines>INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr</GtkIncludedImmodulesDefines>
-    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_PREVIEW_COMMAND="undefined-gtk-print-preview-command";$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED</GtkDefines>
+    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="\"Gtk\"";GTK_HOST="\"i686-pc-vs$(VSVer)\"";GTK_PRINT_BACKENDS="\"file\"";GTK_PRINT_PREVIEW_COMMAND="\"undefined-gtk-print-preview-command\"";$(GtkIncludedImmodulesDefines);GTK_LIBDIR="\"$(GtkDummyPrefix)/lib\"";GTK_DATADIR="\"$(GtkDummyPrefix)/share\"";GTK_DATA_PREFIX="\"$(GtkDummyPrefix)\"";GTK_SYSCONFDIR="\"$(GtkDummyPrefix)/etc\"";MULTIPRESS_CONFDIR="\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\"";MULTIPRESS_LOCALEDIR="\"$(GtkDummyPrefix)/share/locale\"";GTK_VERSION="\"$(GtkVersion)/etc\"";GTK_BINARY_VERSION="\"$(GtkBinaryVersion)/etc\"";GDK_DISABLE_DEPRECATED</GtkDefines>
    <GtkDoInstall>
 echo on

@@ -79,7 +79,7 @@
      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
@@ -79,7 +79,7 @@
      <PreprocessorDefinitions>_DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
@@ -35,7 +35,7 @@
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
@@ -35,7 +35,7 @@
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
@@ -35,7 +35,7 @@
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
@@ -35,7 +35,7 @@
 				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
@@ -9,9 +9,9 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.

 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [8])
-m4_define([gtk_micro_version], [7])
-m4_define([gtk_interface_age], [7])
+m4_define([gtk_minor_version], [9])
+m4_define([gtk_micro_version], [0])
+m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -42,7 +42,7 @@ AC_CANONICAL_TARGET
 m4_define([gtk_binary_version], [3.0.0])

 # required versions of other packages
-m4_define([glib_required_version], [2.35.3])
+m4_define([glib_required_version], [2.37.0])
 m4_define([pango_required_version], [1.32.4])
 m4_define([atk_required_version], [2.7.5])
 m4_define([cairo_required_version], [1.10.0])
@@ -361,7 +361,6 @@ DISABLE_ON_QUARTZ=''
 if test "x$enable_quartz_backend" = xyes; then
  cairo_backends="$cairo_backends cairo-quartz"
  GDK_BACKENDS="$GDK_BACKENDS quartz"
-  backend_immodules="$backend_immodules,quartz"
  GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_QUARTZ"
  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
@@ -876,7 +875,6 @@ AM_CONDITIONAL(INCLUDE_IM_IME, [test x"$INCLUDE_ime" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_INUKTITUT, [test x"$INCLUDE_inuktitut" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_IPA, [test x"$INCLUDE_ipa" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_MULTIPRESS, [test x"$INCLUDE_multipress" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_QUARTZ, [test x"$INCLUDE_quartz" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_THAI, [test x"$INCLUDE_thai" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_TI_ER, [test x"$INCLUDE_ti_er" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_TI_ET, [test x"$INCLUDE_ti_et" = xyes])
@@ -1087,6 +1085,7 @@ if test "x$enable_x11_backend" = xyes; then
      case "$host" in
        *-*-solaris*)
            # Check for solaris
+	    AC_MSG_CHECKING(for Xinerama support on Solaris)

 	    have_solaris_xinerama=false
 	    AC_CHECK_FUNC(XineramaGetInfo,
@@ -1094,8 +1093,6 @@ if test "x$enable_x11_backend" = xyes; then
 		    [have_solaris_xinerama=true], :,
 		    [#include <X11/Xlib.h>])])

-	    AC_MSG_CHECKING(for Xinerama support on Solaris)
-
            if $have_solaris_xinerama ; then
              X_EXTENSIONS="$X_EXTENSIONS Xinerama"
              AC_DEFINE(HAVE_SOLARIS_XINERAMA, 1,
@@ -1245,6 +1242,7 @@ if test "$have_gio_unix" = "yes"; then
 else
  GDK_GIO_PACKAGE=gio-2.0
 fi
+AM_CONDITIONAL(HAVE_GIO_UNIX, test "$have_gio_unix" = "yes")

 # Check for Pango flags

@@ -1,24 +1,23 @@
 /* Change Display
 *
- * Demonstrates migrating a window between different displays and
- * screens. A display is a mouse and keyboard with some number of
- * associated monitors. A screen is a set of monitors grouped
- * into a single physical work area. The neat thing about having
- * multiple displays is that they can be on a completely separate
+ * Demonstrates migrating a window between different displays.
+ * A display is a mouse and keyboard with some number of
+ * associated monitors. The neat thing about having multiple 
+ * displays is that they can be on a completely separate
 * computers, as long as there is a network connection to the
 * computer where the application is running.
 *
 * Only some of the windowing systems where GTK+ runs have the
- * concept of multiple displays and screens. (The X Window System
- * is the main example.) Other windowing systems can only
- * handle one keyboard and mouse, and combine all monitors into
- * a single screen.
+ * concept of multiple displays. (The X Window System is the
+ * main example.) Other windowing systems can only handle one
+ * keyboard and mouse, and combine all monitors into
+ * a single display.
 *
 * This is a moderately complex example, and demonstrates:
 *
- *  - Tracking the currently open displays and screens
+ *  - Tracking the currently open displays
 *
- *  - Changing the screen for a window
+ *  - Changing the display for a window
 *
 *  - Letting the user choose a window by clicking on it
 *
@@ -45,11 +44,8 @@ struct _ChangeDisplayInfo
  GtkSizeGroup *size_group;

  GtkTreeModel *display_model;
-  GtkTreeModel *screen_model;
-  GtkTreeSelection *screen_selection;

  GdkDisplay *current_display;
-  GdkScreen *current_screen;
 };

 /* These enumerations provide symbolic names for the columns
@@ -177,40 +173,11 @@ query_change_display (ChangeDisplayInfo *info)
                                 "to move to the new screen");

  if (toplevel)
-    gtk_window_set_screen (GTK_WINDOW (toplevel), info->current_screen);
+    gtk_window_set_screen (GTK_WINDOW (toplevel), gdk_display_get_screen (info->current_display, 0));
  else
    gdk_display_beep (gdk_screen_get_display (screen));
 }

-/* Fills in the screen list based on the current display
- */
-static void
-fill_screens (ChangeDisplayInfo *info)
-{
-  gtk_list_store_clear (GTK_LIST_STORE (info->screen_model));
-
-  if (info->current_display)
-    {
-      gint n_screens = gdk_display_get_n_screens (info->current_display);
-      gint i;
-
-      for (i = 0; i < n_screens; i++)
-        {
-          GdkScreen *screen = gdk_display_get_screen (info->current_display, i);
-          GtkTreeIter iter;
-
-          gtk_list_store_append (GTK_LIST_STORE (info->screen_model), &iter);
-          gtk_list_store_set (GTK_LIST_STORE (info->screen_model), &iter,
-                              SCREEN_COLUMN_NUMBER, i,
-                              SCREEN_COLUMN_SCREEN, screen,
-                              -1);
-
-          if (i == 0)
-            gtk_tree_selection_select_iter (info->screen_selection, &iter);
-        }
-    }
-}
-
 /* Called when the user clicks on a button in our dialog or
 * closes the dialog through the window manager. Unless the
 * "Change" button was clicked, we destroy the dialog.
@@ -320,28 +287,6 @@ display_changed_cb (GtkTreeSelection  *selection,
                        -1);
  else
    info->current_display = NULL;
-
-  fill_screens (info);
-}
-
-/* Called when the selected row in the sceen list changes.
- * Updates info->current_screen.
- */
-static void
-screen_changed_cb (GtkTreeSelection  *selection,
-                   ChangeDisplayInfo *info)
-{
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-
-  if (info->current_screen)
-    g_object_unref (info->current_screen);
-  if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    gtk_tree_model_get (model, &iter,
-                        SCREEN_COLUMN_SCREEN, &info->current_screen,
-                        -1);
-  else
-    info->current_screen = NULL;
 }

 /* This function is used both for creating the "Display" and
@@ -446,37 +391,6 @@ create_display_frame (ChangeDisplayInfo *info)
  return frame;
 }

-/* Creates the "Screen" frame in the main window.
- */
-GtkWidget *
-create_screen_frame (ChangeDisplayInfo *info)
-{
-  GtkWidget *frame;
-  GtkWidget *tree_view;
-  GtkWidget *button_vbox;
-  GtkTreeViewColumn *column;
-
-  create_frame (info, "Screen", &frame, &tree_view, &button_vbox);
-
-  info->screen_model = (GtkTreeModel *)gtk_list_store_new (SCREEN_NUM_COLUMNS,
-                                                           G_TYPE_INT,
-                                                           GDK_TYPE_SCREEN);
-
-  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), info->screen_model);
-
-  column = gtk_tree_view_column_new_with_attributes ("Number",
-                                                     gtk_cell_renderer_text_new (),
-                                                     "text", SCREEN_COLUMN_NUMBER,
-                                                     NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
-
-  info->screen_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
-  g_signal_connect (info->screen_selection, "changed",
-                    G_CALLBACK (screen_changed_cb), info);
-
-  return frame;
-}
-
 /* Called when one of the currently open displays is closed.
 * Remove it from our list of displays.
 */
@@ -580,12 +494,9 @@ destroy_info (ChangeDisplayInfo *info)

  g_object_unref (info->size_group);
  g_object_unref (info->display_model);
-  g_object_unref (info->screen_model);

  if (info->current_display)
    g_object_unref (info->current_display);
-  if (info->current_screen)
-    g_object_unref (info->current_screen);

  g_free (info);
 }
@@ -637,9 +548,6 @@ do_changedisplay (GtkWidget *do_widget)
      frame = create_display_frame (info);
      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);

-      frame = create_screen_frame (info);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-
      initialize_displays (info);

      gtk_widget_show_all (info->window);
@@ -22,7 +22,6 @@ struct _CanvasItem
  gdouble x, y;
 };

-static gboolean drag_data_requested_for_drop = FALSE;
 static CanvasItem *drop_item = NULL;
 static GList *canvas_items = NULL;

@@ -267,7 +266,6 @@ interactive_canvas_drag_motion (GtkWidget      *widget,
      if (!target)
        return FALSE;

-      drag_data_requested_for_drop = FALSE;
      gtk_drag_get_data (widget, context, target, time);
    }

@@ -297,36 +295,16 @@ interactive_canvas_drag_data_received (GtkWidget        *widget,
    tool_item = gtk_tool_palette_get_drag_item (GTK_TOOL_PALETTE (palette),
                                                selection);

-  /* create a canvas item when a tool button was found */
+  /* create a drop indicator when a tool button was found */

  g_assert (NULL == drop_item);

-  if (!GTK_IS_TOOL_ITEM (tool_item))
-    return;
-
-  if (drop_item)
+  if (GTK_IS_TOOL_ITEM (tool_item))
    {
-      canvas_item_free (drop_item);
-      drop_item = NULL;
-    }
-
-  CanvasItem *item = canvas_item_new (widget, GTK_TOOL_BUTTON (tool_item), x, y);
-
-  /* Either create a new item or just create a preview item, 
-     depending on why the drag data was requested. */
-  if(drag_data_requested_for_drop)
-    {
-      canvas_items = g_list_append (canvas_items, item);
-      drop_item = NULL;
-
-      gtk_drag_finish (context, TRUE, FALSE, time);
-    } else
-    {
-      drop_item = item;
+      drop_item = canvas_item_new (widget, GTK_TOOL_BUTTON (tool_item), x, y);
      gdk_drag_status (context, GDK_ACTION_COPY, time);
+      gtk_widget_queue_draw (widget);
    }
-
-  gtk_widget_queue_draw (widget);
 }

 static gboolean
@@ -337,19 +315,29 @@ interactive_canvas_drag_drop (GtkWidget      *widget,
                              guint           time,
                              gpointer        data)
 {
-  GdkAtom target = gtk_drag_dest_find_target (widget, context, NULL);
+  if (drop_item)
+    {
+      /* turn the drop indicator into a real canvas item */

-  if (!target)
-    return FALSE;
+      drop_item->x = x;
+      drop_item->y = y;

-  drag_data_requested_for_drop = TRUE;
-  gtk_drag_get_data (widget, context, target, time);
+      canvas_items = g_list_append (canvas_items, drop_item);
+      drop_item = NULL;
+
+      /* signal the item was accepted and redraw */
+
+      gtk_drag_finish (context, TRUE, FALSE, time);
+      gtk_widget_queue_draw (widget);
+
+      return TRUE;
+    }

  return FALSE;
 }

-static void
-interactive_canvas_drag_leave (gpointer data)
+static gboolean
+interactive_canvas_real_drag_leave (gpointer data)
 {
  if (drop_item)
    {
@@ -358,9 +346,20 @@ interactive_canvas_drag_leave (gpointer data)
      canvas_item_free (drop_item);
      drop_item = NULL;

-      if (widget)
-        gtk_widget_queue_draw (widget);
+      gtk_widget_queue_draw (widget);
    }
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+interactive_canvas_drag_leave (GtkWidget      *widget,
+                               GdkDragContext *context,
+                               guint           time,
+                               gpointer        data)
+{
+  /* defer cleanup until a potential "drag-drop" signal was received */
+  g_idle_add (interactive_canvas_real_drag_leave, widget);
 }

 static void
@@ -592,7 +591,7 @@ do_toolpalette (GtkWidget *do_widget)
                        "signal::draw", canvas_draw, NULL,
                        "signal::drag-motion", interactive_canvas_drag_motion, NULL,
                        "signal::drag-data-received", interactive_canvas_drag_data_received, NULL,
-                        "signal::drag-leave", interactive_canvas_drag_leave, contents,
+                        "signal::drag-leave", interactive_canvas_drag_leave, NULL,
                        "signal::drag-drop", interactive_canvas_drag_drop, NULL,
                        NULL);

@@ -43,6 +43,7 @@
    <xi:include href="xml/pango_interaction.xml" />
    <xi:include href="xml/cairo_interaction.xml" />
    <xi:include href="xml/x_interaction.xml" />
+    <xi:include href="xml/wayland_interaction.xml" />
    <xi:include href="xml/gdkapplaunchcontext.xml" />
    <xi:include href="xml/gdktestutils.xml" />
  </reference>
@@ -10,6 +10,7 @@ gdk_parse_args
 gdk_get_display_arg_name
 gdk_notify_startup_complete
 gdk_notify_startup_complete_with_id
+gdk_set_allowed_backends

 <SUBSECTION>
 gdk_get_program_class
@@ -51,6 +52,7 @@ gdk_error_trap_pop_ignored
 GDK_WINDOWING_X11
 GDK_WINDOWING_WIN32
 GDK_WINDOWING_QUARTZ
+GDK_WINDOWING_WAYLAND

 <SUBSECTION>
 GDK_VERSION_3_0
@@ -170,6 +172,7 @@ GdkDisplayClass
 <TITLE>GdkDisplayManager</TITLE>
 GdkDisplayManager
 gdk_display_manager_get
+gdk_display_manager_peek
 gdk_display_manager_get_default_display
 gdk_display_manager_set_default_display
 gdk_display_manager_list_displays
@@ -1126,6 +1129,54 @@ gdk_x11_window_get_type
 gdk_window_impl_x11_get_type
 </SECTION>

+<SECTION>
+<INCLUDE>gdk/gdkwayland.h</INCLUDE>
+<TITLE>Wayland Interaction</TITLE>
+<FILE>wayland_interaction</FILE>
+gdk_wayland_device_get_wl_keyboard
+gdk_wayland_device_get_wl_pointer
+gdk_wayland_device_get_wl_seat
+gdk_wayland_display_get_wl_compositor
+gdk_wayland_display_get_wl_display
+gdk_wayland_display_get_wl_shell
+gdk_wayland_window_get_wl_shell_surface
+gdk_wayland_window_get_wl_surface
+gdk_wayland_window_set_use_custom_surface
+
+<SUBSECTION Standard>
+GDK_TYPE_WAYLAND_DEVICE
+GDK_WAYLAND_DEVICE
+GDK_WAYLAND_DEVICE_CLASS
+GDK_WAYLAND_DEVICE_GET_CLASS
+GDK_IS_WAYLAND_DEVICE
+GDK_IS_WAYLAND_DEVICE_CLASS
+GDK_TYPE_WAYLAND_DISPLAY
+GDK_WAYLAND_DISPLAY
+GDK_WAYLAND_DISPLAY_CLASS
+GDK_WAYLAND_DISPLAY_GET_CLASS
+GDK_IS_WAYLAND_DISPLAY
+GDK_IS_WAYLAND_DISPLAY_CLASS
+GDK_TYPE_WAYLAND_DISPLAY_MANAGER
+GDK_WAYLAND_DISPLAY_MANAGER
+GDK_WAYLAND_DISPLAY_MANAGER_CLASS
+GDK_WAYLAND_DISPLAY_MANAGER_GET_CLASS
+GDK_IS_WAYLAND_DISPLAY_MANAGER
+GDK_IS_WAYLAND_DISPLAY_MANAGER_CLASS
+GDK_TYPE_WAYLAND_WINDOW
+GDK_WAYLAND_WINDOW
+GDK_WAYLAND_WINDOW_CLASS
+GDK_WAYLAND_WINDOW_GET_CLASS
+GDK_IS_WAYLAND_WINDOW
+GDK_IS_WAYLAND_WINDOW_CLASS
+
+<SUBSECTION Private>
+gdk_wayland_device_get_type
+gdk_wayland_display_get_type
+gdk_wayland_display_manager_get_type
+gdk_wayland_window_get_type
+
+</SECTION>
+
 <SECTION>
 <TITLE>Application launching</TITLE>
 <FILE>gdkapplaunchcontext</FILE>
@@ -220,6 +220,7 @@
      <xi:include href="xml/gtkfontbutton.xml" />
      <xi:include href="xml/gtkfontchooserwidget.xml" />
      <xi:include href="xml/gtkfontchooserdialog.xml" />
+      <xi:include href="xml/gtkplacessidebar.xml" />
    </chapter>
    
    <chapter id="LayoutContainers">
@@ -235,6 +236,7 @@
      <xi:include href="xml/gtknotebook.xml" />
      <xi:include href="xml/gtkexpander.xml" />
      <xi:include href="xml/gtkoverlay.xml" />
+      <xi:include href="xml/gtkheaderbar.xml" />
      <xi:include href="xml/gtkorientable.xml" />
    </chapter>

@@ -416,6 +418,10 @@
    <title>Index of new symbols in 3.8</title>
    <xi:include href="xml/api-index-3.8.xml"><xi:fallback /></xi:include>
  </index>
+  <index id="api-index-3-10" role="3.10">
+    <title>Index of new symbols in 3.10</title>
+    <xi:include href="xml/api-index-3.10.xml"><xi:fallback /></xi:include>
+  </index>

  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>

@@ -539,6 +539,9 @@ gtk_builder_get_objects
 gtk_builder_expose_object
 gtk_builder_connect_signals
 gtk_builder_connect_signals_full
+gtk_builder_add_callback_symbol
+gtk_builder_add_callback_symbols
+gtk_builder_lookup_callback_symbol
 gtk_builder_set_translation_domain
 gtk_builder_get_translation_domain
 gtk_builder_get_type_from_name
@@ -2480,6 +2483,32 @@ GTK_PANED_GET_CLASS
 gtk_paned_get_type
 </SECTION>

+<SECTION>
+<FILE>gtkplacessidebar</FILE>
+<TITLE>GtkPlacesSidebar</FILE>
+GtkPlacesSidebar
+GtkPlacesOpenFlags
+gtk_places_sidebar_new
+gtk_places_sidebar_set_open_flags
+gtk_places_sidebar_set_location
+gtk_places_sidebar_get_location
+gtk_places_sidebar_set_show_desktop
+gtk_places_sidebar_set_accept_uri_drops
+gtk_places_sidebar_add_shortcut
+gtk_places_sidebar_remove_shortcut
+gtk_places_sidebar_list_shortcuts
+gtk_places_sidebar_get_nth_bookmark
+<SUBSECTION Standard>
+GTK_PLACES_SIDEBAR
+GTK_IS_PLACES_SIDEBAR
+GTK_TYPE_PLACES_SIDEBAR
+GTK_PLACES_SIDEBAR_CLASS
+GTK_IS_PLACES_SIDEBAR_CLASS
+GTK_PLACES_SIDEBAR_GET_CLASS
+<SUBSECTION Private>
+gtk_places_sidebar_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkplug</FILE>
 <TITLE>GtkPlug</TITLE>
@@ -3576,11 +3605,11 @@ gtk_text_mark_get_type
 <TITLE>GtkTextTag</TITLE>
 GtkTextTag
 GtkWrapMode
-GtkTextAttributes
 gtk_text_tag_new
 gtk_text_tag_get_priority
 gtk_text_tag_set_priority
 gtk_text_tag_event
+GtkTextAttributes
 GtkTextAppearance
 gtk_text_attributes_new
 gtk_text_attributes_copy
@@ -5382,6 +5411,18 @@ gtk_widget_set_vexpand_set
 gtk_widget_queue_compute_expand
 gtk_widget_compute_expand

+<SUBSECTION Templates>
+gtk_widget_init_template
+gtk_widget_class_set_template
+gtk_widget_class_set_template_from_resource
+gtk_widget_get_automated_child
+gtk_widget_class_bind_child
+gtk_widget_class_bind_child_internal
+gtk_widget_class_automate_child
+gtk_widget_class_bind_callback
+gtk_widget_class_declare_callback
+gtk_widget_class_set_connect_func
+
 <SUBSECTION Standard>
 GTK_WIDGET
 GTK_IS_WIDGET
@@ -5513,6 +5554,7 @@ gtk_window_get_resize_grip_area
 gtk_window_get_application
 gtk_window_set_application
 gtk_window_set_has_user_ref_count
+gtk_window_set_titlebar

 <SUBSECTION Standard>
 GTK_WINDOW
@@ -7237,6 +7279,8 @@ gtk_grid_attach_next_to
 gtk_grid_get_child_at
 gtk_grid_insert_row
 gtk_grid_insert_column
+gtk_grid_remove_row
+gtk_grid_remove_column
 gtk_grid_insert_next_to
 gtk_grid_set_row_homogeneous
 gtk_grid_get_row_homogeneous
@@ -7494,3 +7538,29 @@ GTK_COLOR_CHOOSER_DIALOG_GET_CLASS
 GtkColorChooserDialogPrivate
 gtk_color_chooser_dialog_get_type
 </SECTION>
+
+<SECTION>
+<FILE>gtkheaderbar</FILE>
+<TITLE>GtkHeaderBar</TITLE>
+GtkHeaderBar
+gtk_header_bar_new
+gtk_header_bar_set_title
+gtk_header_bar_get_title
+gtk_header_bar_set_subtitle
+gtk_header_bar_get_subtitle
+gtk_header_bar_set_custom_title
+gtk_header_bar_get_custom_title
+gtk_header_bar_pack_start
+gtk_header_bar_pack_end
+
+<SUBSECTION Standard>
+GTK_TYPE_HEADER_BAR
+GTK_HEADER_BAR
+GTK_HEADER_BAR_CLASS
+GTK_IS_HEADER_BAR
+GTK_IS_HEADER_BAR_CLASS
+GTK_HEADER_BAR_GET_CLASS
+
+<SUBSECTION Private>
+gtk_header_bar_get_type
+</SECTION>
@@ -461,6 +461,9 @@ nevertheless.
      </varlistentry>

    </variablelist>
+    Since 3.10, this environment variable can contain a comma-separated list
+    of backend names, which are tried in order. The list may also contain
+    a *, which means: try all remaining backends.
    For more information about selecting backends, see the gdk_display_manager_get() function.
  </para>
 </formalpara>
@@ -153,7 +153,7 @@ You can change the default attributes for a given #GtkTextView, and you can
 apply tags that change the attributes for a region of text.  For text features 
 that come from the theme &mdash; such as font and foreground color &mdash; use 
 standard #GtkWidget functions such as gtk_widget_modify_font() or
-gtk_widget_override_text(). For other attributes there are dedicated methods on
+gtk_widget_override_color(). For other attributes there are dedicated methods on
 #GtkTextView such as gtk_text_view_set_tabs().

 <informalexample><programlisting>
@@ -34,6 +34,29 @@ change_fullscreen_state (GSimpleAction *action,
  g_simple_action_set_state (action, state);
 }

+static void
+change_busy_state (GSimpleAction *action,
+                   GVariant      *state,
+                   gpointer       user_data)
+{
+  GtkWindow *window = user_data;
+  GApplication *application = G_APPLICATION (gtk_window_get_application (window));
+
+  /* do this twice to test multiple busy counter increases */
+  if (g_variant_get_boolean (state))
+    {
+      g_application_mark_busy (application);
+      g_application_mark_busy (application);
+    }
+  else
+    {
+      g_application_unmark_busy (application);
+      g_application_unmark_busy (application);
+    }
+
+  g_simple_action_set_state (action, state);
+}
+
 static void
 change_justify_state (GSimpleAction *action,
                      GVariant      *state,
@@ -94,6 +117,7 @@ static GActionEntry win_entries[] = {
  { "copy", window_copy, NULL, NULL, NULL },
  { "paste", window_paste, NULL, NULL, NULL },
  { "fullscreen", activate_toggle, NULL, "false", change_fullscreen_state },
+  { "busy", activate_toggle, NULL, "false", change_busy_state },
  { "justify", activate_radio, "s", "'left'", change_justify_state }
 };

@@ -356,6 +380,10 @@ bloat_pad_startup (GApplication *application)
                               "          <attribute name='action'>win.fullscreen</attribute>"
                               "          <attribute name='accel'>F11</attribute>"
                               "        </item>"
+                               "        <item>"
+                               "          <attribute name='label' translatable='yes'>_Look Busy</attribute>"
+                               "          <attribute name='action'>win.busy</attribute>"
+                               "        </item>"
                               "      </section>"
                               "    </submenu>"
                               "    <submenu id='time-menu'>"
@@ -134,6 +134,7 @@ gdk_c_sources = 				\
 	gdkframeclockidle.c			\
 	gdkpango.c				\
 	gdkpixbuf-drawable.c			\
+	gdkproperty.c				\
 	gdkrectangle.c				\
 	gdkrgba.c				\
 	gdkscreen.c				\
@@ -60,9 +60,7 @@ libgdk_broadway_la_SOURCES =		\
 	gdkeventsource.c	\
 	gdkeventsource.h	\
 	gdkglobals-broadway.c	\
-	gdkim-broadway.c	\
 	gdkkeys-broadway.c	\
-	gdkmain-broadway.c	\
 	gdkproperty-broadway.c	\
 	gdkscreen-broadway.c	\
 	gdkscreen-broadway.h	\
@@ -116,7 +116,7 @@ gdk_broadway_device_get_state (GdkDevice       *device,
 {
  gint x_int, y_int;

-  gdk_window_get_pointer (window, &x_int, &y_int, mask);
+  gdk_window_get_device_position (window, device, &x_int, &y_int, mask);

  if (axes)
    {
@@ -55,8 +55,6 @@ G_DEFINE_TYPE (GdkBroadwayDisplay, gdk_broadway_display, GDK_TYPE_DISPLAY)
 static void
 gdk_broadway_display_init (GdkBroadwayDisplay *display)
 {
-  _gdk_broadway_display_manager_add_display (gdk_display_manager_get (),
-					     GDK_DISPLAY_OBJECT (display));
  display->id_ht = g_hash_table_new (NULL, NULL);
 }

@@ -186,24 +184,6 @@ gdk_broadway_display_get_name (GdkDisplay *display)
  return (gchar *) "Broadway";
 }

-static gint
-gdk_broadway_display_get_n_screens (GdkDisplay *display)
-{
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), 0);
-
-  return 1;
-}
-
-static GdkScreen *
-gdk_broadway_display_get_screen (GdkDisplay *display,
-				 gint        screen_num)
-{
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-  g_return_val_if_fail (screen_num == 0, NULL);
-
-  return GDK_BROADWAY_DISPLAY (display)->screens[screen_num];
-}
-
 static GdkScreen *
 gdk_broadway_display_get_default_screen (GdkDisplay *display)
 {
@@ -257,9 +237,6 @@ gdk_broadway_display_dispose (GObject *object)
 {
  GdkBroadwayDisplay *broadway_display = GDK_BROADWAY_DISPLAY (object);

-  _gdk_broadway_display_manager_remove_display (gdk_display_manager_get (),
-						GDK_DISPLAY_OBJECT (object));
-
  g_list_foreach (broadway_display->input_devices, (GFunc) g_object_run_dispose, NULL);

  _gdk_screen_close (broadway_display->screens[0]);
@@ -394,8 +371,6 @@ gdk_broadway_display_class_init (GdkBroadwayDisplayClass * class)
  display_class->window_type = GDK_TYPE_BROADWAY_WINDOW;

  display_class->get_name = gdk_broadway_display_get_name;
-  display_class->get_n_screens = gdk_broadway_display_get_n_screens;
-  display_class->get_screen = gdk_broadway_display_get_screen;
  display_class->get_default_screen = gdk_broadway_display_get_default_screen;
  display_class->beep = gdk_broadway_display_beep;
  display_class->sync = gdk_broadway_display_sync;
@@ -22,6 +22,7 @@

 #include "config.h"

+#include <stdlib.h>
 #include "gdkdisplay-broadway.h"
 #include "gdkbroadwaydisplaymanager.h"
 #include "gdkprivate-broadway.h"
@@ -33,11 +34,52 @@ struct _GdkBroadwayDisplayManager
 {
  GdkDisplayManager parent;

-  GdkDisplay *default_display;
-  GSList *displays;
+  gboolean init_failed;
 };

-G_DEFINE_TYPE (GdkBroadwayDisplayManager, gdk_broadway_display_manager, GDK_TYPE_DISPLAY_MANAGER)
+static void g_initable_iface_init (GInitableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (GdkBroadwayDisplayManager, gdk_broadway_display_manager, GDK_TYPE_DISPLAY_MANAGER,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, g_initable_iface_init))
+
+static gboolean
+gdk_broadway_display_manager_initable_init (GInitable     *initable,
+                                            GCancellable  *cancellable,
+                                            GError       **error)
+{
+  const gchar *display_name;
+  gint port;
+  GdkBroadwayServer *server;
+
+  display_name = g_getenv ("BROADWAY_DISPLAY");
+
+  port = 0;
+  if (display_name != NULL)
+    {
+      if (*display_name == ':')
+        display_name++;
+      port = strtol(display_name, NULL, 10);
+    }
+  if (port == 0)
+    port = 1;
+
+  server = _gdk_broadway_server_new (port, NULL);
+  if (server == NULL)
+    {
+      GDK_BROADWAY_DISPLAY_MANAGER (initable)->init_failed = TRUE;
+      return FALSE;
+    }
+
+  g_object_unref (server);
+
+  return TRUE;
+}
+
+void
+g_initable_iface_init (GInitableIface *iface)
+{
+  iface->init = gdk_broadway_display_manager_initable_init;
+}

 static GdkDisplay *
 gdk_broadway_display_manager_open_display (GdkDisplayManager *manager,
@@ -46,55 +88,16 @@ gdk_broadway_display_manager_open_display (GdkDisplayManager *manager,
  return _gdk_broadway_display_open (name);
 }

-static GSList *
-gdk_broadway_display_manager_list_displays (GdkDisplayManager *manager)
-{
-  GdkBroadwayDisplayManager *manager_broadway = GDK_BROADWAY_DISPLAY_MANAGER (manager);
-
-  return g_slist_copy (manager_broadway->displays);
-}
-
-static GdkDisplay *
-gdk_broadway_display_manager_get_default_display (GdkDisplayManager *manager)
-{
-  return GDK_BROADWAY_DISPLAY_MANAGER (manager)->default_display;
-}
-
-static void
-gdk_broadway_display_manager_set_default_display (GdkDisplayManager *manager,
-                                                GdkDisplay        *display)
-{
-  GdkBroadwayDisplayManager *manager_broadway = GDK_BROADWAY_DISPLAY_MANAGER (manager);
-
-  manager_broadway->default_display = display;
-}
-
-#include "../gdkkeynames.c"
-
-static gchar *
-gdk_broadway_display_manager_get_keyval_name (GdkDisplayManager *manager,
-                                            guint              keyval)
-{
-  return _gdk_keyval_name (keyval);
-}
-
-static guint
-gdk_broadway_display_manager_lookup_keyval (GdkDisplayManager *manager,
-                                          const gchar       *name)
-{
-  return _gdk_keyval_from_name (name);
-}
-
 static void
 gdk_broadway_display_manager_init (GdkBroadwayDisplayManager *manager)
 {
-  _gdk_broadway_windowing_init ();
 }

 static void
 gdk_broadway_display_manager_finalize (GObject *object)
 {
-  g_error ("A GdkBroadwayDisplayManager object was finalized. This should not happen");
+  if (!GDK_BROADWAY_DISPLAY_MANAGER (object)->init_failed)
+    g_error ("A GdkBroadwayDisplayManager object was finalized. This should not happen");
  G_OBJECT_CLASS (gdk_broadway_display_manager_parent_class)->finalize (object);
 }

@@ -107,40 +110,4 @@ gdk_broadway_display_manager_class_init (GdkBroadwayDisplayManagerClass *class)
  object_class->finalize = gdk_broadway_display_manager_finalize;

  manager_class->open_display = gdk_broadway_display_manager_open_display;
-  manager_class->list_displays = gdk_broadway_display_manager_list_displays;
-  manager_class->set_default_display = gdk_broadway_display_manager_set_default_display;
-  manager_class->get_default_display = gdk_broadway_display_manager_get_default_display;
-  manager_class->atom_intern = _gdk_broadway_display_manager_atom_intern;
-  manager_class->get_atom_name = _gdk_broadway_display_manager_get_atom_name;
-  manager_class->lookup_keyval = gdk_broadway_display_manager_lookup_keyval;
-  manager_class->get_keyval_name = gdk_broadway_display_manager_get_keyval_name;
-}
-
-void
-_gdk_broadway_display_manager_add_display (GdkDisplayManager *manager,
-					   GdkDisplay        *display)
-{
-  GdkBroadwayDisplayManager *manager_broadway = GDK_BROADWAY_DISPLAY_MANAGER (manager);
-
-  if (manager_broadway->displays == NULL)
-    gdk_display_manager_set_default_display (manager, display);
-
-  manager_broadway->displays = g_slist_prepend (manager_broadway->displays, display);
-}
-
-void
-_gdk_broadway_display_manager_remove_display (GdkDisplayManager *manager,
-					      GdkDisplay        *display)
-{
-  GdkBroadwayDisplayManager *manager_broadway = GDK_BROADWAY_DISPLAY_MANAGER (manager);
-
-  manager_broadway->displays = g_slist_remove (manager_broadway->displays, display);
-
-  if (manager_broadway->default_display == display)
-    {
-      if (manager_broadway->displays)
-        gdk_display_manager_set_default_display (manager, manager_broadway->displays->data);
-      else
-        gdk_display_manager_set_default_display (manager, NULL);
-    }
 }
@@ -1,38 +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, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * 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 "gdkmain.h"
-#include "gdkinternals.h"
-#include "gdkdisplay-broadway.h"
-
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-
-void
-_gdk_broadway_initialize_locale (void)
-{
-}
@@ -1,44 +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, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * 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 "gdkdisplay-broadway.h"
-#include "gdkinternals.h"
-#include "gdkprivate-broadway.h"
-#include "gdkintl.h"
-#include "gdkdeviceprivate.h"
-
-#include <glib/gprintf.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <limits.h>
-#include <errno.h>
-
-void
-_gdk_broadway_windowing_init (void)
-{
-  _gdk_broadway_initialize_locale ();
-}
@@ -40,20 +40,6 @@
 #include "gdkbroadwaywindow.h"

 void _gdk_broadway_resync_windows (void);
-void _gdk_broadway_windowing_init (void);
-
-gchar * _gdk_broadway_display_manager_get_atom_name (GdkDisplayManager *manager,
-						     GdkAtom atom);
-void _gdk_broadway_display_manager_add_display (GdkDisplayManager *manager,
-						GdkDisplay        *display);
-void _gdk_broadway_display_manager_remove_display (GdkDisplayManager *manager,
-						   GdkDisplay        *display);
-GdkAtom _gdk_broadway_display_manager_atom_intern_static_string (GdkDisplayManager *manager,
-								 const gchar *atom_name);
-GdkAtom _gdk_broadway_display_manager_atom_intern (GdkDisplayManager *manager,
-						   const gchar *atom_name, 
-						   gboolean     only_if_exists);
-

 void     _gdk_broadway_window_register_dnd (GdkWindow      *window);
 GdkDragContext * _gdk_broadway_window_drag_begin (GdkWindow *window,
@@ -103,8 +89,6 @@ void _gdk_keymap_add_virtual_modifiers_compat (GdkKeymap       *keymap,
 gboolean _gdk_keymap_key_is_modifier   (GdkKeymap       *keymap,
 					guint            keycode);

-void _gdk_broadway_initialize_locale (void);
-
 void _gdk_broadway_screen_events_init   (GdkScreen *screen);
 GdkVisual *_gdk_broadway_screen_get_system_visual (GdkScreen * screen);
 gint _gdk_broadway_screen_visual_get_best_depth (GdkScreen * screen);
@@ -35,34 +35,6 @@

 #include <string.h>

-GdkAtom
-_gdk_broadway_display_manager_atom_intern (GdkDisplayManager *manager,
-					   const gchar *atom_name, 
-					   gboolean     only_if_exists)
-{
-  return _GDK_MAKE_ATOM (g_quark_from_string (atom_name));
-}
-
-GdkAtom
-_gdk_broadway_display_manager_atom_intern_static_string (GdkDisplayManager *manager,
-							 const gchar *atom_name)
-{
-  return _GDK_MAKE_ATOM (g_quark_from_static_string (atom_name));
-}
-
-static const char *
-get_atom_name (GdkAtom atom)
-{
-  return g_quark_to_string (GPOINTER_TO_UINT(atom));
-}
-
-gchar *
-_gdk_broadway_display_manager_get_atom_name (GdkDisplayManager *manager,
-					     GdkAtom atom)
-{
-  return g_strdup (get_atom_name (atom));
-}
-
 gboolean
 _gdk_broadway_window_get_property (GdkWindow   *window,
 				   GdkAtom      property,
@@ -1275,6 +1275,7 @@ create_moveresize_window (MoveResizeData *mv_resize,

  gdk_window_show (mv_resize->moveresize_emulation_window);

+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
  status = gdk_pointer_grab (mv_resize->moveresize_emulation_window,
 			     FALSE,
 			     GDK_BUTTON_RELEASE_MASK |
@@ -1282,6 +1283,7 @@ create_moveresize_window (MoveResizeData *mv_resize,
 			     NULL,
 			     NULL,
 			     timestamp);
+  G_GNUC_END_IGNORE_DEPRECATIONS;

  if (status != GDK_GRAB_SUCCESS)
    {
@@ -1468,56 +1470,6 @@ _gdk_broadway_window_queue_antiexpose (GdkWindow *window,
  return TRUE;
 }

-static void
-copy_region (cairo_surface_t *surface,
-	     cairo_region_t *area,
-	     gint            dx,
-	     gint            dy)
-{
-  cairo_t *cr;
-
-  cr = cairo_create (surface);
-
-  gdk_cairo_region (cr, area);
-  cairo_clip (cr);
-
-  /* NB: This is a self-copy and Cairo doesn't support that yet.
-   * So we do a litle trick.
-   */
-  cairo_push_group (cr);
-
-  cairo_set_source_surface (cr, surface, dx, dy);
-  cairo_paint (cr);
-
-  cairo_pop_group_to_source (cr);
-  cairo_paint (cr);
-
-  cairo_destroy (cr);
-}
-
-void
-_gdk_broadway_window_translate (GdkWindow      *window,
-				cairo_region_t *area,
-				gint            dx,
-				gint            dy)
-{
-  GdkWindowImplBroadway *impl;
-  GdkBroadwayDisplay *broadway_display;
-
-  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
-
-  if (impl->surface)
-    {
-      copy_region (impl->surface, area, dx, dy);
-      broadway_display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (window));
-
-      if (_gdk_broadway_server_window_translate (broadway_display->server,
-						 impl->id,
-						 area, dx, dy))
-	queue_flush (window);
-    }
-}
-
 guint32
 gdk_broadway_get_last_seen_time (GdkWindow  *window)
 {
@@ -1556,7 +1508,6 @@ gdk_window_impl_broadway_class_init (GdkWindowImplBroadwayClass *klass)
  impl_class->input_shape_combine_region = gdk_window_broadway_input_shape_combine_region;
  impl_class->set_static_gravities = gdk_window_broadway_set_static_gravities;
  impl_class->queue_antiexpose = _gdk_broadway_window_queue_antiexpose;
-  impl_class->translate = _gdk_broadway_window_translate;
  impl_class->destroy = _gdk_broadway_window_destroy;
  impl_class->destroy_foreign = gdk_broadway_window_destroy_foreign;
  impl_class->resize_cairo_surface = gdk_window_broadway_resize_cairo_surface;
@@ -275,9 +275,6 @@ gdk_pre_parse_libgtk_only (void)
      else if (g_str_equal (rendering_mode, "recording"))
        _gdk_rendering_mode = GDK_RENDERING_MODE_RECORDING;
    }
-
-  /* Do any setup particular to the windowing system */
-  gdk_display_manager_get ();
 }

  
@@ -328,6 +325,24 @@ gdk_parse_args (int    *argc,
  GDK_NOTE (MISC, g_message ("progname: \"%s\"", g_get_prgname ()));
 }

+/**
+ * gdk_get_display:
+ *
+ * Gets the name of the display, which usually comes from the
+ * <envar>DISPLAY</envar> environment variable or the
+ * <option>--display</option> command line option.
+ *
+ * Returns: the name of the display.
+ *
+ * Deprecated: 3.8: Call gdk_display_get_name (gdk_display_get_default ()))
+ *    instead.
+ */
+gchar *
+gdk_get_display (void)
+{
+  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
+}
+
 /**
 * gdk_get_display_arg_name:
 *
@@ -353,7 +368,7 @@ gdk_get_display_arg_name (void)
 *
 * 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
+ * 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.
 *
@@ -367,6 +382,9 @@ gdk_display_open_default_libgtk_only (void)

  g_return_val_if_fail (gdk_initialized, NULL);

+  if (gdk_display_manager_peek () == NULL)
+    return NULL;
+
  display = gdk_display_get_default ();
  if (display)
    return display;
@@ -101,6 +101,7 @@ gdk_display_is_closed
 gdk_display_keyboard_ungrab
 gdk_display_list_devices
 gdk_display_manager_get
+gdk_display_manager_peek
 gdk_display_manager_get_default_display
 gdk_display_manager_get_type
 gdk_display_manager_list_displays
@@ -335,6 +336,7 @@ gdk_set_program_class
 gdk_set_show_events
 gdk_setting_action_get_type
 gdk_setting_get
+gdk_set_allowed_backends
 gdk_status_get_type
 gdk_synthesize_window_state
 gdk_test_render_sync
@@ -610,7 +612,6 @@ gdk_x11_window_set_theme_variant
 gdk_x11_window_set_hide_titlebar_when_maximized
 gdk_x11_window_set_user_time
 gdk_x11_window_set_utf8_property
-gdk_x11_window_set_frame_sync_enabled
 gdk_x11_xatom_to_atom
 gdk_x11_xatom_to_atom_for_display
 #endif
@@ -213,7 +213,7 @@ gdk_cairo_set_source_pixbuf (cairo_t         *cr,
    format = CAIRO_FORMAT_ARGB32;

  cairo_stride = cairo_format_stride_for_width (format, width);
-  cairo_pixels = g_malloc_n (height, cairo_stride);
+  cairo_pixels = g_malloc (height * cairo_stride);
  surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels,
                                                 format,
                                                 width, height, cairo_stride);
@@ -250,7 +250,7 @@ gdk_cairo_set_source_pixbuf (cairo_t         *cr,
          guchar *end = p + 4 * width;
          guint t1,t2,t3;

-#define MULT(d,c,a,t) G_STMT_START { t = c * a + 0x80; d = ((t >> 8) + t) >> 8; } G_STMT_END
+#define MULT(d,c,a,t) G_STMT_START { t = c * a + 0x7f; d = ((t >> 8) + t) >> 8; } G_STMT_END

          while (p < end)
            {
@@ -330,7 +330,7 @@ gdk_device_manager_list_devices (GdkDeviceManager *device_manager,
 * for this application. In X11, window managers may change this depending on the interaction
 * pattern under the presence of several pointers.
 *
- * You should use this function seldomly, only in code that isn't triggered by a #GdkEvent
+ * You should use this function sheldomly, only in code that isn't triggered by a #GdkEvent
 * and there aren't other means to get a meaningful #GdkDevice to operate on.
 *
 * Returns: (transfer none): The client pointer. This memory is
@@ -25,6 +25,7 @@
 #include "gdkdisplayprivate.h"

 #include "gdkdeviceprivate.h"
+#include "gdkdisplaymanagerprivate.h"
 #include "gdkevents.h"
 #include "gdkwindowimpl.h"
 #include "gdkinternals.h"
@@ -81,6 +82,11 @@ static guint signals[LAST_SIGNAL] = { 0 };

 G_DEFINE_TYPE (GdkDisplay, gdk_display, G_TYPE_OBJECT)

+static void
+gdk_display_real_make_default (GdkDisplay *display)
+{
+}
+
 static void
 gdk_display_class_init (GdkDisplayClass *class)
 {
@@ -92,6 +98,8 @@ gdk_display_class_init (GdkDisplayClass *class)
  class->get_app_launch_context = gdk_display_real_get_app_launch_context;
  class->window_type = GDK_TYPE_WINDOW;

+  class->make_default = gdk_display_real_make_default;
+
  /**
   * GdkDisplay::opened:
   * @display: the object on which the signal is emitted
@@ -199,6 +207,8 @@ gdk_display_init (GdkDisplay *display)

  g_signal_connect (display, "opened",
                    G_CALLBACK (gdk_display_opened), NULL);
+
+  _gdk_display_manager_add_display (gdk_display_manager_get (), display);
 }

 static void
@@ -209,6 +219,8 @@ gdk_display_dispose (GObject *object)

  device_manager = gdk_display_get_device_manager (GDK_DISPLAY (object));

+  _gdk_display_manager_remove_display (gdk_display_manager_get (), display);
+
  g_list_free_full (display->queued_events, (GDestroyNotify) gdk_event_free);
  display->queued_events = NULL;
  display->queued_tail = NULL;
@@ -1415,12 +1427,6 @@ gdk_display_get_name (GdkDisplay *display)
  return GDK_DISPLAY_GET_CLASS (display)->get_name (display);
 }

-gchar *
-gdk_get_display (void)
-{
-  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
-}
-
 /**
 * gdk_display_get_n_screens:
 * @display: a #GdkDisplay
@@ -1430,13 +1436,15 @@ gdk_get_display (void)
 * Returns: number of screens.
 *
 * Since: 2.2
+ *
+ * Deprecated: 3.10: The number of screens is always 1.
 */
 gint
 gdk_display_get_n_screens (GdkDisplay *display)
 {
  g_return_val_if_fail (GDK_IS_DISPLAY (display), 0);

-  return GDK_DISPLAY_GET_CLASS (display)->get_n_screens (display);
+  return 1;
 }

 /**
@@ -1455,8 +1463,9 @@ gdk_display_get_screen (GdkDisplay *display,
 			gint        screen_num)
 {
  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+  g_return_val_if_fail (screen_num == 0, NULL);

-  return GDK_DISPLAY_GET_CLASS (display)->get_screen (display, screen_num);
+  return gdk_display_get_default_screen (display);
 }

 /**
@@ -45,6 +45,7 @@ GdkDisplay *gdk_display_open                (const gchar *display_name);

 const gchar * gdk_display_get_name         (GdkDisplay *display);

+GDK_DEPRECATED_IN_3_10
 gint        gdk_display_get_n_screens      (GdkDisplay  *display);
 GdkScreen * gdk_display_get_screen         (GdkDisplay  *display,
                                            gint         screen_num);
@@ -26,6 +26,7 @@

 #include "gdkconfig.h"
 #include "gdkdisplaymanagerprivate.h"
+#include "gdkdisplayprivate.h"
 #include "gdkinternals.h"
 #include "gdkkeysprivate.h"
 #include "gdkmarshalers.h"
@@ -125,7 +126,24 @@ static void gdk_display_manager_get_property (GObject                *object,

 static guint signals[LAST_SIGNAL] = { 0 };

-G_DEFINE_TYPE (GdkDisplayManager, gdk_display_manager, G_TYPE_OBJECT)
+static void g_initable_iface_init (GInitableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (GdkDisplayManager, gdk_display_manager, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, g_initable_iface_init))
+
+static gboolean
+gdk_display_manager_initable_init (GInitable     *initable,
+                                   GCancellable  *cancellable,
+                                   GError       **error)
+{
+  return TRUE;
+}
+
+static void
+g_initable_iface_init (GInitableIface *iface)
+{
+  iface->init = gdk_display_manager_initable_init;
+}

 static void
 gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
@@ -135,8 +153,6 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
  object_class->set_property = gdk_display_manager_set_property;
  object_class->get_property = gdk_display_manager_get_property;

-  klass->keyval_convert_case = _gdk_display_manager_real_keyval_convert_case;
-
  /**
   * GdkDisplayManager::display-opened:
   * @manager: the object on which the signal is emitted
@@ -208,6 +224,50 @@ gdk_display_manager_get_property (GObject      *object,
    }
 }

+static const gchar *allowed_backends;
+
+/**
+ * gdk_set_allowed_backends:
+ * @backends: a comma-separated list of backends
+ *
+ * Sets a list of backends that GDK should try to use.
+ *
+ * This can be be useful if your application does not
+ * work with certain GDK backends.
+ *
+ * By default, GDK tries all included backends.
+ *
+ * For example,
+ * <programlisting>
+ * gdk_set_allowed_backends ("wayland,quartz,*");
+ * </programlisting>
+ * instructs GDK to try the Wayland backend first,
+ * followed by the Quartz backend, and then all
+ * others.
+ *
+ * If the <envvar>GDK_BACKEND</envvar> environment variable
+ * is set, it determines what backends are tried in what
+ * order, while still respecting the set of allowed backends
+ * that are specified by this function.
+ *
+ * The possible backend names are x11, win32, quartz,
+ * broadway, wayland. You can also include a * in the
+ * list to try all remaining backends.
+ *
+ * This call must happen prior to gdk_display_open(),
+ * gtk_init(), gtk_init_with_args() or gtk_init_check()
+ * in order to take effect.
+ *
+ * Since: 3.10
+ */
+void
+gdk_set_allowed_backends (const gchar *backends)
+{
+  allowed_backends = g_strdup (backends);
+}
+
+static GdkDisplayManager *manager = NULL;
+
 /**
 * gdk_display_manager_get:
 *
@@ -216,7 +276,8 @@ gdk_display_manager_get_property (GObject      *object,
 * When called for the first time, this function consults the
 * <envar>GDK_BACKEND</envar> environment variable to find out which
 * of the supported GDK backends to use (in case GDK has been compiled
- * with multiple backends).
+ * with multiple backends). Applications can use gdk_set_allowed_backends()
+ * to limit what backends can be used.
 *
 * Returns: (transfer none): The global #GdkDisplayManager singleton;
 *     gdk_parse_args(), gdk_init(), or gdk_init_check() must have
@@ -227,42 +288,110 @@ gdk_display_manager_get_property (GObject      *object,
 GdkDisplayManager*
 gdk_display_manager_get (void)
 {
-  static GdkDisplayManager *manager = NULL;
+  gdk_display_manager_peek ();

-  if (!manager)
+  if (manager == NULL)
+    g_error ("No GDK backend found (%s)", allowed_backends);
+
+  return manager;
+}
+
+/**
+ * gdk_display_manager_peek:
+ *
+ * Gets the singleton #GdkDisplayManager object. If GDK could
+ * not be initialized, %NULL is returned.
+ *
+ * Returns: (transfer none): The global #GdkDisplayManager singleton,
+ *     or %NULL if GDK could not be initialized. gdk_parse_args(),
+ *     gdk_init(), or gdk_init_check() must have been called first
+ *
+ * Since: 3.10
+ */
+GdkDisplayManager *
+gdk_display_manager_peek (void)
+{
+  if (manager == NULL)
    {
-      const gchar *backend;
+      const gchar *backend_list;
+      gchar **backends;
+      gint i;
+      gboolean allow_any;
+
+      if (allowed_backends == NULL)
+        allowed_backends = "*";
+      allow_any = strstr (allowed_backends, "*") != NULL;
+
+      backend_list = g_getenv ("GDK_BACKEND");
+      if (backend_list == NULL)
+        backend_list = allowed_backends;
+      backends = g_strsplit (backend_list, ",", 0);
+
+      for (i = 0; manager == NULL && backends[i] != NULL; i++)
+        {
+          const gchar *backend = backends[i];
+          gboolean any = g_str_equal (backend, "*");
+
+          if (!allow_any && !any && !strstr (allowed_backends, backend))
+            continue;

-      backend = g_getenv ("GDK_BACKEND");
 #ifdef GDK_WINDOWING_QUARTZ
-      if (backend == NULL || strcmp (backend, "quartz") == 0)
-        manager = g_object_new (gdk_quartz_display_manager_get_type (), NULL);
-      else
+          if ((any && allow_any) ||
+              (any && strstr (allowed_backends, "quartz")) ||
+              g_str_equal (backend, "quartz"))
+            {
+              GDK_NOTE (MISC, g_message ("Trying quartz backend"));
+              manager = g_initable_new (gdk_quartz_display_manager_get_type (), NULL, NULL, NULL);
+              if (manager)
+                break;
+            }
 #endif
 #ifdef GDK_WINDOWING_WIN32
-      if (backend == NULL || strcmp (backend, "win32") == 0)
-        manager = g_object_new (gdk_win32_display_manager_get_type (), NULL);
-      else
+          if ((any && allow_any) ||
+              (any && strstr (allowed_backends, "win32")) ||
+              g_str_equal (backend, "win32"))
+            {
+              GDK_NOTE (MISC, g_message ("Trying win32 backend"));
+              manager = g_initable_new (gdk_win32_display_manager_get_type (), NULL, NULL, NULL);
+              if (manager)
+                break;
+            }
 #endif
 #ifdef GDK_WINDOWING_X11
-      if (backend == NULL || strcmp (backend, "x11") == 0)
-        manager = g_object_new (gdk_x11_display_manager_get_type (), NULL);
-      else
+          if ((any && allow_any) ||
+              (any && strstr (allowed_backends, "x11")) ||
+              g_str_equal (backend, "x11"))
+            {
+              GDK_NOTE (MISC, g_message ("Trying x11 backend"));
+              manager = g_initable_new (gdk_x11_display_manager_get_type (), NULL, NULL, NULL);
+              if (manager)
+                break;
+            }
 #endif
 #ifdef GDK_WINDOWING_WAYLAND
-      if (backend == NULL || strcmp (backend, "wayland") == 0)
-        manager = g_object_new (gdk_wayland_display_manager_get_type (), NULL);
-      else
+          if ((any && allow_any) ||
+              (any && strstr (allowed_backends, "wayland")) ||
+              g_str_equal (backend, "wayland"))
+            {
+              GDK_NOTE (MISC, g_message ("Trying wayland backend"));
+              manager = g_initable_new (gdk_wayland_display_manager_get_type (), NULL, NULL, NULL);
+              if (manager)
+                break;
+            }
 #endif
 #ifdef GDK_WINDOWING_BROADWAY
-      if (backend == NULL || strcmp (backend, "broadway") == 0)
-        manager = g_object_new (gdk_broadway_display_manager_get_type (), NULL);
-      else
+          if ((any && allow_any) ||
+              (any && strstr (allowed_backends, "broadway")) ||
+              g_str_equal (backend, "broadway"))
+            {
+              GDK_NOTE (MISC, g_message ("Trying broadway backend"));
+              manager = g_initable_new (gdk_broadway_display_manager_get_type (), NULL, NULL, NULL);
+              if (manager)
+                break;
+            }
 #endif
-      if (backend != NULL)
-        g_error ("Unsupported GDK backend: %s", backend);
-      else
-        g_error ("No GDK backend found");
+        }
+      g_strfreev (backends);
    }

  return manager;
@@ -282,7 +411,7 @@ gdk_display_manager_get (void)
 GdkDisplay *
 gdk_display_manager_get_default_display (GdkDisplayManager *manager)
 {
-  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->get_default_display (manager);
+  return manager->default_display;
 }

 /**
@@ -339,7 +468,10 @@ void
 gdk_display_manager_set_default_display (GdkDisplayManager *manager,
                                         GdkDisplay        *display)
 {
-  GDK_DISPLAY_MANAGER_GET_CLASS (manager)->set_default_display (manager, display);
+  manager->default_display = display;
+
+  if (display)
+    GDK_DISPLAY_GET_CLASS (display)->make_default (display);

  g_object_notify (G_OBJECT (manager), "default-display");
 }
@@ -359,7 +491,7 @@ gdk_display_manager_set_default_display (GdkDisplayManager *manager,
 GSList *
 gdk_display_manager_list_displays (GdkDisplayManager *manager)
 {
-  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->list_displays (manager);
+  return g_slist_copy (manager->displays);
 }

 /**
@@ -381,68 +513,28 @@ gdk_display_manager_open_display (GdkDisplayManager *manager,
  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: (transfer none): the atom corresponding to @atom_name.
- */
-GdkAtom
-gdk_atom_intern (const gchar *atom_name,
-                 gboolean     only_if_exists)
+void
+_gdk_display_manager_add_display (GdkDisplayManager *manager,
+                                  GdkDisplay        *display)
 {
-  GdkDisplayManager *manager = gdk_display_manager_get ();
+  if (manager->displays == NULL)
+    gdk_display_manager_set_default_display (manager, display);

-  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->atom_intern (manager, atom_name, TRUE);
+  manager->displays = g_slist_prepend (manager->displays, display);
 }

-/**
- * 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: (transfer none): the atom corresponding to @atom_name
- *
- * Since: 2.10
- */
-GdkAtom
-gdk_atom_intern_static_string (const gchar *atom_name)
+/* NB: This function can be called multiple times per display. */
+void
+_gdk_display_manager_remove_display (GdkDisplayManager *manager,
+                                     GdkDisplay        *display)
 {
-  GdkDisplayManager *manager = gdk_display_manager_get ();
+  manager->displays = g_slist_remove (manager->displays, display);

-  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);
+  if (manager->default_display == display)
+    {
+      if (manager->displays)
+        gdk_display_manager_set_default_display (manager, manager->displays->data);
+      else
+        gdk_display_manager_set_default_display (manager, NULL);
+    }
 }
@@ -43,6 +43,8 @@ G_BEGIN_DECLS
 GType              gdk_display_manager_get_type            (void) G_GNUC_CONST;

 GdkDisplayManager *gdk_display_manager_get                 (void);
+GDK_AVAILABLE_IN_3_10
+GdkDisplayManager *gdk_display_manager_peek                (void);
 GdkDisplay *       gdk_display_manager_get_default_display (GdkDisplayManager *manager);
 void               gdk_display_manager_set_default_display (GdkDisplayManager *manager,
                                                            GdkDisplay        *display);
@@ -31,39 +31,29 @@ typedef struct _GdkDisplayManagerClass GdkDisplayManagerClass;
 struct _GdkDisplayManager
 {
  GObject parent_instance;
+
+  GdkDisplay *default_display;
+
+  GSList *displays;
 };

 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);
 };

+void            _gdk_display_manager_add_display        (GdkDisplayManager      *manager,
+                                                         GdkDisplay             *display);
+void            _gdk_display_manager_remove_display     (GdkDisplayManager      *manager,
+                                                         GdkDisplay             *display);
+
 G_END_DECLS

 #endif
@@ -136,15 +136,13 @@ struct _GdkDisplayClass
  GType window_type;          /* type for native windows for this display, set in class_init */

  const 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);
+  void                       (*make_default)       (GdkDisplay *display);
  GdkWindow *                (*get_default_group)  (GdkDisplay *display);
  gboolean                   (*supports_selection_notification) (GdkDisplay *display);
  gboolean                   (*request_selection_notification)  (GdkDisplay *display,
@@ -66,7 +66,7 @@ typedef enum
 /**
 * GdkDragProtocol:
 * @GDK_DRAG_PROTO_NONE: no protocol.
- * @GDK_DRAG_PROTO_MOTIF: The Motif DND protocol.
+ * @GDK_DRAG_PROTO_MOTIF: The Motif DND protocol. No longer supported
 * @GDK_DRAG_PROTO_XDND: The Xdnd protocol.
 * @GDK_DRAG_PROTO_ROOTWIN: An extension to the Xdnd protocol for
 *  unclaimed root window drops.
@@ -1,5 +1,5 @@
 /*** BEGIN file-header ***/
-#define GDK_ENABLE_BROKEN
+#include "config.h"
 #include "gdk.h"

 /*** END file-header ***/
@@ -371,7 +371,6 @@ gdk_frame_clock_paint_idle (void *data)
              g_signal_emit_by_name (G_OBJECT (clock), "before-paint");
              priv->phase = GDK_FRAME_CLOCK_PHASE_UPDATE;
            }
-          /* fallthrough */
        case GDK_FRAME_CLOCK_PHASE_UPDATE:
          if (priv->freeze_count == 0)
            {
@@ -382,10 +381,10 @@ gdk_frame_clock_paint_idle (void *data)
                  g_signal_emit_by_name (G_OBJECT (clock), "update");
                }
            }
-          /* fallthrough */
        case GDK_FRAME_CLOCK_PHASE_LAYOUT:
          if (priv->freeze_count == 0)
            {
+	      int iter;
 #ifdef G_ENABLE_DEBUG
              if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0)
                {
@@ -396,13 +395,21 @@ gdk_frame_clock_paint_idle (void *data)
 #endif /* G_ENABLE_DEBUG */

              priv->phase = GDK_FRAME_CLOCK_PHASE_LAYOUT;
-              if (priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT)
+	      /* We loop in the layout phase, because we don't want to progress
+	       * into the paint phase with invalid size allocations. This may
+	       * happen in some situation like races between user window
+	       * resizes and natural size changes.
+	       */
+	      iter = 0;
+              while ((priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT) &&
+		     priv->freeze_count == 0 && iter++ < 4)
                {
                  priv->requested &= ~GDK_FRAME_CLOCK_PHASE_LAYOUT;
                  g_signal_emit_by_name (G_OBJECT (clock), "layout");
                }
+	      if (iter == 4)
+		g_warning ("gdk-frame-clock: layout continuously requested, giving up after 4 tries");
            }
-          /* fallthrough */
        case GDK_FRAME_CLOCK_PHASE_PAINT:
          if (priv->freeze_count == 0)
            {
@@ -422,7 +429,6 @@ gdk_frame_clock_paint_idle (void *data)
                  g_signal_emit_by_name (G_OBJECT (clock), "paint");
                }
            }
-          /* fallthrough */
        case GDK_FRAME_CLOCK_PHASE_AFTER_PAINT:
          if (priv->freeze_count == 0)
            {
@@ -437,7 +443,6 @@ gdk_frame_clock_paint_idle (void *data)
                timings->frame_end_time = g_get_monotonic_time ();
 #endif /* G_ENABLE_DEBUG */
            }
-          /* fallthrough */
        case GDK_FRAME_CLOCK_PHASE_RESUME_EVENTS:
          ;
        }
@@ -224,6 +224,7 @@ struct _GdkWindow
  guint native_visibility : 2; /* the native visibility of a impl windows */
  guint viewable : 1; /* mapped and all parents mapped */
  guint applied_shape : 1;
+  guint in_update : 1;
  GdkFullscreenMode fullscreen_mode;

  /* The GdkWindow that has the impl, ref:ed if another window.
@@ -250,10 +251,6 @@ struct _GdkWindow
  GdkCursor *cursor;
  GHashTable *device_cursor;

-  GSList *implicit_paint;
-
-  GList *outstanding_moves;
-
  cairo_region_t *shape;
  cairo_region_t *input_shape;

@@ -269,6 +266,7 @@ struct _GdkWindow
  guint num_offscreen_children;

  GdkFrameClock *frame_clock; /* NULL to use from parent or default */
+  GdkWindowInvalidateHandlerFunc invalidate_handler;
 };

 #define GDK_WINDOW_TYPE(d) (((GDK_WINDOW (d)))->window_type)
@@ -346,8 +344,6 @@ void       _gdk_screen_close             (GdkScreen      *screen);
 void _gdk_cursor_destroy (GdkCursor *cursor);

 extern const GOptionEntry _gdk_windowing_args[];
-gchar *_gdk_windowing_substitute_screen_number (const gchar *display_name,
-                                                gint         screen_number);

 void _gdk_windowing_got_event                (GdkDisplay       *display,
                                              GList            *event_link,
@@ -189,25 +189,6 @@ gdk_keymap_init (GdkKeymap *keymap)
 /* Other key-handling stuff
 */

-/**
- * gdk_keyval_convert_case:
- * @symbol: a keyval
- * @lower: (out): return location for lowercase version of @symbol
- * @upper: (out): return location for uppercase version of @symbol
- *
- * Obtains the upper- and lower-case versions of the keyval @symbol.
- * Examples of keyvals are #GDK_KEY_a, #GDK_KEY_Enter, #GDK_KEY_F1, etc.
- */
-void
-gdk_keyval_convert_case (guint symbol,
-                         guint *lower,
-                         guint *upper)
-{
-  GdkDisplayManager *manager = gdk_display_manager_get ();
-
-  GDK_DISPLAY_MANAGER_GET_CLASS (manager)->keyval_convert_case (manager, symbol, lower, upper);
-}
-
 /**
 * gdk_keyval_to_upper:
 * @keyval: a key value.
@@ -693,6 +674,7 @@ gdk_keymap_get_modifier_mask (GdkKeymap         *keymap,
  return GDK_KEYMAP_GET_CLASS (keymap)->get_modifier_mask (keymap, intent);
 }

+#include "gdkkeynames.c"

 /**
 * gdk_keyval_name:
@@ -711,10 +693,7 @@ gdk_keymap_get_modifier_mask (GdkKeymap         *keymap,
 gchar *
 gdk_keyval_name (guint keyval)
 {
-  GdkDisplayManager *manager = gdk_display_manager_get ();
-
-  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->get_keyval_name (manager,
-                                                                   keyval);
+  return _gdk_keyval_name (keyval);
 }

 /**
@@ -733,20 +712,27 @@ gdk_keyval_name (guint keyval)
 guint
 gdk_keyval_from_name (const gchar *keyval_name)
 {
-  GdkDisplayManager *manager = gdk_display_manager_get ();
-
-  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->lookup_keyval (manager,
-                                                                 keyval_name);
+  return _gdk_keyval_from_name (keyval_name);
 }

+/**
+ * gdk_keyval_convert_case:
+ * @symbol: a keyval
+ * @lower: (out): return location for lowercase version of @symbol
+ * @upper: (out): return location for uppercase version of @symbol
+ *
+ * Obtains the upper- and lower-case versions of the keyval @symbol.
+ * Examples of keyvals are #GDK_KEY_a, #GDK_KEY_Enter, #GDK_KEY_F1, etc.
+ */
 void
-_gdk_display_manager_real_keyval_convert_case (GdkDisplayManager *manager,
-                                               guint              symbol,
-                                               guint             *lower,
-                                               guint             *upper)
+gdk_keyval_convert_case (guint symbol,
+                         guint *lower,
+                         guint *upper)
 {
-  guint xlower = symbol;
-  guint xupper = symbol;
+  guint xlower, xupper;
+
+  xlower = symbol;
+  xupper = symbol;

  /* Check for directly encoded 24-bit UCS characters: */
  if ((symbol & 0xff000000) == 0x01000000)
@@ -76,11 +76,6 @@ struct _GdkKeymap
  GdkDisplay *display;
 };

-void _gdk_display_manager_real_keyval_convert_case (GdkDisplayManager *manager,
-                                                    guint              symbol,
-                                                    guint             *lower,
-                                                    guint             *upper);
-
 G_END_DECLS

 #endif
@@ -65,15 +65,7 @@ void                           gdk_error_trap_pop_ignored (void);

 const gchar *         gdk_get_display_arg_name (void);

-/**
- * gdk_get_display:
- *
- * Gets the name of the display, which usually comes from the
- * <envar>DISPLAY</envar> environment variable or the
- * <option>--display</option> command line option.
- *
- * Returns: the name of the display.
- */
+GDK_DEPRECATED_IN_3_8_FOR(gdk_display_get_name (gdk_display_get_default ()))
 gchar*        gdk_get_display        (void);

 #ifndef GDK_MULTIDEVICE_SAFE
@@ -117,6 +109,9 @@ void gdk_flush (void);

 void gdk_disable_multidevice (void);

+GDK_AVAILABLE_IN_3_10
+void gdk_set_allowed_backends (const gchar *backends);
+
 G_END_DECLS

 #endif /* __GDK_MAIN_H__ */
@@ -555,42 +555,6 @@ gdk_offscreen_window_queue_antiexpose (GdkWindow *window,
  return FALSE;
 }

-static void
-gdk_offscreen_window_translate (GdkWindow      *window,
-                                cairo_region_t *area,
-                                gint            dx,
-                                gint            dy)
-{
-  GdkOffscreenWindow *offscreen = GDK_OFFSCREEN_WINDOW (window->impl);
-
-  if (offscreen->surface)
-    {
-      cairo_t *cr;
-
-      cr = cairo_create (offscreen->surface);
-
-      area = cairo_region_copy (area);
-
-      gdk_cairo_region (cr, area);
-      cairo_clip (cr);
-
-      /* NB: This is a self-copy and Cairo doesn't support that yet.
-       * So we do a litle trick.
-       */
-      cairo_push_group (cr);
-
-      cairo_set_source_surface (cr, offscreen->surface, dx, dy);
-      cairo_paint (cr);
-
-      cairo_pop_group_to_source (cr);
-      cairo_paint (cr);
-
-      cairo_destroy (cr);
-    }
-
-  _gdk_window_add_damage (window, area);
-}
-
 static cairo_surface_t *
 gdk_offscreen_window_resize_cairo_surface (GdkWindow       *window,
                                           cairo_surface_t *surface,
@@ -713,6 +677,16 @@ gdk_offscreen_window_process_updates_recurse (GdkWindow *window,
  _gdk_window_process_updates_recurse (window, region);
 }

+static void
+gdk_offscreen_window_get_frame_extents (GdkWindow    *window,
+					GdkRectangle *rect)
+{
+  rect->x = window->x;
+  rect->y = window->y;
+  rect->width = window->width;
+  rect->height = window->height;
+}
+
 static void
 gdk_offscreen_window_class_init (GdkOffscreenWindowClass *klass)
 {
@@ -742,7 +716,6 @@ gdk_offscreen_window_class_init (GdkOffscreenWindowClass *klass)
  impl_class->input_shape_combine_region = gdk_offscreen_window_input_shape_combine_region;
  impl_class->set_static_gravities = gdk_offscreen_window_set_static_gravities;
  impl_class->queue_antiexpose = gdk_offscreen_window_queue_antiexpose;
-  impl_class->translate = gdk_offscreen_window_translate;
  impl_class->destroy = gdk_offscreen_window_destroy;
  impl_class->destroy_foreign = NULL;
  impl_class->resize_cairo_surface = gdk_offscreen_window_resize_cairo_surface;
@@ -763,7 +736,7 @@ gdk_offscreen_window_class_init (GdkOffscreenWindowClass *klass)
  impl_class->set_startup_id = gdk_offscreen_window_set_string;
  impl_class->set_transient_for = gdk_offscreen_window_set_transient_for;
  impl_class->get_root_origin = NULL;
-  impl_class->get_frame_extents = NULL;
+  impl_class->get_frame_extents = gdk_offscreen_window_get_frame_extents;
  impl_class->set_override_redirect = NULL;
  impl_class->set_accept_focus = NULL;
  impl_class->set_focus_on_map = gdk_offscreen_window_set_boolean;
@@ -29,6 +29,8 @@

 G_BEGIN_DECLS

+const char * _gdk_atom_name_const (GdkAtom atom);
+
 void gdk_window_destroy_notify	     (GdkWindow *window);

 void gdk_synthesize_window_state (GdkWindow     *window,
@@ -0,0 +1,254 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2000 Red Hat, Inc.
+ *               2005 Imendio AB
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "gdkproperty.h"
+
+#include "gdkprivate.h"
+
+/**
+ * SECTION:properties
+ * @Short_description: Functions to manipulate properties on windows
+ * @Title: Properties and Atoms
+ *
+ * Each window under X can have any number of associated
+ * <firstterm>properties</firstterm> attached to it.
+ * Properties are arbitrary chunks of data identified by
+ * <firstterm>atom</firstterm>s. (An <firstterm>atom</firstterm>
+ * is a numeric index into a string table on the X server. They are used
+ * to transfer strings efficiently between clients without
+ * having to transfer the entire string.) A property
+ * has an associated type, which is also identified
+ * using an atom.
+ *
+ * A property has an associated <firstterm>format</firstterm>,
+ * an integer describing how many bits are in each unit
+ * of data inside the property. It must be 8, 16, or 32.
+ * When data is transferred between the server and client,
+ * if they are of different endianesses it will be byteswapped
+ * as necessary according to the format of the property.
+ * Note that on the client side, properties of format 32
+ * will be stored with one unit per <emphasis>long</emphasis>,
+ * even if a long integer has more than 32 bits on the platform.
+ * (This decision was apparently made for Xlib to maintain
+ * compatibility with programs that assumed longs were 32
+ * bits, at the expense of programs that knew better.)
+ *
+ * The functions in this section are used to add, remove
+ * and change properties on windows, to convert atoms
+ * to and from strings and to manipulate some types of
+ * data commonly stored in X window properties.
+ */
+
+static GHashTable *names_to_atoms;
+static GPtrArray *atoms_to_names;
+
+static const gchar xatoms_string[] = 
+  /* These are all the standard predefined X atoms */
+  "NONE\0"
+  "PRIMARY\0"
+  "SECONDARY\0"
+  "ARC\0"
+  "ATOM\0"
+  "BITMAP\0"
+  "CARDINAL\0"
+  "COLORMAP\0"
+  "CURSOR\0"
+  "CUT_BUFFER0\0"
+  "CUT_BUFFER1\0"
+  "CUT_BUFFER2\0"
+  "CUT_BUFFER3\0"
+  "CUT_BUFFER4\0"
+  "CUT_BUFFER5\0"
+  "CUT_BUFFER6\0"
+  "CUT_BUFFER7\0"
+  "DRAWABLE\0"
+  "FONT\0"
+  "INTEGER\0"
+  "PIXMAP\0"
+  "POINT\0"
+  "RECTANGLE\0"
+  "RESOURCE_MANAGER\0"
+  "RGB_COLOR_MAP\0"
+  "RGB_BEST_MAP\0"
+  "RGB_BLUE_MAP\0"
+  "RGB_DEFAULT_MAP\0"
+  "RGB_GRAY_MAP\0"
+  "RGB_GREEN_MAP\0"
+  "RGB_RED_MAP\0"
+  "STRING\0"
+  "VISUALID\0"
+  "WINDOW\0"
+  "WM_COMMAND\0"
+  "WM_HINTS\0"
+  "WM_CLIENT_MACHINE\0"
+  "WM_ICON_NAME\0"
+  "WM_ICON_SIZE\0"
+  "WM_NAME\0"
+  "WM_NORMAL_HINTS\0"
+  "WM_SIZE_HINTS\0"
+  "WM_ZOOM_HINTS\0"
+  "MIN_SPACE\0"
+  "NORM_SPACE\0"
+  "MAX_SPACE\0"
+  "END_SPACE\0"
+  "SUPERSCRIPT_X\0"
+  "SUPERSCRIPT_Y\0"
+  "SUBSCRIPT_X\0"
+  "SUBSCRIPT_Y\0"
+  "UNDERLINE_POSITION\0"
+  "UNDERLINE_THICKNESS\0"
+  "STRIKEOUT_ASCENT\0"
+  "STRIKEOUT_DESCENT\0"
+  "ITALIC_ANGLE\0"
+  "X_HEIGHT\0"
+  "QUAD_WIDTH\0"
+  "WEIGHT\0"
+  "POINT_SIZE\0"
+  "RESOLUTION\0"
+  "COPYRIGHT\0"
+  "NOTICE\0"
+  "FONT_NAME\0"
+  "FAMILY_NAME\0"
+  "FULL_NAME\0"
+  "CAP_HEIGHT\0"
+  "WM_CLASS\0"
+  "WM_TRANSIENT_FOR\0"
+  "CLIPBOARD\0"			/* = 69 */;
+
+static const gint xatoms_offset[] = {
+    0,   5,  13,  23,  27,  32,  39,  48,  57,  64,  76,  88, 
+  100, 112, 124, 136, 148, 160, 169, 174, 182, 189, 195, 205, 
+  222, 236, 249, 262, 278, 291, 305, 317, 324, 333, 340, 351, 
+  360, 378, 391, 404, 412, 428, 442, 456, 466, 477, 487, 497, 
+  511, 525, 537, 549, 568, 588, 605, 623, 636, 645, 656, 663, 
+  674, 685, 695, 702, 712, 724, 734, 745, 754, 771
+};
+
+static void
+ensure_atom_tables (void)
+{
+  int i;
+  
+  if (names_to_atoms)
+    return;
+
+  names_to_atoms = g_hash_table_new (g_str_hash, g_str_equal);
+  atoms_to_names = g_ptr_array_sized_new (G_N_ELEMENTS (xatoms_offset));
+
+  for (i = 0; i < G_N_ELEMENTS (xatoms_offset); i++)
+    {
+      g_hash_table_insert(names_to_atoms, (gchar *)xatoms_string + xatoms_offset[i], GINT_TO_POINTER (i));
+      g_ptr_array_add(atoms_to_names, (gchar *)xatoms_string + xatoms_offset[i]);
+    }
+}
+
+static GdkAtom
+intern_atom_internal (const gchar *atom_name, gboolean allocate)
+{
+  gpointer result;
+  gchar *name;
+
+  ensure_atom_tables ();
+  
+  if (g_hash_table_lookup_extended (names_to_atoms, atom_name, NULL, &result))
+    return result;
+  
+  result = GINT_TO_POINTER (atoms_to_names->len);
+  name = allocate ? g_strdup (atom_name) : (gchar *)atom_name;
+  g_hash_table_insert(names_to_atoms, name, result);
+  g_ptr_array_add(atoms_to_names, name);
+  
+  return result;  
+}
+
+/**
+ * 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: (transfer none): the atom corresponding to @atom_name.
+ */
+GdkAtom
+gdk_atom_intern (const gchar *atom_name,
+                 gboolean     only_if_exists)
+{
+  g_return_val_if_fail (atom_name != NULL, GDK_NONE);
+
+  return intern_atom_internal (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: (transfer none): the atom corresponding to @atom_name
+ *
+ * Since: 2.10
+ */
+GdkAtom
+gdk_atom_intern_static_string (const gchar *atom_name)
+{
+  g_return_val_if_fail (atom_name != NULL, GDK_NONE);
+
+  return intern_atom_internal (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)
+{
+  return g_strdup (_gdk_atom_name_const (atom));
+}
+
+const gchar *
+_gdk_atom_name_const (GdkAtom atom)
+{
+  ensure_atom_tables ();
+
+  if (GPOINTER_TO_INT (atom) >= atoms_to_names->len)
+    return NULL;
+
+  return g_ptr_array_index (atoms_to_names, GPOINTER_TO_INT (atom));
+}
@@ -297,8 +297,8 @@ typedef enum
 *  viewable.
 * @GDK_GRAB_FROZEN: the resource is frozen by an active grab of another client.
 *
- * Returned by gdk_pointer_grab() and gdk_keyboard_grab() to indicate
- * success or the reason for the failure of the grab attempt.
+ * Returned by gdk_device_grab(), gdk_pointer_grab() and gdk_keyboard_grab() to
+ * indicate success or the reason for the failure of the grab attempt.
 */
 typedef enum
 {
@@ -100,6 +100,16 @@
 */
 #define GDK_VERSION_3_8         (G_ENCODE_VERSION (3, 8))

+/**
+ * GDK_VERSION_3_10:
+ *
+ * A macro that evaluates to the 3.10 version of GDK, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 3.10
+ */
+#define GDK_VERSION_3_10        (G_ENCODE_VERSION (3, 10))
+

 /* evaluates to the current stable version; for development cycles,
 * this means the next stable target
@@ -241,4 +251,18 @@
 # define GDK_AVAILABLE_IN_3_8
 #endif

+#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_3_10
+# define GDK_DEPRECATED_IN_3_10               GDK_DEPRECATED
+# define GDK_DEPRECATED_IN_3_10_FOR(f)        GDK_DEPRECATED_FOR(f)
+#else
+# define GDK_DEPRECATED_IN_3_10
+# define GDK_DEPRECATED_IN_3_10_FOR(f)
+#endif
+
+#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_3_10
+# define GDK_AVAILABLE_IN_3_10                GDK_UNAVAILABLE(3, 10)
+#else
+# define GDK_AVAILABLE_IN_3_10
+#endif
+
 #endif  /* __GDK_VERSION_MACROS_H__ */
@@ -634,6 +634,26 @@ gboolean gdk_window_set_static_gravities (GdkWindow *window,

 /* GdkWindow */

+/**
+ * GdkWindowInvalidateHandlerFunc:
+ * @window: a #GdkWindow
+ * @region: a #cairo_region_t
+ *
+ * Whenever some area of the window is invalidated (directly in the
+ * window or in a child window) this gets called with @region in
+ * the coordinate space of @window. You can use @region to just
+ * keep track of the dirty region, or you can actually change
+ * @region in case you are doing display tricks like showing
+ * a child in multiple places.
+ *
+ * Since: 3.10
+ */
+typedef void (*GdkWindowInvalidateHandlerFunc)  (GdkWindow *window,
+						 cairo_region_t *region);
+GDK_AVAILABLE_IN_3_10
+void gdk_window_set_invalidate_handler (GdkWindow *window,
+					GdkWindowInvalidateHandlerFunc handler);
+
 gboolean      gdk_window_has_native         (GdkWindow       *window);
 void              gdk_window_set_type_hint (GdkWindow        *window,
                                            GdkWindowTypeHint hint);
@@ -125,16 +125,6 @@ struct _GdkWindowImplClass
  gboolean     (* queue_antiexpose)     (GdkWindow       *window,
 					 cairo_region_t  *update_area);

-  /* Called to move @area inside @window by @dx x @dy pixels. @area is 
-   * guaranteed to be inside @window. If part of @area is not invisible or
-   * invalid, it is this function's job to queue expose events in those 
-   * areas.
-   */
-  void         (* translate)            (GdkWindow       *window,
-					 cairo_region_t  *area,
-					 gint            dx,
-					 gint            dy);
-
 /* Called to do the windowing system specific part of gdk_window_destroy(),
 *
 * window: The window being destroyed
@@ -1,7 +1,6 @@
 /* GdkQuartzView.m
 *
 * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2011 Hiroyuki Yamamoto
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -24,541 +23,18 @@

@implementation GdkQuartzView

-(id)initWithFrame: (NSRect)frameRect
-{
-  if ((self = [super initWithFrame: frameRect]))
-    {
-      markedRange = NSMakeRange (NSNotFound, 0);
-      selectedRange = NSMakeRange (NSNotFound, 0);
-    }
-
-  return self;
-}
-
-(BOOL)acceptsFirstResponder
-{
-  GDK_NOTE (EVENTS, g_print ("acceptsFirstResponder\n"));
-  return YES;
-}
-
-(BOOL)becomeFirstResponder
-{
-  GDK_NOTE (EVENTS, g_print ("becomeFirstResponder\n"));
-  return YES;
-}
-
-(BOOL)resignFirstResponder
-{
-  GDK_NOTE (EVENTS, g_print ("resignFirstResponder\n"));
-  return YES;
-}
-
-(void) keyDown: (NSEvent *) theEvent
-{
-  GDK_NOTE (EVENTS, g_print ("keyDown\n"));
-  [self interpretKeyEvents: [NSArray arrayWithObject: theEvent]];
-}
-
-(void)flagsChanged: (NSEvent *) theEvent
-{
-}
-
-(NSUInteger)characterIndexForPoint: (NSPoint)aPoint
-{
-  GDK_NOTE (EVENTS, g_print ("characterIndexForPoint\n"));
-  return 0;
-}
-
-(NSRect)firstRectForCharacterRange: (NSRange)aRange actualRange: (NSRangePointer)actualRange
-{
-  GDK_NOTE (EVENTS, g_print ("firstRectForCharacterRange\n"));
-  gint ns_x, ns_y;
-  GdkRectangle *rect;
-
-  rect = g_object_get_data (G_OBJECT (gdk_window), GIC_CURSOR_RECT);
-  if (rect)
-    {
-      _gdk_quartz_window_gdk_xy_to_xy (rect->x, rect->y + rect->height,
-				       &ns_x, &ns_y);
-
-      return NSMakeRect (ns_x, ns_y, rect->width, rect->height);
-    }
-  else
-    {
-      return NSMakeRect (0, 0, 0, 0);
-    }
-}
-
-(NSArray *)validAttributesForMarkedText
-{
-  GDK_NOTE (EVENTS, g_print ("validAttributesForMarkedText\n"));
-  return [NSArray arrayWithObjects: NSUnderlineStyleAttributeName, nil];
-}
-
-(NSAttributedString *)attributedSubstringForProposedRange: (NSRange)aRange actualRange: (NSRangePointer)actualRange
-{
-  GDK_NOTE (EVENTS, g_print ("attributedSubstringForProposedRange\n"));
-  return nil;
-}
-
-(BOOL)hasMarkedText
-{
-  GDK_NOTE (EVENTS, g_print ("hasMarkedText\n"));
-  return markedRange.location != NSNotFound && markedRange.length != 0;
-}
-
-(NSRange)markedRange
-{
-  GDK_NOTE (EVENTS, g_print ("markedRange\n"));
-  return markedRange;
-}
-
-(NSRange)selectedRange
-{
-  GDK_NOTE (EVENTS, g_print ("selectedRange\n"));
-  return selectedRange;
-}
-
-(void)unmarkText
-{
-  GDK_NOTE (EVENTS, g_print ("unmarkText\n"));
-  gchar *prev_str;
-  markedRange = selectedRange = NSMakeRange (NSNotFound, 0);
-
-  prev_str = g_object_get_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT);
-  if (prev_str)
-    g_free (prev_str);
-  g_object_set_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT, NULL);
-}
-
-(void)setMarkedText: (id)aString selectedRange: (NSRange)newSelection replacementRange: (NSRange)replacementRange
-{
-  GDK_NOTE (EVENTS, g_print ("setMarkedText\n"));
-  const char *str;
-  gchar *prev_str;
-
-  if (replacementRange.location == NSNotFound)
-    {
-      markedRange = NSMakeRange (newSelection.location, [aString length]);
-      selectedRange = NSMakeRange (newSelection.location, newSelection.length);
-    }
-  else {
-      markedRange = NSMakeRange (replacementRange.location, [aString length]);
-      selectedRange = NSMakeRange (replacementRange.location + newSelection.location, newSelection.length);
-    }
-
-  if ([aString isKindOfClass: [NSAttributedString class]])
-    {
-      str = [[aString string] UTF8String];
-    }
-  else {
-      str = [aString UTF8String];
-    }
-
-  prev_str = g_object_get_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT);
-  if (prev_str)
-    g_free (prev_str);
-  g_object_set_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT, g_strdup (str));
-  g_object_set_data (G_OBJECT (gdk_window), TIC_SELECTED_POS,
-		     GUINT_TO_POINTER (selectedRange.location));
-  g_object_set_data (G_OBJECT (gdk_window), TIC_SELECTED_LEN,
-		     GUINT_TO_POINTER (selectedRange.length));
-
-  GDK_NOTE (EVENTS, g_print ("setMarkedText: set %s (%p, nsview %p): %s\n",
-			     TIC_MARKED_TEXT, gdk_window, self,
-			     str ? str : "(empty)"));
-
-  /* handle text input changes by mouse events */
-  if (!GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (gdk_window),
-                                            TIC_IN_KEY_DOWN)))
-    {
-      _gdk_quartz_synthesize_null_key_event(gdk_window);
-    }
-}
-
-(void)doCommandBySelector: (SEL)aSelector
-{
-  GDK_NOTE (EVENTS, g_print ("doCommandBySelector\n"));
-  if ([self respondsToSelector: aSelector])
-    [self performSelector: aSelector];
-}
-
-(void)insertText: (id)aString replacementRange: (NSRange)replacementRange
-{
-  GDK_NOTE (EVENTS, g_print ("insertText\n"));
-  const char *str;
-  NSString *string;
-  gchar *prev_str;
-
-  if ([self hasMarkedText])
-    [self unmarkText];
-
-  if ([aString isKindOfClass: [NSAttributedString class]])
-      string = [aString string];
-  else
-      string = aString;
-
-  NSCharacterSet *ctrlChars = [NSCharacterSet controlCharacterSet];
-  NSCharacterSet *wsnlChars = [NSCharacterSet whitespaceAndNewlineCharacterSet];
-  if ([string rangeOfCharacterFromSet:ctrlChars].length &&
-      [string rangeOfCharacterFromSet:wsnlChars].length == 0)
-    {
-      /* discard invalid text input with Chinese input methods */
-      str = "";
-      [self unmarkText];
-      NSInputManager *currentInputManager = [NSInputManager currentInputManager];
-      [currentInputManager markedTextAbandoned:self];
-    }
-  else
-   {
-      str = [string UTF8String];
-   }
-
-  prev_str = g_object_get_data (G_OBJECT (gdk_window), TIC_INSERT_TEXT);
-  if (prev_str)
-    g_free (prev_str);
-  g_object_set_data (G_OBJECT (gdk_window), TIC_INSERT_TEXT, g_strdup (str));
-  GDK_NOTE (EVENTS, g_print ("insertText: set %s (%p, nsview %p): %s\n",
-			     TIC_INSERT_TEXT, gdk_window, self,
-			     str ? str : "(empty)"));
-
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_FILTERED));
-
-  /* handle text input changes by mouse events */
-  if (!GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (gdk_window),
-                                            TIC_IN_KEY_DOWN)))
-    {
-      _gdk_quartz_synthesize_null_key_event(gdk_window);
-    }
-}
-
-(void)deleteBackward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteBackward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)deleteForward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteForward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)deleteToBeginningOfLine: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteToBeginningOfLine\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)deleteToEndOfLine: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteToEndOfLine\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)deleteWordBackward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteWordBackward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)deleteWordForward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteWordForward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)insertBacktab: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("insertBacktab\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)insertNewline: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("insertNewline\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY, GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)insertTab: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("insertTab\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveBackward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveBackward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveBackwardAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveBackwardAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveDown: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveDown\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveDownAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveDownAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveForward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveForward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveForwardAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveForwardAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveLeft: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveLeft\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveLeftAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveLeftAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveRight: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveRight\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveRightAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveRightAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToBeginningOfDocument: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfDocument\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToBeginningOfDocumentAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfDocumentAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToBeginningOfLine: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfLine\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToBeginningOfLineAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfLineAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToEndOfDocument: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToEndOfDocument\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToEndOfDocumentAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToEndOfDocumentAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToEndOfLine: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToEndOfLine\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToEndOfLineAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToEndOfLineAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveUp: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveUp\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveUpAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveUpAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordBackward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordBackward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordBackwardAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordBackwardAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordForward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordForward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordForwardAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordForwardAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordLeft: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordLeft\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordLeftAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordLeftAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordRight: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordRight\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordRightAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordRightAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)pageDown: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("pageDown\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)pageDownAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("pageDownAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)pageUp: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("pageUp\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)pageUpAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("pageUpAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)selectAll: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("selectAll\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)selectLine: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("selectLine\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)selectWord: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("selectWord\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)noop: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("noop\n"));
-}
-
-/* --------------------------------------------------------------- */
-
 -(void)dealloc
 {
  if (trackingRect)
    {
-      [self removeTrackingRect: trackingRect];
+      [self removeTrackingRect:trackingRect];
      trackingRect = 0;
    }

  [super dealloc];
 }

-(void)setGdkWindow: (GdkWindow *)window
+-(void)setGdkWindow:(GdkWindow *)window
 {
  gdk_window = window;
 }
@@ -584,11 +60,10 @@
    return YES;

  /* A view is opaque if its GdkWindow doesn't have the RGBA visual */
-  return gdk_window_get_visual (gdk_window) !=
-    gdk_screen_get_rgba_visual (_gdk_screen);
+  return gdk_window_get_visual (gdk_window) != gdk_screen_get_rgba_visual (_gdk_screen);
 }

-(void)drawRect: (NSRect)rect
+-(void)drawRect:(NSRect)rect 
 {
  GdkRectangle gdk_rect;
  GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (gdk_window->impl);
@@ -600,7 +75,7 @@
  if (GDK_WINDOW_DESTROYED (gdk_window))
    return;

-  if (! (gdk_window->event_mask & GDK_EXPOSURE_MASK))
+  if (!(gdk_window->event_mask & GDK_EXPOSURE_MASK))
    return;

  if (NSEqualRects (rect, NSZeroRect))
@@ -618,7 +93,7 @@
      [NSGraphicsContext saveGraphicsState];

      [[NSColor windowBackgroundColor] setFill];
-      [NSBezierPath fillRect: rect];
+      [NSBezierPath fillRect:rect];

      [NSGraphicsContext restoreGraphicsState];

@@ -632,9 +107,9 @@
      impl->needs_display_region = NULL;
    }

-  [self getRectsBeingDrawn: &drawn_rects count: &count];
+  [self getRectsBeingDrawn:&drawn_rects count:&count];
  region = cairo_region_create ();
-
+  
  for (i = 0; i < count; i++)
    {
      gdk_rect.x = drawn_rects[i].origin.x;
@@ -658,7 +133,7 @@
    }
 }

-(void)setNeedsInvalidateShadow: (BOOL)invalidate
+-(void)setNeedsInvalidateShadow:(BOOL)invalidate
 {
  needsInvalidateShadow = invalidate;
 }
@@ -676,7 +151,7 @@

  if (trackingRect)
    {
-      [self removeTrackingRect: trackingRect];
+      [self removeTrackingRect:trackingRect];
      trackingRect = 0;
    }

@@ -688,32 +163,32 @@
   */

  rect = [self bounds];
-  trackingRect = [self addTrackingRect: rect
-		  owner: self
-		  userData: nil
-		  assumeInside: NO];
+  trackingRect = [self addTrackingRect:rect
+                                 owner:self
+                              userData:nil
+                          assumeInside:NO];
 }

 -(void)viewDidMoveToWindow
 {
  if (![self window]) /* We are destroyed already */
-    return;
+      return;

  [self updateTrackingRect];
 }

-(void)viewWillMoveToWindow: (NSWindow *)newWindow
+-(void)viewWillMoveToWindow:(NSWindow *)newWindow
 {
  if (newWindow == nil && trackingRect)
    {
-      [self removeTrackingRect: trackingRect];
+      [self removeTrackingRect:trackingRect];
      trackingRect = 0;
    }
 }

-(void)setFrame: (NSRect)frame
+-(void)setFrame:(NSRect)frame
 {
-  [super setFrame: frame];
+  [super setFrame:frame];

  if ([self window])
    [self updateTrackingRect];
@@ -17,33 +17,17 @@
 */

 #import <AppKit/AppKit.h>
-#include "gdk/gdk.h"
+#include "gdkwindow.h"

-/* Text Input Client */
-#define TIC_MARKED_TEXT "tic-marked-text"
-#define TIC_SELECTED_POS  "tic-selected-pos"
-#define TIC_SELECTED_LEN  "tic-selected-len"
-#define TIC_INSERT_TEXT "tic-insert-text"
-#define TIC_IN_KEY_DOWN "tic-in-key-down"
-
-/* GtkIMContext */
-#define GIC_CURSOR_RECT  "gic-cursor-rect"
-#define GIC_FILTER_KEY   "gic-filter-key"
-#define GIC_FILTER_PASSTHRU	0
-#define GIC_FILTER_FILTERED	1
-
-@interface GdkQuartzView : NSView <NSTextInputClient>
-{
+@interface GdkQuartzView : NSView {
  GdkWindow *gdk_window;
  NSTrackingRectTag trackingRect;
  BOOL needsInvalidateShadow;
-  NSRange markedRange;
-  NSRange selectedRange;
 }

- (void)setGdkWindow: (GdkWindow *)window;
- (GdkWindow *)gdkWindow;
- (NSTrackingRectTag)trackingRect;
- (void)setNeedsInvalidateShadow: (BOOL)invalidate;
+-(void)setGdkWindow:(GdkWindow *)window;
+-(GdkWindow *)gdkWindow;
+-(NSTrackingRectTag)trackingRect;
+-(void)setNeedsInvalidateShadow:(BOOL)invalidate;

@end
@@ -155,24 +155,6 @@ gdk_quartz_display_get_name (GdkDisplay *display)
  return display_name;
 }

-static gint
-gdk_quartz_display_get_n_screens (GdkDisplay *display)
-{
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), 0);
-
-  return 1;
-}
-
-static GdkScreen *
-gdk_quartz_display_get_screen (GdkDisplay *display,
-                               gint        screen_num)
-{
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-  g_return_val_if_fail (screen_num == 0, NULL);
-
-  return _gdk_screen;
-}
-
 static GdkScreen *
 gdk_quartz_display_get_default_screen (GdkDisplay *display)
 {
@@ -283,8 +265,6 @@ G_DEFINE_TYPE (GdkQuartzDisplay, gdk_quartz_display, GDK_TYPE_DISPLAY)
 static void
 gdk_quartz_display_init (GdkQuartzDisplay *display)
 {
-  _gdk_quartz_display_manager_add_display (gdk_display_manager_get (),
-                                           GDK_DISPLAY_OBJECT (display));
 }

 static void
@@ -292,9 +272,6 @@ gdk_quartz_display_dispose (GObject *object)
 {
  GdkQuartzDisplay *display_quartz = GDK_QUARTZ_DISPLAY (object);

-  _gdk_quartz_display_manager_remove_display (gdk_display_manager_get (),
-                                              GDK_DISPLAY_OBJECT (object));
-
  g_list_foreach (display_quartz->input_devices,
                  (GFunc) g_object_run_dispose, NULL);

@@ -323,8 +300,6 @@ gdk_quartz_display_class_init (GdkQuartzDisplayClass *class)
  display_class->window_type = GDK_TYPE_QUARTZ_WINDOW;

  display_class->get_name = gdk_quartz_display_get_name;
-  display_class->get_n_screens = gdk_quartz_display_get_n_screens;
-  display_class->get_screen = gdk_quartz_display_get_screen;
  display_class->get_default_screen = gdk_quartz_display_get_default_screen;
  display_class->beep = gdk_quartz_display_beep;
  display_class->sync = gdk_quartz_display_sync;
@@ -35,9 +35,6 @@
 struct _GdkQuartzDisplayManager
 {
  GdkDisplayManager parent;
-
-  GdkDisplay *default_display;
-  GSList *displays;
 };


@@ -50,45 +47,6 @@ gdk_quartz_display_manager_open_display (GdkDisplayManager *manager,
  return _gdk_quartz_display_open (name);
 }

-static GSList *
-gdk_quartz_display_manager_list_displays (GdkDisplayManager *manager)
-{
-  GdkQuartzDisplayManager *manager_quartz = GDK_QUARTZ_DISPLAY_MANAGER (manager);
-
-  return g_slist_copy (manager_quartz->displays);
-}
-
-static GdkDisplay *
-gdk_quartz_display_manager_get_default_display (GdkDisplayManager *manager)
-{
-  return GDK_QUARTZ_DISPLAY_MANAGER (manager)->default_display;
-}
-
-static void
-gdk_quartz_display_manager_set_default_display (GdkDisplayManager *manager,
-                                                GdkDisplay        *display)
-{
-  GdkQuartzDisplayManager *manager_quartz = GDK_QUARTZ_DISPLAY_MANAGER (manager);
-
-  manager_quartz->default_display = display;
-}
-
-#include "../gdkkeynames.c"
-
-static gchar *
-gdk_quartz_display_manager_get_keyval_name (GdkDisplayManager *manager,
-                                            guint              keyval)
-{
-  return _gdk_keyval_name (keyval);
-}
-
-static guint
-gdk_quartz_display_manager_lookup_keyval (GdkDisplayManager *manager,
-                                          const gchar       *name)
-{
-  return _gdk_keyval_from_name (name);
-}
-
 static void
 gdk_quartz_display_manager_init (GdkQuartzDisplayManager *manager)
 {
@@ -122,40 +80,6 @@ gdk_quartz_display_manager_class_init (GdkQuartzDisplayManagerClass *class)
  object_class->finalize = gdk_quartz_display_manager_finalize;

  manager_class->open_display = gdk_quartz_display_manager_open_display;
-  manager_class->list_displays = gdk_quartz_display_manager_list_displays;
-  manager_class->set_default_display = gdk_quartz_display_manager_set_default_display;
-  manager_class->get_default_display = gdk_quartz_display_manager_get_default_display;
  manager_class->atom_intern = _gdk_quartz_display_manager_atom_intern;
  manager_class->get_atom_name = _gdk_quartz_display_manager_get_atom_name;
-  manager_class->lookup_keyval = gdk_quartz_display_manager_lookup_keyval;
-  manager_class->get_keyval_name = gdk_quartz_display_manager_get_keyval_name;
-}
-
-void
-_gdk_quartz_display_manager_add_display (GdkDisplayManager *manager,
-                                         GdkDisplay        *display)
-{
-  GdkQuartzDisplayManager *manager_quartz = GDK_QUARTZ_DISPLAY_MANAGER (manager);
-
-  if (manager_quartz->displays == NULL)
-    gdk_display_manager_set_default_display (manager, display);
-
-  manager_quartz->displays = g_slist_prepend (manager_quartz->displays, display);
-}
-
-void
-_gdk_quartz_display_manager_remove_display (GdkDisplayManager *manager,
-                                            GdkDisplay        *display)
-{
-  GdkQuartzDisplayManager *manager_quartz = GDK_QUARTZ_DISPLAY_MANAGER (manager);
-
-  manager_quartz->displays = g_slist_remove (manager_quartz->displays, display);
-
-  if (manager_quartz->default_display == display)
-    {
-      if (manager_quartz->displays)
-        gdk_display_manager_set_default_display (manager, manager_quartz->displays->data);
-      else
-        gdk_display_manager_set_default_display (manager, NULL);
-    }
 }
@@ -618,32 +618,7 @@ gdk_event_prepare (GSource *source,
  gboolean retval;

  gdk_threads_enter ();
-
-  /* The prepare stage is the stage before the main loop starts polling
-   * and dispatching events. The autorelease poll is drained here for
-   * the preceding main loop iteration or, in case of the first iteration,
-   * for the operations carried out between event loop initialization and
-   * this first iteration.
-   *
-   * The autorelease poll must only be drained when the following conditions
-   * apply:
-   *  - We are at the base CFRunLoop level (indicated by current_loop_level),
-   *  - We are at the base g_main_loop level (indicated by
-   *    g_main_depth())
-   *  - We are at the base poll_func level (indicated by getting events).
-   *
-   * Messing with the autorelease pool at any level of nesting can cause access
-   * to deallocated memory because autorelease_pool is static and releasing a
-   * pool will cause all pools allocated inside of it to be released as well.
-   */
-  if (current_loop_level == 0 && g_main_depth() == 0 && getting_events == 0)
-    {
-      if (autorelease_pool)
-        [autorelease_pool drain];
-
-      autorelease_pool = [[NSAutoreleasePool alloc] init];
-    }
-
+  
  *timeout = -1;

  if (_gdk_display->event_pause_count > 0)
@@ -684,6 +659,21 @@ gdk_event_dispatch (GSource     *source,

  gdk_threads_enter ();

+  /* Refresh the autorelease pool if we're at the base CFRunLoop level
+   * (indicated by current_loop_level) and the base g_main_loop level
+   * (indicated by g_main_depth()). Messing with the autorelease pool at
+   * any level of nesting can cause access to deallocated memory because
+   * autorelease_pool is static and releasing a pool will cause all pools
+   * allocated inside of it to be released as well.
+   */
+  if (current_loop_level == 0 && g_main_depth() == 0)
+    {
+      if (autorelease_pool)
+        [autorelease_pool drain];
+
+      autorelease_pool = [[NSAutoreleasePool alloc] init];
+    }
+
  _gdk_quartz_display_queue_events (_gdk_display);

  event = _gdk_event_unqueue (_gdk_display);
@@ -1156,24 +1156,6 @@ synthesize_crossing_event (GdkWindow *window,
  return FALSE;
 }

-void
-_gdk_quartz_synthesize_null_key_event (GdkWindow *window)
-{
-  GdkEvent *event;
-  GdkQuartzDeviceManagerCore *device_manager;
-
-  event = gdk_event_new (GDK_KEY_PRESS);
-  event->any.type = GDK_KEY_PRESS;
-  event->key.window = window;
-  event->key.state = 0;
-  event->key.hardware_keycode = 0;
-  event->key.group = 0;
-  event->key.keyval = GDK_KEY_VoidSymbol;
-  device_manager = GDK_QUARTZ_DEVICE_MANAGER_CORE (_gdk_display->device_manager);
-  gdk_event_set_device (event, device_manager->core_keyboard);
-  append_event(event, FALSE);
-}
-
 GdkModifierType
 _gdk_quartz_events_get_current_keyboard_modifiers (void)
 {
@@ -1512,11 +1494,8 @@ gdk_event_translate (GdkEvent *event,
      }
      break;

-    case NSMouseExited:
-      if (WINDOW_IS_TOPLEVEL (window))
-          [[NSCursor arrowCursor] set];
-      /* fall through */
    case NSMouseEntered:
+    case NSMouseExited:
      return_val = synthesize_crossing_event (window, event, nsevent, x, y, x_root, y_root);
      break;

@@ -82,6 +82,17 @@ _gdk_quartz_display_get_keymap (GdkDisplay *display)
  return default_keymap;
 }

+/* Note: we could check only if building against the 10.5 SDK instead, but
+ * that would make non-xml layouts not work in 32-bit which would be a quite
+ * bad regression. This way, old unsupported layouts will just not work in
+ * 64-bit.
+ */
+#ifdef __LP64__
+static TISInputSourceRef current_layout = NULL;
+#else
+static KeyboardLayoutRef current_layout = NULL;
+#endif
+
 /* This is a table of all keyvals. Each keycode gets KEYVALS_PER_KEYCODE entries.
 * TThere is 1 keyval per modifier (Nothing, Shift, Alt, Shift+Alt);
 */
@@ -256,17 +267,10 @@ const static struct {
 };

 static void
-update_keymap (void)
+maybe_update_keymap (void)
 {
  const void *chr_data = NULL;
-  guint *p;
-  int i;

-  /* Note: we could check only if building against the 10.5 SDK instead, but
-   * that would make non-xml layouts not work in 32-bit which would be a quite
-   * bad regression. This way, old unsupported layouts will just not work in
-   * 64-bit.
-   */
 #ifdef __LP64__
  TISInputSourceRef new_layout = TISCopyCurrentKeyboardLayoutInputSource ();
  CFDataRef layout_data_ref;
@@ -278,221 +282,228 @@ update_keymap (void)
  KLGetCurrentKeyboardLayout (&new_layout);
 #endif

-  g_free (keyval_array);
-  keyval_array = g_new0 (guint, NUM_KEYCODES * KEYVALS_PER_KEYCODE);
+  if (new_layout != current_layout)
+    {
+      guint *p;
+      int i;
+
+      g_free (keyval_array);
+      keyval_array = g_new0 (guint, NUM_KEYCODES * KEYVALS_PER_KEYCODE);

 #ifdef __LP64__
-  layout_data_ref = (CFDataRef) TISGetInputSourceProperty
-    (new_layout, kTISPropertyUnicodeKeyLayoutData);
+      layout_data_ref = (CFDataRef) TISGetInputSourceProperty
+	(new_layout, kTISPropertyUnicodeKeyLayoutData);

-  if (layout_data_ref)
-    chr_data = CFDataGetBytePtr (layout_data_ref);
+      if (layout_data_ref)
+	chr_data = CFDataGetBytePtr (layout_data_ref);

-  if (chr_data == NULL)
-    {
-      g_error ("cannot get keyboard layout data");
-      return;
-    }
+      if (chr_data == NULL)
+	{
+	  g_error ("cannot get keyboard layout data");
+	  return;
+	}
 #else
+      /* Get the layout kind */
+      KLGetKeyboardLayoutProperty (new_layout, kKLKind, (const void **)&layout_kind);

-  /* Get the layout kind */
-  KLGetKeyboardLayoutProperty (new_layout, kKLKind, (const void **)&layout_kind);
+      /* 8-bit-only keyabord layout */
+      if (layout_kind == kKLKCHRKind)
+	{ 
+	  /* Get chr data */
+	  KLGetKeyboardLayoutProperty (new_layout, kKLKCHRData, (const void **)&chr_data);
+	  
+	  for (i = 0; i < NUM_KEYCODES; i++) 
+	    {
+	      int j;
+	      UInt32 modifiers[] = {0, shiftKey, optionKey, shiftKey | optionKey};

-  /* 8-bit-only keyabord layout */
-  if (layout_kind == kKLKCHRKind)
-    {
-      /* Get chr data */
-      KLGetKeyboardLayoutProperty (new_layout, kKLKCHRData, (const void **)&chr_data);
+	      p = keyval_array + i * KEYVALS_PER_KEYCODE;
+	      
+	      for (j = 0; j < KEYVALS_PER_KEYCODE; j++)
+		{
+		  UInt32 c, state = 0;
+		  UInt16 key_code;
+		  UniChar uc;
+		  
+		  key_code = modifiers[j] | i;
+		  c = KeyTranslate (chr_data, key_code, &state);

-      for (i = 0; i < NUM_KEYCODES; i++)
-        {
-          int j;
-          UInt32 modifiers[] = {0, shiftKey, optionKey, shiftKey | optionKey};
+		  if (state != 0)
+		    {
+		      UInt32 state2 = 0;
+		      c = KeyTranslate (chr_data, key_code | 128, &state2);
+		    }

-          p = keyval_array + i * KEYVALS_PER_KEYCODE;
+		  if (c != 0 && c != 0x10)
+		    {
+		      int k;
+		      gboolean found = FALSE;

-          for (j = 0; j < KEYVALS_PER_KEYCODE; j++)
-            {
-              UInt32 c, state = 0;
-              UInt16 key_code;
-              UniChar uc;
+		      /* FIXME: some keyboard layouts (e.g. Russian) use
+                       * a different 8-bit character set. We should
+                       * check for this. Not a serious problem, because
+		       * most (all?) of these layouts also have a
+		       * uchr version. 
+		       */
+		      uc = macroman2ucs (c);

-              key_code = modifiers[j] | i;
-              c = KeyTranslate (chr_data, key_code, &state);
+		      for (k = 0; k < G_N_ELEMENTS (special_ucs_table); k++) 
+			{
+			  if (special_ucs_table[k].ucs_value == uc)
+			    {
+			      p[j] = special_ucs_table[k].keyval;
+			      found = TRUE;
+			      break;
+			    }
+			}
+		      
+		      /* Special-case shift-tab since GTK+ expects
+		       * GDK_KEY_ISO_Left_Tab for that.
+		       */
+		      if (found && p[j] == GDK_KEY_Tab && modifiers[j] == shiftKey)
+			p[j] = GDK_KEY_ISO_Left_Tab;

-              if (state != 0)
-                {
-                  UInt32 state2 = 0;
-                  c = KeyTranslate (chr_data, key_code | 128, &state2);
-                }
+		      if (!found)
+                        p[j] = gdk_unicode_to_keyval (uc);
+		    }
+		}

-              if (c != 0 && c != 0x10)
-                {
-                  int k;
-                  gboolean found = FALSE;
-
-                  /* FIXME: some keyboard layouts (e.g. Russian) use a
-                   * different 8-bit character set. We should check
-                   * for this. Not a serious problem, because most
-                   * (all?) of these layouts also have a uchr version.
-                   */
-                  uc = macroman2ucs (c);
-
-                  for (k = 0; k < G_N_ELEMENTS (special_ucs_table); k++)
-                    {
-                      if (special_ucs_table[k].ucs_value == uc)
-                        {
-                          p[j] = special_ucs_table[k].keyval;
-                          found = TRUE;
-                          break;
-                        }
-                    }
-
-                  /* Special-case shift-tab since GTK+ expects
-                   * GDK_KEY_ISO_Left_Tab for that.
-                   */
-                  if (found && p[j] == GDK_KEY_Tab && modifiers[j] == shiftKey)
-                    p[j] = GDK_KEY_ISO_Left_Tab;
-
-                  if (!found)
-                    p[j] = gdk_unicode_to_keyval (uc);
-                }
-            }
-
-          if (p[3] == p[2])
-            p[3] = 0;
-          if (p[2] == p[1])
-            p[2] = 0;
-          if (p[1] == p[0])
-            p[1] = 0;
-          if (p[0] == p[2] &&
-              p[1] == p[3])
-            p[2] = p[3] = 0;
-        }
-    }
-  /* unicode keyboard layout */
-  else if (layout_kind == kKLKCHRuchrKind || layout_kind == kKLuchrKind)
-    {
-      /* Get chr data */
-      KLGetKeyboardLayoutProperty (new_layout, kKLuchrData, (const void **)&chr_data);
+	      if (p[3] == p[2])
+		p[3] = 0;
+	      if (p[2] == p[1])
+		p[2] = 0;
+	      if (p[1] == p[0])
+		p[1] = 0;
+	      if (p[0] == p[2] && 
+		  p[1] == p[3])
+		p[2] = p[3] = 0;
+	    }
+	}
+      /* unicode keyboard layout */
+      else if (layout_kind == kKLKCHRuchrKind || layout_kind == kKLuchrKind)
+	{ 
+	  /* Get chr data */
+	  KLGetKeyboardLayoutProperty (new_layout, kKLuchrData, (const void **)&chr_data);
 #endif
+	  
+	  for (i = 0; i < NUM_KEYCODES; i++) 
+	    {
+	      int j;
+	      UInt32 modifiers[] = {0, shiftKey, optionKey, shiftKey | optionKey};
+              UniChar chars[4];
+              UniCharCount nChars;

-      for (i = 0; i < NUM_KEYCODES; i++)
-        {
-          int j;
-          UInt32 modifiers[] = {0, shiftKey, optionKey, shiftKey | optionKey};
-          UniChar chars[4];
-          UniCharCount nChars;
+	      p = keyval_array + i * KEYVALS_PER_KEYCODE;

-          p = keyval_array + i * KEYVALS_PER_KEYCODE;
+	      for (j = 0; j < KEYVALS_PER_KEYCODE; j++)
+		{
+		  UInt32 state = 0;
+		  OSStatus err;
+		  UInt16 key_code;
+		  UniChar uc;
+		  
+		  key_code = modifiers[j] | i;
+		  err = UCKeyTranslate (chr_data, i, kUCKeyActionDisplay,
+		                        (modifiers[j] >> 8) & 0xFF,
+		                        LMGetKbdType(),
+		                        0,
+		                        &state, 4, &nChars, chars);

-          for (j = 0; j < KEYVALS_PER_KEYCODE; j++)
-            {
-              UInt32 state = 0;
-              OSStatus err;
-              UInt16 key_code;
-              UniChar uc;
+                  /* FIXME: Theoretically, we can get multiple UTF-16 values;
+		   * we should convert them to proper unicode and figure
+		   * out whether there are really keyboard layouts that
+		   * give us more than one character for one keypress. */
+		  if (err == noErr && nChars == 1)
+		    {
+		      int k;
+		      gboolean found = FALSE;

-              key_code = modifiers[j] | i;
-              err = UCKeyTranslate (chr_data, i, kUCKeyActionDisplay,
-                                    (modifiers[j] >> 8) & 0xFF,
-                                    LMGetKbdType(),
-                                    0,
-                                    &state, 4, &nChars, chars);
+		      /* A few <Shift><Option>keys return two
+		       * characters, the first of which is U+00a0,
+		       * which isn't interesting; so we return the
+		       * second. More sophisticated handling is the
+		       * job of a GtkIMContext.
+		       *
+		       * If state isn't zero, it means that it's a
+		       * dead key of some sort. Some of those are
+		       * enumerated in the special_ucs_table with the
+		       * high nibble set to f to push it into the
+		       * private use range. Here we do the same.
+		       */
+		      if (state != 0)
+			chars[nChars - 1] |= 0xf000;
+		      uc = chars[nChars - 1];

-              /* FIXME: Theoretically, we can get multiple UTF-16
-               * values; we should convert them to proper unicode and
-               * figure out whether there are really keyboard layouts
-               * that give us more than one character for one
-               * keypress.
-               */
-              if (err == noErr && nChars == 1)
-                {
-                  int k;
-                  gboolean found = FALSE;
+		      for (k = 0; k < G_N_ELEMENTS (special_ucs_table); k++) 
+			{
+			  if (special_ucs_table[k].ucs_value == uc)
+			    {
+			      p[j] = special_ucs_table[k].keyval;
+			      found = TRUE;
+			      break;
+			    }
+			}

-                  /* A few <Shift><Option>keys return two characters,
-                   * the first of which is U+00a0, which isn't
-                   * interesting; so we return the second. More
-                   * sophisticated handling is the job of a
-                   * GtkIMContext.
-                   *
-                   * If state isn't zero, it means that it's a dead
-                   * key of some sort. Some of those are enumerated in
-                   * the special_ucs_table with the high nibble set to
-                   * f to push it into the private use range. Here we
-                   * do the same.
-                   */
-                  if (state != 0)
-                    chars[nChars - 1] |= 0xf000;
-                  uc = chars[nChars - 1];
+		      /* Special-case shift-tab since GTK+ expects
+		       * GDK_KEY_ISO_Left_Tab for that.
+		       */
+		      if (found && p[j] == GDK_KEY_Tab && modifiers[j] == shiftKey)
+			p[j] = GDK_KEY_ISO_Left_Tab;

-                  for (k = 0; k < G_N_ELEMENTS (special_ucs_table); k++)
-                    {
-                      if (special_ucs_table[k].ucs_value == uc)
-                        {
-                          p[j] = special_ucs_table[k].keyval;
-                          found = TRUE;
-                          break;
-                        }
-                    }
+		      if (!found)
+                        p[j] = gdk_unicode_to_keyval (uc);
+		    }
+		}

-                  /* Special-case shift-tab since GTK+ expects
-                   * GDK_KEY_ISO_Left_Tab for that.
-                   */
-                  if (found && p[j] == GDK_KEY_Tab && modifiers[j] == shiftKey)
-                    p[j] = GDK_KEY_ISO_Left_Tab;
-
-                  if (!found)
-                    p[j] = gdk_unicode_to_keyval (uc);
-                }
-            }
-
-          if (p[3] == p[2])
-            p[3] = 0;
-          if (p[2] == p[1])
-            p[2] = 0;
-          if (p[1] == p[0])
-            p[1] = 0;
-          if (p[0] == p[2] &&
-              p[1] == p[3])
-            p[2] = p[3] = 0;
-        }
+	      if (p[3] == p[2])
+		p[3] = 0;
+	      if (p[2] == p[1])
+		p[2] = 0;
+	      if (p[1] == p[0])
+		p[1] = 0;
+	      if (p[0] == p[2] && 
+		  p[1] == p[3])
+		p[2] = p[3] = 0;
+	    }
 #ifndef __LP64__
-    }
-  else
-    {
-      g_error ("unknown type of keyboard layout (neither KCHR nor uchr)"
-               " - not supported right now");
-    }
+	}
+      else
+	{
+	  g_error ("unknown type of keyboard layout (neither KCHR nor uchr)"
+	           " - not supported right now");
+	}
 #endif

-  for (i = 0; i < G_N_ELEMENTS (modifier_keys); i++)
-    {
-      p = keyval_array + modifier_keys[i].keycode * KEYVALS_PER_KEYCODE;
+      for (i = 0; i < G_N_ELEMENTS (modifier_keys); i++)
+	{
+	  p = keyval_array + modifier_keys[i].keycode * KEYVALS_PER_KEYCODE;

-      if (p[0] == 0 && p[1] == 0 &&
-          p[2] == 0 && p[3] == 0)
-        p[0] = modifier_keys[i].keyval;
+	  if (p[0] == 0 && p[1] == 0 && 
+	      p[2] == 0 && p[3] == 0)
+	    p[0] = modifier_keys[i].keyval;
+	}
+
+      for (i = 0; i < G_N_ELEMENTS (function_keys); i++)
+	{
+	  p = keyval_array + function_keys[i].keycode * KEYVALS_PER_KEYCODE;
+
+          p[0] = function_keys[i].keyval;
+          p[1] = p[2] = p[3] = 0;
+	}
+
+      for (i = 0; i < G_N_ELEMENTS (known_numeric_keys); i++)
+	{
+	  p = keyval_array + known_numeric_keys[i].keycode * KEYVALS_PER_KEYCODE;
+
+	  if (p[0] == known_numeric_keys[i].normal_keyval)
+            p[0] = known_numeric_keys[i].keypad_keyval;
+	}
+      
+      if (current_layout)
+	g_signal_emit_by_name (default_keymap, "keys_changed");
+
+      current_layout = new_layout;
    }
-
-  for (i = 0; i < G_N_ELEMENTS (function_keys); i++)
-    {
-      p = keyval_array + function_keys[i].keycode * KEYVALS_PER_KEYCODE;
-
-      p[0] = function_keys[i].keyval;
-      p[1] = p[2] = p[3] = 0;
-    }
-
-  for (i = 0; i < G_N_ELEMENTS (known_numeric_keys); i++)
-    {
-      p = keyval_array + known_numeric_keys[i].keycode * KEYVALS_PER_KEYCODE;
-
-      if (p[0] == known_numeric_keys[i].normal_keyval)
-        p[0] = known_numeric_keys[i].keypad_keyval;
-    }
-
-  g_signal_emit_by_name (default_keymap, "keys-changed");
 }

 static PangoDirection
@@ -531,6 +542,8 @@ gdk_quartz_keymap_get_entries_for_keyval (GdkKeymap     *keymap,
  GArray *keys_array;
  int i;

+  maybe_update_keymap ();
+
  *n_keys = 0;
  keys_array = g_array_new (FALSE, FALSE, sizeof (GdkKeymapKey));

@@ -566,6 +579,8 @@ gdk_quartz_keymap_get_entries_for_keycode (GdkKeymap     *keymap,
  int i;
  guint *p;

+  maybe_update_keymap ();
+
  *n_entries = 0;

  if (hardware_keycode > NUM_KEYCODES)
@@ -674,6 +689,8 @@ gdk_quartz_keymap_translate_keyboard_state (GdkKeymap       *keymap,
  GdkModifierType bit;
  guint tmp_modifiers = 0;

+  maybe_update_keymap ();
+
  if (keyval)
    *keyval = 0;
  if (effective_group)
@@ -818,36 +835,14 @@ _gdk_quartz_keys_is_modifier (guint keycode)
  return FALSE;
 }

-static void
-input_sources_changed_notification (CFNotificationCenterRef  center,
-                                    void                    *observer,
-                                    CFStringRef              name,
-                                    const void              *object,
-                                    CFDictionaryRef          userInfo)
-{
-  update_keymap ();
-}
-
 static void
 gdk_quartz_keymap_init (GdkQuartzKeymap *keymap)
 {
-  update_keymap ();
-  CFNotificationCenterAddObserver (CFNotificationCenterGetDistributedCenter (),
-                                   keymap,
-                                   input_sources_changed_notification,
-                                   CFSTR ("AppleSelectedInputSourcesChangedNotification"),
-                                   NULL,
-                                   CFNotificationSuspensionBehaviorDeliverImmediately);
 }

 static void
 gdk_quartz_keymap_finalize (GObject *object)
 {
-  CFNotificationCenterRemoveObserver (CFNotificationCenterGetDistributedCenter (),
-                                      object,
-                                      CFSTR ("AppleSelectedInputSourcesChangedNotification"),
-                                      NULL);
-
  G_OBJECT_CLASS (gdk_quartz_keymap_parent_class)->finalize (object);
 }

@@ -74,7 +74,6 @@ void       _gdk_quartz_event_loop_release_event (NSEvent *event);
 /* Keys */
 GdkEventType _gdk_quartz_keys_event_type  (NSEvent   *event);
 gboolean     _gdk_quartz_keys_is_modifier (guint      keycode);
-void         _gdk_quartz_synthesize_null_key_event (GdkWindow *window);

 /* Drag and Drop */
 void        _gdk_quartz_window_register_dnd      (GdkWindow   *window);
@@ -156,12 +155,6 @@ gchar *     _gdk_quartz_display_utf8_to_string_target      (GdkDisplay     *disp
                                                            const gchar    *str);


-/* Display manager */
-void    _gdk_quartz_display_manager_add_display    (GdkDisplayManager *manager,
-                                                    GdkDisplay        *display);
-void    _gdk_quartz_display_manager_remove_display (GdkDisplayManager *manager,
-                                                    GdkDisplay        *display);
-
 /* Display manager methods - events */
 GdkAtom _gdk_quartz_display_manager_atom_intern   (GdkDisplayManager *manager,
                                                   const gchar       *atom_name,
@@ -301,16 +301,6 @@ gdk_quartz_screen_get_number (GdkScreen *screen)
  return 0;
 }

-gchar *
-_gdk_windowing_substitute_screen_number (const gchar *display_name,
-					 int          screen_number)
-{
-  if (screen_number != 0)
-    return NULL;
-
-  return g_strdup (display_name);
-}
-
 static gint
 gdk_quartz_screen_get_width (GdkScreen *screen)
 {
@@ -2237,49 +2237,6 @@ gdk_quartz_window_queue_antiexpose (GdkWindow *window,
  return FALSE;
 }

-static void
-gdk_quartz_window_translate (GdkWindow      *window,
-                             cairo_region_t *area,
-                             gint            dx,
-                             gint            dy)
-{
-  cairo_region_t *invalidate, *scrolled;
-  GdkWindowImplQuartz *impl = (GdkWindowImplQuartz *)window->impl;
-  GdkRectangle extents;
-
-  cairo_region_get_extents (area, &extents);
-
-  [impl->view scrollRect:NSMakeRect (extents.x - dx, extents.y - dy,
-                                     extents.width, extents.height)
-              by:NSMakeSize (dx, dy)];
-
-  if (impl->needs_display_region)
-    {
-      cairo_region_t *intersection;
-
-      /* Invalidate already invalidated area that was moved at new
-       * location.
-       */
-      intersection = cairo_region_copy (impl->needs_display_region);
-      cairo_region_intersect (intersection, area);
-      cairo_region_translate (intersection, dx, dy);
-
-      gdk_quartz_window_set_needs_display_in_region (window, intersection);
-      cairo_region_destroy (intersection);
-    }
-
-  /* Calculate newly exposed area that needs invalidation */
-  scrolled = cairo_region_copy (area);
-  cairo_region_translate (scrolled, dx, dy);
-
-  invalidate = cairo_region_copy (area);
-  cairo_region_subtract (invalidate, scrolled);
-  cairo_region_destroy (scrolled);
-
-  gdk_quartz_window_set_needs_display_in_region (window, invalidate);
-  cairo_region_destroy (invalidate);
-}
-
 static void
 gdk_quartz_window_set_focus_on_map (GdkWindow *window,
                                    gboolean focus_on_map)
@@ -2338,18 +2295,14 @@ window_type_hint_to_level (GdkWindowTypeHint hint)
      return NSTornOffMenuWindowLevel;

    case GDK_WINDOW_TYPE_HINT_DOCK:
-      return NSFloatingWindowLevel; /* NSDockWindowLevel is deprecated, and not replaced */
-
    case GDK_WINDOW_TYPE_HINT_UTILITY:
-    case GDK_WINDOW_TYPE_HINT_DIALOG:  /* Dialog window */
      return NSFloatingWindowLevel;

    case GDK_WINDOW_TYPE_HINT_NORMAL:  /* Normal toplevel window */
+    case GDK_WINDOW_TYPE_HINT_DIALOG:  /* Dialog window */
    case GDK_WINDOW_TYPE_HINT_TOOLBAR: /* Window used to implement toolbars */
-      return NSNormalWindowLevel;
-
-    case GDK_WINDOW_TYPE_HINT_DESKTOP:
-      return kCGDesktopWindowLevelKey; /* doesn't map to any real Cocoa model */
+    case GDK_WINDOW_TYPE_HINT_DESKTOP: /* N/A */
+      break;

    default:
      break;
@@ -3082,7 +3035,6 @@ gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass)
  impl_class->input_shape_combine_region = gdk_window_quartz_input_shape_combine_region;
  impl_class->set_static_gravities = gdk_window_quartz_set_static_gravities;
  impl_class->queue_antiexpose = gdk_quartz_window_queue_antiexpose;
-  impl_class->translate = gdk_quartz_window_translate;
  impl_class->destroy = gdk_quartz_window_destroy;
  impl_class->destroy_foreign = gdk_quartz_window_destroy_foreign;
  impl_class->resize_cairo_surface = gdk_window_quartz_resize_cairo_surface;
@@ -40,6 +40,8 @@ libgdkinclude_HEADERS =				\
 libgdkwaylandinclude_HEADERS = 			\
 	gdkwaylanddevice.h			\
 	gdkwaylanddisplay.h			\
+	gdkwaylanddisplaymanager.h		\
+	gdkwaylandselection.h			\
 	gdkwaylandwindow.h

 -include $(top_srcdir)/git.mk
@@ -51,9 +51,15 @@ struct _GdkWaylandCursor
  GdkCursor cursor;
  gchar *name;
  guint serial;
-  int hotspot_x, hotspot_y;
-  int width, height;
-  struct wl_buffer *buffer;
+
+  struct
+  {
+    int hotspot_x, hotspot_y;
+    int width, height;
+    struct wl_buffer *buffer;
+  } pixbuf;
+
+  struct wl_cursor *wl_cursor;
 };

 struct _GdkWaylandCursorClass
@@ -65,12 +71,105 @@ G_DEFINE_TYPE (GdkWaylandCursor, _gdk_wayland_cursor, GDK_TYPE_CURSOR)

 static guint theme_serial = 0;

+struct cursor_cache_key
+{
+  GdkCursorType type;
+  const char *name;
+};
+
+static void
+add_to_cache (GdkWaylandDisplay *display, GdkWaylandCursor *cursor)
+{
+  display->cursor_cache = g_slist_prepend (display->cursor_cache, cursor);
+
+  g_object_ref (cursor);
+}
+
+static gint
+cache_compare_func (gconstpointer listelem,
+                    gconstpointer target)
+{
+  GdkWaylandCursor *cursor = (GdkWaylandCursor *) listelem;
+  struct cursor_cache_key* key = (struct cursor_cache_key *) target;
+
+  if (cursor->cursor.type != key->type)
+    return 1; /* No match */
+
+  /* Elements marked as pixmap must be named cursors
+   * (since we don't store normal pixmap cursors
+   */
+  if (key->type == GDK_CURSOR_IS_PIXMAP)
+    return strcmp (key->name, cursor->name);
+
+  return 0; /* Match */
+}
+
+static GdkWaylandCursor*
+find_in_cache (GdkWaylandDisplay *display,
+               GdkCursorType      type,
+               const char        *name)
+{
+  GSList* res;
+  struct cursor_cache_key key;
+
+  key.type = type;
+  key.name = name;
+
+  res = g_slist_find_custom (display->cursor_cache, &key, cache_compare_func);
+
+  if (res)
+    return (GdkWaylandCursor *) res->data;
+
+  return NULL;
+}
+
+/* Called by gdk_wayland_display_finalize to flush any cached cursors
+ * for a dead display.
+ */
+void
+_gdk_wayland_display_finalize_cursors (GdkWaylandDisplay *display)
+{
+  g_slist_foreach (display->cursor_cache, (GFunc) g_object_unref, NULL);
+  g_slist_free (display->cursor_cache);
+}
+
+static gboolean
+set_cursor_from_theme (GdkWaylandCursor *cursor, struct wl_cursor_theme *theme)
+{
+  struct wl_cursor *c;
+
+  c = wl_cursor_theme_get_cursor (theme, cursor->name);
+  if (!c)
+    {
+      g_warning (G_STRLOC ": Unable to load %s from the cursor theme", cursor->name);
+
+      /* return the left_ptr cursor as a fallback */
+      c = wl_cursor_theme_get_cursor (theme, "left_ptr");
+
+      if (!c)
+        return FALSE;
+    }
+
+  cursor->wl_cursor = c;
+
+  return TRUE;
+}
+
+void
+_gdk_wayland_display_update_cursors (GdkWaylandDisplay      *display,
+                                     struct wl_cursor_theme *theme)
+{
+  g_slist_foreach (display->cursor_cache, (GFunc) set_cursor_from_theme, theme);
+}
+
 static void
 gdk_wayland_cursor_finalize (GObject *object)
 {
  GdkWaylandCursor *cursor = GDK_WAYLAND_CURSOR (object);

  g_free (cursor->name);
+  if (cursor->pixbuf.buffer)
+    wl_buffer_destroy (cursor->pixbuf.buffer);

  G_OBJECT_CLASS (_gdk_wayland_cursor_parent_class)->finalize (object);
 }
@@ -83,20 +182,72 @@ gdk_wayland_cursor_get_image (GdkCursor *cursor)

 struct wl_buffer *
 _gdk_wayland_cursor_get_buffer (GdkCursor *cursor,
-                                int       *x,
-                                int       *y,
+                                guint      image_index,
+                                int       *hotspot_x,
+                                int       *hotspot_y,
                                int       *w,
                                int       *h)
 {
  GdkWaylandCursor *wayland_cursor = GDK_WAYLAND_CURSOR (cursor);

-  *x = wayland_cursor->hotspot_x;
-  *y = wayland_cursor->hotspot_y;
+  if (wayland_cursor->wl_cursor)
+    {
+      struct wl_cursor_image *image;

-  *w = wayland_cursor->width;
-  *h = wayland_cursor->height;
+      if (image_index >= wayland_cursor->wl_cursor->image_count)
+        {
+          g_warning (G_STRLOC " out of bounds cursor image [%d / %d]",
+                     image_index,
+                     wayland_cursor->wl_cursor->image_count - 1);
+          image_index = 0;
+        }

-  return wayland_cursor->buffer;
+      image = wayland_cursor->wl_cursor->images[image_index];
+
+      *hotspot_x = image->hotspot_x;
+      *hotspot_y = image->hotspot_y;
+
+      *w = image->width;
+      *h = image->height;
+
+      return wl_cursor_image_get_buffer (image);
+    }
+  else /* From pixbuf */
+    {
+      *hotspot_x = wayland_cursor->pixbuf.hotspot_x;
+      *hotspot_y = wayland_cursor->pixbuf.hotspot_y;
+
+      *w = wayland_cursor->pixbuf.width;
+      *h = wayland_cursor->pixbuf.height;
+
+      return wayland_cursor->pixbuf.buffer;
+    }
+}
+
+guint
+_gdk_wayland_cursor_get_next_image_index (GdkCursor *cursor,
+                                          guint      current_image_index,
+                                          guint     *next_image_delay)
+{
+  struct wl_cursor *wl_cursor = GDK_WAYLAND_CURSOR (cursor)->wl_cursor;
+
+  if (wl_cursor && wl_cursor->image_count > 1)
+    {
+      if (current_image_index >= wl_cursor->image_count)
+        {
+          g_warning (G_STRLOC " out of bounds cursor image [%d / %d]",
+                     current_image_index, wl_cursor->image_count - 1);
+          current_image_index = 0;
+        }
+
+      /* Return the time to next image */
+      if (next_image_delay)
+        *next_image_delay = wl_cursor->images[current_image_index]->delay;
+
+      return (current_image_index + 1) % wl_cursor->image_count;
+    }
+  else
+    return current_image_index;
 }

 static void
@@ -115,29 +266,27 @@ _gdk_wayland_cursor_init (GdkWaylandCursor *cursor)
 {
 }

-/* Use to implement from_pixbuf below */
-#if 0
+/* Used to implement from_pixbuf below */
 static void
-set_pixbuf (GdkWaylandCursor *cursor, GdkPixbuf *pixbuf)
+set_pixbuf (gpointer argb_pixels, int width, int height, GdkPixbuf *pixbuf)
 {
  int stride, i, n_channels;
-  unsigned char *pixels, *end, *argb_pixels, *s, *d;
+  unsigned char *pixels, *end, *s, *d;

  stride = gdk_pixbuf_get_rowstride(pixbuf);
  pixels = gdk_pixbuf_get_pixels(pixbuf);
  n_channels = gdk_pixbuf_get_n_channels(pixbuf);
-  argb_pixels = cursor->map;

 #define MULT(_d,c,a,t) \
 	do { t = c * a + 0x7f; _d = ((t >> 8) + t) >> 8; } while (0)

  if (n_channels == 4)
    {
-      for (i = 0; i < cursor->height; i++)
+      for (i = 0; i < height; i++)
 	{
 	  s = pixels + i * stride;
-	  end = s + cursor->width * 4;
-	  d = argb_pixels + i * cursor->width * 4;
+          end = s + width * 4;
+          d = argb_pixels + i * width * 4;
 	  while (s < end)
 	    {
 	      unsigned int t;
@@ -153,11 +302,11 @@ set_pixbuf (GdkWaylandCursor *cursor, GdkPixbuf *pixbuf)
    }
  else if (n_channels == 3)
    {
-      for (i = 0; i < cursor->height; i++)
+      for (i = 0; i < height; i++)
 	{
 	  s = pixels + i * stride;
-	  end = s + cursor->width * 3;
-	  d = argb_pixels + i * cursor->width * 4;
+          end = s + width * 3;
+          d = argb_pixels + i * width * 4;
 	  while (s < end)
 	    {
 	      d[0] = s[2];
@@ -171,84 +320,6 @@ set_pixbuf (GdkWaylandCursor *cursor, GdkPixbuf *pixbuf)
    }
 }

-static GdkCursor *
-create_cursor(GdkWaylandDisplay *display, GdkPixbuf *pixbuf, int x, int y)
-{
-  GdkWaylandCursor *cursor;
-  int stride, fd;
-  char *filename;
-  GError *error = NULL;
-  struct wl_shm_pool *pool;
-
-  cursor = g_object_new (GDK_TYPE_WAYLAND_CURSOR,
-			 "cursor-type", GDK_CURSOR_IS_PIXMAP,
-			 "display", display,
-			 NULL);
-  cursor->name = NULL;
-  cursor->serial = theme_serial;
-  cursor->x = x;
-  cursor->y = y;
-  if (pixbuf)
-    {
-      cursor->width = gdk_pixbuf_get_width (pixbuf);
-      cursor->height = gdk_pixbuf_get_height (pixbuf);
-    }
-  else
-    {
-      cursor->width = 1;
-      cursor->height = 1;
-    }
-
-  stride = cursor->width * 4;
-  cursor->size = stride * cursor->height;
-
-  fd = g_file_open_tmp("wayland-shm-XXXXXX", &filename, &error);
-  if (fd < 0)
-    {
-      g_critical (G_STRLOC ": Error opening temporary file for buffer: %s",
-                  error->message);
-      g_error_free (error);
-      return NULL;
-  }
-
-  unlink (filename);
-  g_free (filename);
-
-  if (ftruncate(fd, cursor->size) < 0)
-    {
-      g_critical (G_STRLOC ": Error truncating file for buffer: %s",
-                  g_strerror (errno));
-      close(fd);
-      return NULL;
-    }
-
-  cursor->map = mmap(NULL, cursor->size,
-                     PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-  if (cursor->map == MAP_FAILED)
-    {
-      g_critical (G_STRLOC ": Error mmap'ing file for buffer: %s",
-                  g_strerror (errno));
-      close(fd);
-      return NULL;
-    }
-
-  if (pixbuf)
-    set_pixbuf (cursor, pixbuf);
-  else
-    memset (cursor->map, 0, 4);
-
-  cursor->buffer = wl_shm_create_buffer(display->shm,
-					fd,
-					cursor->width,
-					cursor->height,
-					stride, WL_SHM_FORMAT_ARGB8888);
-
-  close(fd);
-
- return GDK_CURSOR (cursor);
-}
-#endif
-
 GdkCursor *
 _gdk_wayland_display_get_cursor_for_type (GdkDisplay    *display,
 					  GdkCursorType  cursor_type)
@@ -277,10 +348,18 @@ _gdk_wayland_display_get_cursor_for_name (GdkDisplay  *display,
 {
  GdkWaylandCursor *private;
  GdkWaylandDisplay *wayland_display = GDK_WAYLAND_DISPLAY (display);
-  struct wl_cursor *cursor;

  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);

+  private = find_in_cache (wayland_display, GDK_CURSOR_IS_PIXMAP, name);
+  if (private)
+    {
+      /* Cache had it, add a ref for this user */
+      g_object_ref (private);
+
+      return (GdkCursor*) private;
+    }
+
  private = g_object_new (GDK_TYPE_WAYLAND_CURSOR,
                          "cursor-type", GDK_CURSOR_IS_PIXMAP,
                          "display", display,
@@ -292,59 +371,73 @@ _gdk_wayland_display_get_cursor_for_name (GdkDisplay  *display,
  if (!name || g_str_equal (name, "blank_cursor"))
    return GDK_CURSOR (private);

-  cursor = wl_cursor_theme_get_cursor (wayland_display->cursor_theme,
-                                       name);
+  if (!set_cursor_from_theme (private, wayland_display->cursor_theme))
+    return GDK_CURSOR (private);

-  if (!cursor)
-    {
-      g_warning (G_STRLOC ": Unable to load %s from the cursor theme", name);
-
-      /* return the left_ptr cursor as a fallback */
-      cursor = wl_cursor_theme_get_cursor (wayland_display->cursor_theme,
-                                           "left_ptr");
-
-      /* if the fallback failed to load, return a blank pointer */
-      if (!cursor)
-        return GDK_CURSOR (private);
-    }
-
-  /* TODO: Do something clever so we can do animated cursors - move the
-   * wl_pointer_set_cursor to a function here so that we can do the magic to
-   * iterate through
-   */
-  private->hotspot_x = cursor->images[0]->hotspot_x;
-  private->hotspot_y = cursor->images[0]->hotspot_y;
-  private->width = cursor->images[0]->width;
-  private->height = cursor->images[0]->height;
-
-  private->buffer = wl_cursor_image_get_buffer(cursor->images[0]);
+  add_to_cache (wayland_display, private);

  return GDK_CURSOR (private);
 }

-/* TODO: Needs implementing */
 GdkCursor *
 _gdk_wayland_display_get_cursor_for_pixbuf (GdkDisplay *display,
 					    GdkPixbuf  *pixbuf,
 					    gint        x,
 					    gint        y)
 {
-  GdkWaylandCursor *private;
+  GdkWaylandCursor *cursor;
+  GdkWaylandDisplay *wayland_display = GDK_WAYLAND_DISPLAY (display);
+  int stride;
+  size_t size;
+  gpointer data;
+  struct wl_shm_pool *pool;

  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
  g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
  g_return_val_if_fail (0 <= x && x < gdk_pixbuf_get_width (pixbuf), NULL);
  g_return_val_if_fail (0 <= y && y < gdk_pixbuf_get_height (pixbuf), NULL);

-  private = g_object_new (GDK_TYPE_WAYLAND_CURSOR,
-                          "cursor-type", GDK_CURSOR_IS_PIXMAP,
-                          "display", display,
-                          NULL);
+  cursor = g_object_new (GDK_TYPE_WAYLAND_CURSOR,
+			 "cursor-type", GDK_CURSOR_IS_PIXMAP,
+			 "display", wayland_display,
+			 NULL);
+  cursor->name = NULL;
+  cursor->serial = theme_serial;
+  cursor->pixbuf.hotspot_x = x;
+  cursor->pixbuf.hotspot_y = y;

-  private->name = NULL;
-  private->serial = theme_serial;
+  if (pixbuf)
+    {
+      cursor->pixbuf.width = gdk_pixbuf_get_width (pixbuf);
+      cursor->pixbuf.height = gdk_pixbuf_get_height (pixbuf);
+    }
+  else
+    {
+      cursor->pixbuf.width = 1;
+      cursor->pixbuf.height = 1;
+    }

-  return GDK_CURSOR (private);
+  pool = _create_shm_pool (wayland_display->shm,
+                           cursor->pixbuf.width,
+                           cursor->pixbuf.height,
+                           &size,
+                           &data);
+
+  if (pixbuf)
+    set_pixbuf (data, cursor->pixbuf.width, cursor->pixbuf.height, pixbuf);
+  else
+    memset (data, 0, 4);
+
+  stride = cursor->pixbuf.width * 4;
+  cursor->pixbuf.buffer = wl_shm_pool_create_buffer (pool, 0,
+                                                     cursor->pixbuf.width,
+                                                     cursor->pixbuf.height,
+                                                     stride,
+                                                     WL_SHM_FORMAT_ARGB8888);
+
+  wl_shm_pool_destroy (pool);
+
+  return GDK_CURSOR (cursor);
 }

 void
@@ -30,7 +30,6 @@
 #include "gdkkeysyms.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdevicemanagerprivate.h"
-#include "gdkprivate-wayland.h"

 #include <xkbcommon/xkbcommon.h>
 #include <X11/keysym.h>
@@ -38,14 +37,13 @@
 #include <sys/time.h>
 #include <sys/mman.h>

-typedef struct _GdkWaylandDeviceData GdkWaylandDeviceData;
-
 typedef struct _DataOffer DataOffer;

 typedef struct _GdkWaylandSelectionOffer GdkWaylandSelectionOffer;

 struct _GdkWaylandDeviceData
 {
+  guint32 id;
  struct wl_seat *wl_seat;
  struct wl_pointer *wl_pointer;
  struct wl_keyboard *wl_keyboard;
@@ -55,7 +53,7 @@ struct _GdkWaylandDeviceData

  GdkDevice *pointer;
  GdkDevice *keyboard;
-
+  GdkCursor *cursor;
  GdkKeymap *keymap;

  GdkModifierType modifiers;
@@ -64,11 +62,17 @@ struct _GdkWaylandDeviceData
  struct wl_data_device *data_device;
  double surface_x, surface_y;
  uint32_t time;
+  uint32_t enter_serial;
+  uint32_t button_press_serial;
  GdkWindow *pointer_grab_window;
  uint32_t pointer_grab_time;
  guint32 repeat_timer;
  guint32 repeat_key;
  guint32 repeat_count;
+  GSettings *keyboard_settings;
+
+  guint cursor_timeout_id;
+  guint cursor_image_index;

  DataOffer *drag_offer;
  DataOffer *selection_offer;
@@ -91,31 +95,29 @@ struct _GdkWaylandDeviceClass

 G_DEFINE_TYPE (GdkWaylandDevice, gdk_wayland_device, GDK_TYPE_DEVICE)

-#define GDK_TYPE_DEVICE_MANAGER_CORE         (gdk_device_manager_core_get_type ())
-#define GDK_DEVICE_MANAGER_CORE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_DEVICE_MANAGER_CORE, GdkDeviceManagerCore))
-#define GDK_DEVICE_MANAGER_CORE_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_DEVICE_MANAGER_CORE, GdkDeviceManagerCoreClass))
-#define GDK_IS_DEVICE_MANAGER_CORE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_DEVICE_MANAGER_CORE))
-#define GDK_IS_DEVICE_MANAGER_CORE_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_DEVICE_MANAGER_CORE))
-#define GDK_DEVICE_MANAGER_CORE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_DEVICE_MANAGER_CORE, GdkDeviceManagerCoreClass))
+#define GDK_TYPE_WAYLAND_DEVICE_MANAGER        (gdk_wayland_device_manager_get_type ())
+#define GDK_WAYLAND_DEVICE_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_WAYLAND_DEVICE_MANAGER, GdkWaylandDeviceManager))
+#define GDK_WAYLAND_DEVICE_MANAGER_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_WAYLAND_DEVICE_MANAGER, GdkWaylandDeviceManagerClass))
+#define GDK_IS_WAYLAND_DEVICE_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_WAYLAND_DEVICE_MANAGER))
+#define GDK_IS_WAYLAND_DEVICE_MANAGER_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_WAYLAND_DEVICE_MANAGER))
+#define GDK_WAYLAND_DEVICE_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_WAYLAND_DEVICE_MANAGER, GdkWaylandDeviceManagerClass))

-typedef struct _GdkDeviceManagerCore GdkDeviceManagerCore;
-typedef struct _GdkDeviceManagerCoreClass GdkDeviceManagerCoreClass;
+typedef struct _GdkWaylandDeviceManager GdkWaylandDeviceManager;
+typedef struct _GdkWaylandDeviceManagerClass GdkWaylandDeviceManagerClass;

-struct _GdkDeviceManagerCore
+struct _GdkWaylandDeviceManager
 {
  GdkDeviceManager parent_object;
-  GdkDevice *core_pointer;
-  GdkDevice *core_keyboard;
  GList *devices;
 };

-struct _GdkDeviceManagerCoreClass
+struct _GdkWaylandDeviceManagerClass
 {
  GdkDeviceManagerClass parent_class;
 };

-G_DEFINE_TYPE (GdkDeviceManagerCore,
-	       gdk_device_manager_core, GDK_TYPE_DEVICE_MANAGER)
+G_DEFINE_TYPE (GdkWaylandDeviceManager,
+	       gdk_wayland_device_manager, GDK_TYPE_DEVICE_MANAGER)

 static gboolean
 gdk_wayland_device_get_history (GdkDevice      *device,
@@ -145,38 +147,83 @@ gdk_wayland_device_get_state (GdkDevice       *device,
    }
 }

+static void
+gdk_wayland_device_stop_window_cursor_animation (GdkWaylandDeviceData *wd)
+{
+  if (wd->cursor_timeout_id > 0)
+    {
+      g_source_remove (wd->cursor_timeout_id);
+      wd->cursor_timeout_id = 0;
+    }
+  wd->cursor_image_index = 0;
+}
+
+static gboolean
+gdk_wayland_device_update_window_cursor (GdkWaylandDeviceData *wd)
+{
+  struct wl_buffer *buffer;
+  int x, y, w, h;
+  guint next_image_index, next_image_delay;
+
+  buffer = _gdk_wayland_cursor_get_buffer (wd->cursor, wd->cursor_image_index,
+                                           &x, &y, &w, &h);
+  wl_pointer_set_cursor (wd->wl_pointer,
+                         wd->enter_serial,
+                         wd->pointer_surface,
+                         x, y);
+  wl_surface_attach (wd->pointer_surface, buffer, 0, 0);
+  wl_surface_damage (wd->pointer_surface,  0, 0, w, h);
+  wl_surface_commit (wd->pointer_surface);
+
+  next_image_index =
+    _gdk_wayland_cursor_get_next_image_index (wd->cursor,
+                                              wd->cursor_image_index,
+                                              &next_image_delay);
+
+  if (next_image_index != wd->cursor_image_index)
+    {
+      guint id;
+
+      /* Queue timeout for next frame */
+      id = g_timeout_add (next_image_delay,
+                          (GSourceFunc)gdk_wayland_device_update_window_cursor,
+                          wd);
+
+      wd->cursor_timeout_id = id;
+      wd->cursor_image_index = next_image_index;
+    }
+  else
+    wd->cursor_timeout_id = 0;
+
+  return FALSE;
+}
+
 static void
 gdk_wayland_device_set_window_cursor (GdkDevice *device,
                                      GdkWindow *window,
                                      GdkCursor *cursor)
 {
  GdkWaylandDeviceData *wd = GDK_WAYLAND_DEVICE(device)->device;
-  GdkWaylandDisplay *wayland_display =
-    GDK_WAYLAND_DISPLAY (gdk_window_get_display (window));
-  struct wl_buffer *buffer;
-  int x, y, w, h;
-
-  if (cursor)
-    g_object_ref (cursor);

  /* Setting the cursor to NULL means that we should use the default cursor */
  if (!cursor)
    {
      /* FIXME: Is this the best sensible default ? */
      cursor = _gdk_wayland_display_get_cursor_for_type (device->display,
-                                                         GDK_LEFT_PTR);
+                                                             GDK_LEFT_PTR);
    }

-  buffer = _gdk_wayland_cursor_get_buffer (cursor, &x, &y, &w, &h);
-  wl_pointer_set_cursor (wd->wl_pointer,
-                         _gdk_wayland_display_get_serial (wayland_display),
-                         wd->pointer_surface,
-                         x, y);
-  wl_surface_attach (wd->pointer_surface, buffer, 0, 0);
-  wl_surface_damage (wd->pointer_surface,  0, 0, w, h);
-  wl_surface_commit(wd->pointer_surface);
+  if (cursor == wd->cursor)
+    return;

-  g_object_unref (cursor);
+  gdk_wayland_device_stop_window_cursor_animation (wd);
+
+  if (wd->cursor)
+    g_object_unref (wd->cursor);
+
+  wd->cursor = g_object_ref (cursor);
+
+  gdk_wayland_device_update_window_cursor (wd);
 }

 static void
@@ -208,13 +255,11 @@ gdk_wayland_device_query_state (GdkDevice        *device,
    *root_window = gdk_screen_get_root_window (default_screen);
  if (child_window)
    *child_window = wd->pointer_focus;
-  /* Do something clever for relative here */
-#if 0
+  /* TODO: Do something clever for relative here */
  if (root_x)
-    *root_x = wd->x;
+    *root_x = wd->surface_x;
  if (root_y)
-    *root_y = wd->y;
-#endif
+    *root_y = wd->surface_y;
  if (win_x)
    *win_x = wd->surface_x;
  if (win_y)
@@ -575,6 +620,7 @@ pointer_handle_enter (void              *data,

  device->surface_x = wl_fixed_to_double (sx);
  device->surface_y = wl_fixed_to_double (sy);
+  device->enter_serial = serial;

  _gdk_wayland_display_deliver_event (device->display, event);

@@ -619,6 +665,13 @@ pointer_handle_leave (void              *data,
                       device, device->pointer_focus));

  g_object_unref(device->pointer_focus);
+  if (device->cursor)
+    {
+      gdk_wayland_device_stop_window_cursor_animation (device);
+      g_object_unref (device->cursor);
+      device->cursor = NULL;
+    }
+
  device->pointer_focus = NULL;
 }

@@ -688,6 +741,8 @@ pointer_handle_button (void              *data,
  }

  device->time = time;
+  if (state)
+    device->button_press_serial = serial;

  event = gdk_event_new (state ? GDK_BUTTON_PRESS : GDK_BUTTON_RELEASE);
  event->button.window = g_object_ref (device->pointer_focus);
@@ -767,10 +822,12 @@ keyboard_handle_keymap (void               *data,
                       uint32_t            size)
 {
  GdkWaylandDeviceData *device = data;
-  if (device->keymap)
-    g_object_unref (device->keymap);

-  device->keymap = _gdk_wayland_keymap_new_from_fd (format, fd, size);
+  _gdk_wayland_keymap_update_from_fd (device->keymap, format, fd, size);
+
+  g_signal_emit_by_name (device->keymap, "keys-changed");
+  g_signal_emit_by_name (device->keymap, "state-changed");
+  g_signal_emit_by_name (device->keymap, "direction-changed");
 }

 static void
@@ -844,22 +901,6 @@ keyboard_handle_leave (void               *data,
 static gboolean
 keyboard_repeat (gpointer data);

-static GdkModifierType
-get_modifier (struct xkb_state *state)
-{
-  GdkModifierType modifiers = 0;
-  modifiers |= (xkb_state_mod_name_is_active (state, XKB_MOD_NAME_SHIFT, XKB_STATE_MODS_EFFECTIVE) > 0)?GDK_SHIFT_MASK:0;
-  modifiers |= (xkb_state_mod_name_is_active (state, XKB_MOD_NAME_CAPS, XKB_STATE_MODS_EFFECTIVE) > 0)?GDK_LOCK_MASK:0;
-  modifiers |= (xkb_state_mod_name_is_active (state, XKB_MOD_NAME_CTRL, XKB_STATE_MODS_EFFECTIVE) > 0)?GDK_CONTROL_MASK:0;
-  modifiers |= (xkb_state_mod_name_is_active (state, XKB_MOD_NAME_ALT, XKB_STATE_MODS_EFFECTIVE) > 0)?GDK_MOD1_MASK:0;
-  modifiers |= (xkb_state_mod_name_is_active (state, "Mod2", XKB_STATE_MODS_EFFECTIVE) > 0)?GDK_MOD2_MASK:0;
-  modifiers |= (xkb_state_mod_name_is_active (state, "Mod3", XKB_STATE_MODS_EFFECTIVE) > 0)?GDK_MOD3_MASK:0;
-  modifiers |= (xkb_state_mod_name_is_active (state, XKB_MOD_NAME_LOGO, XKB_STATE_MODS_EFFECTIVE) > 0)?GDK_MOD4_MASK:0;
-  modifiers |= (xkb_state_mod_name_is_active (state, "Mod5", XKB_STATE_MODS_EFFECTIVE) > 0)?GDK_MOD5_MASK:0;
-
-  return modifiers;
-}
-
 static void
 translate_keyboard_string (GdkEventKey *event)
 {
@@ -924,22 +965,48 @@ translate_keyboard_string (GdkEventKey *event)
    }
 }

+static gboolean
+get_key_repeat (GdkWaylandDeviceData *device,
+                guint                *delay,
+                guint                *interval)
+{
+  gboolean repeat;
+
+  if (device->keyboard_settings)
+    {
+      repeat = g_settings_get_boolean (device->keyboard_settings, "repeat");
+      *delay = g_settings_get_uint (device->keyboard_settings, "delay");
+      *interval = g_settings_get_uint (device->keyboard_settings, "repeat-interval");
+    }
+  else
+    {
+      repeat = TRUE;
+      *delay = 400;
+      *interval = 80;
+    }
+
+  return repeat;
+}
+
 static gboolean
 deliver_key_event(GdkWaylandDeviceData *device,
                  uint32_t time, uint32_t key, uint32_t state)
 {
  GdkEvent *event;
  struct xkb_state *xkb_state;
+  struct xkb_keymap *xkb_keymap;
  GdkKeymap *keymap;
  xkb_keysym_t sym;
+  guint delay, interval;

  keymap = device->keymap;
  xkb_state = _gdk_wayland_keymap_get_xkb_state (keymap);
+  xkb_keymap = _gdk_wayland_keymap_get_xkb_keymap (keymap);

  sym = xkb_state_key_get_one_sym (xkb_state, key);

  device->time = time;
-  device->modifiers = get_modifier (xkb_state);
+  device->modifiers = gdk_keymap_get_modifier_state (keymap);

  event = gdk_event_new (state ? GDK_KEY_PRESS : GDK_KEY_RELEASE);
  event->key.window = device->keyboard_focus?g_object_ref (device->keyboard_focus):NULL;
@@ -947,10 +1014,9 @@ deliver_key_event(GdkWaylandDeviceData *device,
  event->button.time = time;
  event->key.state = device->modifiers;
  event->key.group = 0;
-  event->key.hardware_keycode = sym;
+  event->key.hardware_keycode = key;
  event->key.keyval = sym;
-
-  event->key.is_modifier = device->modifiers > 0;
+  event->key.is_modifier = _gdk_wayland_keymap_key_is_modifier (keymap, key);

  translate_keyboard_string (&event->key);

@@ -962,6 +1028,12 @@ deliver_key_event(GdkWaylandDeviceData *device,
                       event->key.hardware_keycode, event->key.keyval,
                       event->key.string, event->key.state));

+  if (!xkb_keymap_key_repeats (xkb_keymap, key))
+    return FALSE;
+
+  if (!get_key_repeat (device, &delay, &interval))
+    return FALSE;
+
  device->repeat_count++;
  device->repeat_key = key;

@@ -974,10 +1046,6 @@ deliver_key_event(GdkWaylandDeviceData *device,
        }
      return FALSE;
    }
-  else if (device->modifiers)
-    {
-      return FALSE;
-    }
  else switch (device->repeat_count)
    {
    case 1:
@@ -988,11 +1056,11 @@ deliver_key_event(GdkWaylandDeviceData *device,
        }

      device->repeat_timer =
-        gdk_threads_add_timeout (400, keyboard_repeat, device);
+        gdk_threads_add_timeout (delay, keyboard_repeat, device);
      return TRUE;
    case 2:
      device->repeat_timer =
-        gdk_threads_add_timeout (80, keyboard_repeat, device);
+        gdk_threads_add_timeout (interval, keyboard_repeat, device);
      return FALSE;
    default:
      return TRUE;
@@ -1036,12 +1104,18 @@ keyboard_handle_modifiers (void               *data,
  GdkWaylandDeviceData *device = data;
  GdkKeymap *keymap;
  struct xkb_state *xkb_state;
+  PangoDirection direction;

  keymap = device->keymap;
+  direction = gdk_keymap_get_direction (keymap);
  xkb_state = _gdk_wayland_keymap_get_xkb_state (keymap);
  device->modifiers = mods_depressed | mods_latched | mods_locked;

  xkb_state_update_mask (xkb_state, mods_depressed, mods_latched, mods_locked, group, 0, 0);
+
+  g_signal_emit_by_name (keymap, "state-changed");
+  if (direction != gdk_keymap_get_direction (keymap))
+    g_signal_emit_by_name (keymap, "direction-changed");
 }

 static const struct wl_pointer_listener pointer_listener = {
@@ -1065,8 +1139,8 @@ seat_handle_capabilities(void *data, struct wl_seat *seat,
                         enum wl_seat_capability caps)
 {
  GdkWaylandDeviceData *device = data;
-  GdkDeviceManagerCore *device_manager_core =
-    GDK_DEVICE_MANAGER_CORE(device->device_manager);
+  GdkWaylandDeviceManager *device_manager =
+    GDK_WAYLAND_DEVICE_MANAGER(device->device_manager);

  if ((caps & WL_SEAT_CAPABILITY_POINTER) && !device->wl_pointer)
    {
@@ -1086,22 +1160,25 @@ seat_handle_capabilities(void *data, struct wl_seat *seat,
                                      NULL);
      GDK_WAYLAND_DEVICE (device->pointer)->device = device;

-      device_manager_core->devices =
-        g_list_prepend (device_manager_core->devices, device->pointer);
+      device_manager->devices =
+        g_list_prepend (device_manager->devices, device->pointer);
+
+      g_signal_emit_by_name (device_manager, "device-added", device->pointer);
    }
  else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && device->wl_pointer)
    {
      wl_pointer_destroy(device->wl_pointer);
      device->wl_pointer = NULL;

-      device_manager_core->devices =
-        g_list_remove (device_manager_core->devices, device->pointer);
+      device_manager->devices =
+        g_list_remove (device_manager->devices, device->pointer);

+      g_signal_emit_by_name (device_manager, "device-removed", device->pointer);
      g_object_unref (device->pointer);
      device->pointer = NULL;
    }

-  if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !device->wl_keyboard) 
+  if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !device->wl_keyboard)
    {
      device->wl_keyboard = wl_seat_get_keyboard(seat);
      wl_keyboard_set_user_data(device->wl_keyboard, device);
@@ -1119,17 +1196,20 @@ seat_handle_capabilities(void *data, struct wl_seat *seat,
                                       NULL);
      GDK_WAYLAND_DEVICE (device->keyboard)->device = device;

-      device_manager_core->devices =
-        g_list_prepend (device_manager_core->devices, device->keyboard);
+      device_manager->devices =
+        g_list_prepend (device_manager->devices, device->keyboard);
+
+      g_signal_emit_by_name (device_manager, "device-added", device->keyboard);
    }
  else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && device->wl_keyboard) 
    {
      wl_keyboard_destroy(device->wl_keyboard);
      device->wl_keyboard = NULL;

-      device_manager_core->devices =
-        g_list_remove (device_manager_core->devices, device->keyboard);
+      device_manager->devices =
+        g_list_remove (device_manager->devices, device->keyboard);

+      g_signal_emit_by_name (device_manager, "device-removed", device->keyboard);
      g_object_unref (device->keyboard);
      device->keyboard = NULL;
    }
@@ -1145,9 +1225,25 @@ static const struct wl_seat_listener seat_listener = {
    seat_handle_capabilities,
 };

+static void
+init_settings (GdkWaylandDeviceData *device)
+{
+  GSettingsSchemaSource *source;
+  GSettingsSchema *schema;
+
+  source = g_settings_schema_source_get_default ();
+  schema = g_settings_schema_source_lookup (source, "org.gnome.settings-daemon.peripherals.keyboard", FALSE);
+  if (schema != NULL)
+    {
+      device->keyboard_settings = g_settings_new_full (schema, NULL, NULL);
+      g_settings_schema_unref (schema);
+    }
+}
+
 void
-_gdk_wayland_device_manager_add_device (GdkDeviceManager *device_manager,
-					struct wl_seat *wl_seat)
+_gdk_wayland_device_manager_add_seat (GdkDeviceManager *device_manager,
+                                      guint32           id,
+				      struct wl_seat   *wl_seat)
 {
  GdkDisplay *display;
  GdkWaylandDisplay *display_wayland;
@@ -1157,6 +1253,7 @@ _gdk_wayland_device_manager_add_device (GdkDeviceManager *device_manager,
  display_wayland = GDK_WAYLAND_DISPLAY (display);

  device = g_new0 (GdkWaylandDeviceData, 1);
+  device->id = id;
  device->keymap = _gdk_wayland_keymap_new ();
  device->display = display;
  device->device_manager = device_manager;
@@ -1174,6 +1271,34 @@ _gdk_wayland_device_manager_add_device (GdkDeviceManager *device_manager,

  device->pointer_surface =
    wl_compositor_create_surface (display_wayland->compositor);
+
+  init_settings (device);
+}
+
+void
+_gdk_wayland_device_manager_remove_seat (GdkDeviceManager *manager,
+                                         guint32           id)
+{
+  GdkWaylandDeviceManager *device_manager = GDK_WAYLAND_DEVICE_MANAGER (manager);
+  GList *l;
+
+  for (l = device_manager->devices; l != NULL; l = l->next)
+    {
+      GdkWaylandDevice *wayland_device = l->data;
+      GdkWaylandDeviceData *device = wayland_device->device;
+
+      if (device->id == id)
+        {
+          seat_handle_capabilities (device, device->wl_seat, 0);
+          g_object_unref (device->keymap);
+          wl_surface_destroy (device->pointer_surface);
+          /* FIXME: destroy data_device */
+          g_clear_object (&device->keyboard_settings);
+          g_free (device);
+
+          break;
+        }
+    }
 }

 static void
@@ -1183,43 +1308,43 @@ free_device (gpointer data)
 }

 static void
-gdk_device_manager_core_finalize (GObject *object)
+gdk_wayland_device_manager_finalize (GObject *object)
 {
-  GdkDeviceManagerCore *device_manager_core;
+  GdkWaylandDeviceManager *device_manager;

-  device_manager_core = GDK_DEVICE_MANAGER_CORE (object);
+  device_manager = GDK_WAYLAND_DEVICE_MANAGER (object);

-  g_list_free_full (device_manager_core->devices, free_device);
+  g_list_free_full (device_manager->devices, free_device);

-  G_OBJECT_CLASS (gdk_device_manager_core_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gdk_wayland_device_manager_parent_class)->finalize (object);
 }

 static GList *
-gdk_device_manager_core_list_devices (GdkDeviceManager *device_manager,
+gdk_wayland_device_manager_list_devices (GdkDeviceManager *device_manager,
                                      GdkDeviceType     type)
 {
-  GdkDeviceManagerCore *device_manager_core;
+  GdkWaylandDeviceManager *wayland_device_manager;
  GList *devices = NULL;

  if (type == GDK_DEVICE_TYPE_MASTER)
    {
-      device_manager_core = (GdkDeviceManagerCore *) device_manager;
-      devices = g_list_copy(device_manager_core->devices);
+      wayland_device_manager = (GdkWaylandDeviceManager *) device_manager;
+      devices = g_list_copy(wayland_device_manager->devices);
    }

  return devices;
 }

 static GdkDevice *
-gdk_device_manager_core_get_client_pointer (GdkDeviceManager *device_manager)
+gdk_wayland_device_manager_get_client_pointer (GdkDeviceManager *device_manager)
 {
-  GdkDeviceManagerCore *device_manager_core;
+  GdkWaylandDeviceManager *wayland_device_manager;
  GList *l;

-  device_manager_core = (GdkDeviceManagerCore *) device_manager;
+  wayland_device_manager = (GdkWaylandDeviceManager *) device_manager;

  /* Find the first pointer device */
-  for (l = device_manager_core->devices; l != NULL; l = l->next)
+  for (l = wayland_device_manager->devices; l != NULL; l = l->next)
    {
      GdkDevice *device = l->data;

@@ -1231,29 +1356,35 @@ gdk_device_manager_core_get_client_pointer (GdkDeviceManager *device_manager)
 }

 static void
-gdk_device_manager_core_class_init (GdkDeviceManagerCoreClass *klass)
+gdk_wayland_device_manager_class_init (GdkWaylandDeviceManagerClass *klass)
 {
  GdkDeviceManagerClass *device_manager_class = GDK_DEVICE_MANAGER_CLASS (klass);
  GObjectClass *object_class = G_OBJECT_CLASS (klass);

-  object_class->finalize = gdk_device_manager_core_finalize;
-  device_manager_class->list_devices = gdk_device_manager_core_list_devices;
-  device_manager_class->get_client_pointer = gdk_device_manager_core_get_client_pointer;
+  object_class->finalize = gdk_wayland_device_manager_finalize;
+  device_manager_class->list_devices = gdk_wayland_device_manager_list_devices;
+  device_manager_class->get_client_pointer = gdk_wayland_device_manager_get_client_pointer;
 }

 static void
-gdk_device_manager_core_init (GdkDeviceManagerCore *device_manager)
+gdk_wayland_device_manager_init (GdkWaylandDeviceManager *device_manager)
 {
 }

 GdkDeviceManager *
 _gdk_wayland_device_manager_new (GdkDisplay *display)
 {
-  return g_object_new (GDK_TYPE_DEVICE_MANAGER_CORE,
+  return g_object_new (GDK_TYPE_WAYLAND_DEVICE_MANAGER,
                       "display", display,
                       NULL);
 }

+uint32_t
+_gdk_wayland_device_get_button_press_serial(GdkWaylandDeviceData *device)
+{
+  return device->button_press_serial;
+}
+
 gint
 gdk_wayland_device_get_selection_type_atoms (GdkDevice  *gdk_device,
                                             GdkAtom   **atoms_out)
@@ -1420,7 +1551,7 @@ data_source_send (void                  *data,
                  const char            *mime_type,
                  int32_t                fd)
 {
-  GdkWaylandSelectionOffer *offer = (GdkWaylandSelectionOffer *)data;;
+  GdkWaylandSelectionOffer *offer = (GdkWaylandSelectionOffer *)data;
  gchar *buf;
  gssize len, bytes_written = 0;

@@ -34,6 +34,40 @@
 #include "gdkkeysprivate.h"
 #include "gdkprivate-wayland.h"

+/**
+ * SECTION:wayland_interaction
+ * @Short_description: Wayland backend-specific functions
+ * @Title: Wayland Interaction
+ *
+ * The functions in this section are specific to the GDK Wayland backend.
+ * To use them, you need to include the <literal>&lt;gdk/gdkwayland.h&gt;</literal>
+ * header and use the Wayland-specific pkg-config files to build your
+ * application (either <literal>gdk-wayland-3.0</literal> or
+ * <literal>gtk+-wayland-3.0</literal>).
+ *
+ * To make your code compile with other GDK backends, guard backend-specific
+ * calls by an ifdef as follows. Since GDK may be built with multiple
+ * backends, you should also check for the backend that is in use (e.g. by
+ * using the GDK_IS_WAYLAND_DISPLAY() macro).
+ * |[
+ * #ifdef GDK_WINDOWING_WAYLAND
+ *   if (GDK_IS_WAYLAND_DISPLAY (display))
+ *     {
+ *       /&ast; make Wayland-specific calls here &ast;/
+ *     }
+ *   else
+ * #endif
+ * #ifdef GDK_WINDOWING_X11
+ *   if (GDK_IS_X11_DISPLAY (display))
+ *     {
+ *       /&ast; make X11-specific calls here &ast;/
+ *     }
+ *   else
+ * #endif
+ *   g_error ("Unsupported GDK backend");
+ * ]|
+ */
+
 static void _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *wayland_display);

 G_DEFINE_TYPE (GdkWaylandDisplay, gdk_wayland_display, GDK_TYPE_DISPLAY)
@@ -88,6 +122,29 @@ gdk_input_init (GdkDisplay *display)
  g_list_free (list);
 }

+static void
+init_sync_callback(void *data, struct wl_callback *callback, uint32_t serial)
+{
+  GdkWaylandDisplay *display = data;
+
+  display->init_ref_count--;
+  wl_callback_destroy(callback);
+}
+
+static const struct wl_callback_listener init_sync_listener = {
+	init_sync_callback
+};
+
+static void
+wait_for_roundtrip(GdkWaylandDisplay *display)
+{
+  struct wl_callback *callback;
+
+  display->init_ref_count++;
+  callback = wl_display_sync(display->wl_display);
+  wl_callback_add_listener(callback, &init_sync_listener, display);
+}
+
 static void
 gdk_registry_handle_global(void *data, struct wl_registry *registry, uint32_t id,
 					const char *interface, uint32_t version)
@@ -112,11 +169,18 @@ gdk_registry_handle_global(void *data, struct wl_registry *registry, uint32_t id
  } else if (strcmp(interface, "wl_output") == 0) {
    output =
      wl_registry_bind(display_wayland->wl_registry, id, &wl_output_interface, 1);
-    _gdk_wayland_screen_add_output(display_wayland->screen, output);
+    _gdk_wayland_screen_add_output(display_wayland->screen, id, output);
+    /* We need another roundtrip to receive the modes and geometry
+     * events for the output, which gives us the physical properties
+     * and available modes on the output. */
+    wait_for_roundtrip(display_wayland);
  } else if (strcmp(interface, "wl_seat") == 0) {
    seat = wl_registry_bind(display_wayland->wl_registry, id, &wl_seat_interface, 1);
-    _gdk_wayland_device_manager_add_device (gdk_display->device_manager,
-					    seat);
+    _gdk_wayland_device_manager_add_seat (gdk_display->device_manager, id, seat);
+    /* We need another roundtrip to receive the wl_seat capabilities
+     * event which informs us of available input devices on this
+     * seat. */
+    wait_for_roundtrip(display_wayland);
  } else if (strcmp(interface, "wl_data_device_manager") == 0) {
      display_wayland->data_device_manager =
        wl_registry_bind(display_wayland->wl_registry, id,
@@ -130,9 +194,12 @@ gdk_registry_handle_global_remove(void               *data,
                                  uint32_t            id)
 {
  GdkWaylandDisplay *display_wayland = data;
+  GdkDisplay *display = GDK_DISPLAY (display_wayland);

-  /* We don't know what this item is - try as an output */
-  _gdk_wayland_screen_remove_output_by_id (display_wayland->screen, id);
+  _gdk_wayland_device_manager_remove_seat (display->device_manager, id);
+  _gdk_wayland_screen_remove_output (display_wayland->screen, id);
+
+  /* FIXME: the object needs to be destroyed here, we're leaking */
 }

 static const struct wl_registry_listener registry_listener = {
@@ -140,6 +207,12 @@ static const struct wl_registry_listener registry_listener = {
    gdk_registry_handle_global_remove
 };

+static void
+log_handler(const char *format, va_list args)
+{
+  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, args);
+}
+
 GdkDisplay *
 _gdk_wayland_display_open (const gchar *display_name)
 {
@@ -147,6 +220,8 @@ _gdk_wayland_display_open (const gchar *display_name)
  GdkDisplay *display;
  GdkWaylandDisplay *display_wayland;

+  wl_log_set_handler_client(log_handler);
+
  wl_display = wl_display_connect(display_name);
  if (!wl_display)
    return NULL;
@@ -164,7 +239,11 @@ _gdk_wayland_display_open (const gchar *display_name)
  display_wayland->wl_registry = wl_display_get_registry(display_wayland->wl_display);
  wl_registry_add_listener(display_wayland->wl_registry, &registry_listener, display_wayland);

-  wl_display_dispatch(display_wayland->wl_display);
+  /* We use init_ref_count to track whether some part of our
+   * initialization still needs a roundtrip to complete. */
+  wait_for_roundtrip(display_wayland);
+  while (display_wayland->init_ref_count > 0)
+    wl_display_roundtrip(display_wayland->wl_display);

  display_wayland->event_source =
    _gdk_wayland_display_event_source_new (display);
@@ -204,9 +283,7 @@ gdk_wayland_display_finalize (GObject *object)
 {
  GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (object);

-  /* Keymap */
-  if (display_wayland->keymap)
-    g_object_unref (display_wayland->keymap);
+  _gdk_wayland_display_finalize_cursors (display_wayland);

  /* input GdkDevice list */
  g_list_free_full (display_wayland->input_devices, g_object_unref);
@@ -224,22 +301,6 @@ gdk_wayland_display_get_name (GdkDisplay *display)
  return "Wayland";
 }

-static gint
-gdk_wayland_display_get_n_screens (GdkDisplay *display)
-{
-  return 1;
-}
-
-static GdkScreen *
-gdk_wayland_display_get_screen (GdkDisplay *display, 
-				gint        screen_num)
-{
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-  g_return_val_if_fail (screen_num == 0, NULL);
-
-  return GDK_WAYLAND_DISPLAY (display)->screen;
-}
-
 static GdkScreen *
 gdk_wayland_display_get_default_screen (GdkDisplay *display)
 {
@@ -272,7 +333,7 @@ gdk_wayland_display_flush (GdkDisplay *display)
  g_return_if_fail (GDK_IS_DISPLAY (display));

  if (!display->closed)
-    wl_display_flush(GDK_WAYLAND_DISPLAY (display)->wl_display);;
+    wl_display_flush(GDK_WAYLAND_DISPLAY (display)->wl_display);
 }

 static gboolean
@@ -363,11 +424,6 @@ gdk_wayland_display_get_next_serial (GdkDisplay *display)
  return ++serial;
 }

-void
-_gdk_wayland_display_make_default (GdkDisplay *display)
-{
-}
-
 /**
 * gdk_wayland_display_broadcast_startup_message:
 * @display: a #GdkDisplay
@@ -474,6 +530,8 @@ _gdk_wayland_display_get_keymap (GdkDisplay *display)
      break;
    }

+  g_list_free (list);
+
  if (core_keyboard && tmp_keymap)
    {
      g_object_unref (tmp_keymap);
@@ -511,8 +569,6 @@ gdk_wayland_display_class_init (GdkWaylandDisplayClass * class)

  display_class->window_type = gdk_wayland_window_get_type ();
  display_class->get_name = gdk_wayland_display_get_name;
-  display_class->get_n_screens = gdk_wayland_display_get_n_screens;
-  display_class->get_screen = gdk_wayland_display_get_screen;
  display_class->get_default_screen = gdk_wayland_display_get_default_screen;
  display_class->beep = gdk_wayland_display_beep;
  display_class->sync = gdk_wayland_display_sync;
@@ -564,27 +620,56 @@ gdk_wayland_display_init (GdkWaylandDisplay *display)
  display->xkb_context = xkb_context_new (0);
 }

+void
+gdk_wayland_display_set_cursor_theme (GdkDisplay  *display,
+                                      const gchar *name,
+                                      gint         size)
+{
+  GdkWaylandDisplay *wayland_display = GDK_WAYLAND_DISPLAY(display);
+  struct wl_cursor_theme *theme;
+
+  g_assert (wayland_display);
+  g_assert (wayland_display->shm);
+
+  theme = wl_cursor_theme_load (name, size, wayland_display->shm);
+  if (theme == NULL)
+    {
+      g_warning ("Failed to load cursor theme %s\n", name);
+      return;
+    }
+
+  _gdk_wayland_display_update_cursors (wayland_display, theme);
+
+  if (wayland_display->cursor_theme != NULL)
+    wl_cursor_theme_destroy (wayland_display->cursor_theme);
+  wayland_display->cursor_theme = theme;
+}
+
 static void
 _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *wayland_display)
 {
-  guint w, h;
-  const gchar *theme_name;
+  guint size;
+  const gchar *name;
  GValue v = G_VALUE_INIT;

  g_assert (wayland_display);
  g_assert (wayland_display->shm);

-  _gdk_wayland_display_get_default_cursor_size (GDK_DISPLAY (wayland_display),
-                                                &w, &h);
+  g_value_init (&v, G_TYPE_INT);
+  if (gdk_setting_get ("gtk-cursor-theme-size", &v))
+    size = g_value_get_int (&v);
+  else
+    size = 32;
+  g_value_unset (&v);
+
  g_value_init (&v, G_TYPE_STRING);
  if (gdk_setting_get ("gtk-cursor-theme-name", &v))
-    theme_name = g_value_get_string (&v);
+    name = g_value_get_string (&v);
  else
-    theme_name = "default";
+    name = "default";

-  wayland_display->cursor_theme = wl_cursor_theme_load (theme_name,
-                                                        w,
-                                                        wayland_display->shm);
+  gdk_wayland_display_set_cursor_theme (GDK_DISPLAY (wayland_display),
+                                        name, size);
  g_value_unset (&v);
 }

@@ -42,9 +42,6 @@ struct _GdkWaylandDisplay
  GdkDisplay parent_instance;
  GdkScreen *screen;

-  /* Keyboard related information */
-  GdkKeymap *keymap;
-
  /* input GdkDevice list */
  GList *input_devices;

@@ -65,9 +62,12 @@ struct _GdkWaylandDisplay
  struct wl_data_device_manager *data_device_manager;

  struct wl_cursor_theme *cursor_theme;
+  GSList *cursor_cache;

  GSource *event_source;

+  int init_ref_count;
+
  struct xkb_context *xkb_context;
 };

@@ -27,17 +27,13 @@
 #include "gdkwayland.h"
 #include "gdkinternals.h"

-#include <xkbcommon/xkbcommon.h>
-
 struct _GdkWaylandDisplayManager
 {
  GdkDisplayManager parent;

-  GdkDisplay *default_display;
  GSList *displays;

-  GHashTable *name_to_atoms;
-  guint next_atom;
+  gboolean init_failed;
 };

 struct _GdkWaylandDisplayManagerClass
@@ -45,12 +41,50 @@ struct _GdkWaylandDisplayManagerClass
  GdkDisplayManagerClass parent_class;
 };

-G_DEFINE_TYPE (GdkWaylandDisplayManager, gdk_wayland_display_manager, GDK_TYPE_DISPLAY_MANAGER)
+static void g_initable_iface_init (GInitableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (GdkWaylandDisplayManager, gdk_wayland_display_manager, GDK_TYPE_DISPLAY_MANAGER,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, g_initable_iface_init))
+
+static gboolean
+gdk_wayland_display_manager_initable_init (GInitable     *initable,
+                                           GCancellable  *cancellable,
+                                           GError       **error)
+{
+  struct wl_display *wl_display;
+
+  /* Set by the compositor when launching a special client - and it gets reset
+   * by wl_display_connect so we must avoid calling it twice
+   */
+  if (g_getenv ("WAYLAND_SOCKET"))
+    return TRUE;
+
+  /* check that a connection to the default display is possible */
+  wl_display = wl_display_connect (gdk_get_display_arg_name ());
+
+  if (!wl_display)
+    {
+      GDK_WAYLAND_DISPLAY_MANAGER (initable)->init_failed = TRUE;
+      return FALSE;
+    }
+
+  wl_display_disconnect (wl_display);
+
+  return TRUE;
+}
+
+void
+g_initable_iface_init (GInitableIface *iface)
+{
+  iface->init = gdk_wayland_display_manager_initable_init;
+}

 static void
 gdk_wayland_display_manager_finalize (GObject *object)
 {
-  g_error ("A GdkWaylandDisplayManager object was finalized. This should not happen");
+  if (GDK_WAYLAND_DISPLAY_MANAGER (object)->init_failed == FALSE)
+    g_error ("A GdkWaylandDisplayManager object was finalized. This should not happen");
+
  G_OBJECT_CLASS (gdk_wayland_display_manager_parent_class)->finalize (object);
 }

@@ -61,107 +95,6 @@ gdk_wayland_display_manager_open_display (GdkDisplayManager *manager,
  return _gdk_wayland_display_open (name);
 }

-static GSList *
-gdk_wayland_display_manager_list_displays (GdkDisplayManager *manager)
-{
-  return g_slist_copy (GDK_WAYLAND_DISPLAY_MANAGER (manager)->displays);
-}
-
-static void
-gdk_wayland_display_manager_set_default_display (GdkDisplayManager *manager,
-						 GdkDisplay        *display)
-{
-  GDK_WAYLAND_DISPLAY_MANAGER (manager)->default_display = display;
-
-  _gdk_wayland_display_make_default (display);
-}
-
-static GdkDisplay *
-gdk_wayland_display_manager_get_default_display (GdkDisplayManager *manager)
-{
-  return GDK_WAYLAND_DISPLAY_MANAGER (manager)->default_display;
-}
-
-static GdkAtom
-gdk_wayland_display_manager_atom_intern (GdkDisplayManager *manager_in,
-					 const gchar       *atom_name,
-					 gboolean           dup)
-{
-  GdkWaylandDisplayManager *manager = GDK_WAYLAND_DISPLAY_MANAGER (manager_in);
-  GdkAtom atom;
-  gpointer data;
-  const gchar *atom_name_intern;
-
-  atom_name_intern = g_intern_string (atom_name);
-  data = g_hash_table_lookup (manager->name_to_atoms, atom_name_intern);
-
-  if (data)
-    {
-      atom = GDK_POINTER_TO_ATOM (data);
-      return atom;
-    }
-
-  atom = _GDK_MAKE_ATOM (manager->next_atom);
-
-  g_hash_table_insert (manager->name_to_atoms,
-                       (gchar *)atom_name_intern,
-                       GDK_ATOM_TO_POINTER (atom));
-  manager->next_atom++;
-
-  return atom;
-}
-
-static gchar *
-gdk_wayland_display_manager_get_atom_name (GdkDisplayManager *manager_in,
-					   GdkAtom            atom)
-{
-  GdkWaylandDisplayManager *manager = GDK_WAYLAND_DISPLAY_MANAGER (manager_in);
-  GHashTableIter iter;
-  gpointer key, value;
-
-  g_hash_table_iter_init (&iter, manager->name_to_atoms);
-
-  while (g_hash_table_iter_next (&iter, &key, &value))
-    {
-      if (GDK_POINTER_TO_ATOM (value) == atom)
-        return g_strdup (key);
-    }
-
-  return NULL;
-}
-
-static guint
-gdk_wayland_display_manager_lookup_keyval (GdkDisplayManager *manager,
-					   const gchar       *keyval_name)
-{
-  g_return_val_if_fail (keyval_name != NULL, 0);
-
-  return xkb_keysym_from_name (keyval_name, 0);
-}
-
-static gchar *
-gdk_wayland_display_manager_get_keyval_name (GdkDisplayManager *manager,
-					     guint              keyval)
-{
-  static char buf[128];
-
-  switch (keyval)
-    {
-    case GDK_KEY_Page_Up:
-      return "Page_Up";
-    case GDK_KEY_Page_Down:
-      return "Page_Down";
-    case GDK_KEY_KP_Page_Up:
-      return "KP_Page_Up";
-    case GDK_KEY_KP_Page_Down:
-      return "KP_Page_Down";
-    }
-
-  xkb_keysym_get_name(keyval, buf, sizeof (buf));
-
-  return buf;
-}
-
 static void
 gdk_wayland_display_manager_class_init (GdkWaylandDisplayManagerClass *class)
 {
@@ -171,53 +104,11 @@ gdk_wayland_display_manager_class_init (GdkWaylandDisplayManagerClass *class)
  object_class->finalize = gdk_wayland_display_manager_finalize;

  manager_class->open_display = gdk_wayland_display_manager_open_display;
-  manager_class->list_displays = gdk_wayland_display_manager_list_displays;
-  manager_class->set_default_display = gdk_wayland_display_manager_set_default_display;
-  manager_class->get_default_display = gdk_wayland_display_manager_get_default_display;
-  manager_class->atom_intern = gdk_wayland_display_manager_atom_intern;
-  manager_class->get_atom_name = gdk_wayland_display_manager_get_atom_name;
-  manager_class->lookup_keyval = gdk_wayland_display_manager_lookup_keyval;
-  manager_class->get_keyval_name = gdk_wayland_display_manager_get_keyval_name;
 }

-static struct {
-  const gchar *name;
-  guint atom_id;
-} predefined_atoms[] = {
-      { "NONE", 0 },
-      { "PRIMARY", 1 },
-      { "SECONDARY", 2 },
-      { "ATOM", 4 },
-      { "BITMAP", 5 },
-      { "COLORMAP", 7 },
-      { "DRAWABLE", 17 },
-      { "INTEGER", 19 },
-      { "PIXMAP", 20 },
-      { "STRING", 31 },
-      { "WINDOW", 33 },
-      { "CLIPBOARD", 69 },
-};
-
 static void
 gdk_wayland_display_manager_init (GdkWaylandDisplayManager *manager)
 {
-  gint i;
-
-  manager->name_to_atoms = g_hash_table_new (NULL, NULL);
-
-  for (i = 0; i < G_N_ELEMENTS (predefined_atoms); i++)
-    {
-      GdkAtom atom;
-      const gchar *atom_name = predefined_atoms[i].name;
-
-      atom = _GDK_MAKE_ATOM (predefined_atoms[i].atom_id);
-      g_hash_table_insert (manager->name_to_atoms,
-                           (gchar *)g_intern_static_string (atom_name),
-                           GDK_ATOM_TO_POINTER (atom));
-    }
-
-  manager->next_atom =
-    predefined_atoms[G_N_ELEMENTS (predefined_atoms) - 1].atom_id + 1;
 }

 void
@@ -240,7 +131,7 @@ _gdk_wayland_display_manager_remove_display (GdkDisplayManager *manager,

  manager_wayland->displays = g_slist_remove (manager_wayland->displays, display);

-  if (manager_wayland->default_display == display)
+  if (gdk_display_manager_get_default_display (manager) == display)
    {
      if (manager_wayland->displays)
        gdk_display_manager_set_default_display (manager, manager_wayland->displays->data);
@@ -57,9 +57,6 @@ gdk_event_source_check(GSource *base)
 {
  GdkWaylandEventSource *source = (GdkWaylandEventSource *) base;

-  if (source->pfd.revents & (G_IO_ERR | G_IO_HUP))
-    g_error ("Lost connection to wayland compositor");
-
  if (source->display->event_pause_count > 0)
    return FALSE;

@@ -153,9 +150,12 @@ _gdk_wayland_display_queue_events (GdkDisplay *display)

  display_wayland = GDK_WAYLAND_DISPLAY (display);
  source = (GdkWaylandEventSource *) display_wayland->event_source;
-  if (source->pfd.revents)
+  if (source->pfd.revents & G_IO_IN)
    {
 	wl_display_dispatch(display_wayland->wl_display);
 	source->pfd.revents = 0;
    }
+
+  if (source->pfd.revents & (G_IO_ERR | G_IO_HUP))
+    g_error ("Lost connection to wayland compositor");
 }
@@ -50,6 +50,9 @@ struct _GdkWaylandKeymap

  struct xkb_keymap *xkb_keymap;
  struct xkb_state *xkb_state;
+
+  PangoDirection *direction;
+  gboolean bidi;
 };

 struct _GdkWaylandKeymapClass
@@ -66,19 +69,36 @@ G_DEFINE_TYPE (GdkWaylandKeymap, _gdk_wayland_keymap, GDK_TYPE_KEYMAP)
 static void
 gdk_wayland_keymap_finalize (GObject *object)
 {
+  GdkWaylandKeymap *keymap = GDK_WAYLAND_KEYMAP (object);
+
+  xkb_keymap_unref (keymap->xkb_keymap);
+  xkb_state_unref (keymap->xkb_state);
+  g_free (keymap->direction);
+
  G_OBJECT_CLASS (_gdk_wayland_keymap_parent_class)->finalize (object);
 }

 static PangoDirection
 gdk_wayland_keymap_get_direction (GdkKeymap *keymap)
 {
-    return PANGO_DIRECTION_NEUTRAL;
+  GdkWaylandKeymap *keymap_wayland = GDK_WAYLAND_KEYMAP (keymap);
+  gint i;
+
+  for (i = 0; i < xkb_keymap_num_layouts (keymap_wayland->xkb_keymap); i++)
+    {
+      if (xkb_state_layout_index_is_active (keymap_wayland->xkb_state, i, XKB_STATE_LAYOUT_EFFECTIVE))
+        return keymap_wayland->direction[i];
+    }
+
+  return PANGO_DIRECTION_NEUTRAL;
 }

 static gboolean
 gdk_wayland_keymap_have_bidi_layouts (GdkKeymap *keymap)
 {
-    return FALSE;
+  GdkWaylandKeymap *keymap_wayland = GDK_WAYLAND_KEYMAP (keymap);
+
+  return keymap_wayland->bidi;
 }

 static gboolean
@@ -101,14 +121,45 @@ gdk_wayland_keymap_get_entries_for_keyval (GdkKeymap     *keymap,
 					   GdkKeymapKey **keys,
 					   gint          *n_keys)
 {
-  if (n_keys)
-    *n_keys = 1;
-  if (keys)
+  struct xkb_keymap *xkb_keymap = GDK_WAYLAND_KEYMAP (keymap)->xkb_keymap;
+  GArray *retval;
+  guint keycode;
+
+  retval = g_array_new (FALSE, FALSE, sizeof (GdkKeymapKey));
+
+  for (keycode = 8; keycode < 255; keycode++) /* FIXME: min/max keycode */
    {
-      *keys = g_new0 (GdkKeymapKey, 1);
-      (*keys)->keycode = keyval;
+      gint num_layouts, layout;
+      num_layouts = xkb_keymap_num_layouts_for_key (xkb_keymap, keycode);
+      for (layout = 0; layout < num_layouts; layout++)
+        {
+          gint num_levels, level;
+          num_levels = xkb_keymap_num_levels_for_key (xkb_keymap, keycode, layout);
+          for (level = 0; level < num_levels; level++)
+            {
+              const xkb_keysym_t *syms;
+              gint num_syms, sym;
+              num_syms = xkb_keymap_key_get_syms_by_level (xkb_keymap, keycode, layout, level, &syms);
+              for (sym = 0; sym < num_syms; sym++)
+                {
+                  if (syms[sym] == keyval)
+                    {
+                      GdkKeymapKey key;
+
+                      key.keycode = keycode;
+                      key.group = layout;
+                      key.level = level;
+
+                      g_array_append_val (retval, key);
+                    }
+                }
+            }
+        }
    }

+  *n_keys = retval->len;
+  *keys = (GdkKeymapKey*) g_array_free (retval, FALSE);
+
  return TRUE;
 }

@@ -119,26 +170,119 @@ gdk_wayland_keymap_get_entries_for_keycode (GdkKeymap     *keymap,
 					    guint        **keyvals,
 					    gint          *n_entries)
 {
+  struct xkb_keymap *xkb_keymap = GDK_WAYLAND_KEYMAP (keymap)->xkb_keymap;
+  gint num_layouts, layout;
+  gint num_entries;
+  gint i;
+
+  num_layouts = xkb_keymap_num_layouts_for_key (xkb_keymap, hardware_keycode);
+
+  num_entries = 0;
+  for (layout = 0; layout < num_layouts; layout++)
+    num_entries += xkb_keymap_num_levels_for_key (xkb_keymap, hardware_keycode,  layout);
+
 if (n_entries)
-    *n_entries = 1;
+    *n_entries = num_entries;
  if (keys)
-    {
-      *keys = g_new0 (GdkKeymapKey, 1);
-      (*keys)->keycode = hardware_keycode;
-    }
+    *keys = g_new0 (GdkKeymapKey, num_entries);
  if (keyvals)
+    *keyvals = g_new0 (guint, num_entries);
+
+  i = 0;
+  for (layout = 0; layout < num_layouts; layout++)
    {
-      *keyvals = g_new0 (guint, 1);
-      (*keyvals)[0] = hardware_keycode;
+      gint num_levels, level;
+      num_levels = xkb_keymap_num_levels_for_key (xkb_keymap, hardware_keycode, layout);
+      for (level = 0; level < num_levels; level++)
+        {
+          const xkb_keysym_t *syms;
+          int num_syms;
+          num_syms = xkb_keymap_key_get_syms_by_level (xkb_keymap, hardware_keycode, layout, 0, &syms);
+          if (keys)
+            {
+              (*keys)[i].keycode = hardware_keycode;
+              (*keys)[i].group = layout;
+              (*keys)[i].level = level;
+            }
+          if (keyvals && num_syms > 0)
+            (*keyvals)[i] = syms[0];
+
+          i++;
+        }
    }
-  return TRUE;
+
+  return num_entries > 0;
 }

 static guint
 gdk_wayland_keymap_lookup_key (GdkKeymap          *keymap,
 			       const GdkKeymapKey *key)
 {
-  return key->keycode;
+  struct xkb_keymap *xkb_keymap = GDK_WAYLAND_KEYMAP (keymap)->xkb_keymap;
+  const xkb_keysym_t *syms;
+  int num_syms;
+
+  num_syms = xkb_keymap_key_get_syms_by_level (xkb_keymap,
+                                               key->keycode,
+                                               key->group,
+                                               key->level,
+                                               &syms);
+  if (num_syms > 0)
+    return syms[0];
+  else
+    return XKB_KEY_NoSymbol;
+}
+
+static guint32
+get_xkb_modifiers (struct xkb_keymap *xkb_keymap,
+                   GdkModifierType    state)
+{
+  guint32 mods = 0;
+
+  if (state & GDK_SHIFT_MASK)
+    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_SHIFT);
+  if (state & GDK_LOCK_MASK)
+    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CAPS);
+  if (state & GDK_CONTROL_MASK)
+    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CTRL);
+  if (state & GDK_MOD1_MASK)
+    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_ALT);
+  if (state & GDK_MOD2_MASK)
+    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod2");
+  if (state & GDK_MOD3_MASK)
+    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod3");
+  if (state & GDK_MOD4_MASK)
+    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_LOGO);
+  if (state & GDK_MOD5_MASK)
+    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod5");
+
+  return mods;
+}
+
+static GdkModifierType
+get_gdk_modifiers (struct xkb_keymap *xkb_keymap,
+                   guint32            mods)
+{
+  GdkModifierType state = 0;
+
+  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_SHIFT)))
+    state |= GDK_SHIFT_MASK;
+  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CAPS)))
+    state |= GDK_LOCK_MASK;
+  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CTRL)))
+    state |= GDK_CONTROL_MASK;
+  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_ALT)))
+    state |= GDK_MOD1_MASK;
+  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod2")))
+    state |= GDK_MOD2_MASK;
+  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod3")))
+    state |= GDK_MOD3_MASK;
+  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_LOGO)))
+    state |= GDK_MOD4_MASK;
+  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod5")))
+    state |= GDK_MOD5_MASK;
+
+  return state;
 }

 static gboolean
@@ -148,24 +292,59 @@ gdk_wayland_keymap_translate_keyboard_state (GdkKeymap       *keymap,
 					     gint             group,
 					     guint           *keyval,
 					     gint            *effective_group,
-					     gint            *level,
+					     gint            *effective_level,
 					     GdkModifierType *consumed_modifiers)
 {
+  struct xkb_keymap *xkb_keymap;
+  struct xkb_state *xkb_state;
+  guint32 modifiers;
+  guint32 consumed;
+  xkb_layout_index_t layout;
+  xkb_level_index_t level;
+  xkb_keysym_t sym;
+
  g_return_val_if_fail (keymap == NULL || GDK_IS_KEYMAP (keymap), FALSE);
  g_return_val_if_fail (group < 4, FALSE);

+  xkb_keymap = GDK_WAYLAND_KEYMAP (keymap)->xkb_keymap;
+
+  modifiers = get_xkb_modifiers (xkb_keymap, state);
+
+  xkb_state = xkb_state_new (xkb_keymap);
+
+  xkb_state_update_mask (xkb_state, modifiers, 0, 0, group, 0, 0);
+
+  layout = xkb_state_key_get_layout (xkb_state, hardware_keycode);
+  level = xkb_state_key_get_level (xkb_state, hardware_keycode, layout);
+  sym = xkb_state_key_get_one_sym (xkb_state, hardware_keycode);
+  consumed = modifiers & ~xkb_state_mod_mask_remove_consumed (xkb_state, hardware_keycode, modifiers);
+
+  xkb_state_unref (xkb_state);
+
  if (keyval)
-    *keyval = hardware_keycode;
+    *keyval = sym;
  if (effective_group)
-    *effective_group = 0;
-  if (level)
-    *level = 0;
+    *effective_group = layout;
+  if (effective_level)
+    *effective_level = level;
  if (consumed_modifiers)
-    *consumed_modifiers = 0;
+    *consumed_modifiers = get_gdk_modifiers (xkb_keymap, consumed);

  return TRUE;
 }

+static guint
+gdk_wayland_keymap_get_modifier_state (GdkKeymap *keymap)
+{
+  struct xkb_keymap *xkb_keymap = GDK_WAYLAND_KEYMAP (keymap)->xkb_keymap;
+  struct xkb_state *xkb_state = GDK_WAYLAND_KEYMAP (keymap)->xkb_state;
+  xkb_mod_mask_t mods;
+
+  mods = xkb_state_serialize_mods (xkb_state, XKB_STATE_MODS_EFFECTIVE);
+
+  return get_gdk_modifiers (xkb_keymap, mods);
+}
+
 static void
 gdk_wayland_keymap_add_virtual_modifiers (GdkKeymap       *keymap,
 					  GdkModifierType *state)
@@ -196,6 +375,7 @@ _gdk_wayland_keymap_class_init (GdkWaylandKeymapClass *klass)
  keymap_class->get_entries_for_keycode = gdk_wayland_keymap_get_entries_for_keycode;
  keymap_class->lookup_key = gdk_wayland_keymap_lookup_key;
  keymap_class->translate_keyboard_state = gdk_wayland_keymap_translate_keyboard_state;
+  keymap_class->get_modifier_state = gdk_wayland_keymap_get_modifier_state;
  keymap_class->add_virtual_modifiers = gdk_wayland_keymap_add_virtual_modifiers;
  keymap_class->map_virtual_modifiers = gdk_wayland_keymap_map_virtual_modifiers;
 }
@@ -205,6 +385,75 @@ _gdk_wayland_keymap_init (GdkWaylandKeymap *keymap)
 {
 }

+static void
+update_direction (GdkWaylandKeymap *keymap)
+{
+  gint num_layouts;
+  gint *rtl;
+  guint key;
+  gboolean have_rtl, have_ltr;
+  gint i;
+
+  num_layouts = xkb_keymap_num_layouts (keymap->xkb_keymap);
+
+  g_free (keymap->direction);
+  keymap->direction = g_new0 (PangoDirection, num_layouts);
+
+  rtl = g_new0 (gint, num_layouts);
+
+  for (key = 8; key < 255; key++) /* FIXME: min/max keycode */
+    {
+       gint layouts;
+       gint layout;
+
+       layouts = xkb_keymap_num_layouts_for_key (keymap->xkb_keymap, key);
+       for (layout = 0; layout < layouts; layout++)
+         {
+           const xkb_keysym_t *syms;
+           gint num_syms;
+           gint sym;
+
+           num_syms = xkb_keymap_key_get_syms_by_level (keymap->xkb_keymap, key, layout, 0, &syms);
+           for (sym = 0; sym < num_syms; sym++)
+             {
+               PangoDirection dir;
+               dir = pango_unichar_direction (xkb_keysym_to_utf32 (syms[sym]));
+               switch (dir)
+                 {
+                 case PANGO_DIRECTION_RTL:
+                   rtl[layout]++;
+                   break;
+                 case PANGO_DIRECTION_LTR:
+                   rtl[layout]--;
+                   break;
+                 default:
+                   break;
+                 }
+             }
+         }
+    }
+
+  have_rtl = have_ltr = FALSE;
+  for (i = 0; i < num_layouts; i++)
+    {
+      if (rtl[i] > 0)
+        {
+          keymap->direction[i] = PANGO_DIRECTION_RTL;
+          have_rtl = TRUE;
+        }
+      else
+        {
+          keymap->direction[i] = PANGO_DIRECTION_LTR;
+          have_ltr = TRUE;
+        }
+    }
+
+  if (have_rtl && have_ltr)
+    keymap->bidi = TRUE;
+
+  g_free (rtl);
+}
+
 GdkKeymap *
 _gdk_wayland_keymap_new ()
 {
@@ -225,34 +474,41 @@ _gdk_wayland_keymap_new ()
  keymap->xkb_state = xkb_state_new (keymap->xkb_keymap);
  xkb_context_unref (context);

+  update_direction (keymap);
+
  return GDK_KEYMAP (keymap);
 }

-GdkKeymap *
-_gdk_wayland_keymap_new_from_fd (uint32_t format,
-                                 uint32_t fd, uint32_t size)
+void
+_gdk_wayland_keymap_update_from_fd (GdkKeymap *keymap,
+                                    uint32_t   format,
+                                    uint32_t   fd,
+                                    uint32_t   size)
 {
-  GdkWaylandKeymap *keymap;
+  GdkWaylandKeymap *keymap_wayland = GDK_WAYLAND_KEYMAP (keymap);
  struct xkb_context *context;
  char *map_str;

-  keymap = g_object_new (_gdk_wayland_keymap_get_type(), NULL);
-
  context = xkb_context_new (0);

  map_str = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
-  if (map_str == MAP_FAILED) {
-    close(fd);
-    return NULL;
+  if (map_str == MAP_FAILED)
+    {
+      close(fd);
+      return;
  }

-  keymap->xkb_keymap = xkb_keymap_new_from_string (context, map_str, format, 0);
+  xkb_keymap_unref (keymap_wayland->xkb_keymap);
+  keymap_wayland->xkb_keymap = xkb_keymap_new_from_string (context, map_str, format, 0);
  munmap (map_str, size);
  close (fd);
-  keymap->xkb_state = xkb_state_new (keymap->xkb_keymap);
+
+  xkb_state_unref (keymap_wayland->xkb_state);
+  keymap_wayland->xkb_state = xkb_state_new (keymap_wayland->xkb_keymap);
+
  xkb_context_unref (context);

-  return GDK_KEYMAP (keymap);
+  update_direction (keymap_wayland);
 }

 struct xkb_keymap *_gdk_wayland_keymap_get_xkb_keymap (GdkKeymap *keymap)
@@ -264,3 +520,23 @@ struct xkb_state *_gdk_wayland_keymap_get_xkb_state (GdkKeymap *keymap)
 {
  return GDK_WAYLAND_KEYMAP (keymap)->xkb_state;
 }
+
+gboolean
+_gdk_wayland_keymap_key_is_modifier (GdkKeymap *keymap,
+                                     guint      keycode)
+{
+  struct xkb_keymap *xkb_keymap = GDK_WAYLAND_KEYMAP (keymap)->xkb_keymap;
+  struct xkb_state *xkb_state;
+  gboolean is_modifier;
+
+  is_modifier = FALSE;
+
+  xkb_state = xkb_state_new (xkb_keymap);
+
+  if (xkb_state_update_key (xkb_state, keycode, XKB_KEY_DOWN) & XKB_STATE_MODS_EFFECTIVE)
+    is_modifier = TRUE;
+
+  xkb_state_unref (xkb_state);
+
+  return is_modifier;
+}
@@ -49,9 +49,18 @@ void _gdk_wayland_window_add_focus    (GdkWindow *window);
 void _gdk_wayland_window_remove_focus (GdkWindow *window);

 GdkKeymap *_gdk_wayland_keymap_new (void);
-GdkKeymap *_gdk_wayland_keymap_new_from_fd (uint32_t format,
-                                            uint32_t fd, uint32_t size);
+void       _gdk_wayland_keymap_update_from_fd (GdkKeymap *keymap,
+                                               uint32_t   format,
+                                               uint32_t   fd,
+                                               uint32_t   size);
 struct xkb_state *_gdk_wayland_keymap_get_xkb_state (GdkKeymap *keymap);
+struct xkb_keymap *_gdk_wayland_keymap_get_xkb_keymap (GdkKeymap *keymap);
+gboolean           _gdk_wayland_keymap_key_is_modifier (GdkKeymap *keymap,
+                                                        guint      keycode);
+
+void       _gdk_wayland_display_finalize_cursors (GdkWaylandDisplay *display);
+void       _gdk_wayland_display_update_cursors (GdkWaylandDisplay      *display,
+                                                struct wl_cursor_theme *theme);

 GdkCursor *_gdk_wayland_display_get_cursor_for_type (GdkDisplay    *display,
 						     GdkCursorType  cursor_type);
@@ -71,10 +80,14 @@ gboolean   _gdk_wayland_display_supports_cursor_alpha (GdkDisplay *display);
 gboolean   _gdk_wayland_display_supports_cursor_color (GdkDisplay *display);

 struct wl_buffer *_gdk_wayland_cursor_get_buffer (GdkCursor *cursor,
-						  int       *x,
-						  int       *y,
+                                                  guint      image_index,
+                                                  int       *hotspot_x,
+                                                  int       *hotspot_y,
                                                  int       *w,
                                                  int       *h);
+guint      _gdk_wayland_cursor_get_next_image_index (GdkCursor *cursor,
+                                                     guint      current_image_index,
+                                                     guint     *next_image_delay);

 GdkDragProtocol _gdk_wayland_window_get_drag_protocol (GdkWindow *window,
 						       GdkWindow **target);
@@ -125,10 +138,16 @@ gchar *     _gdk_wayland_display_utf8_to_string_target (GdkDisplay  *display,
 							const gchar *str);

 GdkDeviceManager *_gdk_wayland_device_manager_new (GdkDisplay *display);
-void              _gdk_wayland_device_manager_add_device (GdkDeviceManager *device_manager,
-							  struct wl_seat *seat);
+void              _gdk_wayland_device_manager_add_seat (GdkDeviceManager *device_manager,
+                                                        guint32           id,
+						        struct wl_seat   *seat);
+void              _gdk_wayland_device_manager_remove_seat (GdkDeviceManager *device_manager,
+                                                           guint32           id);
+
+typedef struct _GdkWaylandDeviceData GdkWaylandDeviceData;

 GdkKeymap *_gdk_wayland_device_get_keymap (GdkDevice *device);
+uint32_t _gdk_wayland_device_get_button_press_serial(GdkWaylandDeviceData *device);

 void     _gdk_wayland_display_deliver_event (GdkDisplay *display, GdkEvent *event);
 GSource *_gdk_wayland_display_event_source_new (GdkDisplay *display);
@@ -137,17 +156,17 @@ void     _gdk_wayland_display_queue_events (GdkDisplay *display);
 GdkAppLaunchContext *_gdk_wayland_display_get_app_launch_context (GdkDisplay *display);

 GdkDisplay *_gdk_wayland_display_open (const gchar *display_name);
-void        _gdk_wayland_display_make_default (GdkDisplay *display);

 GdkWindow *_gdk_wayland_screen_create_root_window (GdkScreen *screen,
 						   int width,
 						   int height);

 GdkScreen *_gdk_wayland_screen_new (GdkDisplay *display);
-void _gdk_wayland_screen_add_output (GdkScreen *scren,
+void _gdk_wayland_screen_add_output (GdkScreen        *screen,
+                                     guint32           id,
                                     struct wl_output *output);
-void _gdk_wayland_screen_remove_output_by_id (GdkScreen *screen,
-                                              guint32 id);
+void _gdk_wayland_screen_remove_output (GdkScreen *screen,
+                                        guint32 id);

 void _gdk_wayland_display_manager_add_display (GdkDisplayManager *manager,
 					       GdkDisplay        *display);
@@ -162,4 +181,10 @@ void _gdk_wayland_window_set_device_grabbed (GdkWindow      *window,
 guint32 _gdk_wayland_display_get_serial (GdkWaylandDisplay *wayland_display);
 void _gdk_wayland_display_update_serial (GdkWaylandDisplay *wayland_display, guint32 serial);

+struct wl_shm_pool * _create_shm_pool (struct wl_shm *shm,
+                                      int             width,
+                                      int             height,
+                                      size_t         *buf_length,
+                                      void          **data_out);
+
 #endif /* __GDK_PRIVATE_WAYLAND_H__ */
@@ -21,6 +21,7 @@
 #include <string.h>

 #include <glib.h>
+#include <gio/gio.h>
 #include "gdkscreenprivate.h"
 #include "gdkvisualprivate.h"
 #include "gdkdisplay.h"
@@ -38,6 +39,14 @@ typedef struct _GdkWaylandScreenClass GdkWaylandScreenClass;
 #define GDK_IS_WAYLAND_SCREEN_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WAYLAND_SCREEN))
 #define GDK_WAYLAND_SCREEN_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WAYLAND_SCREEN, GdkWaylandScreenClass))

+typedef struct {
+        gboolean     antialias;
+        gboolean     hinting;
+        gint         dpi;
+        const gchar *rgba;
+        const gchar *hintstyle;
+} GsdXftSettings;
+
 typedef struct _GdkWaylandMonitor GdkWaylandMonitor;

 struct _GdkWaylandScreen
@@ -56,6 +65,9 @@ struct _GdkWaylandScreen
  /* Xinerama/RandR 1.2 */
  GPtrArray *monitors;
  gint       primary_monitor;
+
+  GHashTable *settings;
+  GsdXftSettings xft_settings;
 };

 struct _GdkWaylandScreenClass
@@ -67,6 +79,8 @@ struct _GdkWaylandScreenClass

 struct _GdkWaylandMonitor
 {
+  GdkWaylandScreen *screen;
+  guint32       id;
  struct wl_output *output;
  GdkRectangle  geometry;
  int		width_mm;
@@ -133,6 +147,8 @@ gdk_wayland_screen_finalize (GObject *object)

  deinit_multihead (GDK_SCREEN (object));

+  g_hash_table_destroy (screen_wayland->settings);
+
  G_OBJECT_CLASS (_gdk_wayland_screen_parent_class)->finalize (object);
 }

@@ -274,80 +290,375 @@ gdk_wayland_screen_broadcast_client_message (GdkScreen *screen,
 {
 }

+static void
+notify_setting (GdkScreen   *screen,
+                const gchar *setting)
+{
+  GdkEvent event;
+
+  event.type = GDK_SETTING;
+  event.setting.window = gdk_screen_get_root_window (screen);
+  event.setting.send_event = FALSE;
+  event.setting.action = GDK_SETTING_ACTION_CHANGED;
+  event.setting.name = (gchar *)setting;
+  gdk_event_put (&event);
+}
+
+typedef enum
+{
+  GSD_FONT_ANTIALIASING_MODE_NONE,
+  GSD_FONT_ANTIALIASING_MODE_GRAYSCALE,
+  GSD_FONT_ANTIALIASING_MODE_RGBA
+} GsdFontAntialiasingMode;
+
+typedef enum
+{
+  GSD_FONT_HINTING_NONE,
+  GSD_FONT_HINTING_SLIGHT,
+  GSD_FONT_HINTING_MEDIUM,
+  GSD_FONT_HINTING_FULL
+} GsdFontHinting;
+
+typedef enum
+{
+  GSD_FONT_RGBA_ORDER_RGBA,
+  GSD_FONT_RGBA_ORDER_RGB,
+  GSD_FONT_RGBA_ORDER_BGR,
+  GSD_FONT_RGBA_ORDER_VRGB,
+  GSD_FONT_RGBA_ORDER_VBGR
+} GsdFontRgbaOrder;
+
+static gdouble
+get_dpi_from_gsettings (GdkWaylandScreen *screen_wayland)
+{
+        GSettings  *interface_settings;
+        gdouble      factor;
+
+        interface_settings = g_hash_table_lookup (screen_wayland->settings,
+                                                  "org.gnome.desktop.interface");
+        if (interface_settings != NULL)
+          factor = g_settings_get_double (interface_settings, "text-scaling-factor");
+        else
+          factor = 1.0;
+
+        return 96.0 * factor;
+}
+
+static void
+update_xft_settings (GdkScreen *screen)
+{
+  GdkWaylandScreen *screen_wayland = GDK_WAYLAND_SCREEN (screen);
+  GSettings *settings;
+  GsdFontAntialiasingMode antialiasing;
+  GsdFontHinting hinting;
+  GsdFontRgbaOrder order;
+  gboolean use_rgba = FALSE;
+  GsdXftSettings xft_settings;
+
+  settings = g_hash_table_lookup (screen_wayland->settings, "org.gnome.settings-daemon.plugins.xsettings");
+
+  if (settings)
+    {
+      antialiasing = g_settings_get_enum (settings, "antialiasing");
+      hinting = g_settings_get_enum (settings, "hinting");
+      order = g_settings_get_enum (settings, "rgba-order");
+    }
+  else
+    {
+      antialiasing = GSD_FONT_ANTIALIASING_MODE_GRAYSCALE;
+      hinting = GSD_FONT_HINTING_MEDIUM;
+      order = GSD_FONT_RGBA_ORDER_RGB;
+    }
+
+  xft_settings.antialias = (antialiasing != GSD_FONT_ANTIALIASING_MODE_NONE);
+  xft_settings.hinting = (hinting != GSD_FONT_HINTING_NONE);
+  xft_settings.dpi = get_dpi_from_gsettings (screen_wayland) * 1024; /* Xft wants 1/1024ths of an inch */
+  xft_settings.rgba = "rgb";
+  xft_settings.hintstyle = "hintfull";
+
+  switch (hinting)
+    {
+    case GSD_FONT_HINTING_NONE:
+      xft_settings.hintstyle = "hintnone";
+      break;
+    case GSD_FONT_HINTING_SLIGHT:
+      xft_settings.hintstyle = "hintslight";
+      break;
+    case GSD_FONT_HINTING_MEDIUM:
+      xft_settings.hintstyle = "hintmedium";
+      break;
+    case GSD_FONT_HINTING_FULL:
+      xft_settings.hintstyle = "hintfull";
+      break;
+    }
+
+  switch (order)
+    {
+    case GSD_FONT_RGBA_ORDER_RGBA:
+      xft_settings.rgba = "rgba";
+      break;
+    case GSD_FONT_RGBA_ORDER_RGB:
+      xft_settings.rgba = "rgb";
+      break;
+    case GSD_FONT_RGBA_ORDER_BGR:
+      xft_settings.rgba = "bgr";
+      break;
+    case GSD_FONT_RGBA_ORDER_VRGB:
+      xft_settings.rgba = "vrgb";
+      break;
+    case GSD_FONT_RGBA_ORDER_VBGR:
+      xft_settings.rgba = "vbgr";
+      break;
+    }
+
+  switch (antialiasing)
+   {
+   case GSD_FONT_ANTIALIASING_MODE_NONE:
+     xft_settings.antialias = FALSE;
+     break;
+   case GSD_FONT_ANTIALIASING_MODE_GRAYSCALE:
+     xft_settings.antialias = TRUE;
+     break;
+   case GSD_FONT_ANTIALIASING_MODE_RGBA:
+     xft_settings.antialias = TRUE;
+     use_rgba = TRUE;
+   }
+
+  if (!use_rgba)
+    xft_settings.rgba = "none";
+
+  if (screen_wayland->xft_settings.antialias != xft_settings.antialias)
+    {
+      screen_wayland->xft_settings.antialias = xft_settings.antialias;
+      notify_setting (screen, "gtk-xft-antialias");
+    }
+
+  if (screen_wayland->xft_settings.hinting != xft_settings.hinting)
+    {
+      screen_wayland->xft_settings.hinting = xft_settings.hinting;
+      notify_setting (screen, "gtk-xft-hinting");
+    }
+
+  if (screen_wayland->xft_settings.hintstyle != xft_settings.hintstyle)
+    {
+      screen_wayland->xft_settings.hintstyle = xft_settings.hintstyle;
+      notify_setting (screen, "gtk-xft-hintstyle");
+    }
+
+  if (screen_wayland->xft_settings.rgba != xft_settings.rgba)
+    {
+      screen_wayland->xft_settings.rgba = xft_settings.rgba;
+      notify_setting (screen, "gtk-xft-rgba");
+    }
+
+  if (screen_wayland->xft_settings.dpi != xft_settings.dpi)
+    {
+      screen_wayland->xft_settings.dpi = xft_settings.dpi;
+      notify_setting (screen, "gtk-xft-dpi");
+    }
+}
+
+typedef struct _TranslationEntry TranslationEntry;
+struct _TranslationEntry {
+  const gchar *schema;
+  const gchar *key;
+  const gchar *setting;
+  GType type;
+  union {
+    const gchar *s;
+    gint         i;
+    gboolean     b;
+  } fallback;
+};
+
+static TranslationEntry translations[] = {
+  { "org.gnome.desktop.interface", "gtk-theme", "gtk-theme-name" , G_TYPE_STRING, { .s = "Adwaita" } },
+  { "org.gnome.desktop.interface", "icon-theme", "gtk-icon-theme-name", G_TYPE_STRING, { .s = "gnome" } },
+  { "org.gnome.desktop.interface", "cursor-theme", "gtk-cursor-theme-name", G_TYPE_STRING, { .s = "Adwaita" } },
+  { "org.gnome.desktop.interface", "cursor-size", "gtk-cursor-theme-size", G_TYPE_INT, { .i = 32 } },
+  { "org.gnome.desktop.interface", "font-name", "gtk-font-name", G_TYPE_STRING, { .s = "Cantarell 11" } },
+  { "org.gnome.desktop.interface", "cursor-blink", "gtk-cursor-blink", G_TYPE_BOOLEAN,  { .b = TRUE } },
+  { "org.gnome.desktop.interface", "cursor-blink-time", "gtk-cursor-blink-time", G_TYPE_INT, { .i = 1200 } },
+  { "org.gnome.desktop.interface", "cursor-blink-timeout", "gtk-cursor-blink-timeout", G_TYPE_INT, { .i = 3600 } },
+  { "org.gnome.desktop.interface", "menus-have-icons", "gtk-menu-images", G_TYPE_BOOLEAN, { .b = FALSE } },
+  { "org.gnome.desktop.interface", "buttons-have-icons", "gtk-button-images", G_TYPE_BOOLEAN, { .b = FALSE } },
+  { "org.gnome.desktop.interface", "gtk-im-module", "gtk-im-module", G_TYPE_STRING, { .s = "simple" } },
+  { "org.gnome.desktop.interface", "enable-animations", "gtk-enable-animations", G_TYPE_BOOLEAN, { .b = TRUE } },
+  { "org.gnome.desktop.interface", "show-input-method-menu", "gtk-show-input-method-menu", G_TYPE_BOOLEAN, { .b = FALSE } },
+  { "org.gnome.desktop.interface", "show-unicode-menu", "gtk-show-unicode-menu", G_TYPE_BOOLEAN, { .b = FALSE } },
+  { "org.gnome.desktop.interface", "automatic-mnemonics", "gtk-auto-mnemonics", G_TYPE_BOOLEAN, { .b = TRUE } },
+  { "org.gnome.desktop.interface", "toolbar-style", "gtk-toolbar-style", G_TYPE_STRING, { .s = "both-horiz"} },
+  { "org.gnome.desktop.interface", "toolbar-icons-size", "gtk-toolbar-icon-size", G_TYPE_STRING, { .s = "large"} },
+  { "org.gnome.settings-daemon.peripherals.mouse", "double-click", "gtk-double-click-time", G_TYPE_INT, { .i = 250 } },
+  { "org.gnome.settings-daemon.peripherals.mouse", "drag-threshold", "gtk-dnd-drag-threshold", G_TYPE_INT, {.i = 8 } },
+  { "org.gnome.desktop.sound", "theme-name", "gtk-sound-theme-name", G_TYPE_STRING, { .s = "freedesktop" } },
+  { "org.gnome.desktop.sound", "event-sounds", "gtk-enable-event-sounds", G_TYPE_BOOLEAN, { .b = TRUE } },
+  { "org.gnome.desktop.sound", "input-feedback-sounds", "gtk-enable-input-feedback-sounds", G_TYPE_BOOLEAN, { . b = FALSE } },
+  { "org.gnome.desktop.privacy", "recent-files-max-age", "gtk-recent-files-max-age", G_TYPE_INT, { .i = 30 } },
+  { "org.gnome.desktop.privacy", "remember-recent-files",    "gtk-recent-files-enabled", G_TYPE_BOOLEAN, { .b = TRUE } },
+  { "org.gnome.settings-daemon.plugins.xsettings", "antialiasing", "gtk-xft-antialias", G_TYPE_NONE, { .i = 0 } },
+  { "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hinting", G_TYPE_NONE, { .i = 0 } },
+  { "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hintstyle", G_TYPE_NONE, { .i = 0 } },
+  { "org.gnome.settings-daemon.plugins.xsettings", "rgba-order", "gtk-xft-rgba", G_TYPE_NONE, { .i = 0 } },
+  { "org.gnome.desktop.interface", "text-scaling-factor", "gtk-xft-dpi" , G_TYPE_NONE, { .i = 0 } },
+
+};
+
+static TranslationEntry *
+find_translation_entry_by_key (GSettings *settings, const gchar *key)
+{
+  guint i;
+  gchar *schema;
+
+  g_object_get (settings, "schema", &schema, NULL);
+
+  for (i = 0; i < G_N_ELEMENTS (translations); i++)
+    {
+      if (g_str_equal (schema, translations[i].schema) &&
+          g_str_equal (key, translations[i].key))
+        {
+          g_free (schema);
+          return &translations[i];
+        }
+    }
+
+  g_free (schema);
+
+  return NULL;
+}
+
+static TranslationEntry *
+find_translation_entry_by_setting (const gchar *setting)
+{
+  guint i;
+
+  for (i = 0; i < G_N_ELEMENTS (translations); i++)
+    {
+      if (g_str_equal (setting, translations[i].setting))
+        return &translations[i];
+    }
+
+  return NULL;
+}
+
+static void
+settings_changed (GSettings   *settings,
+                  const gchar *key,
+                  GdkScreen   *screen)
+{
+  TranslationEntry *entry;
+
+  entry = find_translation_entry_by_key (settings, key);
+
+  if (entry != NULL)
+    {
+      if (entry->type != G_TYPE_NONE)
+        notify_setting (screen, entry->setting);
+      else
+        update_xft_settings (screen);
+    }
+}
+
+static void
+init_settings (GdkScreen *screen)
+{
+  GdkWaylandScreen *screen_wayland = GDK_WAYLAND_SCREEN (screen);
+  GSettingsSchemaSource *source;
+  GSettingsSchema *schema;
+  GSettings *settings;
+  gint i;
+
+  screen_wayland->settings = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
+
+  source = g_settings_schema_source_get_default ();
+
+  for (i = 0; i < G_N_ELEMENTS (translations); i++)
+    {
+      if (g_hash_table_lookup (screen_wayland->settings, (gpointer)translations[i].schema) != NULL)
+        continue;
+
+      schema = g_settings_schema_source_lookup (source, translations[i].schema, FALSE);
+      if (schema != NULL)
+        {
+          settings = g_settings_new_full (schema, NULL, NULL);
+          g_signal_connect (settings, "changed",
+                            G_CALLBACK (settings_changed), screen);
+          g_hash_table_insert (screen_wayland->settings, (gpointer)translations[i].schema, settings);
+          g_settings_schema_unref (schema);
+        }
+    }
+
+  update_xft_settings (screen);
+}
+
+static void
+set_value_from_entry (GdkScreen        *screen,
+                      TranslationEntry *entry,
+                      GValue           *value)
+{
+  GdkWaylandScreen *screen_wayland = GDK_WAYLAND_SCREEN (screen);
+  GSettings *settings;
+
+  settings = (GSettings *)g_hash_table_lookup (screen_wayland->settings, entry->schema);
+  switch (entry->type)
+    {
+    case G_TYPE_STRING:
+      if (settings)
+        {
+          gchar *s;
+          s = g_settings_get_string (settings, entry->key);
+          g_value_set_string (value, s);
+          g_free (s);
+        }
+      else
+        {
+          g_value_set_static_string (value, entry->fallback.s);
+        }
+      break;
+    case G_TYPE_INT:
+      g_value_set_int (value, settings != NULL
+                              ? g_settings_get_int (settings, entry->key)
+                              : entry->fallback.i);
+      break;
+    case G_TYPE_BOOLEAN:
+      g_value_set_boolean (value, settings != NULL
+                                  ? g_settings_get_boolean (settings, entry->key)
+                                  : entry->fallback.b);
+      break;
+    case G_TYPE_NONE:
+      if (g_str_equal (entry->setting, "gtk-xft-antialias"))
+        g_value_set_int (value, screen_wayland->xft_settings.antialias);
+      else if (g_str_equal (entry->setting, "gtk-xft-hinting"))
+        g_value_set_int (value, screen_wayland->xft_settings.hinting);
+      else if (g_str_equal (entry->setting, "gtk-xft-hintstyle"))
+        g_value_set_static_string (value, screen_wayland->xft_settings.hintstyle);
+      else if (g_str_equal (entry->setting, "gtk-xft-rgba"))
+        g_value_set_static_string (value, screen_wayland->xft_settings.rgba);
+      else if (g_str_equal (entry->setting, "gtk-xft-dpi"))
+        g_value_set_int (value, screen_wayland->xft_settings.dpi);
+      else
+        g_assert_not_reached ();
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+}
+
 static gboolean
 gdk_wayland_screen_get_setting (GdkScreen   *screen,
 				const gchar *name,
 				GValue      *value)
 {
+  TranslationEntry *entry;
+
  g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);

-  if (strcmp ("gtk-theme-name", name) == 0)
+  entry = find_translation_entry_by_setting (name);
+  if (entry != NULL)
    {
-      const gchar *s = "Adwaita";
-      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : %s\n", name, s));
-      g_value_set_static_string (value, s);
+      set_value_from_entry (screen, entry, value);
      return TRUE;
-    }
-  if (strcmp ("gtk-cursor-theme-name", name) == 0)
-    {
-      const gchar *s = "Adwaita";
-      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : %s\n", name, s));
-      g_value_set_static_string (value, s);
-      return TRUE;
-    }
-  else if (strcmp ("gtk-icon-theme-name", name) == 0)
-    {
-      const gchar *s = "gnome";
-      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : %s\n", name, s));
-      g_value_set_static_string (value, s);
-      return TRUE;
-    }
-  else if (strcmp ("gtk-double-click-time", name) == 0)
-    {
-      gint i = 250;
-      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : %d\n", name, i));
-      g_value_set_int (value, i);
-      return TRUE;
-    }
-  else if (strcmp ("gtk-double-click-distance", name) == 0)
-    {
-      gint i = 5;
-      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : %d\n", name, i));
-      g_value_set_int (value, i);
-      return TRUE;
-    }
-  else if (strcmp ("gtk-dnd-drag-threshold", name) == 0)
-    {
-      gint i = 8;
-      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : %d\n", name, i));
-      g_value_set_int (value, i);
-      return TRUE;
-    }
-  else if (strcmp ("gtk-split-cursor", name) == 0)
-    {
-      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : FALSE\n", name));
-      g_value_set_boolean (value, FALSE);
-      return TRUE;
-    }
-  else if (strcmp ("gtk-alternative-button-order", name) == 0)
-    {
-      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : TRUE\n", name));
-      g_value_set_boolean (value, TRUE);
-      return TRUE;
-    }
-  else if (strcmp ("gtk-alternative-sort-arrows", name) == 0)
-    {
-      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : TRUE\n", name));
-      g_value_set_boolean (value, TRUE);
-      return TRUE;
-    }
-  else if (strcmp ("gtk-xft-dpi", name) == 0)
-    {
-      gint i = 96*1024;
-      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : TRUE\n", name));
-      g_value_set_int (value, i);
-      return TRUE;
-    }
+   }

  return FALSE;
 }
@@ -479,8 +790,8 @@ _gdk_wayland_screen_new (GdkDisplay *display)

  screen_wayland = GDK_WAYLAND_SCREEN (screen);
  screen_wayland->display = display;
-  screen_wayland->width = 8192;
-  screen_wayland->height = 8192;
+  screen_wayland->width = 0;
+  screen_wayland->height = 0;

  screen_wayland->visual = gdk_wayland_visual_new (screen);

@@ -490,6 +801,7 @@ _gdk_wayland_screen_new (GdkDisplay *display)
 					    screen_wayland->height);

  init_multihead (screen);
+  init_settings (screen);

  return screen;
 }
@@ -541,6 +853,30 @@ _gdk_wayland_screen_init (GdkWaylandScreen *screen_wayland)
 {
 }

+static void
+update_screen_size (GdkWaylandScreen *screen_wayland)
+{
+  gint width, height;
+  gint i;
+
+  width = height = 0;
+  for (i = 0; i < screen_wayland->monitors->len; i++)
+    {
+      GdkWaylandMonitor *monitor = screen_wayland->monitors->pdata[i];
+
+      width = MAX (width, monitor->geometry.x + monitor->geometry.width);
+      height = MAX (height, monitor->geometry.y + monitor->geometry.height);
+    }
+
+  if (screen_wayland->width != width ||
+      screen_wayland->height != height)
+    {
+      screen_wayland->width = width;
+      screen_wayland->height = width;
+      g_signal_emit_by_name (screen_wayland, "size-changed");
+    }
+}
+
 static void
 output_handle_geometry(void *data,
 		       struct wl_output *wl_output,
@@ -558,6 +894,12 @@ output_handle_geometry(void *data,

  monitor->manufacturer = g_strdup (make);
  monitor->output_name = g_strdup (model);
+
+  if (monitor->geometry.width != 0)
+    {
+      g_signal_emit_by_name (monitor->screen, "monitors-changed");
+      update_screen_size (monitor->screen);
+    }
 }

 static void
@@ -575,6 +917,9 @@ output_handle_mode(void *data,

  monitor->geometry.width = width;
  monitor->geometry.height = height;
+
+  g_signal_emit_by_name (monitor->screen, "monitors-changed");
+  update_screen_size (monitor->screen);
 }

 static const struct wl_output_listener output_listener =
@@ -584,21 +929,24 @@ static const struct wl_output_listener output_listener =
 };

 void
-_gdk_wayland_screen_add_output (GdkScreen *screen,
+_gdk_wayland_screen_add_output (GdkScreen        *screen,
+                                guint32           id,
                                struct wl_output *output)
 {
  GdkWaylandScreen *screen_wayland = GDK_WAYLAND_SCREEN (screen);
  GdkWaylandMonitor *monitor = g_new0(GdkWaylandMonitor, 1);

+  monitor->id = id;
  monitor->output = output;
+  monitor->screen = screen_wayland;
  g_ptr_array_add(screen_wayland->monitors, monitor);

  wl_output_add_listener(output, &output_listener, monitor);
 }

 void
-_gdk_wayland_screen_remove_output_by_id (GdkScreen *screen,
-                                         guint32    id)
+_gdk_wayland_screen_remove_output (GdkScreen *screen,
+                                   guint32    id)
 {
  GdkWaylandScreen *screen_wayland = GDK_WAYLAND_SCREEN (screen);
  int i;
@@ -607,9 +955,12 @@ _gdk_wayland_screen_remove_output_by_id (GdkScreen *screen,
    {
      GdkWaylandMonitor *monitor = screen_wayland->monitors->pdata[i];

-      if (wl_proxy_get_id ((struct wl_proxy *)monitor->output) == id)
+      if (monitor->id == id)
        {
          g_ptr_array_remove (screen_wayland->monitors, monitor);
+
+          g_signal_emit_by_name (screen_wayland, "monitors-changed");
+          update_screen_size (screen_wayland);
          break;
        }
    }
@@ -31,52 +31,10 @@

 #include <gdk/wayland/gdkwaylanddevice.h>
 #include <gdk/wayland/gdkwaylanddisplay.h>
+#include <gdk/wayland/gdkwaylanddisplaymanager.h>
+#include <gdk/wayland/gdkwaylandselection.h>
 #include <gdk/wayland/gdkwaylandwindow.h>

-G_BEGIN_DECLS
-
-typedef struct _GdkWaylandDisplayManager GdkWaylandDisplayManager;
-typedef struct _GdkWaylandDisplayManagerClass GdkWaylandDisplayManagerClass;
-
-#define GDK_TYPE_WAYLAND_DISPLAY_MANAGER              (gdk_wayland_display_manager_get_type())
-#define GDK_WAYLAND_DISPLAY_MANAGER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManager))
-#define GDK_WAYLAND_DISPLAY_MANAGER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManagerClass))
-#define GDK_IS_WAYLAND_DISPLAY_MANAGER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WAYLAND_DISPLAY_MANAGER))
-#define GDK_IS_WAYLAND_DISPLAY_MANAGER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WAYLAND_DISPLAY_MANAGER))
-#define GDK_WAYLAND_DISPLAY_MANAGER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManagerClass))
-
-GType      gdk_wayland_display_manager_get_type   (void);
-
-#if defined (GTK_COMPILATION) || defined (GDK_COMPILATION)
-#define gdk_wayland_device_get_selection_type_atoms gdk_wayland_device_get_selection_type_atoms_libgtk_only
-int
-gdk_wayland_device_get_selection_type_atoms (GdkDevice  *device,
-                                             GdkAtom   **atoms_out);
-
-typedef void (*GdkDeviceWaylandRequestContentCallback) (GdkDevice *device, const gchar *data, gsize len, gpointer userdata);
-
-#define gdk_wayland_device_request_selection_content gdk_wayland_device_request_selection_content_libgtk_only
-gboolean
-gdk_wayland_device_request_selection_content (GdkDevice                              *device,
-                                              const gchar                            *requested_mime_type,
-                                              GdkDeviceWaylandRequestContentCallback  cb,
-                                              gpointer                                userdata);
-
-typedef gchar *(*GdkDeviceWaylandOfferContentCallback) (GdkDevice *device, const gchar *mime_type, gssize *len, gpointer userdata);
-
-#define gdk_wayland_device_offer_selection_content gdk_wayland_device_offer_selection_content_libgtk_only
-gboolean
-gdk_wayland_device_offer_selection_content (GdkDevice                             *gdk_device,
-                                            const gchar                          **mime_types,
-                                            gint                                   nr_mime_types,
-                                            GdkDeviceWaylandOfferContentCallback   cb,
-                                            gpointer                               userdata);
-
-#define gdk_wayland_device_clear_selection_content gdk_wayland_device_clear_selection_content_libgtk_only
-gboolean
-gdk_wayland_device_clear_selection_content (GdkDevice *gdk_device);
-
-#endif
-G_END_DECLS
+#undef __GDKWAYLAND_H_INSIDE__

 #endif /* __GDK_WAYLAND_H__ */
@@ -47,6 +47,9 @@ GType                   gdk_wayland_display_get_type            (void);
 struct wl_display      *gdk_wayland_display_get_wl_display      (GdkDisplay *display);
 struct wl_compositor   *gdk_wayland_display_get_wl_compositor   (GdkDisplay *display);
 struct wl_shell        *gdk_wayland_display_get_wl_shell        (GdkDisplay *display);
+void                    gdk_wayland_display_set_cursor_theme    (GdkDisplay  *display,
+                                                                 const gchar *theme,
+                                                                 gint         size);

 G_END_DECLS

@@ -0,0 +1,50 @@
+/* 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, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * 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/. 
+ */
+
+#ifndef __GDK_WAYLAND_DISPLAY_MANAGER_H__
+#define __GDK_WAYLAND_DISPLAY_MANAGER_H__
+
+#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkwayland.h> can be included directly."
+#endif
+
+#include <gdk/gdk.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GdkWaylandDisplayManager GdkWaylandDisplayManager;
+typedef struct _GdkWaylandDisplayManagerClass GdkWaylandDisplayManagerClass;
+
+#define GDK_TYPE_WAYLAND_DISPLAY_MANAGER              (gdk_wayland_display_manager_get_type())
+#define GDK_WAYLAND_DISPLAY_MANAGER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManager))
+#define GDK_WAYLAND_DISPLAY_MANAGER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManagerClass))
+#define GDK_IS_WAYLAND_DISPLAY_MANAGER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WAYLAND_DISPLAY_MANAGER))
+#define GDK_IS_WAYLAND_DISPLAY_MANAGER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WAYLAND_DISPLAY_MANAGER))
+#define GDK_WAYLAND_DISPLAY_MANAGER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManagerClass))
+
+GType      gdk_wayland_display_manager_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GDK_WAYLAND_DISPLAY_MANAGER_H__ */
@@ -0,0 +1,69 @@
+/* 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, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * 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/. 
+ */
+
+#ifndef __GDK_WAYLAND_SELECTION_H__
+#define __GDK_WAYLAND_SELECTION_H__
+
+#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkwayland.h> can be included directly."
+#endif
+
+#include <gdk/gdk.h>
+
+G_BEGIN_DECLS
+
+#if defined (GTK_COMPILATION) || defined (GDK_COMPILATION)
+#define gdk_wayland_device_get_selection_type_atoms gdk_wayland_device_get_selection_type_atoms_libgtk_only
+int
+gdk_wayland_device_get_selection_type_atoms (GdkDevice  *device,
+                                             GdkAtom   **atoms_out);
+
+typedef void (*GdkDeviceWaylandRequestContentCallback) (GdkDevice *device, const gchar *data, gsize len, gpointer userdata);
+
+#define gdk_wayland_device_request_selection_content gdk_wayland_device_request_selection_content_libgtk_only
+gboolean
+gdk_wayland_device_request_selection_content (GdkDevice                              *device,
+                                              const gchar                            *requested_mime_type,
+                                              GdkDeviceWaylandRequestContentCallback  cb,
+                                              gpointer                                userdata);
+
+typedef gchar *(*GdkDeviceWaylandOfferContentCallback) (GdkDevice *device, const gchar *mime_type, gssize *len, gpointer userdata);
+
+#define gdk_wayland_device_offer_selection_content gdk_wayland_device_offer_selection_content_libgtk_only
+gboolean
+gdk_wayland_device_offer_selection_content (GdkDevice                             *gdk_device,
+                                            const gchar                          **mime_types,
+                                            gint                                   nr_mime_types,
+                                            GdkDeviceWaylandOfferContentCallback   cb,
+                                            gpointer                               userdata);
+
+#define gdk_wayland_device_clear_selection_content gdk_wayland_device_clear_selection_content_libgtk_only
+gboolean
+gdk_wayland_device_clear_selection_content (GdkDevice *gdk_device);
+
+#endif
+
+G_END_DECLS
+
+#endif /* __GDK_WAYLAND_SELECTION_H__ */
@@ -47,6 +47,8 @@ GType                    gdk_wayland_window_get_type             (void);
 struct wl_surface       *gdk_wayland_window_get_wl_surface       (GdkWindow *window);
 struct wl_shell_surface *gdk_wayland_window_get_wl_shell_surface (GdkWindow *window);

+void                     gdk_wayland_window_set_use_custom_surface (GdkWindow *window);
+
 G_END_DECLS

 #endif /* __GDK_WAYLAND_WINDOW_H__ */
@@ -36,7 +36,6 @@
 #include <sys/mman.h>
 #include <errno.h>

-#include <wayland-egl.h>

 #define WINDOW_IS_TOPLEVEL_OR_FOREIGN(window) \
  (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&   \
@@ -96,8 +95,6 @@ struct _GdkWindowImplWayland

  GdkCursor *cursor;

-  gint8 toplevel_window_type;
-
  struct wl_surface *surface;
  struct wl_shell_surface *shell_surface;
  unsigned int mapped : 1;
@@ -115,6 +112,8 @@ struct _GdkWindowImplWayland
   */
  cairo_surface_t *server_surface;

+  gchar *title;
+
  uint32_t resize_edges;

  int focus_count;
@@ -135,7 +134,12 @@ struct _GdkWindowImplWayland
  guint32 grab_time;

  gboolean fullscreen;
-  int saved_width, saved_height; /* before going fullscreen */
+  struct
+    {
+      int width, height;
+    } saved_fullscreen, saved_maximized;
+
+  gboolean use_custom_surface;
 };

 struct _GdkWindowImplWaylandClass
@@ -148,7 +152,6 @@ G_DEFINE_TYPE (GdkWindowImplWayland, _gdk_window_impl_wayland, GDK_TYPE_WINDOW_I
 static void
 _gdk_window_impl_wayland_init (GdkWindowImplWayland *impl)
 {
-  impl->toplevel_window_type = -1;
 }

 void
@@ -282,6 +285,8 @@ _gdk_wayland_display_create_window_impl (GdkDisplay    *display,

  g_object_ref (window);

+  impl->title = NULL;
+
  switch (GDK_WINDOW_TYPE (window))
    {
    case GDK_WINDOW_TOPLEVEL:
@@ -381,7 +386,7 @@ gdk_wayland_cairo_surface_destroy (void *p)
 }


-static struct wl_shm_pool *
+struct wl_shm_pool *
 _create_shm_pool (struct wl_shm  *shm,
                  int             width,
                  int             height,
@@ -555,17 +560,15 @@ gdk_wayland_window_map (GdkWindow *window)
 {
  GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
  GdkWindowImplWayland *parent;
-  GdkWaylandDisplay *wayland_display =
-    GDK_WAYLAND_DISPLAY (gdk_window_get_display (window));
  GdkWindow *transient_for;

-  if (!impl->mapped)
+  if (!impl->mapped && !impl->use_custom_surface)
    {
      /* Popup menus can appear without a transient parent, which means they
       * cannot be positioned properly on Wayland. This attempts to guess the
       * surface they should be positioned with by finding the surface beneath
-       * the device that created the grab for the popup window */
-
+       * the device that created the grab for the popup window
+       */
      if (!impl->transient_for && impl->hint == GDK_WINDOW_TYPE_HINT_POPUP_MENU)
        {
          transient_for = gdk_device_get_window_at_position (impl->grab_device, NULL, NULL);
@@ -583,6 +586,7 @@ gdk_wayland_window_map (GdkWindow *window)
        {
          struct wl_seat *grab_input_seat = NULL;
          GdkWindowImplWayland *tmp_impl;
+          GdkWaylandDeviceData *device;

          parent = GDK_WINDOW_IMPL_WAYLAND (transient_for->impl);

@@ -608,10 +612,10 @@ gdk_wayland_window_map (GdkWindow *window)
               impl->hint == GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU ||
               impl->hint == GDK_WINDOW_TYPE_HINT_COMBO))
            {
-
+              device = wl_seat_get_user_data(grab_input_seat);
              wl_shell_surface_set_popup (impl->shell_surface,
                                          grab_input_seat,
-                                          _gdk_wayland_display_get_serial (wayland_display),
+                                          _gdk_wayland_device_get_button_press_serial(device),
                                          parent->surface,
                                          window->x, window->y, 0);
            }
@@ -704,15 +708,23 @@ gdk_wayland_window_show (GdkWindow *window, gboolean already_mapped)
      XSERVER_TIME_IS_LATER (display_wayland->user_time, impl->user_time))
    gdk_wayland_window_set_user_time (window, impl->user_time);

-  impl->surface = wl_compositor_create_surface(display_wayland->compositor);
-  wl_surface_set_user_data(impl->surface, window);
+  if (!impl->surface)
+    {
+      impl->surface = wl_compositor_create_surface(display_wayland->compositor);
+      wl_surface_set_user_data(impl->surface, window);
+    }

-  impl->shell_surface = wl_shell_get_shell_surface (display_wayland->shell,
-                                                    impl->surface);
-  wl_shell_surface_add_listener(impl->shell_surface,
-                                &shell_surface_listener, window);
+  if (!impl->shell_surface &&
+      !impl->use_custom_surface &&
+      display_wayland->shell)
+    {
+      impl->shell_surface = wl_shell_get_shell_surface (display_wayland->shell,
+                                                        impl->surface);
+      wl_shell_surface_add_listener(impl->shell_surface,
+                                    &shell_surface_listener, window);
+    }

-  gdk_window_set_type_hint (window, impl->hint);  
+  gdk_window_set_type_hint (window, impl->hint);

  _gdk_make_event (window, GDK_MAP, NULL, FALSE);
  event = _gdk_make_event (window, GDK_VISIBILITY_NOTIFY, NULL, FALSE);
@@ -720,6 +732,9 @@ gdk_wayland_window_show (GdkWindow *window, gboolean already_mapped)

  if (impl->cairo_surface)
    gdk_wayland_window_attach_image (window);
+
+  if (impl->shell_surface && impl->title)
+    wl_shell_surface_set_title (impl->shell_surface, impl->title);
 }

 static void
@@ -731,10 +746,17 @@ gdk_wayland_window_hide (GdkWindow *window)
    {
      if (impl->shell_surface)
        wl_shell_surface_destroy(impl->shell_surface);
-      if (impl->surface)
-        wl_surface_destroy(impl->surface);
+      if (impl->use_custom_surface)
+        {
+          wl_surface_attach (impl->surface, NULL, 0, 0);
+          wl_surface_commit (impl->surface);
+        }
+      else if (impl->surface)
+        {
+          wl_surface_destroy(impl->surface);
+          impl->surface = NULL;
+        }
      impl->shell_surface = NULL;
-      impl->surface = NULL;
      cairo_surface_destroy(impl->server_surface);
      impl->server_surface = NULL;
      impl->mapped = FALSE;
@@ -760,10 +782,17 @@ gdk_window_wayland_withdraw (GdkWindow *window)
        {
          if (impl->shell_surface)
            wl_shell_surface_destroy(impl->shell_surface);
-          if (impl->surface)
-            wl_surface_destroy(impl->surface);
+          if (impl->use_custom_surface)
+            {
+              wl_surface_attach (impl->surface, NULL, 0, 0);
+              wl_surface_commit (impl->surface);
+            }
+          else if (impl->surface)
+            {
+              wl_surface_destroy(impl->surface);
+              impl->surface = NULL;
+            }
          impl->shell_surface = NULL;
-          impl->surface = NULL;
          cairo_surface_destroy(impl->server_surface);
          impl->server_surface = NULL;
          impl->mapped = FALSE;
@@ -980,15 +1009,6 @@ gdk_wayland_window_queue_antiexpose (GdkWindow *window,
  return FALSE;
 }

-static void
-gdk_wayland_window_translate (GdkWindow      *window,
-			      cairo_region_t *area,
-			      gint            dx,
-			      gint            dy)
-{
-  _gdk_window_invalidate_for_expose (window, area);
-}
-
 static void
 gdk_wayland_window_destroy (GdkWindow *window,
 			    gboolean   recursing,
@@ -1151,10 +1171,15 @@ static void
 gdk_wayland_window_set_title (GdkWindow   *window,
 			      const gchar *title)
 {
+  GdkWindowImplWayland *impl;
  g_return_if_fail (title != NULL);

  if (GDK_WINDOW_DESTROYED (window))
    return;
+
+  impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
+
+  impl->title = strdup (title);
 }

 static void
@@ -1284,15 +1309,59 @@ gdk_wayland_window_unstick (GdkWindow *window)
 static void
 gdk_wayland_window_maximize (GdkWindow *window)
 {
-  if (GDK_WINDOW_DESTROYED (window))
+  GdkWindowImplWayland *impl;
+
+  if (GDK_WINDOW_DESTROYED (window) ||
+      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
    return;
+
+  impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
+
+  if (GDK_WINDOW_IS_MAPPED (window))
+    {
+      if (impl->surface)
+        {
+          impl->saved_maximized.width = gdk_window_get_width (window);
+          impl->saved_maximized.height = gdk_window_get_height (window);
+
+          if (impl->shell_surface)
+            wl_shell_surface_set_maximized (impl->shell_surface, NULL);
+        }
+
+      gdk_synthesize_window_state (window,
+                                   0,
+                                   GDK_WINDOW_STATE_MAXIMIZED);
+    }
 }

 static void
 gdk_wayland_window_unmaximize (GdkWindow *window)
 {
-  if (GDK_WINDOW_DESTROYED (window))
+  GdkWindowImplWayland *impl;
+
+  if (GDK_WINDOW_DESTROYED (window) ||
+      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
    return;
+
+  impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
+
+  if (GDK_WINDOW_IS_MAPPED (window))
+    {
+      if (impl->surface)
+        {
+          if (impl->shell_surface)
+            wl_shell_surface_set_toplevel (impl->shell_surface);
+        }
+
+      gdk_synthesize_window_state (window,
+                                   GDK_WINDOW_STATE_MAXIMIZED,
+                                   0);
+
+      gdk_wayland_window_configure (window,
+                                    impl->saved_maximized.width,
+                                    impl->saved_maximized.height,
+                                    0);
+    }
 }

 static void
@@ -1306,8 +1375,12 @@ gdk_wayland_window_fullscreen (GdkWindow *window)
  if (impl->fullscreen)
    return;

-  impl->saved_width = gdk_window_get_width (window);
-  impl->saved_height = gdk_window_get_height (window);
+  if (!impl->shell_surface)
+    return;
+
+  impl->saved_fullscreen.width = gdk_window_get_width (window);
+  impl->saved_fullscreen.height = gdk_window_get_height (window);
+    
  wl_shell_surface_set_fullscreen (impl->shell_surface,
                                   WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
                                   0,
@@ -1329,12 +1402,16 @@ gdk_wayland_window_unfullscreen (GdkWindow *window)
  if (!impl->fullscreen)
    return;

+  if (!impl->shell_surface)
+    return;
+
  wl_shell_surface_set_toplevel (impl->shell_surface);
  gdk_synthesize_window_state (window, GDK_WINDOW_STATE_FULLSCREEN, 0);
-  gdk_wayland_window_configure (window, impl->saved_width, impl->saved_height,
+  gdk_wayland_window_configure (window,
+                                impl->saved_fullscreen.width,
+                                impl->saved_fullscreen.height,
                                0);

-
  impl->fullscreen = FALSE;
 }

@@ -1456,6 +1533,9 @@ gdk_wayland_window_begin_resize_drag (GdkWindow     *window,

  impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);

+  if (!impl->shell_surface)
+    return;
+    
  wl_shell_surface_resize (impl->shell_surface,
                           gdk_wayland_device_get_wl_seat (device),
                           _gdk_wayland_display_get_serial (wayland_display),
@@ -1485,6 +1565,9 @@ gdk_wayland_window_begin_move_drag (GdkWindow *window,

  impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);

+  if (!impl->shell_surface)
+    return;
+
  wl_shell_surface_move (impl->shell_surface,
                         gdk_wayland_device_get_wl_seat (device),
                         _gdk_wayland_display_get_serial (wayland_display));
@@ -1634,7 +1717,6 @@ _gdk_window_impl_wayland_class_init (GdkWindowImplWaylandClass *klass)
  impl_class->input_shape_combine_region = gdk_window_wayland_input_shape_combine_region;
  impl_class->set_static_gravities = gdk_window_wayland_set_static_gravities;
  impl_class->queue_antiexpose = gdk_wayland_window_queue_antiexpose;
-  impl_class->translate = gdk_wayland_window_translate;
  impl_class->destroy = gdk_wayland_window_destroy;
  impl_class->destroy_foreign = gdk_window_wayland_destroy_foreign;
  impl_class->resize_cairo_surface = gdk_window_wayland_resize_cairo_surface;
@@ -1754,3 +1836,69 @@ gdk_wayland_window_get_wl_shell_surface (GdkWindow *window)

  return impl->shell_surface;
 }
+
+/**
+ * gdk_wayland_window_set_use_custom_surface:
+ * @window: (type GdkWaylandWindow): a #GdkWindow
+ *
+ * Marks a #GdkWindow as a custom Wayland surface. The application is
+ * expected to register the surface as some type of surface using
+ * some Wayland interface.
+ *
+ * Agood example would be writing a panel or on-screen-keyboard as an
+ * out-of-process helper - as opposed to having those in the compositor
+ * process. In this case the underlying surface isn't a wl_shell
+ * surface and the panel or OSK client need to identify the wl_surface
+ * as a panel or OSK to the compositor. The assumption is that the
+ * compositor will expose a private interface to the special client
+ * that lets the client identify the wl_surface as a panel or such.
+ *
+ * This function should be called before a #GdkWindow is shown. This is
+ * best done by connecting to the #GtkWidget::realized signal:
+ *
+ * <informalexample>
+ * <programlisting>
+ *   static void
+ *   widget_realize_cb (GtkWidget *widget)
+ *   {
+ *     GdkWindow *window;
+ *     struct wl_surface *surface;
+ *     struct input_panel_surface *ip_surface;
+ *
+ *     window = gtk_widget_get_window (widget);
+ *     gdk_wayland_window_set_custom_surface (window);
+ *
+ *     surface = gdk_wayland_window_get_wl_surface (window);
+ *     ip_surface = input_panel_get_input_panel_surface (input_panel, surface);
+ *     input_panel_surface_set_panel (ip_surface);
+ *   }
+ *
+ *   static void
+ *   setup_window (GtkWindow *window)
+ *   {
+ *     g_signal_connect (window, "realize", G_CALLBACK (widget_realize_cb), NULL);
+ *   }
+ * </programlisting>
+ * </informalexample>
+ *
+ * Since: 3.10
+ */
+void
+gdk_wayland_window_set_use_custom_surface (GdkWindow *window)
+{
+  GdkWindowImplWayland *impl;
+  GdkWaylandDisplay *display;
+
+  g_return_if_fail (GDK_IS_WAYLAND_WINDOW (window));
+
+  impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
+
+  if (!impl->surface)
+    {
+      display = GDK_WAYLAND_DISPLAY (gdk_window_get_display (window));
+      impl->surface = wl_compositor_create_surface (display->compositor);
+      wl_surface_set_user_data (impl->surface, window);
+    }
+
+  impl->use_custom_surface = TRUE;
+}
@@ -299,24 +299,6 @@ gdk_win32_display_get_name (GdkDisplay *display)
  return display_name_cache;
 }

-static gint
-gdk_win32_display_get_n_screens (GdkDisplay *display)
-{
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), 0);
-
-  return 1;
-}
-
-static GdkScreen *
-gdk_win32_display_get_screen (GdkDisplay *display,
-			      gint        screen_num)
-{
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-  g_return_val_if_fail (screen_num == 0, NULL);
-
-  return _gdk_screen;
-}
-
 static GdkScreen *
 gdk_win32_display_get_default_screen (GdkDisplay *display)
 {
@@ -663,8 +645,6 @@ gdk_win32_display_class_init (GdkWin32DisplayClass *klass)
  display_class->window_type = GDK_TYPE_WIN32_WINDOW;

  display_class->get_name = gdk_win32_display_get_name;
-  display_class->get_n_screens = gdk_win32_display_get_n_screens;
-  display_class->get_screen = gdk_win32_display_get_screen;
  display_class->get_default_screen = gdk_win32_display_get_default_screen;
  display_class->beep = gdk_win32_display_beep;
  display_class->sync = gdk_win32_display_sync;
@@ -45,41 +45,6 @@ gdk_win32_display_manager_open_display (GdkDisplayManager *manager,
  return _gdk_win32_display_open (name);
 }

-static GSList *
-gdk_win32_display_manager_list_displays (GdkDisplayManager *manager)
-{
-  return g_slist_append (NULL, gdk_display_get_default ());
-}
-
-static GdkDisplay *
-gdk_win32_display_manager_get_default_display (GdkDisplayManager *manager)
-{
-  return _gdk_win32_display_open (NULL);
-}
-
-static void
-gdk_win32_display_manager_set_default_display (GdkDisplayManager *manager,
-                                               GdkDisplay        *display)
-{
-  g_assert (gdk_display_get_default () == display);
-}
-
-#include "../gdkkeynames.c"
-
-static gchar *
-gdk_win32_display_manager_get_keyval_name (GdkDisplayManager *manager,
-                                           guint              keyval)
-{
-  return _gdk_keyval_name (keyval);
-}
-
-static guint
-gdk_win32_display_manager_lookup_keyval (GdkDisplayManager *manager,
-                                         const gchar       *name)
-{
-  return _gdk_keyval_from_name (name);
-}
-
 static void
 gdk_win32_display_manager_init (GdkWin32DisplayManager *manager)
 {
@@ -109,11 +74,8 @@ gdk_win32_display_manager_class_init (GdkWin32DisplayManagerClass *class)
  object_class->finalize = gdk_win32_display_manager_finalize;

  manager_class->open_display = gdk_win32_display_manager_open_display;
-  manager_class->list_displays = gdk_win32_display_manager_list_displays;
-  manager_class->set_default_display = gdk_win32_display_manager_set_default_display;
-  manager_class->get_default_display = gdk_win32_display_manager_get_default_display;
+#if 0
  manager_class->atom_intern = _gdk_win32_display_manager_atom_intern;
  manager_class->get_atom_name = _gdk_win32_display_manager_get_atom_name;
-  manager_class->lookup_keyval = gdk_win32_display_manager_lookup_keyval;
-  manager_class->get_keyval_name = gdk_win32_display_manager_get_keyval_name;
+#endif
 }
@@ -147,16 +147,6 @@ gdk_win32_screen_get_number (GdkScreen *screen)
  return 0;
 }

-gchar *
-_gdk_windowing_substitute_screen_number (const gchar *display_name,
-					 int          screen_number)
-{
-  if (screen_number != 0)
-    return NULL;
-
-  return g_strdup (display_name);
-}
-
 static gchar *
 gdk_win32_screen_make_display_name (GdkScreen *screen)
 {
@@ -3319,80 +3319,6 @@ _gdk_win32_window_queue_antiexpose (GdkWindow *window,
  return FALSE;
 }

-/* Gets called from gdwindow.c(do_move_region_bits_on_impl)
- * and got tested with testgtk::big_window. Given the previous,
- * untested implementation this one looks much too simple ;)
- */
-static void
-_gdk_win32_window_translate (GdkWindow *window,
-                             cairo_region_t *area, /* In impl window coords */
-                             gint       dx,
-                             gint       dy)
-{
-  GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
-  GdkRectangle extents;
-  RECT rect;
-  HRGN hrgn, area_hrgn;
-  HDC hdc;
-  int ret;
-
-  /* Note: This is the destination area, not the source, and
-     it has been moved by dx, dy from the source area */
-  area_hrgn = cairo_region_to_hrgn (area, 0, 0);
-
-  /* First we copy any outstanding invalid areas in the 
-     source area to the new position in the destination area */
-  hrgn = CreateRectRgn (0, 0, 0, 0);
-  ret = GetUpdateRgn (GDK_WINDOW_HWND (window), hrgn, FALSE);
-  if (ret == ERROR)
-    WIN32_API_FAILED ("GetUpdateRgn");
-  else if (ret != NULLREGION)
-    {
-      /* Convert the source invalid region as it would be copied */
-      OffsetRgn (hrgn, dx, dy);
-      /* Keep what intersects the copy destination area */
-      ret = CombineRgn (hrgn, hrgn, area_hrgn, RGN_AND);
-      /* And invalidate it */
-      if (ret == ERROR)
-        WIN32_API_FAILED ("CombineRgn");
-      else if (ret != NULLREGION)
-	API_CALL (InvalidateRgn, (GDK_WINDOW_HWND (window), hrgn, TRUE));
-    }
-
-  /* Then we copy the bits, invalidating whatever is copied from
-     otherwise invisible areas */
-
-  hdc = _gdk_win32_impl_acquire_dc (impl);
-
-  /* Clip hdc to target region */
-  API_CALL (SelectClipRgn, (hdc, area_hrgn));
-
-  cairo_region_get_extents (area, &extents);
-
-  rect.left = MIN (extents.x, extents.x - dx);
-  rect.top = MIN (extents.y, extents.y - dy);
-  rect.right = MAX (extents.x + extents.width, extents.x - dx  + extents.width);
-  rect.bottom = MAX (extents.y + extents.height, extents.y - dy  + extents.height);
-
-  SetRectRgn (hrgn, 0, 0, 0, 0);
-
-  if (!ScrollDC (hdc, dx, dy, &rect, NULL, hrgn, NULL))
-    WIN32_GDI_FAILED ("ScrollDC");
-  else if (!InvalidateRgn (GDK_WINDOW_HWND (window), hrgn, FALSE))
-    WIN32_GDI_FAILED ("InvalidateRgn");
-
-  /* Unset hdc clip region */
-  API_CALL (SelectClipRgn, (hdc, NULL));
-
-  _gdk_win32_impl_release_dc (impl);
-
-  if (!DeleteObject (hrgn))
-    WIN32_GDI_FAILED ("DeleteObject");
-
-  if (!DeleteObject (area_hrgn))
-    WIN32_GDI_FAILED ("DeleteObject");
-}
-
 static void
 gdk_win32_input_shape_combine_region (GdkWindow *window,
 				      const cairo_region_t *shape_region,
@@ -3559,7 +3485,6 @@ gdk_window_impl_win32_class_init (GdkWindowImplWin32Class *klass)
  impl_class->input_shape_combine_region = gdk_win32_input_shape_combine_region;
  impl_class->set_static_gravities = gdk_win32_window_set_static_gravities;
  impl_class->queue_antiexpose = _gdk_win32_window_queue_antiexpose;
-  impl_class->translate = _gdk_win32_window_translate;
  impl_class->destroy = gdk_win32_window_destroy;
  impl_class->destroy_foreign = gdk_win32_window_destroy_foreign;
  impl_class->resize_cairo_surface = gdk_win32_window_resize_cairo_surface;
@@ -450,7 +450,7 @@ gdk_x11_device_core_window_at_position (GdkDevice       *device,
    }
  else
    {
-      gint i, screens, width, height;
+      gint width, height;
      GList *toplevels, *list;
      Window pointer_window, root, child;
      int rootx = -1, rooty = -1;
@@ -459,59 +459,52 @@ gdk_x11_device_core_window_at_position (GdkDevice       *device,

      /* FIXME: untrusted clients case not multidevice-safe */
      pointer_window = None;
-      screens = gdk_display_get_n_screens (display);
-
-      for (i = 0; i < screens; ++i)
+      screen = gdk_display_get_screen (display, 0);
+      toplevels = gdk_screen_get_toplevel_windows (screen);
+      for (list = toplevels; list != NULL; list = g_list_next (list))
        {
-          screen = gdk_display_get_screen (display, i);
-          toplevels = gdk_screen_get_toplevel_windows (screen);
-          for (list = toplevels; list != NULL; list = g_list_next (list))
+          window = GDK_WINDOW (list->data);
+          xwindow = GDK_WINDOW_XID (window);
+          gdk_x11_display_error_trap_push (display);
+          XQueryPointer (xdisplay, xwindow,
+                         &root, &child,
+                         &rootx, &rooty,
+                         &winx, &winy,
+                         &xmask);
+          if (gdk_x11_display_error_trap_pop (display))
+            continue;
+          if (child != None)
            {
-              window = GDK_WINDOW (list->data);
-              xwindow = GDK_WINDOW_XID (window);
-              gdk_x11_display_error_trap_push (display);
+              pointer_window = child;
+              break;
+            }
+          gdk_window_get_geometry (window, NULL, NULL, &width, &height);
+          if (winx >= 0 && winy >= 0 && winx < width && winy < height)
+            {
+              /* A childless toplevel, or below another window? */
+              XSetWindowAttributes attributes;
+              Window w;
+
+              w = XCreateWindow (xdisplay, xwindow, winx, winy, 1, 1, 0,
+                                 CopyFromParent, InputOnly, CopyFromParent,
+                                 0, &attributes);
+              XMapWindow (xdisplay, w);
              XQueryPointer (xdisplay, xwindow,
                             &root, &child,
                             &rootx, &rooty,
                             &winx, &winy,
                             &xmask);
-              if (gdk_x11_display_error_trap_pop (display))
-                continue;
-              if (child != None)
+              XDestroyWindow (xdisplay, w);
+              if (child == w)
                {
-                  pointer_window = child;
+                  pointer_window = xwindow;
                  break;
                }
-              gdk_window_get_geometry (window, NULL, NULL, &width, &height);
-              if (winx >= 0 && winy >= 0 && winx < width && winy < height)
-                {
-                  /* A childless toplevel, or below another window? */
-                  XSetWindowAttributes attributes;
-                  Window w;
-
-                  w = XCreateWindow (xdisplay, xwindow, winx, winy, 1, 1, 0,
-                                     CopyFromParent, InputOnly, CopyFromParent,
-                                     0, &attributes);
-                  XMapWindow (xdisplay, w);
-                  XQueryPointer (xdisplay, xwindow,
-                                 &root, &child,
-                                 &rootx, &rooty,
-                                 &winx, &winy,
-                                 &xmask);
-                  XDestroyWindow (xdisplay, w);
-                  if (child == w)
-                    {
-                      pointer_window = xwindow;
-                      break;
-                    }
-                }
            }
-
-          g_list_free (toplevels);
-          if (pointer_window != None)
-            break;
        }

+      g_list_free (toplevels);
+
      xwindow = pointer_window;
    }

@@ -512,27 +512,53 @@ gdk_x11_device_xi2_window_at_position (GdkDevice       *device,
    }
  else
    {
-      gint i, screens, width, height;
+      gint width, height;
      GList *toplevels, *list;
      Window pointer_window, root, child;

      /* FIXME: untrusted clients case not multidevice-safe */
      pointer_window = None;
-      screens = gdk_display_get_n_screens (display);

-      for (i = 0; i < screens; ++i)
+      screen = gdk_display_get_screen (display, 0);
+      toplevels = gdk_screen_get_toplevel_windows (screen);
+      for (list = toplevels; list != NULL; list = g_list_next (list))
        {
-          screen = gdk_display_get_screen (display, i);
-          toplevels = gdk_screen_get_toplevel_windows (screen);
-          for (list = toplevels; list != NULL; list = g_list_next (list))
+          window = GDK_WINDOW (list->data);
+          xwindow = GDK_WINDOW_XID (window);
+
+          /* Free previous button mask, if any */
+          g_free (button_state.mask);
+
+          gdk_x11_display_error_trap_push (display);
+          XIQueryPointer (xdisplay,
+                          device_xi2->device_id,
+                          xwindow,
+                          &root, &child,
+                          &xroot_x, &xroot_y,
+                          &xwin_x, &xwin_y,
+                          &button_state,
+                          &mod_state,
+                          &group_state);
+          if (gdk_x11_display_error_trap_pop (display))
+            continue;
+          if (child != None)
            {
-              window = GDK_WINDOW (list->data);
-              xwindow = GDK_WINDOW_XID (window);
+              pointer_window = child;
+              break;
+            }
+          gdk_window_get_geometry (window, NULL, NULL, &width, &height);
+          if (xwin_x >= 0 && xwin_y >= 0 && xwin_x < width && xwin_y < height)
+            {
+              /* A childless toplevel, or below another window? */
+              XSetWindowAttributes attributes;
+              Window w;

-              /* Free previous button mask, if any */
-              g_free (button_state.mask);
+              free (button_state.mask);

-              gdk_x11_display_error_trap_push (display);
+              w = XCreateWindow (xdisplay, xwindow, (int)xwin_x, (int)xwin_y, 1, 1, 0,
+                                 CopyFromParent, InputOnly, CopyFromParent,
+                                 0, &attributes);
+              XMapWindow (xdisplay, w);
              XIQueryPointer (xdisplay,
                              device_xi2->device_id,
                              xwindow,
@@ -542,42 +568,12 @@ gdk_x11_device_xi2_window_at_position (GdkDevice       *device,
                              &button_state,
                              &mod_state,
                              &group_state);
-              if (gdk_x11_display_error_trap_pop (display))
-                continue;
-              if (child != None)
+              XDestroyWindow (xdisplay, w);
+              if (child == w)
                {
-                  pointer_window = child;
+                  pointer_window = xwindow;
                  break;
                }
-              gdk_window_get_geometry (window, NULL, NULL, &width, &height);
-              if (xwin_x >= 0 && xwin_y >= 0 && xwin_x < width && xwin_y < height)
-                {
-                  /* A childless toplevel, or below another window? */
-                  XSetWindowAttributes attributes;
-                  Window w;
-
-                  free (button_state.mask);
-
-                  w = XCreateWindow (xdisplay, xwindow, (int)xwin_x, (int)xwin_y, 1, 1, 0,
-                                     CopyFromParent, InputOnly, CopyFromParent,
-                                     0, &attributes);
-                  XMapWindow (xdisplay, w);
-                  XIQueryPointer (xdisplay,
-                                  device_xi2->device_id,
-                                  xwindow,
-                                  &root, &child,
-                                  &xroot_x, &xroot_y,
-                                  &xwin_x, &xwin_y,
-                                  &button_state,
-                                  &mod_state,
-                                  &group_state);
-                  XDestroyWindow (xdisplay, w);
-                  if (child == w)
-                    {
-                      pointer_window = xwindow;
-                      break;
-                    }
-                }
            }

          g_list_free (toplevels);
@@ -491,8 +491,6 @@ gdk_x11_device_manager_xi2_constructed (GObject *object)
  XIEventMask event_mask;
  unsigned char mask[2] = { 0 };

-  G_OBJECT_CLASS (gdk_x11_device_manager_xi2_parent_class)->constructed (object);
-
  device_manager = GDK_X11_DEVICE_MANAGER_XI2 (object);
  display = gdk_device_manager_get_display (GDK_DEVICE_MANAGER (object));
  xdisplay = GDK_DISPLAY_XDISPLAY (display);
@@ -1410,11 +1408,11 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
        GdkDevice *source_device;

        GDK_NOTE(EVENTS,
-                 g_message ("touch %s:\twindow %ld\n\ttouch id: %u\n\tpointer emulating: %d",
+                 g_message ("touch %s:\twindow %ld\n\ttouch id: %u\n\tpointer emulating: %s",
                            ev->evtype == XI_TouchBegin ? "begin" : "end",
                            xev->event,
                            xev->detail,
-                            xev->flags & XITouchEmulatingPointer));
+                            xev->flags & XITouchEmulatingPointer ? "true" : "false"));

        if (ev->evtype == XI_TouchBegin)
          event->touch.type = GDK_TOUCH_BEGIN;
@@ -1483,10 +1481,10 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
        GdkDevice *source_device;

        GDK_NOTE(EVENTS,
-                 g_message ("touch update:\twindow %ld\n\ttouch id: %u\n\tpointer emulating: %d",
+                 g_message ("touch update:\twindow %ld\n\ttouch id: %u\n\tpointer emulating: %s",
                            xev->event,
                            xev->detail,
-                            xev->flags & XITouchEmulatingPointer));
+                            xev->flags & XITouchEmulatingPointer ? "true" : "false"));

        event->touch.window = window;
        event->touch.sequence = GUINT_TO_POINTER (xev->detail);
@@ -1558,23 +1556,18 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
                                             GUINT_TO_POINTER (xev->sourceid));
        gdk_event_set_source_device (event, source_device);

-        if (ev->evtype == XI_Enter &&
-            xev->detail != XINotifyInferior && xev->mode != XINotifyPassiveUngrab &&
-	    gdk_window_get_window_type (window) == GDK_WINDOW_TOPLEVEL)
+	if (gdk_device_get_device_type (source_device) != GDK_DEVICE_TYPE_MASTER)
+          _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (source_device));
+        else
          {
-            if (gdk_device_get_device_type (source_device) != GDK_DEVICE_TYPE_MASTER)
-              _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (source_device));
-            else
-              {
-                GList *slaves, *l;
+            GList *slaves, *l;

-                slaves = gdk_device_list_slave_devices (source_device);
+            slaves = gdk_device_list_slave_devices (source_device);

-                for (l = slaves; l; l = l->next)
-                  _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (l->data));
+            for (l = slaves; l; l = l->next)
+              _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (l->data));

-                g_list_free (slaves);
-              }
+            g_list_free (slaves);
          }

        event->crossing.mode = translate_crossing_mode (xev->mode);
@@ -176,8 +176,6 @@ G_DEFINE_TYPE_WITH_CODE (GdkX11Display, gdk_x11_display, GDK_TYPE_DISPLAY,
 static void
 gdk_x11_display_init (GdkX11Display *display)
 {
-  _gdk_x11_display_manager_add_display (gdk_display_manager_get (),
-                                        GDK_DISPLAY (display));
 }

 static void
@@ -488,27 +486,21 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,

  if (xevent->type == DestroyNotify && !is_substructure)
    {
-      int i, n;
+      screen = GDK_X11_DISPLAY (display)->screen;
+      x11_screen = GDK_X11_SCREEN (screen);

-      n = gdk_display_get_n_screens (display);
-      for (i = 0; i < n; i++)
+      if (x11_screen->wmspec_check_window == xevent->xdestroywindow.window)
        {
-          screen = gdk_display_get_screen (display, i);
-          x11_screen = GDK_X11_SCREEN (screen);
+          x11_screen->wmspec_check_window = None;
+          x11_screen->last_wmspec_check_time = 0;
+          g_free (x11_screen->window_manager_name);
+          x11_screen->window_manager_name = g_strdup ("unknown");

-          if (x11_screen->wmspec_check_window == xevent->xdestroywindow.window)
-            {
-              x11_screen->wmspec_check_window = None;
-              x11_screen->last_wmspec_check_time = 0;
-              g_free (x11_screen->window_manager_name);
-              x11_screen->window_manager_name = g_strdup ("unknown");
+          /* careful, reentrancy */
+          _gdk_x11_screen_window_manager_changed (screen);

-              /* careful, reentrancy */
-              _gdk_x11_screen_window_manager_changed (screen);
-
-              return_val = FALSE;
-              goto done;
-            }
+          return_val = FALSE;
+          goto done;
        }
    }

@@ -1356,7 +1348,6 @@ _gdk_x11_display_open (const gchar *display_name)

  XClassHint *class_hint;
  gulong pid;
-  gint i;
  gint ignore;
  gint maj, min;

@@ -1396,18 +1387,12 @@ _gdk_x11_display_open (const gchar *display_name)
 #endif

  /* initialize the display's screens */ 
-  display_x11->screens = g_new (GdkScreen *, ScreenCount (display_x11->xdisplay));
-  for (i = 0; i < ScreenCount (display_x11->xdisplay); i++)
-    display_x11->screens[i] = _gdk_x11_screen_new (display, i);
+  display_x11->screen = _gdk_x11_screen_new (display, DefaultScreen (display_x11->xdisplay));

  /* We need to initialize events after we have the screen
   * structures in places
   */
-  for (i = 0; i < ScreenCount (display_x11->xdisplay); i++)
-    _gdk_x11_xsettings_init (GDK_X11_SCREEN (display_x11->screens[i]));
-
-  /*set the default screen */
-  display_x11->default_screen = display_x11->screens[DefaultScreen (display_x11->xdisplay)];
+  _gdk_x11_xsettings_init (GDK_X11_SCREEN (display_x11->screen));

  display->device_manager = _gdk_x11_device_manager_new (display);

@@ -1421,7 +1406,7 @@ _gdk_x11_display_open (const gchar *display_name)
  attr.height = 10;
  attr.event_mask = 0;

-  display_x11->leader_gdk_window = gdk_window_new (GDK_X11_SCREEN (display_x11->default_screen)->root_window, 
+  display_x11->leader_gdk_window = gdk_window_new (GDK_X11_SCREEN (display_x11->screen)->root_window, 
 						   &attr, GDK_WA_X | GDK_WA_Y);
  (_gdk_x11_window_get_toplevel (display_x11->leader_gdk_window))->is_leader = TRUE;

@@ -1497,7 +1482,7 @@ _gdk_x11_display_open (const gchar *display_name)

    gdk_x11_display_error_trap_push (display);
    XQueryPointer (display_x11->xdisplay,
-		   GDK_X11_SCREEN (display_x11->default_screen)->xroot_window,
+		   GDK_X11_SCREEN (display_x11->screen)->xroot_window,
 		   &root, &child, &rootx, &rooty, &winx, &winy, &xmask);
    if (G_UNLIKELY (gdk_x11_display_error_trap_pop (display) == BadWindow))
      {
@@ -1595,8 +1580,7 @@ _gdk_x11_display_open (const gchar *display_name)

  gdk_x11_display_init_input (display);

-  for (i = 0; i < ScreenCount (display_x11->xdisplay); i++)
-    _gdk_x11_screen_setup (display_x11->screens[i]);
+  _gdk_x11_screen_setup (display_x11->screen);

  g_signal_emit_by_name (display, "opened");

@@ -1688,25 +1672,10 @@ gdk_x11_display_get_name (GdkDisplay *display)
  return (gchar *) DisplayString (GDK_X11_DISPLAY (display)->xdisplay);
 }

-static gint
-gdk_x11_display_get_n_screens (GdkDisplay *display)
-{
-  return ScreenCount (GDK_X11_DISPLAY (display)->xdisplay);
-}
-
-static GdkScreen *
-gdk_x11_display_get_screen (GdkDisplay *display,
-			    gint        screen_num)
-{
-  g_return_val_if_fail (ScreenCount (GDK_X11_DISPLAY (display)->xdisplay) > screen_num, NULL);
-
-  return GDK_X11_DISPLAY (display)->screens[screen_num];
-}
-
 static GdkScreen *
 gdk_x11_display_get_default_screen (GdkDisplay *display)
 {
-  return GDK_X11_DISPLAY (display)->default_screen;
+  return GDK_X11_DISPLAY (display)->screen;
 }

 gboolean
@@ -1714,16 +1683,10 @@ _gdk_x11_display_is_root_window (GdkDisplay *display,
 				 Window      xroot_window)
 {
  GdkX11Display *display_x11;
-  gint i;

  display_x11 = GDK_X11_DISPLAY (display);

-  for (i = 0; i < ScreenCount (display_x11->xdisplay); i++)
-    {
-      if (GDK_SCREEN_XROOTWIN (display_x11->screens[i]) == xroot_window)
-	return TRUE;
-    }
-  return FALSE;
+  return GDK_SCREEN_XROOTWIN (display_x11->screen) == xroot_window;
 }

 struct XPointerUngrabInfo {
@@ -1741,8 +1704,7 @@ device_grab_update_callback (GdkDisplay *display,

  pointer_info = _gdk_display_get_pointer_info (display, device);
  _gdk_display_device_grab_update (display, device,
-                                   pointer_info->last_slave ? pointer_info->last_slave : device,
-                                   serial);
+                                   pointer_info->last_slave, serial);
 }

 #define XSERVER_TIME_IS_LATER(time1, time2)                        \
@@ -1872,16 +1834,11 @@ gdk_x11_display_ungrab (GdkDisplay *display)
 static void
 gdk_x11_display_dispose (GObject *object)
 {
-  GdkDisplay *display = GDK_DISPLAY (object);
  GdkX11Display *display_x11 = GDK_X11_DISPLAY (object);
-  gint           i;
-
-  _gdk_x11_display_manager_remove_display (gdk_display_manager_get (), display);

  g_list_foreach (display_x11->input_devices, (GFunc) g_object_run_dispose, NULL);

-  for (i = 0; i < ScreenCount (display_x11->xdisplay); i++)
-    _gdk_screen_close (display_x11->screens[i]);
+  _gdk_screen_close (display_x11->screen);

  if (display_x11->event_source)
    {
@@ -1934,9 +1891,7 @@ gdk_x11_display_finalize (GObject *object)
  g_list_free_full (display_x11->input_windows, g_free);

  /* Free all GdkScreens */
-  for (i = 0; i < ScreenCount (display_x11->xdisplay); i++)
-    g_object_unref (display_x11->screens[i]);
-  g_free (display_x11->screens);
+  g_object_unref (display_x11->screen);

  g_free (display_x11->startup_notification_id);

@@ -2012,14 +1967,10 @@ GdkScreen *
 _gdk_x11_display_screen_for_xrootwin (GdkDisplay *display,
 				      Window      xrootwin)
 {
-  gint i;
+  GdkScreen *screen = gdk_display_get_default_screen (display);

-  for (i = 0; i < ScreenCount (GDK_X11_DISPLAY (display)->xdisplay); i++)
-    {
-      GdkScreen *screen = gdk_display_get_screen (display, i);
-      if (GDK_SCREEN_XROOTWIN (screen) == xrootwin)
-	return screen;
-    }
+  if (GDK_SCREEN_XROOTWIN (screen) == xrootwin)
+    return screen;

  return NULL;
 }
@@ -2041,8 +1992,8 @@ gdk_x11_display_get_xdisplay (GdkDisplay *display)
  return GDK_X11_DISPLAY (display)->xdisplay;
 }

-void
-_gdk_x11_display_make_default (GdkDisplay *display)
+static void
+gdk_x11_display_make_default (GdkDisplay *display)
 {
  GdkX11Display *display_x11 = GDK_X11_DISPLAY (display);
  const gchar *startup_id;
@@ -2831,12 +2782,11 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
  display_class->window_type = GDK_TYPE_X11_WINDOW;

  display_class->get_name = gdk_x11_display_get_name;
-  display_class->get_n_screens = gdk_x11_display_get_n_screens;
-  display_class->get_screen = gdk_x11_display_get_screen;
  display_class->get_default_screen = gdk_x11_display_get_default_screen;
  display_class->beep = gdk_x11_display_beep;
  display_class->sync = gdk_x11_display_sync;
  display_class->flush = gdk_x11_display_flush;
+  display_class->make_default = gdk_x11_display_make_default;
  display_class->has_pending = gdk_x11_display_has_pending;
  display_class->queue_events = _gdk_x11_display_queue_events;
  display_class->get_default_group = gdk_x11_display_get_default_group;
@@ -38,8 +38,7 @@ struct _GdkX11Display
 {
  GdkDisplay parent_instance;
  Display *xdisplay;
-  GdkScreen *default_screen;
-  GdkScreen **screens;
+  GdkScreen *screen;

  GSource *event_source;

@@ -32,8 +32,7 @@ struct _GdkX11DisplayManager
 {
  GdkDisplayManager parent;

-  GdkDisplay *default_display;
-  GSList *displays;
+  gboolean init_failed;
 };

 struct _GdkX11DisplayManagerClass
@@ -41,19 +40,48 @@ struct _GdkX11DisplayManagerClass
  GdkDisplayManagerClass parent_class;
 };

-G_DEFINE_TYPE (GdkX11DisplayManager, gdk_x11_display_manager, GDK_TYPE_DISPLAY_MANAGER)
+static void g_initable_iface_init (GInitableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (GdkX11DisplayManager, gdk_x11_display_manager, GDK_TYPE_DISPLAY_MANAGER,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, g_initable_iface_init))
+
+static gboolean
+gdk_x11_display_manager_initable_init (GInitable     *initable,
+                                       GCancellable  *cancellable,
+                                       GError       **error)
+{
+  Display *display;
+
+  /* check that a connection to the default display is possible */
+  display = XOpenDisplay (gdk_get_display_arg_name ());
+  if (!display)
+    {
+      GDK_X11_DISPLAY_MANAGER (initable)->init_failed = TRUE;
+      return FALSE;
+    }
+
+  XCloseDisplay (display);
+
+  return TRUE;
+}
+
+void
+g_initable_iface_init (GInitableIface *iface)
+{
+  iface->init = gdk_x11_display_manager_initable_init;
+}
+

 static GdkDisplay *
 gdk_x11_display_manager_open_display (GdkDisplayManager *manager,
                                      const gchar       *name)
 {
-  GdkX11DisplayManager *manager_x11 = GDK_X11_DISPLAY_MANAGER (manager);
  GdkDisplay *display;

  display = _gdk_x11_display_open (name);
  if (display != NULL)
    {
-      if (manager_x11->default_display == NULL)
+      if (gdk_display_manager_get_default_display (manager) == NULL)
        gdk_display_manager_set_default_display (manager, display);

      g_signal_emit_by_name (manager, "display-opened", display);
@@ -62,28 +90,6 @@ gdk_x11_display_manager_open_display (GdkDisplayManager *manager,
  return display;
 }

-static GSList *
-gdk_x11_display_manager_list_displays (GdkDisplayManager *manager)
-{
-  return g_slist_copy (GDK_X11_DISPLAY_MANAGER (manager)->displays);
-}
-
-static GdkDisplay *
-gdk_x11_display_manager_get_default_display (GdkDisplayManager *manager)
-{
-  return GDK_X11_DISPLAY_MANAGER (manager)->default_display;
-}
-
-static void
-gdk_x11_display_manager_set_default_display (GdkDisplayManager *manager,
-                                             GdkDisplay        *display)
-{
-  GDK_X11_DISPLAY_MANAGER (manager)->default_display = display;
-
-  if (display)
-    _gdk_x11_display_make_default (display);
-}
-
 static void
 gdk_x11_display_manager_init (GdkX11DisplayManager *manager)
 {
@@ -93,7 +99,8 @@ gdk_x11_display_manager_init (GdkX11DisplayManager *manager)
 static void
 gdk_x11_display_manager_finalize (GObject *object)
 {
-  g_error ("A GdkX11DisplayManager object was finalized. This should not happen");
+  if (GDK_X11_DISPLAY_MANAGER (object)->init_failed == FALSE)
+    g_error ("A GdkX11DisplayManager object was finalized. This should not happen");
  G_OBJECT_CLASS (gdk_x11_display_manager_parent_class)->finalize (object);
 }

@@ -106,38 +113,4 @@ gdk_x11_display_manager_class_init (GdkX11DisplayManagerClass *class)
  object_class->finalize = gdk_x11_display_manager_finalize;

  manager_class->open_display = gdk_x11_display_manager_open_display;
-  manager_class->list_displays = gdk_x11_display_manager_list_displays;
-  manager_class->set_default_display = gdk_x11_display_manager_set_default_display;
-  manager_class->get_default_display = gdk_x11_display_manager_get_default_display;
-  manager_class->atom_intern = _gdk_x11_display_manager_atom_intern;
-  manager_class->get_atom_name = _gdk_x11_display_manager_get_atom_name;
-  manager_class->lookup_keyval = _gdk_x11_display_manager_lookup_keyval;
-  manager_class->get_keyval_name = _gdk_x11_display_manager_get_keyval_name;
-  manager_class->keyval_convert_case = _gdk_x11_display_manager_keyval_convert_case;
-}
-
-void
-_gdk_x11_display_manager_add_display (GdkDisplayManager *manager,
-                                      GdkDisplay        *display)
-{
-  GdkX11DisplayManager *manager_x11 = GDK_X11_DISPLAY_MANAGER (manager);
-
-  manager_x11->displays = g_slist_prepend (manager_x11->displays, display);
-}
-
-void
-_gdk_x11_display_manager_remove_display (GdkDisplayManager *manager,
-                                         GdkDisplay        *display)
-{
-  GdkX11DisplayManager *manager_x11 = GDK_X11_DISPLAY_MANAGER (manager);
-
-  manager_x11->displays = g_slist_remove (manager_x11->displays, display);
-
-  if (manager_x11->default_display == display)
-    {
-      if (manager_x11->displays)
-        gdk_display_manager_set_default_display (manager, manager_x11->displays->data);
-      else
-        gdk_display_manager_set_default_display (manager, NULL);
-    }
 }
@@ -28,26 +28,11 @@
 typedef struct _GdkWindowQueueItem GdkWindowQueueItem;
 typedef struct _GdkWindowParentPos GdkWindowParentPos;

-typedef enum {
-  GDK_WINDOW_QUEUE_TRANSLATE,
-  GDK_WINDOW_QUEUE_ANTIEXPOSE
-} GdkWindowQueueType;
-
 struct _GdkWindowQueueItem
 {
  GdkWindow *window;
  gulong serial;
-  GdkWindowQueueType type;
-  union {
-    struct {
-      cairo_region_t *area;
-      gint dx;
-      gint dy;
-    } translate;
-    struct {
-      cairo_region_t *area;
-    } antiexpose;
-  } u;
+  cairo_region_t *antiexpose_area;
 };

 void
@@ -140,14 +125,7 @@ queue_item_free (GdkWindowQueueItem *item)
 				    (gpointer *)&(item->window));
    }
  
-  if (item->type == GDK_WINDOW_QUEUE_ANTIEXPOSE)
-    cairo_region_destroy (item->u.antiexpose.area);
-  else
-    {
-      if (item->u.translate.area)
-	cairo_region_destroy (item->u.translate.area);
-    }
-  
+  cairo_region_destroy (item->antiexpose_area);
  g_free (item);
 }

@@ -213,11 +191,8 @@ gdk_window_queue (GdkWindow          *window,
 	  GdkWindowQueueItem *item = tmp_list->data;
 	  GList *next = tmp_list->next;
 	  
-	  if (item->type == GDK_WINDOW_QUEUE_ANTIEXPOSE)
-	    {
-	      queue_delete_link (display_x11->translate_queue, tmp_list);
-	      queue_item_free (item);
-	    }
+	  queue_delete_link (display_x11->translate_queue, tmp_list);
+	  queue_item_free (item);

 	  tmp_list = next;
 	}
@@ -232,86 +207,12 @@ gdk_window_queue (GdkWindow          *window,
  g_queue_push_tail (display_x11->translate_queue, item);
 }

-static GC
-_get_scratch_gc (GdkWindow *window, cairo_region_t *clip_region)
-{
-  GdkX11Screen *screen;
-  XRectangle *rectangles;
-  gint n_rects;
-  gint depth;
-
-  screen = GDK_X11_SCREEN (gdk_window_get_screen (window));
-  depth = gdk_visual_get_depth (gdk_window_get_visual (window)) - 1;
-
-  if (!screen->subwindow_gcs[depth])
-    {
-      XGCValues values;
-      
-      values.graphics_exposures = True;
-      values.subwindow_mode = IncludeInferiors;
-      
-      screen->subwindow_gcs[depth] = XCreateGC (screen->xdisplay,
-                                                GDK_WINDOW_XID (window),
-                                                GCSubwindowMode | GCGraphicsExposures,
-                                                &values);
-    }
-  
-  _gdk_x11_region_get_xrectangles (clip_region,
-                                   0, 0,
-                                   &rectangles,
-                                   &n_rects);
-  
-  XSetClipRectangles (screen->xdisplay,
-                      screen->subwindow_gcs[depth],
-                      0, 0,
-                      rectangles, n_rects,
-                      YXBanded);
-  
-  g_free (rectangles);
-  return screen->subwindow_gcs[depth];
-}
-
-
-
-void
-_gdk_x11_window_translate (GdkWindow      *window,
-                           cairo_region_t *area,
-                           gint            dx,
-                           gint            dy)
-{
-  GdkWindowQueueItem *item;
-  GC xgc;
-  GdkRectangle extents;
-
-  cairo_region_get_extents (area, &extents);
-
-  xgc = _get_scratch_gc (window, area);
-
-  cairo_region_translate (area, -dx, -dy); /* Move to source region */
-
-  item = g_new (GdkWindowQueueItem, 1);
-  item->type = GDK_WINDOW_QUEUE_TRANSLATE;
-  item->u.translate.area = cairo_region_copy (area);
-  item->u.translate.dx = dx;
-  item->u.translate.dy = dy;
-  gdk_window_queue (window, item);
-
-  XCopyArea (GDK_WINDOW_XDISPLAY (window),
-             GDK_WINDOW_XID (window),
-             GDK_WINDOW_XID (window),
-             xgc,
-             extents.x - dx, extents.y - dy,
-             extents.width, extents.height,
-             extents.x, extents.y);
-}
-
 gboolean
 _gdk_x11_window_queue_antiexpose (GdkWindow *window,
 				  cairo_region_t *area)
 {
  GdkWindowQueueItem *item = g_new (GdkWindowQueueItem, 1);
-  item->type = GDK_WINDOW_QUEUE_ANTIEXPOSE;
-  item->u.antiexpose.area = area;
+  item->antiexpose_area = area;

  gdk_window_queue (window, item);

@@ -339,28 +240,7 @@ _gdk_x11_window_process_expose (GdkWindow    *window,
          if (serial - item->serial > (gulong) G_MAXLONG)
            {
              if (item->window == window)
-                {
-                  if (item->type == GDK_WINDOW_QUEUE_TRANSLATE)
-                    {
-                      if (item->u.translate.area)
-                        {
-                          cairo_region_t *intersection;
-
-                          intersection = cairo_region_copy (invalidate_region);
-                          cairo_region_intersect (intersection, item->u.translate.area);
-                          cairo_region_subtract (invalidate_region, intersection);
-                          cairo_region_translate (intersection, item->u.translate.dx, item->u.translate.dy);
-                          cairo_region_union (invalidate_region, intersection);
-                          cairo_region_destroy (intersection);
-                        }
-                      else
-                        cairo_region_translate (invalidate_region, item->u.translate.dx, item->u.translate.dy);
-                    }
-                  else /* anti-expose */
-                    {
-                      cairo_region_subtract (invalidate_region, item->u.antiexpose.area);
-                    }
-                }
+		cairo_region_subtract (invalidate_region, item->antiexpose_area);
            }
          else
            {
@@ -1382,63 +1382,6 @@ gdk_x11_keymap_translate_keyboard_state (GdkKeymap       *keymap,
  return tmp_keyval != NoSymbol;
 }

-/* Key handling not part of the keymap */
-gchar*
-_gdk_x11_display_manager_get_keyval_name (GdkDisplayManager *manager,
-                                          guint              keyval)
-{
-  switch (keyval)
-    {
-    case GDK_KEY_Page_Up:
-      return "Page_Up";
-    case GDK_KEY_Page_Down:
-      return "Page_Down";
-    case GDK_KEY_KP_Page_Up:
-      return "KP_Page_Up";
-    case GDK_KEY_KP_Page_Down:
-      return "KP_Page_Down";
-    }
-
-  return XKeysymToString (keyval);
-}
-
-guint
-_gdk_x11_display_manager_lookup_keyval (GdkDisplayManager *manager,
-                                        const gchar       *keyval_name)
-{
-  g_return_val_if_fail (keyval_name != NULL, 0);
-
-  return XStringToKeysym (keyval_name);
-}
-
-void
-_gdk_x11_display_manager_keyval_convert_case (GdkDisplayManager *manager,
-                                              guint              symbol,
-                                              guint             *lower,
-                                              guint             *upper)
-{
-  KeySym xlower = 0;
-  KeySym xupper = 0;
-
-  /* Check for directly encoded 24-bit UCS characters: */
-  if ((symbol & 0xff000000) == 0x01000000)
-    {
-      if (lower)
-        *lower = gdk_unicode_to_keyval (g_unichar_tolower (symbol & 0x00ffffff));
-      if (upper)
-        *upper = gdk_unicode_to_keyval (g_unichar_toupper (symbol & 0x00ffffff));
-      return;
-    }
-
-  if (symbol)
-    XConvertCase (symbol, &xlower, &xupper);
-
-  if (lower)
-    *lower = xlower;
-  if (upper)
-    *upper = xupper;
-}
-
 /**
 * gdk_x11_keymap_get_group_for_state:
 * @keymap: a #GdkX11Keymap
@@ -168,7 +168,6 @@ gboolean _gdk_x11_display_is_root_window (GdkDisplay *display,
                                          Window      xroot_window);

 GdkDisplay * _gdk_x11_display_open            (const gchar *display_name);
-void _gdk_x11_display_make_default            (GdkDisplay *display);
 void _gdk_x11_display_update_grab_info        (GdkDisplay *display,
                                               GdkDevice  *device,
                                               gint        status);
@@ -248,24 +247,11 @@ void     _gdk_device_xi2_reset_scroll_valuators   (GdkX11DeviceXI2    *device);

 void     _gdk_x11_event_translate_keyboard_string (GdkEventKey *event);

-void _gdk_x11_display_manager_add_display      (GdkDisplayManager *manager,
-                                                GdkDisplay        *display);
-void _gdk_x11_display_manager_remove_display   (GdkDisplayManager *manager,
-                                                GdkDisplay        *display);
-
 GdkAtom _gdk_x11_display_manager_atom_intern   (GdkDisplayManager *manager,
                                                const gchar       *atom_name,
                                                gboolean           copy_name);
 gchar * _gdk_x11_display_manager_get_atom_name (GdkDisplayManager *manager,
                                                GdkAtom            atom);
-guint   _gdk_x11_display_manager_lookup_keyval (GdkDisplayManager *manager,
-                                                const gchar       *name);
-gchar * _gdk_x11_display_manager_get_keyval_name (GdkDisplayManager *manager,
-                                                  guint              keyval);
-void    _gdk_x11_display_manager_keyval_convert_case (GdkDisplayManager *manager,
-                                                      guint              symbol,
-                                                      guint             *lower,
-                                                      guint             *upper);

 GdkCursor *_gdk_x11_display_get_cursor_for_type     (GdkDisplay    *display,
                                                     GdkCursorType  type);
@@ -38,44 +38,6 @@
 #include <string.h>


-/**
- * SECTION:properties
- * @Short_description: Functions to manipulate properties on windows
- * @Title: Properties and Atoms
- *
- * Each window under X can have any number of associated
- * <firstterm>properties</firstterm> attached to it.
- * Properties are arbitrary chunks of data identified by
- * <firstterm>atom</firstterm>s. (An <firstterm>atom</firstterm>
- * is a numeric index into a string table on the X server. They are used
- * to transfer strings efficiently between clients without
- * having to transfer the entire string.) A property
- * has an associated type, which is also identified
- * using an atom.
- *
- * A property has an associated <firstterm>format</firstterm>,
- * an integer describing how many bits are in each unit
- * of data inside the property. It must be 8, 16, or 32.
- * When data is transferred between the server and client,
- * if they are of different endianesses it will be byteswapped
- * as necessary according to the format of the property.
- * Note that on the client side, properties of format 32
- * will be stored with one unit per <emphasis>long</emphasis>,
- * even if a long integer has more than 32 bits on the platform.
- * (This decision was apparently made for Xlib to maintain
- * compatibility with programs that assumed longs were 32
- * bits, at the expense of programs that knew better.)
- *
- * The functions in this section are used to add, remove
- * and change properties on windows, to convert atoms
- * to and from strings and to manipulate some types of
- * data commonly stored in X window properties.
- */
-
-
-static GPtrArray *virtual_atom_array;
-static GHashTable *virtual_atom_hash;
-
 static const gchar xatoms_string[] = 
  /* These are all the standard predefined X atoms */
  "\0"  /* leave a space for None, even though it is not a predefined atom */
@@ -235,14 +197,12 @@ gdk_x11_atom_to_xatom_for_display (GdkDisplay *display,

  if (!xatom)
    {
-      char *name;
-
-      g_return_val_if_fail (ATOM_TO_INDEX (atom) < virtual_atom_array->len, None);
-
-      name = g_ptr_array_index (virtual_atom_array, ATOM_TO_INDEX (atom));
+      char *name = gdk_atom_name (atom);

      xatom = XInternAtom (GDK_DISPLAY_XDISPLAY (display), name, FALSE);
      insert_atom_pair (display, atom, xatom);
+
+      g_free (name);
    }

  return xatom;
@@ -377,68 +337,6 @@ gdk_x11_xatom_to_atom (Atom xatom)
  return gdk_x11_xatom_to_atom_for_display (gdk_display_get_default (), xatom);
 }

-static void
-virtual_atom_check_init (void)
-{
-  if (!virtual_atom_hash)
-    {
-      gint i;
-
-      virtual_atom_hash = g_hash_table_new (g_str_hash, g_str_equal);
-      virtual_atom_array = g_ptr_array_new ();
-
-      for (i = 0; i < G_N_ELEMENTS (xatoms_offset); i++)
-        {
-          g_ptr_array_add (virtual_atom_array, (gchar *)(xatoms_string + xatoms_offset[i]));
-          g_hash_table_insert (virtual_atom_hash, (gchar *)(xatoms_string + xatoms_offset[i]),
-                               GUINT_TO_POINTER (i));
-        }
-    }
-}
-
-GdkAtom
-_gdk_x11_display_manager_atom_intern (GdkDisplayManager *manager,
-                                      const gchar       *atom_name,
-                                      gboolean           dup)
-{
-  GdkAtom result;
-
-  virtual_atom_check_init ();
-
-  result = GDK_POINTER_TO_ATOM (g_hash_table_lookup (virtual_atom_hash, atom_name));
-  if (!result)
-    {
-      result = INDEX_TO_ATOM (virtual_atom_array->len);
-
-      g_ptr_array_add (virtual_atom_array, dup ? g_strdup (atom_name) : (gchar *)atom_name);
-      g_hash_table_insert (virtual_atom_hash,
-                           g_ptr_array_index (virtual_atom_array,
-                                              ATOM_TO_INDEX (result)),
-                                              GDK_ATOM_TO_POINTER (result));
-    }
-
-  return result;
-}
-
-static const gchar *
-get_atom_name (GdkAtom atom)
-{
-  virtual_atom_check_init ();
-
-  if (ATOM_TO_INDEX (atom) < virtual_atom_array->len)
-    return g_ptr_array_index (virtual_atom_array, ATOM_TO_INDEX (atom));
-  else
-    return NULL;
-}
-
-
-gchar *
-_gdk_x11_display_manager_get_atom_name (GdkDisplayManager *manager,
-                                        GdkAtom            atom)
-{
-  return g_strdup (get_atom_name (atom));
-}
-
 /**
 * gdk_x11_get_xatom_by_name_for_display:
 * @display: a #GdkDisplay
@@ -519,7 +417,7 @@ gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
 {
  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);

-  return get_atom_name (gdk_x11_xatom_to_atom_for_display (display, xatom));
+  return _gdk_atom_name_const (gdk_x11_xatom_to_atom_for_display (display, xatom));
 }

 /**
@@ -538,7 +436,7 @@ gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
 const gchar *
 gdk_x11_get_xatom_name (Atom xatom)
 {
-  return get_atom_name (gdk_x11_xatom_to_atom (xatom));
+  return _gdk_atom_name_const (gdk_x11_xatom_to_atom (xatom));
 }

 gboolean
@@ -149,9 +149,6 @@ gdk_x11_screen_dispose (GObject *object)
  if (x11_screen->root_window)
    _gdk_window_destroy (x11_screen->root_window, TRUE);

-  for (i = 0; i < x11_screen->nvisuals; i++)
-    g_object_run_dispose (G_OBJECT (x11_screen->visuals[i]));
-
  G_OBJECT_CLASS (gdk_x11_screen_parent_class)->dispose (object);

  x11_screen->xdisplay = NULL;
@@ -1473,7 +1470,6 @@ gdk_x11_screen_supports_net_wm_hint (GdkScreen *screen,
  GdkX11Screen *x11_screen;
  NetWmSupportedAtoms *supported_atoms;
  GdkDisplay *display;
-  Atom atom;

  g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);

@@ -1525,12 +1521,13 @@ gdk_x11_screen_supports_net_wm_hint (GdkScreen *screen,
  if (supported_atoms->atoms == NULL)
    return FALSE;

-  atom = gdk_x11_atom_to_xatom_for_display (display, property);
-
-  for (i = 0; i < supported_atoms->n_atoms; i++)
+  i = 0;
+  while (i < supported_atoms->n_atoms)
    {
-      if (supported_atoms->atoms[i] == atom)
+      if (supported_atoms->atoms[i] == gdk_x11_atom_to_xatom_for_display (display, property))
        return TRUE;
+
+      ++i;
    }

  return FALSE;
@@ -87,28 +87,12 @@ gdk_x11_visual_finalize (GObject *object)
  G_OBJECT_CLASS (gdk_x11_visual_parent_class)->finalize (object);
 }

-static void
-gdk_x11_visual_dispose (GObject *object)
-{
-  GdkVisual *visual = (GdkVisual *)object;
-  GdkX11Visual *x11_visual = (GdkX11Visual *)object;
-
-  if (x11_visual->colormap != None)
-    {
-      XFreeColormap (GDK_SCREEN_XDISPLAY (visual->screen), x11_visual->colormap);
-      x11_visual->colormap = None;
-    }
-
-  G_OBJECT_CLASS (gdk_x11_visual_parent_class)->dispose (object);
-}
-
 static void
 gdk_x11_visual_class_init (GdkX11VisualClass *class)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (class);

  object_class->finalize = gdk_x11_visual_finalize;
-  object_class->dispose = gdk_x11_visual_dispose;
 }

 void
@@ -154,10 +154,8 @@ G_DEFINE_TYPE (GdkWindowImplX11, gdk_window_impl_x11, GDK_TYPE_WINDOW_IMPL)
 static void
 gdk_window_impl_x11_init (GdkWindowImplX11 *impl)
 {  
-  impl->toplevel_window_type = -1;
  impl->device_cursor = g_hash_table_new_full (NULL, NULL,
                                               NULL, g_object_unref);
-  impl->frame_sync_enabled = TRUE;
 }

 GdkToplevelX11 *
@@ -404,8 +402,7 @@ gdk_x11_window_end_frame (GdkWindow *window)
 		       impl->toplevel->extended_update_counter,
 		       impl->toplevel->current_counter_value);

-      if (impl->frame_sync_enabled &&
-          gdk_x11_screen_supports_net_wm_hint (gdk_window_get_screen (window),
+      if (gdk_x11_screen_supports_net_wm_hint (gdk_window_get_screen (window),
 					       gdk_atom_intern_static_string ("_NET_WM_FRAME_DRAWN")))
        {
          impl->toplevel->frame_pending = TRUE;
@@ -1079,15 +1076,15 @@ _gdk_x11_display_create_window_impl (GdkDisplay    *display,
      class = InputOnly;
    }

-  if (window->width > 32767 ||
-      window->height > 32767)
+  if (window->width > 65535 ||
+      window->height > 65535)
    {
-      g_warning ("Native Windows wider or taller than 32767 pixels are not supported");
+      g_warning ("Native Windows wider or taller than 65535 pixels are not supported");

-      if (window->width > 32767)
-        window->width = 32767;
-      if (window->height > 32767)
-        window->height = 32767;
+      if (window->width > 65535)
+        window->width = 65535;
+      if (window->height > 65535)
+        window->height = 65535;
    }

  impl->xid = XCreateWindow (xdisplay, xparent,
@@ -5308,37 +5305,6 @@ gdk_x11_window_get_xid (GdkWindow *window)
  return GDK_WINDOW_IMPL_X11 (window->impl)->xid;
 }

-/**
- * gdk_x11_window_set_frame_sync_enabled:
- * @window: (type GdkX11Window): a native #GdkWindow
- * @frame_sync_enabled: whether frame-synchronization should be enabled
- *
- * This function can be used to disable frame synchronization for a window.
- * Normally frame synchronziation will be enabled or disabled based on whether
- * the system has a compositor that supports frame synchronization, but if
- * the window is not directly managed by the window manager, then frame
- * synchronziation may need to be disabled. This is the case for a window
- * embedded via the XEMBED protocol.
- *
- * Since: 3.8
- */
-void
-gdk_x11_window_set_frame_sync_enabled (GdkWindow *window,
-                                       gboolean   frame_sync_enabled)
-{
-  /* Try to ensure the window has a native window */
-  if (!_gdk_window_has_impl (window))
-    gdk_window_ensure_native (window);
-
-  if (!GDK_WINDOW_IS_X11 (window))
-    {
-      g_warning (G_STRLOC " drawable is not a native X11 window");
-      return;
-    }
-
-  GDK_WINDOW_IMPL_X11 (window->impl)->frame_sync_enabled = FALSE;
-}
-
 static void
 gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
 {
@@ -5368,7 +5334,6 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
  impl_class->input_shape_combine_region = gdk_window_x11_input_shape_combine_region;
  impl_class->set_static_gravities = gdk_window_x11_set_static_gravities;
  impl_class->queue_antiexpose = _gdk_x11_window_queue_antiexpose;
-  impl_class->translate = _gdk_x11_window_translate;
  impl_class->destroy = gdk_x11_window_destroy;
  impl_class->destroy_foreign = gdk_x11_window_destroy_foreign;
  impl_class->resize_cairo_surface = gdk_window_x11_resize_cairo_surface;
--- a/Show More
+++ b/Show More