]> Pileus Git - ~andy/gtk/blobdiff - gdk/x11/gdkwindow-x11.c
Don't access GdkDisplay fields directly
[~andy/gtk] / gdk / x11 / gdkwindow-x11.c
index a8dd83b6bc60ad8cbf219cd239c4fb7d28638f70..527da43f3c8c174b93a549b1a33d31ba8a5c9b4d 100644 (file)
 
 #include "config.h"
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-
-#ifdef HAVE_XKB
-#include <X11/XKBlib.h>
-#endif
-
-#include <netinet/in.h>
-#include <unistd.h>
-
-#include "gdk.h"
+#include "gdkwindow-x11.h"
 
+#include "gdkx.h"
 #include "gdkwindow.h"
 #include "gdkwindowimpl.h"
 #include "gdkasync.h"
-#include "gdkinputprivate.h"
 #include "gdkdisplay-x11.h"
 #include "gdkprivate-x11.h"
-#include "gdkregion.h"
+#include "gdkvisualprivate.h"
 #include "gdkinternals.h"
-#include "MwmUtil.h"
-#include "gdkwindow-x11.h"
-#include "gdkalias.h"
+#include "gdkdeviceprivate.h"
+#include "gdkeventsource.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <netinet/in.h>
+#include <unistd.h>
 
+#include <cairo-xlib.h>
+
+#include "MwmUtil.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
 
 #include <X11/extensions/shape.h>
 
+#ifdef HAVE_XKB
+#include <X11/XKBlib.h>
+#endif
+
 #ifdef HAVE_XCOMPOSITE
 #include <X11/extensions/Xcomposite.h>
 #endif
@@ -101,17 +102,14 @@ const int _gdk_nenvent_masks = sizeof (_gdk_event_mask_table) / sizeof (int);
 static void     gdk_window_set_static_win_gravity (GdkWindow  *window,
                                                   gboolean    on);
 static gboolean gdk_window_icon_name_set          (GdkWindow  *window);
-static void     gdk_window_add_colormap_windows   (GdkWindow  *window);
 static void     set_wm_name                       (GdkDisplay  *display,
                                                   Window       xwindow,
                                                   const gchar *name);
 static void     move_to_current_desktop           (GdkWindow *window);
+static void     gdk_window_x11_set_background     (GdkWindow      *window,
+                                                   cairo_pattern_t *pattern);
 
-static GdkColormap* gdk_window_impl_x11_get_colormap (GdkDrawable *drawable);
-static void         gdk_window_impl_x11_set_colormap (GdkDrawable *drawable,
-                                                     GdkColormap *cmap);
 static void        gdk_window_impl_x11_finalize   (GObject            *object);
-static void        gdk_window_impl_iface_init     (GdkWindowImplIface *iface);
 
 #define WINDOW_IS_TOPLEVEL_OR_FOREIGN(window) \
   (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&   \
@@ -130,28 +128,19 @@ static void        gdk_window_impl_iface_init     (GdkWindowImplIface *iface);
     (( time1 < time2 ) && ( time2 - time1 > ((guint32)-1)/2 ))     \
   )
 
-G_DEFINE_TYPE_WITH_CODE (GdkWindowImplX11,
-                         gdk_window_impl_x11,
-                         GDK_TYPE_DRAWABLE_IMPL_X11,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_WINDOW_IMPL,
-                                                gdk_window_impl_iface_init));
-
-GType
-_gdk_window_impl_get_type (void)
-{
-  return gdk_window_impl_x11_get_type ();
-}
+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,
+                                               (GDestroyNotify) gdk_cursor_unref);
 }
 
 GdkToplevelX11 *
 _gdk_x11_window_get_toplevel (GdkWindow *window)
 {
-  GdkWindowObject *private;
   GdkWindowImplX11 *impl;
   
   g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
@@ -159,8 +148,7 @@ _gdk_x11_window_get_toplevel (GdkWindow *window)
   if (!WINDOW_IS_TOPLEVEL (window))
     return NULL;
 
-  private = (GdkWindowObject *)window;
-  impl = GDK_WINDOW_IMPL_X11 (private->impl);
+  impl = GDK_WINDOW_IMPL_X11 (window->impl);
 
   if (!impl->toplevel)
     impl->toplevel = g_new0 (GdkToplevelX11, 1);
@@ -168,99 +156,216 @@ _gdk_x11_window_get_toplevel (GdkWindow *window)
   return impl->toplevel;
 }
 
+static const cairo_user_data_key_t gdk_x11_cairo_key;
+
+/**
+ * _gdk_x11_window_update_size:
+ * @impl: a #GdkWindowImplX11.
+ * 
+ * Updates the state of the window (in particular the drawable's
+ * cairo surface) when its size has changed.
+ **/
+void
+_gdk_x11_window_update_size (GdkWindowImplX11 *impl)
+{
+  if (impl->cairo_surface)
+    {
+      cairo_xlib_surface_set_size (impl->cairo_surface,
+                                   gdk_window_get_width (impl->wrapper),
+                                   gdk_window_get_height (impl->wrapper));
+    }
+}
+
+/*****************************************************
+ * X11 specific implementations of generic functions *
+ *****************************************************/
+
 static void
-gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
+gdk_x11_cairo_surface_destroy (void *data)
 {
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GdkDrawableClass *drawable_class = GDK_DRAWABLE_CLASS (klass);
-  
-  object_class->finalize = gdk_window_impl_x11_finalize;
+  GdkWindowImplX11 *impl = data;
+
+  impl->cairo_surface = NULL;
+}
+
+static cairo_surface_t *
+gdk_x11_create_cairo_surface (GdkWindowImplX11 *impl,
+                             int width,
+                             int height)
+{
+  GdkVisual *visual;
+    
+  visual = gdk_window_get_visual (impl->wrapper);
+  return cairo_xlib_surface_create (GDK_WINDOW_XDISPLAY (impl->wrapper),
+                                    GDK_WINDOW_IMPL_X11 (impl)->xid,
+                                    GDK_VISUAL_XVISUAL (visual),
+                                    width, height);
+}
+
+static cairo_surface_t *
+gdk_x11_ref_cairo_surface (GdkWindow *window)
+{
+  GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return NULL;
+
+  if (!impl->cairo_surface)
+    {
+      impl->cairo_surface = gdk_x11_create_cairo_surface (impl,
+                                                          gdk_window_get_width (window),
+                                                          gdk_window_get_height (window));
+      
+      if (impl->cairo_surface)
+       cairo_surface_set_user_data (impl->cairo_surface, &gdk_x11_cairo_key,
+                                    impl, gdk_x11_cairo_surface_destroy);
+    }
+  else
+    cairo_surface_reference (impl->cairo_surface);
 
-  drawable_class->set_colormap = gdk_window_impl_x11_set_colormap;
-  drawable_class->get_colormap = gdk_window_impl_x11_get_colormap;
+  return impl->cairo_surface;
 }
 
 static void
 gdk_window_impl_x11_finalize (GObject *object)
 {
-  GdkWindowObject *wrapper;
-  GdkDrawableImplX11 *draw_impl;
-  GdkWindowImplX11 *window_impl;
+  GdkWindow *wrapper;
+  GdkWindowImplX11 *impl;
   
   g_return_if_fail (GDK_IS_WINDOW_IMPL_X11 (object));
 
-  draw_impl = GDK_DRAWABLE_IMPL_X11 (object);
-  window_impl = GDK_WINDOW_IMPL_X11 (object);
+  impl = GDK_WINDOW_IMPL_X11 (object);
   
-  wrapper = (GdkWindowObject*) draw_impl->wrapper;
+  wrapper = impl->wrapper;
 
-  _gdk_xgrab_check_destroy (GDK_WINDOW (wrapper));
+  _gdk_xgrab_check_destroy (wrapper);
 
   if (!GDK_WINDOW_DESTROYED (wrapper))
     {
       GdkDisplay *display = GDK_WINDOW_DISPLAY (wrapper);
       
-      _gdk_xid_table_remove (display, draw_impl->xid);
-      if (window_impl->toplevel && window_impl->toplevel->focus_window)
-       _gdk_xid_table_remove (display, window_impl->toplevel->focus_window);
+      _gdk_xid_table_remove (display, impl->xid);
+      if (impl->toplevel && impl->toplevel->focus_window)
+       _gdk_xid_table_remove (display, impl->toplevel->focus_window);
     }
 
-  g_free (window_impl->toplevel);
+  g_free (impl->toplevel);
+
+  if (impl->cursor)
+    gdk_cursor_unref (impl->cursor);
 
-  if (window_impl->cursor)
-    gdk_cursor_unref (window_impl->cursor);
+  g_hash_table_destroy (impl->device_cursor);
 
   G_OBJECT_CLASS (gdk_window_impl_x11_parent_class)->finalize (object);
 }
 
+typedef struct {
+  GdkDisplay *display;
+  Pixmap pixmap;
+} FreePixmapData;
+
+static void
+free_pixmap (gpointer datap)
+{
+  FreePixmapData *data = datap;
+
+  if (!gdk_display_is_closed (data->display))
+    {
+      XFreePixmap (GDK_DISPLAY_XDISPLAY (data->display),
+                   data->pixmap);
+    }
+
+  g_object_unref (data->display);
+  g_slice_free (FreePixmapData, data);
+}
+
+static void
+attach_free_pixmap_handler (cairo_surface_t *surface,
+                            GdkDisplay      *display,
+                            Pixmap           pixmap)
+{
+  static const cairo_user_data_key_t key;
+  FreePixmapData *data;
+  
+  data = g_slice_new (FreePixmapData);
+  data->display = g_object_ref (display);
+  data->pixmap = pixmap;
+
+  cairo_surface_set_user_data (surface, &key, data, free_pixmap);
+}
+
+/* Cairo does not guarantee we get an xlib surface if we call
+ * cairo_surface_create_similar(). In some cases however, we must use a
+ * pixmap or bitmap in the X11 API.
+ * These functions ensure an Xlib surface.
+ */
+cairo_surface_t *
+_gdk_x11_window_create_bitmap_surface (GdkWindow *window,
+                                       int        width,
+                                       int        height)
+{
+  cairo_surface_t *surface;
+  Pixmap pixmap;
+
+  pixmap = XCreatePixmap (GDK_WINDOW_XDISPLAY (window),
+                          GDK_WINDOW_XID (window),
+                          width, height, 1);
+  surface = cairo_xlib_surface_create_for_bitmap (GDK_WINDOW_XDISPLAY (window),
+                                                  pixmap,
+                                                  GDK_SCREEN_XSCREEN (GDK_WINDOW_SCREEN (window)),
+                                                  width, height);
+  attach_free_pixmap_handler (surface, GDK_WINDOW_DISPLAY (window), pixmap);
+
+  return surface;
+}
+
+/* Create a surface backed with a pixmap without alpha on the same screen as window */
+static cairo_surface_t *
+gdk_x11_window_create_pixmap_surface (GdkWindow *window,
+                                      int        width,
+                                      int        height)
+{
+  GdkScreen *screen = gdk_window_get_screen (window);
+  GdkVisual *visual = gdk_screen_get_system_visual (screen);
+  cairo_surface_t *surface;
+  Pixmap pixmap;
+
+  pixmap = XCreatePixmap (GDK_WINDOW_XDISPLAY (window),
+                          GDK_WINDOW_XID (window),
+                          width, height,
+                          gdk_visual_get_depth (visual));
+  surface = cairo_xlib_surface_create (GDK_WINDOW_XDISPLAY (window),
+                                       pixmap,
+                                       GDK_VISUAL_XVISUAL (visual),
+                                       width, height);
+  attach_free_pixmap_handler (surface, GDK_WINDOW_DISPLAY (window), pixmap);
+
+  return surface;
+}
+
 static void
 tmp_unset_bg (GdkWindow *window)
 {
   GdkWindowImplX11 *impl;
-  GdkWindowObject *obj;
 
-  obj = (GdkWindowObject *) window;
-  impl = GDK_WINDOW_IMPL_X11 (obj->impl);
+  impl = GDK_WINDOW_IMPL_X11 (window->impl);
 
   impl->no_bg = TRUE;
 
-  if (obj->bg_pixmap != GDK_NO_BG)
-    XSetWindowBackgroundPixmap (GDK_DRAWABLE_XDISPLAY (window),
-                               GDK_DRAWABLE_XID (window), None);
+  XSetWindowBackgroundPixmap (GDK_WINDOW_XDISPLAY (window),
+                              GDK_WINDOW_XID (window), None);
 }
 
 static void
 tmp_reset_bg (GdkWindow *window)
 {
   GdkWindowImplX11 *impl;
-  GdkWindowObject *obj;
 
-  obj = (GdkWindowObject *) window;
-  impl = GDK_WINDOW_IMPL_X11 (obj->impl);
+  impl = GDK_WINDOW_IMPL_X11 (window->impl);
 
   impl->no_bg = FALSE;
 
-  if (obj->bg_pixmap == GDK_NO_BG)
-    return;
-  
-  if (obj->bg_pixmap)
-    {
-      Pixmap xpixmap;
-
-      if (obj->bg_pixmap == GDK_PARENT_RELATIVE_BG)
-       xpixmap = ParentRelative;
-      else 
-       xpixmap = GDK_DRAWABLE_XID (obj->bg_pixmap);
-
-      XSetWindowBackgroundPixmap (GDK_DRAWABLE_XDISPLAY (window),
-                                 GDK_DRAWABLE_XID (window), xpixmap);
-    }
-  else
-    {
-      XSetWindowBackground (GDK_DRAWABLE_XDISPLAY (window),
-                           GDK_DRAWABLE_XID (window),
-                           obj->bg_color.pixel);
-    }
+  gdk_window_x11_set_background (window, window->background);
 }
 
 /* Unsetting and resetting window backgrounds.
@@ -274,28 +379,24 @@ void
 _gdk_x11_window_tmp_unset_bg (GdkWindow *window,
                              gboolean   recurse)
 {
-  GdkWindowObject *private;
-
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  private = (GdkWindowObject *)window;
-
-  if (private->input_only || private->destroyed ||
-      (private->window_type != GDK_WINDOW_ROOT &&
+  if (window->input_only || window->destroyed ||
+      (window->window_type != GDK_WINDOW_ROOT &&
        !GDK_WINDOW_IS_MAPPED (window)))
     return;
   
   if (_gdk_window_has_impl (window) &&
       GDK_WINDOW_IS_X11 (window) &&
-      private->window_type != GDK_WINDOW_ROOT &&
-      private->window_type != GDK_WINDOW_FOREIGN)
+      window->window_type != GDK_WINDOW_ROOT &&
+      window->window_type != GDK_WINDOW_FOREIGN)
     tmp_unset_bg (window);
 
   if (recurse)
     {
       GList *l;
 
-      for (l = private->children; l != NULL; l = l->next)
+      for (l = window->children; l != NULL; l = l->next)
        _gdk_x11_window_tmp_unset_bg (l->data, TRUE);
     }
 }
@@ -303,13 +404,10 @@ _gdk_x11_window_tmp_unset_bg (GdkWindow *window,
 void
 _gdk_x11_window_tmp_unset_parent_bg (GdkWindow *window)
 {
-  GdkWindowObject *private;
-  private = (GdkWindowObject*) window;
-
-  if (GDK_WINDOW_TYPE (private->parent) == GDK_WINDOW_ROOT)
+  if (GDK_WINDOW_TYPE (window->parent) == GDK_WINDOW_ROOT)
     return;
   
-  window = _gdk_window_get_impl_window ((GdkWindow *)private->parent);
+  window = _gdk_window_get_impl_window (window->parent);
   _gdk_x11_window_tmp_unset_bg (window,        FALSE);
 }
 
@@ -317,29 +415,25 @@ void
 _gdk_x11_window_tmp_reset_bg (GdkWindow *window,
                              gboolean   recurse)
 {
-  GdkWindowObject *private;
-
   g_return_if_fail (GDK_IS_WINDOW (window));
 
-  private = (GdkWindowObject *)window;
-
-  if (private->input_only || private->destroyed ||
-      (private->window_type != GDK_WINDOW_ROOT &&
+  if (window->input_only || window->destroyed ||
+      (window->window_type != GDK_WINDOW_ROOT &&
        !GDK_WINDOW_IS_MAPPED (window)))
     return;
 
   
   if (_gdk_window_has_impl (window) &&
       GDK_WINDOW_IS_X11 (window) &&
-      private->window_type != GDK_WINDOW_ROOT &&
-      private->window_type != GDK_WINDOW_FOREIGN)
+      window->window_type != GDK_WINDOW_ROOT &&
+      window->window_type != GDK_WINDOW_FOREIGN)
     tmp_reset_bg (window);
 
   if (recurse)
     {
       GList *l;
 
-      for (l = private->children; l != NULL; l = l->next)
+      for (l = window->children; l != NULL; l = l->next)
        _gdk_x11_window_tmp_reset_bg (l->data, TRUE);
     }
 }
@@ -347,115 +441,49 @@ _gdk_x11_window_tmp_reset_bg (GdkWindow *window,
 void
 _gdk_x11_window_tmp_reset_parent_bg (GdkWindow *window)
 {
-  GdkWindowObject *private;
-  private = (GdkWindowObject*) window;
-
-  if (GDK_WINDOW_TYPE (private->parent) == GDK_WINDOW_ROOT)
+  if (GDK_WINDOW_TYPE (window->parent) == GDK_WINDOW_ROOT)
     return;
   
-  window = _gdk_window_get_impl_window ((GdkWindow *)private->parent);
+  window = _gdk_window_get_impl_window (window->parent);
 
   _gdk_x11_window_tmp_reset_bg (window, FALSE);
 }
 
-static GdkColormap*
-gdk_window_impl_x11_get_colormap (GdkDrawable *drawable)
-{
-  GdkDrawableImplX11 *drawable_impl;
-  
-  g_return_val_if_fail (GDK_IS_WINDOW_IMPL_X11 (drawable), NULL);
-
-  drawable_impl = GDK_DRAWABLE_IMPL_X11 (drawable);
-
-  if (!((GdkWindowObject *) drawable_impl->wrapper)->input_only && 
-      drawable_impl->colormap == NULL)
-    {
-      XWindowAttributes window_attributes;
-      GdkVisual *visual;
-
-      XGetWindowAttributes (GDK_SCREEN_XDISPLAY (drawable_impl->screen),
-                            drawable_impl->xid,
-                            &window_attributes);
-
-      visual = gdk_x11_screen_lookup_visual (drawable_impl->screen,
-                                            window_attributes.visual->visualid);
-      drawable_impl->colormap = gdk_x11_colormap_foreign_new (visual,
-                                                             window_attributes.colormap);
-    }
-  
-  return drawable_impl->colormap;
-}
-
-static void
-gdk_window_impl_x11_set_colormap (GdkDrawable *drawable,
-                                  GdkColormap *cmap)
-{
-  GdkDrawableImplX11 *draw_impl;
-  
-  g_return_if_fail (GDK_IS_WINDOW_IMPL_X11 (drawable));
-
-  draw_impl = GDK_DRAWABLE_IMPL_X11 (drawable);
-
-  if (cmap && GDK_WINDOW_DESTROYED (draw_impl->wrapper))
-    return;
-
-  /* chain up */
-  GDK_DRAWABLE_CLASS (gdk_window_impl_x11_parent_class)->set_colormap (drawable, cmap);
-
-  if (cmap)
-    {
-      XSetWindowColormap (GDK_SCREEN_XDISPLAY (draw_impl->screen),
-                          draw_impl->xid,
-                          GDK_COLORMAP_XCOLORMAP (cmap));
-
-      if (((GdkWindowObject*)draw_impl->wrapper)->window_type !=
-          GDK_WINDOW_TOPLEVEL)
-        gdk_window_add_colormap_windows (GDK_WINDOW (draw_impl->wrapper));
-    }
-}
-
-
 void
 _gdk_windowing_window_init (GdkScreen * screen)
 {
-  GdkWindowObject *private;
-  GdkDrawableImplX11 *draw_impl;
+  GdkWindow *window;
+  GdkWindowImplX11 *impl;
   GdkScreenX11 *screen_x11;
 
   screen_x11 = GDK_SCREEN_X11 (screen);
 
   g_assert (screen_x11->root_window == NULL);
 
-  gdk_screen_set_default_colormap (screen,
-                                  gdk_screen_get_system_colormap (screen));
-
-  screen_x11->root_window = g_object_new (GDK_TYPE_WINDOW, NULL);
+  window = screen_x11->root_window = g_object_new (GDK_TYPE_WINDOW, NULL);
 
-  private = (GdkWindowObject *) screen_x11->root_window;
-  private->impl = g_object_new (_gdk_window_impl_get_type (), NULL);
-  private->impl_window = private;
+  window->impl = g_object_new (GDK_TYPE_WINDOW_IMPL_X11, NULL);
+  window->impl_window = window;
+  window->visual = gdk_screen_get_system_visual (screen);
 
-  draw_impl = GDK_DRAWABLE_IMPL_X11 (private->impl);
+  impl = GDK_WINDOW_IMPL_X11 (window->impl);
   
-  draw_impl->screen = screen;
-  draw_impl->xid = screen_x11->xroot_window;
-  draw_impl->wrapper = GDK_DRAWABLE (private);
-  draw_impl->colormap = gdk_screen_get_system_colormap (screen);
-  g_object_ref (draw_impl->colormap);
+  impl->xid = screen_x11->xroot_window;
+  impl->wrapper = window;
   
-  private->window_type = GDK_WINDOW_ROOT;
-  private->depth = DefaultDepthOfScreen (screen_x11->xscreen);
+  window->window_type = GDK_WINDOW_ROOT;
+  window->depth = DefaultDepthOfScreen (screen_x11->xscreen);
 
-  private->x = 0;
-  private->y = 0;
-  private->abs_x = 0;
-  private->abs_y = 0;
-  private->width = WidthOfScreen (screen_x11->xscreen);
-  private->height = HeightOfScreen (screen_x11->xscreen);
-  private->viewable = TRUE;
+  window->x = 0;
+  window->y = 0;
+  window->abs_x = 0;
+  window->abs_y = 0;
+  window->width = WidthOfScreen (screen_x11->xscreen);
+  window->height = HeightOfScreen (screen_x11->xscreen);
+  window->viewable = TRUE;
 
   /* see init_randr_support() in gdkscreen-x11.c */
-  private->event_mask = GDK_STRUCTURE_MASK;
+  window->event_mask = GDK_STRUCTURE_MASK;
 
   _gdk_window_update_size (screen_x11->root_window);
   
@@ -467,7 +495,7 @@ _gdk_windowing_window_init (GdkScreen * screen)
 static void
 set_wm_protocols (GdkWindow *window)
 {
-  GdkDisplay *display = gdk_drawable_get_display (window);
+  GdkDisplay *display = gdk_window_get_display (window);
   Atom protocols[4];
   int n = 0;
   
@@ -513,18 +541,31 @@ check_leader_window_title (GdkDisplay *display)
 }
 
 static Window
-create_focus_window (Display *xdisplay,
-                    XID      parent)
+create_focus_window (GdkDisplay *display,
+                    XID         parent)
 {
-  Window focus_window = XCreateSimpleWindow (xdisplay, parent,
-                                            -1, -1, 1, 1, 0,
-                                            0, 0);
-  
+  GdkDisplayX11 *display_x11;
+  GdkEventMask event_mask;
+  Display *xdisplay;
+  Window focus_window;
+
+  xdisplay = GDK_DISPLAY_XDISPLAY (display);
+  display_x11 = GDK_DISPLAY_X11 (display);
+
+  focus_window = XCreateSimpleWindow (xdisplay, parent,
+                                      -1, -1, 1, 1, 0,
+                                      0, 0);
+
   /* FIXME: probably better to actually track the requested event mask for the toplevel
    */
-  XSelectInput (xdisplay, focus_window,
-               KeyPressMask | KeyReleaseMask | FocusChangeMask);
-  
+  event_mask = (GDK_KEY_PRESS_MASK |
+                GDK_KEY_RELEASE_MASK |
+                GDK_FOCUS_CHANGE_MASK);
+
+  gdk_event_source_select_events ((GdkEventSource *) display_x11->event_source,
+                                  focus_window,
+                                  event_mask, 0);
+
   XMapWindow (xdisplay, focus_window);
 
   return focus_window;
@@ -538,8 +579,7 @@ ensure_sync_counter (GdkWindow *window)
     {
       GdkDisplay *display = GDK_WINDOW_DISPLAY (window);
       GdkToplevelX11 *toplevel = _gdk_x11_window_get_toplevel (window);
-      GdkWindowObject *private = (GdkWindowObject *)window;
-      GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (private->impl);
+      GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
 
       if (toplevel && impl->use_synchronized_configure &&
          toplevel->update_counter == None &&
@@ -571,27 +611,23 @@ static void
 setup_toplevel_window (GdkWindow *window, 
                       GdkWindow *parent)
 {
-  GdkWindowObject *obj = (GdkWindowObject *)window;
   GdkToplevelX11 *toplevel = _gdk_x11_window_get_toplevel (window);
+  GdkDisplay *display = gdk_window_get_display (window);
   Display *xdisplay = GDK_WINDOW_XDISPLAY (window);
   XID xid = GDK_WINDOW_XID (window);
-  XID xparent = GDK_WINDOW_XID (parent);
   GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (GDK_WINDOW_SCREEN (parent));
   XSizeHints size_hints;
   long pid;
   Window leader_window;
-    
-  if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_DIALOG)
-    XSetTransientForHint (xdisplay, xid, xparent);
-  
+
   set_wm_protocols (window);
-  
-  if (!obj->input_only)
+
+  if (!window->input_only)
     {
       /* The focus window is off the visible area, and serves to receive key
        * press events so they don't get sent to child windows.
        */
-      toplevel->focus_window = create_focus_window (xdisplay, xid);
+      toplevel->focus_window = create_focus_window (display, xid);
       _gdk_xid_table_insert (screen_x11->display, &toplevel->focus_window, window);
     }
   
@@ -602,8 +638,8 @@ setup_toplevel_window (GdkWindow *window,
    * correct value???
    */
   size_hints.flags = PSize;
-  size_hints.width = obj->width;
-  size_hints.height = obj->height;
+  size_hints.width = window->width;
+  size_hints.height = window->height;
   
   XSetWMNormalHints (xdisplay, xid, &size_hints);
   
@@ -631,7 +667,7 @@ setup_toplevel_window (GdkWindow *window,
                      XA_WINDOW, 32, PropModeReplace,
                      (guchar *) &toplevel->focus_window, 1);
 
-  if (!obj->focus_on_map)
+  if (!window->focus_on_map)
     gdk_x11_window_set_user_time (window, 0);
   else if (GDK_DISPLAY_X11 (screen_x11->display)->user_time != 0)
     gdk_x11_window_set_user_time (window, GDK_DISPLAY_X11 (screen_x11->display)->user_time);
@@ -643,20 +679,17 @@ void
 _gdk_window_impl_new (GdkWindow     *window,
                      GdkWindow     *real_parent,
                      GdkScreen     *screen,
-                     GdkVisual     *visual,
                      GdkEventMask   event_mask,
                      GdkWindowAttr *attributes,
                      gint           attributes_mask)
 {
-  GdkWindowObject *private;
   GdkWindowImplX11 *impl;
-  GdkDrawableImplX11 *draw_impl;
   GdkScreenX11 *screen_x11;
+  GdkDisplayX11 *display_x11;
   
   Window xparent;
   Visual *xvisual;
   Display *xdisplay;
-  Window xid;
 
   XSetWindowAttributes xattributes;
   long xattributes_mask;
@@ -664,33 +697,20 @@ _gdk_window_impl_new (GdkWindow     *window,
   
   unsigned int class;
   const char *title;
-  int i;
-  
-  private = (GdkWindowObject *) window;
   
   screen_x11 = GDK_SCREEN_X11 (screen);
   xparent = GDK_WINDOW_XID (real_parent);
+  display_x11 = GDK_DISPLAY_X11 (GDK_SCREEN_DISPLAY (screen));
   
-  impl = g_object_new (_gdk_window_impl_get_type (), NULL);
-  private->impl = (GdkDrawable *)impl;
-  draw_impl = GDK_DRAWABLE_IMPL_X11 (impl);
-  draw_impl->wrapper = GDK_DRAWABLE (window);
+  impl = g_object_new (GDK_TYPE_WINDOW_IMPL_X11, NULL);
+  window->impl = GDK_WINDOW_IMPL (impl);
+  impl->wrapper = GDK_WINDOW (window);
   
-  draw_impl->screen = screen;
   xdisplay = screen_x11->xdisplay;
 
   xattributes_mask = 0;
 
-  xvisual = ((GdkVisualPrivate*) visual)->xvisual;
-  
-  xattributes.event_mask = StructureNotifyMask | PropertyChangeMask;
-  for (i = 0; i < _gdk_nenvent_masks; i++)
-    {
-      if (event_mask & (1 << (i + 1)))
-       xattributes.event_mask |= _gdk_event_mask_table[i];
-    }
-  if (xattributes.event_mask)
-    xattributes_mask |= CWEventMask;
+  xvisual = gdk_x11_visual_get_xvisual (window->visual);
   
   if (attributes_mask & GDK_WA_NOREDIR)
     {
@@ -703,63 +723,44 @@ _gdk_window_impl_new (GdkWindow     *window,
 
   impl->override_redirect = xattributes.override_redirect;
   
-  if (private->parent && private->parent->guffaw_gravity)
+  if (window->parent && window->parent->guffaw_gravity)
     {
       xattributes.win_gravity = StaticGravity;
       xattributes_mask |= CWWinGravity;
     }
   
   /* Sanity checks */
-  switch (private->window_type)
+  switch (window->window_type)
     {
     case GDK_WINDOW_TOPLEVEL:
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TEMP:
-      if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT)
+      if (GDK_WINDOW_TYPE (window->parent) != GDK_WINDOW_ROOT)
        {
          /* The common code warns for this case */
          xparent = GDK_SCREEN_XROOTWIN (screen);
        }
     }
          
-  if (!private->input_only)
+  if (!window->input_only)
     {
       class = InputOutput;
 
-      if (attributes_mask & GDK_WA_COLORMAP)
-        {
-          draw_impl->colormap = attributes->colormap;
-          g_object_ref (attributes->colormap);
-        }
-      else
-       {
-         if ((((GdkVisualPrivate *)gdk_screen_get_system_visual (screen))->xvisual) ==  xvisual)
-            {
-             draw_impl->colormap = gdk_screen_get_system_colormap (screen);
-              g_object_ref (draw_impl->colormap);
-            }
-         else
-            {
-              draw_impl->colormap = gdk_colormap_new (visual, FALSE);
-            }
-       }
-      
-      xattributes.background_pixel = private->bg_color.pixel;
+      xattributes.background_pixel = BlackPixel (xdisplay, screen_x11->screen_num);
 
       xattributes.border_pixel = BlackPixel (xdisplay, screen_x11->screen_num);
       xattributes_mask |= CWBorderPixel | CWBackPixel;
 
-      if (private->guffaw_gravity)
+      if (window->guffaw_gravity)
        xattributes.bit_gravity = StaticGravity;
       else
        xattributes.bit_gravity = NorthWestGravity;
       
       xattributes_mask |= CWBitGravity;
 
-      xattributes.colormap = GDK_COLORMAP_XCOLORMAP (draw_impl->colormap);
+      xattributes.colormap = _gdk_visual_get_x11_colormap (window->visual);
       xattributes_mask |= CWColormap;
 
-      if (private->window_type == GDK_WINDOW_TEMP)
+      if (window->window_type == GDK_WINDOW_TEMP)
        {
          xattributes.save_under = True;
          xattributes.override_redirect = True;
@@ -772,34 +773,31 @@ _gdk_window_impl_new (GdkWindow     *window,
   else
     {
       class = InputOnly;
-      draw_impl->colormap = gdk_screen_get_system_colormap (screen);
-      g_object_ref (draw_impl->colormap);
     }
 
-  if (private->width > 65535 ||
-      private->height > 65535)
+  if (window->width > 65535 ||
+      window->height > 65535)
     {
       g_warning ("Native Windows wider or taller than 65535 pixels are not supported");
       
-      if (private->width > 65535)
-       private->width = 65535;
-      if (private->height > 65535)
-       private->height = 65535;
+      if (window->width > 65535)
+       window->width = 65535;
+      if (window->height > 65535)
+       window->height = 65535;
     }
   
-  xid = draw_impl->xid = XCreateWindow (xdisplay, xparent,
-                                       private->x + private->parent->abs_x,
-                                       private->y + private->parent->abs_y,
-                                       private->width, private->height,
-                                       0, private->depth, class, xvisual,
-                                       xattributes_mask, &xattributes);
+  impl->xid = XCreateWindow (xdisplay, xparent,
+                             window->x + window->parent->abs_x,
+                             window->y + window->parent->abs_y,
+                             window->width, window->height,
+                             0, window->depth, class, xvisual,
+                             xattributes_mask, &xattributes);
 
   g_object_ref (window);
-  _gdk_xid_table_insert (screen_x11->display, &draw_impl->xid, window);
+  _gdk_xid_table_insert (screen_x11->display, &impl->xid, window);
 
-  switch (GDK_WINDOW_TYPE (private))
+  switch (GDK_WINDOW_TYPE (window))
     {
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TOPLEVEL:
     case GDK_WINDOW_TEMP:
       if (attributes_mask & GDK_WA_TITLE)
@@ -814,29 +812,24 @@ _gdk_window_impl_new (GdkWindow     *window,
          class_hint = XAllocClassHint ();
          class_hint->res_name = attributes->wmclass_name;
          class_hint->res_class = attributes->wmclass_class;
-         XSetClassHint (xdisplay, xid, class_hint);
+         XSetClassHint (xdisplay, impl->xid, class_hint);
          XFree (class_hint);
        }
   
-      setup_toplevel_window (window, (GdkWindow *)private->parent);
+      setup_toplevel_window (window, window->parent);
       break;
 
     case GDK_WINDOW_CHILD:
-      if (!private->input_only &&
-         (draw_impl->colormap != gdk_screen_get_system_colormap (screen)) &&
-         (draw_impl->colormap != gdk_drawable_get_colormap (gdk_window_get_toplevel (window))))
-       {
-         GDK_NOTE (MISC, g_message ("adding colormap window\n"));
-         gdk_window_add_colormap_windows (window);
-       }
-      break;
-      
     default:
       break;
     }
 
   if (attributes_mask & GDK_WA_TYPE_HINT)
     gdk_window_set_type_hint (window, attributes->type_hint);
+
+  gdk_event_source_select_events ((GdkEventSource *) display_x11->event_source,
+                                  GDK_WINDOW_XID (window), event_mask,
+                                  StructureNotifyMask | PropertyChangeMask);
 }
 
 static GdkEventMask
@@ -867,9 +860,9 @@ x_event_mask_to_gdk_event_mask (long mask)
  * For example in the X backend, a native window handle is an Xlib
  * <type>XID</type>.
  * 
- * Return value: a #GdkWindow wrapper for the native window or 
- *   %NULL if the window has been destroyed. The wrapper will be
- *   newly created, if one doesn't exist already.
+ * Return value: (transfer full): a #GdkWindow wrapper for the native
+ *   window, or %NULL if the window has been destroyed. The wrapper
+ *   will be newly created, if one doesn't exist already.
  *
  * Since: 2.2
  **/
@@ -877,10 +870,9 @@ GdkWindow *
 gdk_window_foreign_new_for_display (GdkDisplay     *display,
                                    GdkNativeWindow anid)
 {
+  GdkScreen *screen;
   GdkWindow *window;
-  GdkWindowObject *private;
   GdkWindowImplX11 *impl;
-  GdkDrawableImplX11 *draw_impl;
   GdkDisplayX11 *display_x11;
   XWindowAttributes attrs;
   Window root, parent;
@@ -910,42 +902,43 @@ gdk_window_foreign_new_for_display (GdkDisplay     *display,
   if (children)
     XFree (children);
   
+  screen = _gdk_x11_display_screen_for_xrootwin (display, root);
+
   window = g_object_new (GDK_TYPE_WINDOW, NULL);
 
-  private = (GdkWindowObject *) window;
-  private->impl = g_object_new (_gdk_window_impl_get_type (), NULL);
-  private->impl_window = private;
+  window->impl = g_object_new (GDK_TYPE_WINDOW_IMPL_X11, NULL);
+  window->impl_window = window;
+  window->visual = gdk_x11_screen_lookup_visual (screen,
+                                                  XVisualIDFromVisual (attrs.visual));
 
-  impl = GDK_WINDOW_IMPL_X11 (private->impl);
-  draw_impl = GDK_DRAWABLE_IMPL_X11 (private->impl);
-  draw_impl->wrapper = GDK_DRAWABLE (window);
-  draw_impl->screen = _gdk_x11_display_screen_for_xrootwin (display, root);
+  impl = GDK_WINDOW_IMPL_X11 (window->impl);
+  impl->wrapper = window;
   
-  private->parent = gdk_xid_table_lookup_for_display (display, parent);
+  window->parent = gdk_xid_table_lookup_for_display (display, parent);
   
-  if (!private->parent || GDK_WINDOW_TYPE (private->parent) == GDK_WINDOW_FOREIGN)
-    private->parent = (GdkWindowObject *) gdk_screen_get_root_window (draw_impl->screen);
+  if (!window->parent || GDK_WINDOW_TYPE (window->parent) == GDK_WINDOW_FOREIGN)
+    window->parent = gdk_screen_get_root_window (screen);
   
-  private->parent->children = g_list_prepend (private->parent->children, window);
+  window->parent->children = g_list_prepend (window->parent->children, window);
 
-  draw_impl->xid = anid;
+  impl->xid = anid;
 
-  private->x = attrs.x;
-  private->y = attrs.y;
-  private->width = attrs.width;
-  private->height = attrs.height;
-  private->window_type = GDK_WINDOW_FOREIGN;
-  private->destroyed = FALSE;
+  window->x = attrs.x;
+  window->y = attrs.y;
+  window->width = attrs.width;
+  window->height = attrs.height;
+  window->window_type = GDK_WINDOW_FOREIGN;
+  window->destroyed = FALSE;
 
-  private->event_mask = x_event_mask_to_gdk_event_mask (attrs.your_event_mask);
+  window->event_mask = x_event_mask_to_gdk_event_mask (attrs.your_event_mask);
 
   if (attrs.map_state == IsUnmapped)
-    private->state = GDK_WINDOW_STATE_WITHDRAWN;
+    window->state = GDK_WINDOW_STATE_WITHDRAWN;
   else
-    private->state = 0;
-  private->viewable = TRUE;
+    window->state = 0;
+  window->viewable = TRUE;
 
-  private->depth = attrs.depth;
+  window->depth = attrs.depth;
   
   g_object_ref (window);
   _gdk_xid_table_insert (display, &GDK_WINDOW_XID (window), window);
@@ -966,8 +959,8 @@ gdk_window_foreign_new_for_display (GdkDisplay     *display,
  * For example in the X backend, a native window handle is an Xlib
  * <type>XID</type>.
  *
- * Return value: the #GdkWindow wrapper for the native window, 
- *    or %NULL if there is none.
+ * Return value: (transfer none): the #GdkWindow wrapper for the native
+ *    window, or %NULL if there is none.
  *
  * Since: 2.2
  **/
@@ -977,41 +970,18 @@ gdk_window_lookup_for_display (GdkDisplay *display, GdkNativeWindow anid)
   return (GdkWindow*) gdk_xid_table_lookup_for_display (display, anid);
 }
 
-/**
- * gdk_window_lookup:
- * @anid: a native window handle.
- *
- * Looks up the #GdkWindow that wraps the given native window handle. 
- *
- * For example in the X backend, a native window handle is an Xlib
- * <type>XID</type>.
- *
- * Return value: the #GdkWindow wrapper for the native window, 
- *    or %NULL if there is none.
- **/
-GdkWindow *
-gdk_window_lookup (GdkNativeWindow anid)
-{
-  return (GdkWindow*) gdk_xid_table_lookup (anid);
-}
-
 static void
 gdk_toplevel_x11_free_contents (GdkDisplay *display,
                                GdkToplevelX11 *toplevel)
 {
-  if (toplevel->icon_window)
-    {
-      g_object_unref (toplevel->icon_window);
-      toplevel->icon_window = NULL;
-    }
   if (toplevel->icon_pixmap)
     {
-      g_object_unref (toplevel->icon_pixmap);
+      cairo_surface_destroy (toplevel->icon_pixmap);
       toplevel->icon_pixmap = NULL;
     }
   if (toplevel->icon_mask)
     {
-      g_object_unref (toplevel->icon_mask);
+      cairo_surface_destroy (toplevel->icon_mask);
       toplevel->icon_mask = NULL;
     }
   if (toplevel->group_leader)
@@ -1032,11 +1002,11 @@ gdk_toplevel_x11_free_contents (GdkDisplay *display,
 }
 
 static void
-_gdk_x11_window_destroy (GdkWindow *window,
-                        gboolean   recursing,
-                        gboolean   foreign_destroy)
+gdk_x11_window_destroy (GdkWindow *window,
+                        gboolean   recursing,
+                        gboolean   foreign_destroy)
 {
-  GdkWindowObject *private = (GdkWindowObject *)window;
+  GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
   GdkToplevelX11 *toplevel;
   
   g_return_if_fail (GDK_IS_WINDOW (window));
@@ -1047,7 +1017,12 @@ _gdk_x11_window_destroy (GdkWindow *window,
   if (toplevel)
     gdk_toplevel_x11_free_contents (GDK_WINDOW_DISPLAY (window), toplevel);
 
-  _gdk_x11_drawable_finish (private->impl);
+  if (impl->cairo_surface)
+    {
+      cairo_surface_finish (impl->cairo_surface);
+      cairo_surface_set_user_data (impl->cairo_surface, &gdk_x11_cairo_key,
+                                  NULL, NULL);
+    }
 
   if (!recursing && !foreign_destroy)
     {
@@ -1055,8 +1030,19 @@ _gdk_x11_window_destroy (GdkWindow *window,
     }
 }
 
-void
-_gdk_windowing_window_destroy_foreign (GdkWindow *window)
+static cairo_surface_t *
+gdk_window_x11_resize_cairo_surface (GdkWindow       *window,
+                                     cairo_surface_t *surface,
+                                     gint             width,
+                                     gint             height)
+{
+  cairo_xlib_surface_set_size (surface, width, height);
+
+  return surface;
+}
+
+static void
+gdk_x11_window_destroy_foreign (GdkWindow *window)
 {
   /* It's somebody else's window, but in our hierarchy,
    * so reparent it to the root window, and then send
@@ -1084,26 +1070,25 @@ _gdk_windowing_window_destroy_foreign (GdkWindow *window)
   XSendEvent (GDK_WINDOW_XDISPLAY (window),
              GDK_WINDOW_XID (window),
              False, 0, (XEvent *)&xclient);
-  gdk_display_sync (GDK_WINDOW_DISPLAY (window));
-  gdk_error_trap_pop ();
+  gdk_error_trap_pop_ignored ();
 }
 
 static GdkWindow *
 get_root (GdkWindow *window)
 {
-  GdkScreen *screen = gdk_drawable_get_screen (window);
+  GdkScreen *screen = gdk_window_get_screen (window);
 
   return gdk_screen_get_root_window (screen);
 }
 
 /* This function is called when the XWindow is really gone.
  */
-void
-gdk_window_destroy_notify (GdkWindow *window)
+static void
+gdk_x11_window_destroy_notify (GdkWindow *window)
 {
   GdkWindowImplX11 *window_impl;
 
-  window_impl = GDK_WINDOW_IMPL_X11 (((GdkWindowObject *)window)->impl);
+  window_impl = GDK_WINDOW_IMPL_X11 ((window)->impl);
 
   if (!GDK_WINDOW_DESTROYED (window))
     {
@@ -1127,41 +1112,34 @@ update_wm_hints (GdkWindow *window,
                 gboolean   force)
 {
   GdkToplevelX11 *toplevel = _gdk_x11_window_get_toplevel (window);
-  GdkWindowObject *private = (GdkWindowObject *)window;
   GdkDisplay *display = GDK_WINDOW_DISPLAY (window);
   XWMHints wm_hints;
 
   if (!force &&
       !toplevel->is_leader &&
-      private->state & GDK_WINDOW_STATE_WITHDRAWN)
+      window->state & GDK_WINDOW_STATE_WITHDRAWN)
     return;
 
   wm_hints.flags = StateHint | InputHint;
-  wm_hints.input = private->accept_focus ? True : False;
+  wm_hints.input = window->accept_focus ? True : False;
   wm_hints.initial_state = NormalState;
   
-  if (private->state & GDK_WINDOW_STATE_ICONIFIED)
+  if (window->state & GDK_WINDOW_STATE_ICONIFIED)
     {
       wm_hints.flags |= StateHint;
       wm_hints.initial_state = IconicState;
     }
 
-  if (toplevel->icon_window && !GDK_WINDOW_DESTROYED (toplevel->icon_window))
-    {
-      wm_hints.flags |= IconWindowHint;
-      wm_hints.icon_window = GDK_WINDOW_XID (toplevel->icon_window);
-    }
-
   if (toplevel->icon_pixmap)
     {
       wm_hints.flags |= IconPixmapHint;
-      wm_hints.icon_pixmap = GDK_PIXMAP_XID (toplevel->icon_pixmap);
+      wm_hints.icon_pixmap = cairo_xlib_surface_get_drawable (toplevel->icon_pixmap);
     }
 
   if (toplevel->icon_mask)
     {
       wm_hints.flags |= IconMaskHint;
-      wm_hints.icon_mask = GDK_PIXMAP_XID (toplevel->icon_mask);
+      wm_hints.icon_mask = cairo_xlib_surface_get_drawable (toplevel->icon_mask);
     }
   
   wm_hints.flags |= WindowGroupHint;
@@ -1187,12 +1165,10 @@ set_initial_hints (GdkWindow *window)
   GdkDisplay *display = GDK_WINDOW_DISPLAY (window);
   Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
   Window xwindow = GDK_WINDOW_XID (window);  
-  GdkWindowObject *private;
   GdkToplevelX11 *toplevel;
   Atom atoms[9];
   gint i;
 
-  private = (GdkWindowObject*) window;
   toplevel = _gdk_x11_window_get_toplevel (window);
 
   if (!toplevel)
@@ -1207,7 +1183,7 @@ set_initial_hints (GdkWindow *window)
   
   i = 0;
 
-  if (private->state & GDK_WINDOW_STATE_MAXIMIZED)
+  if (window->state & GDK_WINDOW_STATE_MAXIMIZED)
     {
       atoms[i] = gdk_x11_get_xatom_by_name_for_display (display,
                                                        "_NET_WM_STATE_MAXIMIZED_VERT");
@@ -1218,21 +1194,21 @@ set_initial_hints (GdkWindow *window)
       toplevel->have_maxhorz = toplevel->have_maxvert = TRUE;
     }
 
-  if (private->state & GDK_WINDOW_STATE_ABOVE)
+  if (window->state & GDK_WINDOW_STATE_ABOVE)
     {
       atoms[i] = gdk_x11_get_xatom_by_name_for_display (display,
                                                        "_NET_WM_STATE_ABOVE");
       ++i;
     }
   
-  if (private->state & GDK_WINDOW_STATE_BELOW)
+  if (window->state & GDK_WINDOW_STATE_BELOW)
     {
       atoms[i] = gdk_x11_get_xatom_by_name_for_display (display,
                                                        "_NET_WM_STATE_BELOW");
       ++i;
     }
   
-  if (private->state & GDK_WINDOW_STATE_STICKY)
+  if (window->state & GDK_WINDOW_STATE_STICKY)
     {
       atoms[i] = gdk_x11_get_xatom_by_name_for_display (display,
                                                        "_NET_WM_STATE_STICKY");
@@ -1240,7 +1216,7 @@ set_initial_hints (GdkWindow *window)
       toplevel->have_sticky = TRUE;
     }
 
-  if (private->state & GDK_WINDOW_STATE_FULLSCREEN)
+  if (window->state & GDK_WINDOW_STATE_FULLSCREEN)
     {
       atoms[i] = gdk_x11_get_xatom_by_name_for_display (display,
                                                        "_NET_WM_STATE_FULLSCREEN");
@@ -1248,7 +1224,7 @@ set_initial_hints (GdkWindow *window)
       toplevel->have_fullscreen = TRUE;
     }
 
-  if (private->modal_hint)
+  if (window->modal_hint)
     {
       atoms[i] = gdk_x11_get_xatom_by_name_for_display (display,
                                                        "_NET_WM_STATE_MODAL");
@@ -1284,7 +1260,7 @@ set_initial_hints (GdkWindow *window)
                       gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE"));
     }
 
-  if (private->state & GDK_WINDOW_STATE_STICKY)
+  if (window->state & GDK_WINDOW_STATE_STICKY)
     {
       atoms[0] = 0xFFFFFFFF;
       XChangeProperty (xdisplay,
@@ -1307,11 +1283,10 @@ set_initial_hints (GdkWindow *window)
 static void
 gdk_window_x11_show (GdkWindow *window, gboolean already_mapped)
 {
-  GdkWindowObject *private = (GdkWindowObject*) window;
   GdkDisplay *display;
   GdkDisplayX11 *display_x11;
   GdkToplevelX11 *toplevel;
-  GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (private->impl);
+  GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
   Display *xdisplay = GDK_WINDOW_XDISPLAY (window);
   Window xwindow = GDK_WINDOW_XID (window);
   gboolean unset_bg;
@@ -1321,7 +1296,7 @@ gdk_window_x11_show (GdkWindow *window, gboolean already_mapped)
       
   if (WINDOW_IS_TOPLEVEL (window))
     {
-      display = gdk_drawable_get_display (window);
+      display = gdk_window_get_display (window);
       display_x11 = GDK_DISPLAY_X11 (display);
       toplevel = _gdk_x11_window_get_toplevel (window);
       
@@ -1331,8 +1306,8 @@ gdk_window_x11_show (GdkWindow *window, gboolean already_mapped)
        gdk_x11_window_set_user_time (window, display_x11->user_time);
     }
   
-  unset_bg = !private->input_only &&
-    (private->window_type == GDK_WINDOW_CHILD ||
+  unset_bg = !window->input_only &&
+    (window->window_type == GDK_WINDOW_CHILD ||
      impl->override_redirect) &&
     gdk_window_is_viewable (window);
   
@@ -1349,14 +1324,13 @@ static void
 pre_unmap (GdkWindow *window)
 {
   GdkWindow *start_window = NULL;
-  GdkWindowObject *private = (GdkWindowObject *)window;
 
-  if (private->input_only)
+  if (window->input_only)
     return;
 
-  if (private->window_type == GDK_WINDOW_CHILD)
-    start_window = _gdk_window_get_impl_window ((GdkWindow *)private->parent);
-  else if (private->window_type == GDK_WINDOW_TEMP)
+  if (window->window_type == GDK_WINDOW_CHILD)
+    start_window = _gdk_window_get_impl_window ((GdkWindow *)window->parent);
+  else if (window->window_type == GDK_WINDOW_TEMP)
     start_window = get_root (window);
 
   if (start_window)
@@ -1367,28 +1341,27 @@ static void
 post_unmap (GdkWindow *window)
 {
   GdkWindow *start_window = NULL;
-  GdkWindowObject *private = (GdkWindowObject *)window;
   
-  if (private->input_only)
+  if (window->input_only)
     return;
 
-  if (private->window_type == GDK_WINDOW_CHILD)
-    start_window = _gdk_window_get_impl_window ((GdkWindow *)private->parent);
-  else if (private->window_type == GDK_WINDOW_TEMP)
+  if (window->window_type == GDK_WINDOW_CHILD)
+    start_window = _gdk_window_get_impl_window ((GdkWindow *)window->parent);
+  else if (window->window_type == GDK_WINDOW_TEMP)
     start_window = get_root (window);
 
   if (start_window)
     {
       _gdk_x11_window_tmp_reset_bg (start_window, TRUE);
 
-      if (private->window_type == GDK_WINDOW_CHILD && private->parent)
+      if (window->window_type == GDK_WINDOW_CHILD && window->parent)
        {
          GdkRectangle invalid_rect;
       
          gdk_window_get_position (window, &invalid_rect.x, &invalid_rect.y);
-         gdk_drawable_get_size (GDK_DRAWABLE (window),
-                                &invalid_rect.width, &invalid_rect.height);
-         gdk_window_invalidate_rect ((GdkWindow *)private->parent,
+         invalid_rect.width = gdk_window_get_width (window);
+         invalid_rect.height = gdk_window_get_height (window);
+         gdk_window_invalidate_rect ((GdkWindow *)window->parent,
                                      &invalid_rect, TRUE);
        }
     }
@@ -1397,10 +1370,6 @@ post_unmap (GdkWindow *window)
 static void
 gdk_window_x11_hide (GdkWindow *window)
 {
-  GdkWindowObject *private;
-  
-  private = (GdkWindowObject*) window;
-
   /* We'll get the unmap notify eventually, and handle it then,
    * but checking here makes things more consistent if we are
    * just doing stuff ourself.
@@ -1409,10 +1378,9 @@ gdk_window_x11_hide (GdkWindow *window)
                          NextRequest (GDK_WINDOW_XDISPLAY (window)));
 
   /* You can't simply unmap toplevel windows. */
-  switch (private->window_type)
+  switch (window->window_type)
     {
     case GDK_WINDOW_TOPLEVEL:
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TEMP: /* ? */
       gdk_window_withdraw (window);
       return;
@@ -1434,10 +1402,7 @@ gdk_window_x11_hide (GdkWindow *window)
 static void
 gdk_window_x11_withdraw (GdkWindow *window)
 {
-  GdkWindowObject *private;
-  
-  private = (GdkWindowObject*) window;
-  if (!private->destroyed)
+  if (!window->destroyed)
     {
       if (GDK_WINDOW_IS_MAPPED (window))
         gdk_synthesize_window_state (window,
@@ -1460,14 +1425,13 @@ window_x11_move (GdkWindow *window,
                  gint       x,
                  gint       y)
 {
-  GdkWindowObject *private = (GdkWindowObject *) window;
-  GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (private->impl);
+  GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
 
-  if (GDK_WINDOW_TYPE (private) == GDK_WINDOW_CHILD)
+  if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD)
     {
       _gdk_window_move_resize_child (window,
                                      x, y,
-                                     private->width, private->height);
+                                     window->width, window->height);
     }
   else
     {
@@ -1477,8 +1441,8 @@ window_x11_move (GdkWindow *window,
 
       if (impl->override_redirect)
         {
-          private->x = x;
-          private->y = y;
+          window->x = x;
+          window->y = y;
         }
     }
 }
@@ -1488,23 +1452,21 @@ window_x11_resize (GdkWindow *window,
                    gint       width,
                    gint       height)
 {
-  GdkWindowObject *private = (GdkWindowObject *) window;
-
   if (width < 1)
     width = 1;
 
   if (height < 1)
     height = 1;
 
-  if (GDK_WINDOW_TYPE (private) == GDK_WINDOW_CHILD)
+  if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD)
     {
       _gdk_window_move_resize_child (window,
-                                     private->x, private->y,
+                                     window->x, window->y,
                                      width, height);
     }
   else
     {
-      GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (private->impl);
+      GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
 
       XResizeWindow (GDK_WINDOW_XDISPLAY (window),
                      GDK_WINDOW_XID (window),
@@ -1512,18 +1474,18 @@ window_x11_resize (GdkWindow *window,
 
       if (impl->override_redirect)
         {
-          private->width = width;
-          private->height = height;
-          _gdk_x11_drawable_update_size (private->impl);
+          window->width = width;
+          window->height = height;
+          _gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (window->impl));
         }
       else
         {
-          if (width != private->width || height != private->height)
-            private->resize_count += 1;
+          if (width != window->width || height != window->height)
+            window->resize_count += 1;
         }
     }
 
-  _gdk_x11_drawable_update_size (private->impl);
+  _gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (window->impl));
 }
 
 static inline void
@@ -1533,22 +1495,20 @@ window_x11_move_resize (GdkWindow *window,
                         gint       width,
                         gint       height)
 {
-  GdkWindowObject *private = (GdkWindowObject *) window;;
-  
   if (width < 1)
     width = 1;
 
   if (height < 1)
     height = 1;
 
-  if (GDK_WINDOW_TYPE (private) == GDK_WINDOW_CHILD)
+  if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD)
     {
       _gdk_window_move_resize_child (window, x, y, width, height);
-      _gdk_x11_drawable_update_size (private->impl);
+      _gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (window->impl));
     }
   else
     {
-      GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (private->impl);
+      GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
 
       XMoveResizeWindow (GDK_WINDOW_XDISPLAY (window),
                          GDK_WINDOW_XID (window),
@@ -1556,18 +1516,18 @@ window_x11_move_resize (GdkWindow *window,
 
       if (impl->override_redirect)
         {
-          private->x = x;
-          private->y = y;
+          window->x = x;
+          window->y = y;
 
-          private->width = width;
-          private->height = height;
+          window->width = width;
+          window->height = height;
 
-          _gdk_x11_drawable_update_size (private->impl);
+          _gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (window->impl));
         }
       else
         {
-          if (width != private->width || height != private->height)
-            private->resize_count += 1;
+          if (width != window->width || height != window->height)
+            window->resize_count += 1;
         }
     }
 }
@@ -1597,27 +1557,23 @@ gdk_window_x11_reparent (GdkWindow *window,
                          gint       x,
                          gint       y)
 {
-  GdkWindowObject *window_private;
-  GdkWindowObject *parent_private;
   GdkWindowImplX11 *impl;
 
-  window_private = (GdkWindowObject*) window;
-  parent_private = (GdkWindowObject*) new_parent;
-  impl = GDK_WINDOW_IMPL_X11 (window_private->impl);
+  impl = GDK_WINDOW_IMPL_X11 (window->impl);
 
   _gdk_x11_window_tmp_unset_bg (window, TRUE);
   _gdk_x11_window_tmp_unset_parent_bg (window);
   XReparentWindow (GDK_WINDOW_XDISPLAY (window),
                   GDK_WINDOW_XID (window),
                   GDK_WINDOW_XID (new_parent),
-                  parent_private->abs_x + x, parent_private->abs_y + y);
+                  new_parent->abs_x + x, new_parent->abs_y + y);
   _gdk_x11_window_tmp_reset_parent_bg (window);
   _gdk_x11_window_tmp_reset_bg (window, TRUE);
 
   if (GDK_WINDOW_TYPE (new_parent) == GDK_WINDOW_FOREIGN)
     new_parent = gdk_screen_get_root_window (GDK_WINDOW_SCREEN (window));
 
-  window_private->parent = parent_private;
+  window->parent = new_parent;
 
   /* Switch the window type as appropriate */
 
@@ -1632,8 +1588,8 @@ gdk_window_x11_reparent (GdkWindow *window,
        {
          /* This is also done in common code at a later stage, but we
             need it in setup_toplevel, so do it here too */
-         if (window_private->toplevel_window_type != -1)
-           GDK_WINDOW_TYPE (window) = window_private->toplevel_window_type;
+         if (window->toplevel_window_type != -1)
+           GDK_WINDOW_TYPE (window) = window->toplevel_window_type;
          else if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD)
            GDK_WINDOW_TYPE (window) = GDK_WINDOW_TOPLEVEL;
          
@@ -1645,7 +1601,6 @@ gdk_window_x11_reparent (GdkWindow *window,
       
     case GDK_WINDOW_TOPLEVEL:
     case GDK_WINDOW_CHILD:
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TEMP:
       if (WINDOW_IS_TOPLEVEL (window) &&
          impl->toplevel)
@@ -1666,27 +1621,6 @@ gdk_window_x11_reparent (GdkWindow *window,
   return FALSE;
 }
 
-static void
-gdk_window_x11_clear_region (GdkWindow *window,
-                            GdkRegion *region,
-                            gboolean   send_expose)
-{
-  GdkRectangle *rectangles;
-  int n_rectangles, i;
-
-  gdk_region_get_rectangles  (region,
-                             &rectangles,
-                             &n_rectangles);
-
-  for (i = 0; i < n_rectangles; i++)
-    XClearArea (GDK_WINDOW_XDISPLAY (window), GDK_WINDOW_XID (window),
-               rectangles[i].x, rectangles[i].y,
-               rectangles[i].width, rectangles[i].height,
-               send_expose);
-
-  g_free (rectangles);
-}
-
 static void
 gdk_window_x11_raise (GdkWindow *window)
 {
@@ -1778,7 +1712,7 @@ move_to_current_desktop (GdkWindow *window)
       gulong *current_desktop;
       GdkDisplay *display;
       
-      display = gdk_drawable_get_display (window);
+      display = gdk_window_get_display (window);
 
       /* Get current desktop, then set it; this is a race, but not
        * one that matters much in practice.
@@ -1799,7 +1733,7 @@ move_to_current_desktop (GdkWindow *window)
           xclient.type = ClientMessage;
           xclient.serial = 0;
           xclient.send_event = True;
-          xclient.window = GDK_WINDOW_XWINDOW (window);
+          xclient.window = GDK_WINDOW_XID (window);
          xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_DESKTOP");
           xclient.format = 32;
 
@@ -1820,18 +1754,9 @@ move_to_current_desktop (GdkWindow *window)
     }
 }
 
-/**
- * gdk_window_focus:
- * @window: a #GdkWindow
- * @timestamp: timestamp of the event triggering the window focus
- *
- * Sets keyboard focus to @window. In most cases, gtk_window_present() 
- * should be used on a #GtkWindow, rather than calling this function.
- * 
- **/
-void
-gdk_window_focus (GdkWindow *window,
-                  guint32    timestamp)
+static void
+gdk_x11_window_focus (GdkWindow *window,
+                     guint32    timestamp)
 {
   GdkDisplay *display;
 
@@ -1850,7 +1775,7 @@ gdk_window_focus (GdkWindow *window,
 
       memset (&xclient, 0, sizeof (xclient));
       xclient.type = ClientMessage;
-      xclient.window = GDK_WINDOW_XWINDOW (window);
+      xclient.window = GDK_WINDOW_XID (window);
       xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display,
                                                                        "_NET_ACTIVE_WINDOW");
       xclient.format = 32;
@@ -1877,98 +1802,20 @@ gdk_window_focus (GdkWindow *window,
     }
 }
 
-/**
- * gdk_window_set_hints:
- * @window: a #GdkWindow
- * @x: ignored field, does not matter
- * @y: ignored field, does not matter
- * @min_width: minimum width hint
- * @min_height: minimum height hint
- * @max_width: max width hint
- * @max_height: max height hint
- * @flags: logical OR of GDK_HINT_POS, GDK_HINT_MIN_SIZE, and/or GDK_HINT_MAX_SIZE
- *
- * This function is broken and useless and you should ignore it.
- * If using GTK+, use functions such as gtk_window_resize(), gtk_window_set_size_request(),
- * gtk_window_move(), gtk_window_parse_geometry(), and gtk_window_set_geometry_hints(),
- * depending on what you're trying to do.
- *
- * If using GDK directly, use gdk_window_set_geometry_hints().
- * 
- **/
-void
-gdk_window_set_hints (GdkWindow *window,
-                     gint       x,
-                     gint       y,
-                     gint       min_width,
-                     gint       min_height,
-                     gint       max_width,
-                     gint       max_height,
-                     gint       flags)
+static void
+gdk_x11_window_set_type_hint (GdkWindow        *window,
+                             GdkWindowTypeHint hint)
 {
-  XSizeHints size_hints;
+  GdkDisplay *display;
+  Atom atom;
   
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     return;
-  
-  size_hints.flags = 0;
-  
-  if (flags & GDK_HINT_POS)
-    {
-      size_hints.flags |= PPosition;
-      size_hints.x = x;
-      size_hints.y = y;
-    }
-  
-  if (flags & GDK_HINT_MIN_SIZE)
-    {
-      size_hints.flags |= PMinSize;
-      size_hints.min_width = min_width;
-      size_hints.min_height = min_height;
-    }
-  
-  if (flags & GDK_HINT_MAX_SIZE)
-    {
-      size_hints.flags |= PMaxSize;
-      size_hints.max_width = max_width;
-      size_hints.max_height = max_height;
-    }
-  
-  /* FIXME: Would it be better to delete this property if
-   *        flags == 0? It would save space on the server
-   */
-  XSetWMNormalHints (GDK_WINDOW_XDISPLAY (window),
-                    GDK_WINDOW_XID (window),
-                    &size_hints);
-}
-
-/**
- * gdk_window_set_type_hint:
- * @window: A toplevel #GdkWindow
- * @hint: A hint of the function this window will have
- *
- * The application can use this call to provide a hint to the window
- * manager about the functionality of a window. The window manager
- * can use this information when determining the decoration and behaviour
- * of the window.
- *
- * The hint must be set before the window is mapped.
- **/
-void
-gdk_window_set_type_hint (GdkWindow        *window,
-                         GdkWindowTypeHint hint)
-{
-  GdkDisplay *display;
-  Atom atom;
-  
-  if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
-    return;
-
-  display = gdk_drawable_get_display (window);
-
-  switch (hint)
+
+  display = gdk_window_get_display (window);
+
+  switch (hint)
     {
     case GDK_WINDOW_TYPE_HINT_DIALOG:
       atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_DIALOG");
@@ -2023,18 +1870,8 @@ gdk_window_set_type_hint (GdkWindow        *window,
                   (guchar *)&atom, 1);
 }
 
-/**
- * gdk_window_get_type_hint:
- * @window: A toplevel #GdkWindow
- *
- * This function returns the type hint set for a window.
- *
- * Return value: The type hint set for @window
- *
- * Since: 2.10
- **/
-GdkWindowTypeHint
-gdk_window_get_type_hint (GdkWindow *window)
+static GdkWindowTypeHint
+gdk_x11_window_get_type_hint (GdkWindow *window)
 {
   GdkDisplay *display;
   GdkWindowTypeHint type;
@@ -2052,7 +1889,7 @@ gdk_window_get_type_hint (GdkWindow *window)
 
   type = GDK_WINDOW_TYPE_HINT_NORMAL;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
                           gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE"),
@@ -2129,32 +1966,15 @@ gdk_wmspec_change_state (gboolean   add,
              (XEvent *)&xclient);
 }
 
-/**
- * gdk_window_set_modal_hint:
- * @window: A toplevel #GdkWindow
- * @modal: %TRUE if the window is modal, %FALSE otherwise.
- *
- * The application can use this hint to tell the window manager
- * that a certain window has modal behaviour. The window manager
- * can use this information to handle modal windows in a special
- * way.
- *
- * You should only use this on windows for which you have
- * previously called gdk_window_set_transient_for()
- **/
-void
-gdk_window_set_modal_hint (GdkWindow *window,
-                          gboolean   modal)
+static void
+gdk_x11_window_set_modal_hint (GdkWindow *window,
+                              gboolean   modal)
 {
-  GdkWindowObject *private;
-
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     return;
 
-  private = (GdkWindowObject*) window;
-
-  private->modal_hint = modal;
+  window->modal_hint = modal;
 
   if (GDK_WINDOW_IS_MAPPED (window))
     gdk_wmspec_change_state (modal, window,
@@ -2162,23 +1982,9 @@ gdk_window_set_modal_hint (GdkWindow *window,
                             GDK_NONE);
 }
 
-/**
- * gdk_window_set_skip_taskbar_hint:
- * @window: a toplevel #GdkWindow
- * @skips_taskbar: %TRUE to skip the taskbar
- * 
- * Toggles whether a window should appear in a task list or window
- * list. If a window's semantic type as specified with
- * gdk_window_set_type_hint() already fully describes the window, this
- * function should <emphasis>not</emphasis> be called in addition, 
- * instead you should allow the window to be treated according to 
- * standard policy for its semantic type.
- *
- * Since: 2.2
- **/
-void
-gdk_window_set_skip_taskbar_hint (GdkWindow *window,
-                                  gboolean   skips_taskbar)
+static void
+gdk_x11_window_set_skip_taskbar_hint (GdkWindow *window,
+                                     gboolean   skips_taskbar)
 {
   GdkToplevelX11 *toplevel;
   
@@ -2197,25 +2003,9 @@ gdk_window_set_skip_taskbar_hint (GdkWindow *window,
                             GDK_NONE);
 }
 
-/**
- * gdk_window_set_skip_pager_hint:
- * @window: a toplevel #GdkWindow
- * @skips_pager: %TRUE to skip the pager
- * 
- * Toggles whether a window should appear in a pager (workspace
- * switcher, or other desktop utility program that displays a small
- * thumbnail representation of the windows on the desktop). If a
- * window's semantic type as specified with gdk_window_set_type_hint()
- * already fully describes the window, this function should 
- * <emphasis>not</emphasis> be called in addition, instead you should 
- * allow the window to be treated according to standard policy for 
- * its semantic type.
- *
- * Since: 2.2
- **/
-void
-gdk_window_set_skip_pager_hint (GdkWindow *window,
-                                gboolean   skips_pager)
+static void
+gdk_x11_window_set_skip_pager_hint (GdkWindow *window,
+                                   gboolean   skips_pager)
 {
   GdkToplevelX11 *toplevel;
     
@@ -2234,18 +2024,8 @@ gdk_window_set_skip_pager_hint (GdkWindow *window,
                             GDK_NONE);
 }
 
-/**
- * gdk_window_set_urgency_hint:
- * @window: a toplevel #GdkWindow
- * @urgent: %TRUE if the window is urgent
- * 
- * Toggles whether a window needs the user's
- * urgent attention.
- *
- * Since: 2.8
- **/
-void
-gdk_window_set_urgency_hint (GdkWindow *window,
+static void
+gdk_x11_window_set_urgency_hint (GdkWindow *window,
                             gboolean   urgent)
 {
   GdkToplevelX11 *toplevel;
@@ -2262,39 +2042,10 @@ gdk_window_set_urgency_hint (GdkWindow *window,
   update_wm_hints (window, FALSE);
 }
 
-/**
- * gdk_window_set_geometry_hints:
- * @window: a toplevel #GdkWindow
- * @geometry: geometry hints
- * @geom_mask: bitmask indicating fields of @geometry to pay attention to
- *
- * Sets the geometry hints for @window. Hints flagged in @geom_mask
- * are set, hints not flagged in @geom_mask are unset.
- * To unset all hints, use a @geom_mask of 0 and a @geometry of %NULL.
- *
- * This function provides hints to the windowing system about
- * acceptable sizes for a toplevel window. The purpose of 
- * this is to constrain user resizing, but the windowing system
- * will typically  (but is not required to) also constrain the
- * current size of the window to the provided values and
- * constrain programatic resizing via gdk_window_resize() or
- * gdk_window_move_resize().
- * 
- * Note that on X11, this effect has no effect on windows
- * of type %GDK_WINDOW_TEMP or windows where override redirect
- * has been turned on via gdk_window_set_override_redirect()
- * since these windows are not resizable by the user.
- * 
- * Since you can't count on the windowing system doing the
- * constraints for programmatic resizes, you should generally
- * call gdk_window_constrain_size() yourself to determine
- * appropriate sizes.
- *
- **/
-void 
-gdk_window_set_geometry_hints (GdkWindow         *window,
-                              const GdkGeometry *geometry,
-                              GdkWindowHints     geom_mask)
+static void
+gdk_x11_window_set_geometry_hints (GdkWindow         *window,
+                                  const GdkGeometry *geometry,
+                                  GdkWindowHints     geom_mask)
 {
   XSizeHints size_hints;
   
@@ -2543,20 +2294,9 @@ set_wm_name (GdkDisplay  *display,
                     name);
 }
 
-/**
- * gdk_window_set_title:
- * @window: a toplevel #GdkWindow
- * @title: title of @window
- *
- * Sets the title of a toplevel window, to be displayed in the titlebar.
- * If you haven't explicitly set the icon name for the window
- * (using gdk_window_set_icon_name()), the icon name will be set to
- * @title as well. @title must be in UTF-8 encoding (as with all
- * user-readable strings in GDK/GTK+). @title may not be %NULL.
- **/
-void
-gdk_window_set_title (GdkWindow   *window,
-                     const gchar *title)
+static void
+gdk_x11_window_set_title (GdkWindow   *window,
+                         const gchar *title)
 {
   GdkDisplay *display;
   Display *xdisplay;
@@ -2568,7 +2308,7 @@ gdk_window_set_title (GdkWindow   *window,
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     return;
   
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   xdisplay = GDK_DISPLAY_XDISPLAY (display);
   xwindow = GDK_WINDOW_XID (window);
 
@@ -2587,32 +2327,13 @@ gdk_window_set_title (GdkWindow   *window,
     }
 }
 
-/**
- * gdk_window_set_role:
- * @window: a toplevel #GdkWindow
- * @role: a string indicating its role
- *
- * When using GTK+, typically you should use gtk_window_set_role() instead
- * of this low-level function.
- * 
- * The window manager and session manager use a window's role to
- * distinguish it from other kinds of window in the same application.
- * When an application is restarted after being saved in a previous
- * session, all windows with the same title and role are treated as
- * interchangeable.  So if you have two windows with the same title
- * that should be distinguished for session management purposes, you
- * should set the role on those windows. It doesn't matter what string
- * you use for the role, as long as you have a different role for each
- * non-interchangeable kind of window.
- * 
- **/
-void          
-gdk_window_set_role (GdkWindow   *window,
-                    const gchar *role)
+static void
+gdk_x11_window_set_role (GdkWindow   *window,
+                        const gchar *role)
 {
   GdkDisplay *display;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -2627,26 +2348,15 @@ gdk_window_set_role (GdkWindow   *window,
                      gdk_x11_get_xatom_by_name_for_display (display, "WM_WINDOW_ROLE"));
 }
 
-/**
- * gdk_window_set_startup_id:
- * @window: a toplevel #GdkWindow
- * @startup_id: a string with startup-notification identifier
- *
- * When using GTK+, typically you should use gtk_window_set_startup_id()
- * instead of this low-level function.
- *
- * Since: 2.12
- *
- **/
-void
-gdk_window_set_startup_id (GdkWindow   *window,
-                          const gchar *startup_id)
+static void
+gdk_x11_window_set_startup_id (GdkWindow   *window,
+                              const gchar *startup_id)
 {
   GdkDisplay *display;
 
   g_return_if_fail (GDK_IS_WINDOW (window));
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -2662,22 +2372,9 @@ gdk_window_set_startup_id (GdkWindow   *window,
                      gdk_x11_get_xatom_by_name_for_display (display, "_NET_STARTUP_ID"));
 }
 
-/**
- * gdk_window_set_transient_for:
- * @window: a toplevel #GdkWindow
- * @parent: another toplevel #GdkWindow
- *
- * Indicates to the window manager that @window is a transient dialog
- * associated with the application window @parent. This allows the
- * window manager to do things like center @window on @parent and
- * keep @window above @parent.
- *
- * See gtk_window_set_transient_for() if you're using #GtkWindow or
- * #GtkDialog.
- **/
-void
-gdk_window_set_transient_for (GdkWindow *window,
-                             GdkWindow *parent)
+static void
+gdk_x11_window_set_transient_for (GdkWindow *window,
+                                 GdkWindow *parent)
 {
   if (!GDK_WINDOW_DESTROYED (window) && !GDK_WINDOW_DESTROYED (parent) &&
       WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -2686,80 +2383,169 @@ gdk_window_set_transient_for (GdkWindow *window,
                          GDK_WINDOW_XID (parent));
 }
 
-static void
-gdk_window_x11_set_background (GdkWindow      *window,
-                               const GdkColor *color)
+static gboolean
+gdk_window_x11_set_back_color (GdkWindow *window,
+                               double     red,
+                               double     green,
+                               double     blue,
+                               double     alpha)
 {
-  XSetWindowBackground (GDK_WINDOW_XDISPLAY (window),
-                       GDK_WINDOW_XID (window), color->pixel);
+  GdkVisual *visual = gdk_window_get_visual (window);
+
+  /* I suppose we could handle these, but that'd require fiddling with 
+   * xrender formats... */
+  if (alpha != 1.0)
+    return FALSE;
+
+  switch (visual->type)
+    {
+    case GDK_VISUAL_DIRECT_COLOR:
+    case GDK_VISUAL_TRUE_COLOR:
+       {
+         /* If bits not used for color are used for something other than padding,
+          * it's likely alpha, so we set them to 1s.
+          */
+         guint padding, pixel;
+
+         /* Shifting by >= width-of-type isn't defined in C */
+         if (visual->depth >= 32)
+           padding = 0;
+         else
+           padding = ((~(guint32)0)) << visual->depth;
+         
+         pixel = ~ (visual->red_mask | visual->green_mask | visual->blue_mask | padding);
+         
+         pixel += (((int) (red   * ((1 << visual->red_prec  ) - 1))) << visual->red_shift  ) +
+                  (((int) (green * ((1 << visual->green_prec) - 1))) << visual->green_shift) +
+                  (((int) (blue  * ((1 << visual->blue_prec ) - 1))) << visual->blue_shift );
+
+          XSetWindowBackground (GDK_WINDOW_XDISPLAY (window),
+                                GDK_WINDOW_XID (window), pixel);
+       }
+      return TRUE;
+
+    /* These require fiddling with the colormap, and as they're essentially unused
+     * we're just gonna skip them for now.
+     */
+    case GDK_VISUAL_PSEUDO_COLOR:
+    case GDK_VISUAL_GRAYSCALE:
+    case GDK_VISUAL_STATIC_GRAY:
+    case GDK_VISUAL_STATIC_COLOR:
+    default:
+      break;
+    }
+
+  return FALSE;
 }
 
-static void
-gdk_window_x11_set_back_pixmap (GdkWindow *window,
-                                GdkPixmap *pixmap)
+static gboolean
+matrix_is_identity (cairo_matrix_t *matrix)
 {
-  Pixmap xpixmap;
-  
-  if (pixmap == GDK_PARENT_RELATIVE_BG)
-    xpixmap = ParentRelative;
-  else if (pixmap == GDK_NO_BG)
-    xpixmap = None;
-  else
-    xpixmap = GDK_PIXMAP_XID (pixmap);
-  
-  if (!GDK_WINDOW_DESTROYED (window))
-    XSetWindowBackgroundPixmap (GDK_WINDOW_XDISPLAY (window),
-                               GDK_WINDOW_XID (window), xpixmap);
+  return matrix->xx == 1.0 && matrix->yy == 1.0 &&
+    matrix->yx == 0.0 && matrix->xy == 0.0 &&
+    matrix->x0 == 0.0 && matrix->y0 == 0.0;
 }
 
 static void
-gdk_window_x11_set_cursor (GdkWindow *window,
-                           GdkCursor *cursor)
+gdk_window_x11_set_background (GdkWindow      *window,
+                               cairo_pattern_t *pattern)
 {
-  GdkWindowObject *private;
-  GdkWindowImplX11 *impl;
-  GdkCursorPrivate *cursor_private;
-  Cursor xcursor;
-  
-  private = (GdkWindowObject *)window;
-  impl = GDK_WINDOW_IMPL_X11 (private->impl);
-  cursor_private = (GdkCursorPrivate*) cursor;
+  double r, g, b, a;
+  cairo_surface_t *surface;
+  cairo_matrix_t matrix;
 
-  if (impl->cursor)
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  if (pattern == NULL)
     {
-      gdk_cursor_unref (impl->cursor);
-      impl->cursor = NULL;
+      GdkWindow *parent;
+
+      /* X throws BadMatch if the parent has a different visual when
+       * using ParentRelative */
+      parent = gdk_window_get_parent (window);
+      if (parent && gdk_window_get_visual (parent) == gdk_window_get_visual (window))
+        XSetWindowBackgroundPixmap (GDK_WINDOW_XDISPLAY (window),
+                                    GDK_WINDOW_XID (window), ParentRelative);
+      else
+        XSetWindowBackgroundPixmap (GDK_WINDOW_XDISPLAY (window),
+                                    GDK_WINDOW_XID (window), None);
+      return;
     }
 
+  switch (cairo_pattern_get_type (pattern))
+    {
+    case CAIRO_PATTERN_TYPE_SOLID:
+      cairo_pattern_get_rgba (pattern, &r, &g, &b, &a);
+      if (gdk_window_x11_set_back_color (window, r, g, b, a))
+        return;
+      break;
+    case CAIRO_PATTERN_TYPE_SURFACE:
+      cairo_pattern_get_matrix (pattern, &matrix);
+      if (cairo_pattern_get_surface (pattern, &surface) == CAIRO_STATUS_SUCCESS &&
+          matrix_is_identity (&matrix) &&
+          cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_XLIB &&
+          cairo_xlib_surface_get_visual (surface) == GDK_VISUAL_XVISUAL (gdk_window_get_visual ((window))) &&
+          cairo_xlib_surface_get_display (surface) == GDK_WINDOW_XDISPLAY (window))
+        {
+          double x, y;
+
+          cairo_surface_get_device_offset (surface, &x, &y);
+          /* XXX: This still bombs for non-pixmaps, but there's no way to
+           * detect we're not a pixmap in Cairo... */
+          if (x == 0.0 && y == 0.0)
+            {
+              XSetWindowBackgroundPixmap (GDK_WINDOW_XDISPLAY (window),
+                                          GDK_WINDOW_XID (window),
+                                          cairo_xlib_surface_get_drawable (surface));
+              return;
+            }
+        }
+      /* fall through */
+    case CAIRO_PATTERN_TYPE_LINEAR:
+    case CAIRO_PATTERN_TYPE_RADIAL:
+    default:
+      /* fallback: just use black */
+      break;
+    }
+
+  XSetWindowBackgroundPixmap (GDK_WINDOW_XDISPLAY (window),
+                              GDK_WINDOW_XID (window), None);
+}
+
+static void
+gdk_window_x11_set_device_cursor (GdkWindow *window,
+                                  GdkDevice *device,
+                                  GdkCursor *cursor)
+{
+  GdkWindowImplX11 *impl;
+
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  g_return_if_fail (GDK_IS_DEVICE (device));
+
+  impl = GDK_WINDOW_IMPL_X11 (window->impl);
+
   if (!cursor)
-    xcursor = None;
+    g_hash_table_remove (impl->device_cursor, device);
   else
     {
       _gdk_x11_cursor_update_theme (cursor);
-      xcursor = cursor_private->xcursor;
+      g_hash_table_replace (impl->device_cursor,
+                            device, gdk_cursor_ref (cursor));
     }
-  
+
   if (!GDK_WINDOW_DESTROYED (window))
-    {
-      XDefineCursor (GDK_WINDOW_XDISPLAY (window),
-                    GDK_WINDOW_XID (window),
-                    xcursor);
-      
-      if (cursor)
-       impl->cursor = gdk_cursor_ref (cursor);
-    }
+    GDK_DEVICE_GET_CLASS (device)->set_window_cursor (device, window, cursor);
 }
 
 GdkCursor *
 _gdk_x11_window_get_cursor (GdkWindow *window)
 {
-  GdkWindowObject *private;
   GdkWindowImplX11 *impl;
   
   g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
     
-  private = (GdkWindowObject *)window;
-  impl = GDK_WINDOW_IMPL_X11 (private->impl);
+  impl = GDK_WINDOW_IMPL_X11 (window->impl);
 
   return impl->cursor;
 }
@@ -2769,8 +2555,7 @@ gdk_window_x11_get_geometry (GdkWindow *window,
                              gint      *x,
                              gint      *y,
                              gint      *width,
-                             gint      *height,
-                             gint      *depth)
+                             gint      *height)
 {
   Window root;
   gint tx;
@@ -2794,8 +2579,6 @@ gdk_window_x11_get_geometry (GdkWindow *window,
        *width = twidth;
       if (height)
        *height = theight;
-      if (depth)
-       *depth = tdepth;
     }
 }
 
@@ -2825,70 +2608,8 @@ gdk_window_x11_get_root_coords (GdkWindow *window,
   return return_val;
 }
 
-static gboolean
-gdk_window_x11_get_deskrelative_origin (GdkWindow *window,
-                                       gint      *x,
-                                       gint      *y)
-{
-  gboolean return_val = FALSE;
-  gint num_children, format_return;
-  Window win, *child, parent, root;
-  Atom type_return;
-  Atom atom;
-  gulong number_return, bytes_after_return;
-  guchar *data_return;
-  
-  atom = gdk_x11_get_xatom_by_name_for_display (GDK_WINDOW_DISPLAY (window),
-                                               "ENLIGHTENMENT_DESKTOP");
-  win = GDK_WINDOW_XID (window);
-  
-  while (XQueryTree (GDK_WINDOW_XDISPLAY (window), win, &root, &parent,
-                    &child, (unsigned int *)&num_children))
-    {
-      if ((child) && (num_children > 0))
-       XFree (child);
-      
-      if (!parent)
-       break;
-      else
-       win = parent;
-      
-      if (win == root)
-       break;
-      
-      data_return = NULL;
-      XGetWindowProperty (GDK_WINDOW_XDISPLAY (window), win, atom, 0, 0,
-                         False, XA_CARDINAL, &type_return, &format_return,
-                         &number_return, &bytes_after_return, &data_return);
-      
-      if (type_return == XA_CARDINAL)
-       {
-         XFree (data_return);
-         break;
-       }
-    }
-  
-  return_val = XTranslateCoordinates (GDK_WINDOW_XDISPLAY (window),
-                                     GDK_WINDOW_XID (window),
-                                     win,
-                                     0, 0, x, y,
-                                     &root);
-  
-  return return_val;
-}
-
-/**
- * gdk_window_get_root_origin:
- * @window: a toplevel #GdkWindow
- * @x: return location for X position of window frame
- * @y: return location for Y position of window frame
- *
- * Obtains the top-left corner of the window manager frame in root
- * window coordinates.
- * 
- **/
-void
-gdk_window_get_root_origin (GdkWindow *window,
+static void
+gdk_x11_window_get_root_origin (GdkWindow *window,
                            gint      *x,
                            gint      *y)
 {
@@ -2903,23 +2624,12 @@ gdk_window_get_root_origin (GdkWindow *window,
     *y = rect.y;
 }
 
-/**
- * gdk_window_get_frame_extents:
- * @window: a toplevel #GdkWindow
- * @rect: rectangle to fill with bounding box of the window frame
- *
- * Obtains the bounding box of the window, including window manager
- * titlebar/borders if any. The frame position is given in root window
- * coordinates. To get the position of the window itself (rather than
- * the frame) in root window coordinates, use gdk_window_get_origin().
- * 
- **/
-void
-gdk_window_get_frame_extents (GdkWindow    *window,
-                              GdkRectangle *rect)
+static void
+gdk_x11_window_get_frame_extents (GdkWindow    *window,
+                                 GdkRectangle *rect)
 {
   GdkDisplay *display;
-  GdkWindowObject *private;
+  GdkWindowImplX11 *impl;
   Window xwindow;
   Window xparent;
   Window root;
@@ -2940,22 +2650,22 @@ gdk_window_get_frame_extents (GdkWindow    *window,
   
   g_return_if_fail (rect != NULL);
   
-  private = (GdkWindowObject*) window;
-  
   rect->x = 0;
   rect->y = 0;
   rect->width = 1;
   rect->height = 1;
   
-  while (private->parent && ((GdkWindowObject*) private->parent)->parent)
-    private = (GdkWindowObject*) private->parent;
+  while (window->parent && (window->parent)->parent)
+    window = window->parent;
 
   /* Refine our fallback answer a bit using local information */
-  rect->x = private->x;
-  rect->y = private->y;
-  gdk_drawable_get_size ((GdkDrawable *)private, &rect->width, &rect->height);
+  rect->x = window->x;
+  rect->y = window->y;
+  rect->width = window->width;
+  rect->height = window->height;
 
-  if (GDK_WINDOW_DESTROYED (private))
+  impl = GDK_WINDOW_IMPL_X11 (window->impl);
+  if (GDK_WINDOW_DESTROYED (window) || impl->override_redirect)
     return;
 
   nvroots = 0;
@@ -2963,7 +2673,7 @@ gdk_window_get_frame_extents (GdkWindow    *window,
 
   gdk_error_trap_push();
   
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   xwindow = GDK_WINDOW_XID (window);
 
   /* first try: use _NET_FRAME_EXTENTS */
@@ -3068,110 +2778,116 @@ gdk_window_get_frame_extents (GdkWindow    *window,
   if (vroots)
     XFree (vroots);
 
-  gdk_error_trap_pop ();
+  gdk_error_trap_pop_ignored ();
 }
 
 void
-_gdk_windowing_get_pointer (GdkDisplay       *display,
-                           GdkScreen       **screen,
-                           gint             *x,
-                           gint             *y,
-                           GdkModifierType  *mask)
+_gdk_windowing_get_device_state (GdkDisplay       *display,
+                                 GdkDevice        *device,
+                                 GdkScreen       **screen,
+                                 gint             *x,
+                                 gint             *y,
+                                 GdkModifierType  *mask)
 {
   GdkScreen *default_screen;
-  Display *xdisplay;
-  Window xwindow;
-  Window root = None;
-  Window child;
-  int rootx, rooty;
-  int winx;
-  int winy;
-  unsigned int xmask;
 
-  if (display->closed)
+  if (gdk_display_is_closed (display))
     return;
 
   default_screen = gdk_display_get_default_screen (display);
 
-  xdisplay = GDK_SCREEN_XDISPLAY (default_screen);
-  xwindow = GDK_SCREEN_XROOTWIN (default_screen);
-  
-  if (G_LIKELY (GDK_DISPLAY_X11 (display)->trusted_client)) 
+
+  if (G_LIKELY (GDK_DISPLAY_X11 (display)->trusted_client))
     {
-      XQueryPointer (xdisplay, xwindow,
-                    &root, &child, &rootx, &rooty, &winx, &winy, &xmask);
-    } 
-  else 
+      GdkWindow *root;
+
+      GDK_DEVICE_GET_CLASS (device)->query_state (device,
+                                                  gdk_screen_get_root_window (default_screen),
+                                                  &root, NULL,
+                                                  x, y,
+                                                  NULL, NULL,
+                                                  mask);
+      *screen = gdk_window_get_screen (root);
+    }
+  else
     {
       XSetWindowAttributes attributes;
-      Window w;
-      
-      w = XCreateWindow (xdisplay, xwindow, 0, 0, 1, 1, 0, 
-                        CopyFromParent, InputOnly, CopyFromParent, 
+      Display *xdisplay;
+      Window xwindow, w, root, child;
+      int rootx, rooty, winx, winy;
+      unsigned int xmask;
+
+      /* FIXME: untrusted clients not multidevice-safe */
+
+      xdisplay = GDK_SCREEN_XDISPLAY (default_screen);
+      xwindow = GDK_SCREEN_XROOTWIN (default_screen);
+
+      w = XCreateWindow (xdisplay, xwindow, 0, 0, 1, 1, 0,
+                        CopyFromParent, InputOnly, CopyFromParent,
                         0, &attributes);
-      XQueryPointer (xdisplay, w, 
+      XQueryPointer (xdisplay, w,
                     &root, &child, &rootx, &rooty, &winx, &winy, &xmask);
       XDestroyWindow (xdisplay, w);
+
+      if (root != None)
+        {
+          GdkWindow *gdk_root = gdk_window_lookup_for_display (display, root);
+          *screen = gdk_window_get_screen (gdk_root);
+        }
+
+      *x = rootx;
+      *y = rooty;
+      *mask = xmask;
     }
-  
-  if (root != None)
-    {
-      GdkWindow *gdk_root = gdk_window_lookup_for_display (display, root);
-      *screen = gdk_drawable_get_screen (gdk_root);
-    }
-  
-  *x = rootx;
-  *y = rooty;
-  *mask = xmask;
 }
 
 static gboolean
-gdk_window_x11_get_pointer (GdkWindow       *window,
-                           gint            *x,
-                           gint            *y,
-                           GdkModifierType *mask)
+gdk_window_x11_get_device_state (GdkWindow       *window,
+                                 GdkDevice       *device,
+                                 gint            *x,
+                                 gint            *y,
+                                 GdkModifierType *mask)
 {
   GdkDisplay *display = GDK_WINDOW_DISPLAY (window);
   gboolean return_val;
-  Window root;
-  Window child;
-  int rootx, rooty;
-  int winx = 0;
-  int winy = 0;
-  unsigned int xmask = 0;
 
   g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), FALSE);
 
-  
   return_val = TRUE;
+
   if (!GDK_WINDOW_DESTROYED (window))
     {
       if (G_LIKELY (GDK_DISPLAY_X11 (display)->trusted_client))
        {
-         if (XQueryPointer (GDK_WINDOW_XDISPLAY (window),
-                            GDK_WINDOW_XID (window),
-                            &root, &child, &rootx, &rooty, &winx, &winy, &xmask))
-           {
-             if (child)
-               return_val = gdk_window_lookup_for_display (GDK_WINDOW_DISPLAY (window), child) != NULL;
-           }
+          GdkWindow *child;
+
+          GDK_DEVICE_GET_CLASS (device)->query_state (device, window,
+                                                      NULL, &child,
+                                                      NULL, NULL,
+                                                      x, y, mask);
+          return_val = (child != NULL);
        }
       else
        {
          GdkScreen *screen;
          int originx, originy;
-         _gdk_windowing_get_pointer (gdk_drawable_get_display (window), &screen,
-                                     &rootx, &rooty, &xmask);
+          int rootx, rooty;
+          int winx = 0;
+          int winy = 0;
+          unsigned int xmask = 0;
+
+          _gdk_windowing_get_device_state (gdk_window_get_display (window), device,
+                                           &screen, &rootx, &rooty, &xmask);
          gdk_window_get_origin (window, &originx, &originy);
          winx = rootx - originx;
          winy = rooty - originy;
+
+          *x = winx;
+          *y = winy;
+          *mask = xmask;
        }
     }
 
-  *x = winx;
-  *y = winy;
-  *mask = xmask;
-
   return return_val;
 }
 
@@ -3195,6 +2911,8 @@ gdk_window_x11_get_pointer (GdkWindow       *window,
  * for the color picker in the #GtkColorSelectionDialog.
  *
  * Since: 2.8
+ *
+ * Deprecated: 3.0: Use gdk_display_warp_device() instead.
  */ 
 void
 gdk_display_warp_pointer (GdkDisplay *display,
@@ -3202,37 +2920,64 @@ gdk_display_warp_pointer (GdkDisplay *display,
                          gint        x,
                          gint        y)
 {
-  Display *xdisplay;
-  Window dest;
+  GdkDevice *device;
 
-  xdisplay = GDK_DISPLAY_XDISPLAY (display);
-  dest = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen));
+  g_return_if_fail (GDK_IS_DISPLAY (display));
+  g_return_if_fail (GDK_IS_SCREEN (screen));
 
-  XWarpPointer (xdisplay, None, dest, 0, 0, 0, 0, x, y);  
+  device = display->core_pointer;
+  GDK_DEVICE_GET_CLASS (device)->warp (device, screen, x, y);
+}
+
+/**
+ * gdk_display_warp_device:
+ * @display: a #GdkDisplay.
+ * @device: a #GdkDevice.
+ * @screen: the screen of @display to warp @device to.
+ * @x: the X coordinate of the destination.
+ * @y: the Y coordinate of the destination.
+ *
+ * Warps @device in @display to the point @x,@y on
+ * the screen @screen, unless the device is confined
+ * to a window by a grab, in which case it will be moved
+ * as far as allowed by the grab. Warping the pointer
+ * creates events as if the user had moved the mouse
+ * instantaneously to the destination.
+ *
+ * Note that the pointer should normally be under the
+ * control of the user. This function was added to cover
+ * some rare use cases like keyboard navigation support
+ * for the color picker in the #GtkColorSelectionDialog.
+ *
+ * Since: 3.0
+ **/
+void
+gdk_display_warp_device (GdkDisplay *display,
+                         GdkDevice  *device,
+                         GdkScreen  *screen,
+                         gint        x,
+                         gint        y)
+{
+  g_return_if_fail (GDK_IS_DISPLAY (display));
+  g_return_if_fail (GDK_IS_DEVICE (device));
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+  g_return_if_fail (display == gdk_device_get_display (device));
+
+  GDK_DEVICE_GET_CLASS (device)->warp (device, screen, x, y);
 }
 
 GdkWindow*
-_gdk_windowing_window_at_pointer (GdkDisplay *display,
-                                  gint       *win_x,
-                                 gint       *win_y,
-                                 GdkModifierType *mask,
-                                 gboolean   get_toplevel)
+_gdk_windowing_window_at_device_position (GdkDisplay      *display,
+                                          GdkDevice       *device,
+                                          gint            *win_x,
+                                          gint            *win_y,
+                                          GdkModifierType *mask,
+                                          gboolean         get_toplevel)
 {
   GdkWindow *window;
   GdkScreen *screen;
-  Window root;
-  Window xwindow;
-  Window child;
-  Window xwindow_last = 0;
-  Display *xdisplay;
-  int rootx = -1, rooty = -1;
-  int winx, winy;
-  unsigned int xmask;
 
   screen = gdk_display_get_default_screen (display);
-  
-  xwindow = GDK_SCREEN_XROOTWIN (screen);
-  xdisplay = GDK_SCREEN_XDISPLAY (screen);
 
   /* This function really only works if the mouse pointer is held still
    * during its operation. If it moves from one leaf window to another
@@ -3240,35 +2985,24 @@ _gdk_windowing_window_at_pointer (GdkDisplay *display,
    * and the result.
    */
   gdk_x11_display_grab (display);
-  if (G_LIKELY (GDK_DISPLAY_X11 (display)->trusted_client)) 
-    {
-      XQueryPointer (xdisplay, xwindow,
-                    &root, &child, &rootx, &rooty, &winx, &winy, &xmask);
-      if (root == xwindow)
-       xwindow = child;
-      else
-       xwindow = root;
-      
-      while (xwindow)
-       {
-         xwindow_last = xwindow;
-         XQueryPointer (xdisplay, xwindow,
-                        &root, &xwindow, &rootx, &rooty, &winx, &winy, &xmask);
-         if (get_toplevel &&
-             (window = gdk_window_lookup_for_display (display, xwindow_last)) != NULL &&
-             GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
-           {
-             xwindow = xwindow_last;
-             break;
-           }
-       }
-    } 
-  else 
+  if (G_LIKELY (GDK_DISPLAY_X11 (display)->trusted_client))
+    window = GDK_DEVICE_GET_CLASS (device)->window_at_position (device, win_x, win_y, mask, get_toplevel);
+  else
     {
       gint i, screens, width, height;
       GList *toplevels, *list;
-      Window pointer_window;
-      
+      Window pointer_window, root, xwindow, child;
+      Window xwindow_last = 0;
+      Display *xdisplay;
+      int rootx = -1, rooty = -1;
+      int winx, winy;
+      unsigned int xmask;
+
+      /* FIXME: untrusted clients case not multidevice-safe */
+
+      xwindow = GDK_SCREEN_XROOTWIN (screen);
+      xdisplay = GDK_SCREEN_XDISPLAY (screen);
+
       pointer_window = None;
       screens = gdk_display_get_n_screens (display);
       for (i = 0; i < screens; ++i) {
@@ -3276,11 +3010,10 @@ _gdk_windowing_window_at_pointer (GdkDisplay *display,
        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_XWINDOW (window);
+         xwindow = GDK_WINDOW_XID (window);
          gdk_error_trap_push ();
          XQueryPointer (xdisplay, xwindow,
                         &root, &child, &rootx, &rooty, &winx, &winy, &xmask);
-         gdk_flush ();
          if (gdk_error_trap_pop ())
            continue;
          if (child != None) 
@@ -3288,7 +3021,7 @@ _gdk_windowing_window_at_pointer (GdkDisplay *display,
              pointer_window = child;
              break;
            }
-         gdk_window_get_geometry (window, NULL, NULL, &width, &height, NULL);
+         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? */
@@ -3321,24 +3054,24 @@ _gdk_windowing_window_at_pointer (GdkDisplay *display,
          gdk_error_trap_push ();
          XQueryPointer (xdisplay, xwindow,
                         &root, &xwindow, &rootx, &rooty, &winx, &winy, &xmask);
-         gdk_flush ();
          if (gdk_error_trap_pop ())
            break;
-         if (get_toplevel &&
+         if (get_toplevel && xwindow_last != root &&
              (window = gdk_window_lookup_for_display (display, xwindow_last)) != NULL &&
              GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
            break;
        }
+
+      window = gdk_window_lookup_for_display (display, xwindow_last);
+
+      *win_x = window ? winx : -1;
+      *win_y = window ? winy : -1;
+      if (mask)
+        *mask = xmask;
     }
-  
+
   gdk_x11_display_ungrab (display);
 
-  window = gdk_window_lookup_for_display (display, xwindow_last);
-  *win_x = window ? winx : -1;
-  *win_y = window ? winy : -1;
-  if (mask)
-    *mask = xmask;
-  
   return window;
 }
 
@@ -3359,7 +3092,7 @@ gdk_window_x11_get_events (GdkWindow *window)
       event_mask = x_event_mask_to_gdk_event_mask (attrs.your_event_mask);
       /* if property change was filtered out before, keep it filtered out */
       filtered = GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK;
-      GDK_WINDOW_OBJECT (window)->event_mask = event_mask & ((GDK_WINDOW_OBJECT (window)->event_mask & filtered) | ~filtered);
+      window->event_mask = event_mask & ((window->event_mask & filtered) | ~filtered);
 
       return event_mask;
     }
@@ -3369,78 +3102,28 @@ gdk_window_x11_set_events (GdkWindow    *window,
                            GdkEventMask  event_mask)
 {
   long xevent_mask = 0;
-  int i;
   
   if (!GDK_WINDOW_DESTROYED (window))
     {
+      GdkDisplayX11 *display_x11;
+
       if (GDK_WINDOW_XID (window) != GDK_WINDOW_XROOTWIN (window))
         xevent_mask = StructureNotifyMask | PropertyChangeMask;
-      for (i = 0; i < _gdk_nenvent_masks; i++)
-       {
-         if (event_mask & (1 << (i + 1)))
-           xevent_mask |= _gdk_event_mask_table[i];
-       }
-      
-      XSelectInput (GDK_WINDOW_XDISPLAY (window),
-                   GDK_WINDOW_XID (window),
-                   xevent_mask);
-    }
-}
 
-static void
-gdk_window_add_colormap_windows (GdkWindow *window)
-{
-  GdkWindow *toplevel;
-  Window *old_windows;
-  Window *new_windows;
-  int i, count;
-  
-  g_return_if_fail (GDK_IS_WINDOW (window));
-
-  if (GDK_WINDOW_DESTROYED (window))
-    return;
-
-  toplevel = gdk_window_get_toplevel (window);
-  
-  old_windows = NULL;
-  if (!XGetWMColormapWindows (GDK_WINDOW_XDISPLAY (toplevel),
-                             GDK_WINDOW_XID (toplevel),
-                             &old_windows, &count))
-    {
-      count = 0;
+      display_x11 = GDK_DISPLAY_X11 (gdk_window_get_display (window));
+      gdk_event_source_select_events ((GdkEventSource *) display_x11->event_source,
+                                      GDK_WINDOW_XID (window), event_mask,
+                                      xevent_mask);
     }
-  
-  for (i = 0; i < count; i++)
-    if (old_windows[i] == GDK_WINDOW_XID (window))
-      {
-       XFree (old_windows);
-       return;
-      }
-  
-  new_windows = g_new (Window, count + 1);
-  
-  for (i = 0; i < count; i++)
-    new_windows[i] = old_windows[i];
-  new_windows[count] = GDK_WINDOW_XID (window);
-  
-  XSetWMColormapWindows (GDK_WINDOW_XDISPLAY (toplevel),
-                        GDK_WINDOW_XID (toplevel),
-                        new_windows, count + 1);
-  
-  g_free (new_windows);
-  if (old_windows)
-    XFree (old_windows);
 }
 
 static inline void
 do_shape_combine_region (GdkWindow       *window,
-                        const GdkRegion *shape_region,
+                        const cairo_region_t *shape_region,
                         gint             offset_x,
                         gint             offset_y,
                         gint             shape)
 {
-  GdkWindowObject *private = (GdkWindowObject *)window;
-  
   if (GDK_WINDOW_DESTROYED (window))
     return;
 
@@ -3507,7 +3190,7 @@ do_shape_combine_region (GdkWindow       *window,
 
 static void
 gdk_window_x11_shape_combine_region (GdkWindow       *window,
-                                     const GdkRegion *shape_region,
+                                     const cairo_region_t *shape_region,
                                      gint             offset_x,
                                      gint             offset_y)
 {
@@ -3516,7 +3199,7 @@ gdk_window_x11_shape_combine_region (GdkWindow       *window,
 
 static void 
 gdk_window_x11_input_shape_combine_region (GdkWindow       *window,
-                                          const GdkRegion *shape_region,
+                                          const cairo_region_t *shape_region,
                                           gint             offset_x,
                                           gint             offset_y)
 {
@@ -3526,23 +3209,8 @@ gdk_window_x11_input_shape_combine_region (GdkWindow       *window,
 }
 
 
-/**
- * gdk_window_set_override_redirect:
- * @window: a toplevel #GdkWindow
- * @override_redirect: %TRUE if window should be override redirect
- *
- * An override redirect window is not under the control of the window manager.
- * This means it won't have a titlebar, won't be minimizable, etc. - it will
- * be entirely under the control of the application. The window manager
- * can't see the override redirect window at all.
- *
- * Override redirect should only be used for short-lived temporary
- * windows, such as popup menus. #GtkMenu uses an override redirect
- * window in its implementation, for example.
- * 
- **/
-void
-gdk_window_set_override_redirect (GdkWindow *window,
+static void
+gdk_x11_window_set_override_redirect (GdkWindow *window,
                                  gboolean override_redirect)
 {
   XSetWindowAttributes attr;
@@ -3550,8 +3218,7 @@ gdk_window_set_override_redirect (GdkWindow *window,
   if (!GDK_WINDOW_DESTROYED (window) &&
       WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     {
-      GdkWindowObject *private = (GdkWindowObject *)window;
-      GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (private->impl);
+      GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
 
       attr.override_redirect = (override_redirect? True : False);
       XChangeWindowAttributes (GDK_WINDOW_XDISPLAY (window),
@@ -3563,32 +3230,15 @@ gdk_window_set_override_redirect (GdkWindow *window,
     }
 }
 
-/**
- * gdk_window_set_accept_focus:
- * @window: a toplevel #GdkWindow
- * @accept_focus: %TRUE if the window should receive input focus
- *
- * Setting @accept_focus to %FALSE hints the desktop environment that the
- * window doesn't want to receive input focus. 
- *
- * On X, it is the responsibility of the window manager to interpret this 
- * hint. ICCCM-compliant window manager usually respect it.
- *
- * Since: 2.4 
- **/
-void
-gdk_window_set_accept_focus (GdkWindow *window,
-                            gboolean accept_focus)
+static void
+gdk_x11_window_set_accept_focus (GdkWindow *window,
+                                gboolean accept_focus)
 {
-  GdkWindowObject *private;
-
-  private = (GdkWindowObject *)window;  
-  
   accept_focus = accept_focus != FALSE;
 
-  if (private->accept_focus != accept_focus)
+  if (window->accept_focus != accept_focus)
     {
-      private->accept_focus = accept_focus;
+      window->accept_focus = accept_focus;
 
       if (!GDK_WINDOW_DESTROYED (window) &&
          WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -3596,38 +3246,18 @@ gdk_window_set_accept_focus (GdkWindow *window,
     }
 }
 
-/**
- * gdk_window_set_focus_on_map:
- * @window: a toplevel #GdkWindow
- * @focus_on_map: %TRUE if the window should receive input focus when mapped
- *
- * Setting @focus_on_map to %FALSE hints the desktop environment that the
- * window doesn't want to receive input focus when it is mapped.  
- * focus_on_map should be turned off for windows that aren't triggered
- * interactively (such as popups from network activity).
- *
- * On X, it is the responsibility of the window manager to interpret
- * this hint. Window managers following the freedesktop.org window
- * manager extension specification should respect it.
- *
- * Since: 2.6 
- **/
-void
-gdk_window_set_focus_on_map (GdkWindow *window,
-                            gboolean focus_on_map)
+static void
+gdk_x11_window_set_focus_on_map (GdkWindow *window,
+                                gboolean focus_on_map)
 {
-  GdkWindowObject *private;
-
-  private = (GdkWindowObject *)window;  
-  
   focus_on_map = focus_on_map != FALSE;
 
-  if (private->focus_on_map != focus_on_map)
+  if (window->focus_on_map != focus_on_map)
     {
-      private->focus_on_map = focus_on_map;
+      window->focus_on_map = focus_on_map;
       
       if ((!GDK_WINDOW_DESTROYED (window)) &&
-         (!private->focus_on_map) &&
+         (!window->focus_on_map) &&
          WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
        gdk_x11_window_set_user_time (window, 0);
     }
@@ -3667,7 +3297,7 @@ gdk_x11_window_set_user_time (GdkWindow *window,
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     return;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   display_x11 = GDK_DISPLAY_X11 (display);
   toplevel = _gdk_x11_window_get_toplevel (window);
 
@@ -3704,23 +3334,109 @@ gdk_x11_window_set_user_time (GdkWindow *window,
        ? XMaxRequestSize (GDK_DISPLAY_XDISPLAY (display)) - 100         \
        : XExtendedMaxRequestSize (GDK_DISPLAY_XDISPLAY (display)) - 100)
 
-/**
- * gdk_window_set_icon_list:
- * @window: The #GdkWindow toplevel window to set the icon of.
- * @pixbufs: A list of pixbufs, of different sizes.
- *
- * Sets a list of icons for the window. One of these will be used
- * to represent the window when it has been iconified. The icon is
- * usually shown in an icon box or some sort of task bar. Which icon
- * size is shown depends on the window manager. The window manager
- * can scale the icon  but setting several size icons can give better
- * image quality since the window manager may only need to scale the
- * icon by a small amount or not at all.
- *
- **/
-void
-gdk_window_set_icon_list (GdkWindow *window,
-                         GList     *pixbufs)
+static void
+gdk_window_update_icon (GdkWindow *window,
+                        GList     *icon_list)
+{
+  GdkToplevelX11 *toplevel;
+  GdkPixbuf *best_icon;
+  GList *tmp_list;
+  int best_size;
+  
+  toplevel = _gdk_x11_window_get_toplevel (window);
+
+  if (toplevel->icon_pixmap != NULL)
+    {
+      cairo_surface_destroy (toplevel->icon_pixmap);
+      toplevel->icon_pixmap = NULL;
+    }
+  
+  if (toplevel->icon_mask != NULL)
+    {
+      cairo_surface_destroy (toplevel->icon_mask);
+      toplevel->icon_mask = NULL;
+    }
+  
+#define IDEAL_SIZE 48
+  
+  best_size = G_MAXINT;
+  best_icon = NULL;
+  for (tmp_list = icon_list; tmp_list; tmp_list = tmp_list->next)
+    {
+      GdkPixbuf *pixbuf = tmp_list->data;
+      int this;
+  
+      /* average width and height - if someone passes in a rectangular
+       * icon they deserve what they get.
+       */
+      this = gdk_pixbuf_get_width (pixbuf) + gdk_pixbuf_get_height (pixbuf);
+      this /= 2;
+  
+      if (best_icon == NULL)
+        {
+          best_icon = pixbuf;
+          best_size = this;
+        }
+      else
+        {
+          /* icon is better if it's 32 pixels or larger, and closer to
+           * the ideal size than the current best.
+           */
+          if (this >= 32 &&
+              (ABS (best_size - IDEAL_SIZE) <
+               ABS (this - IDEAL_SIZE)))
+            {
+              best_icon = pixbuf;
+              best_size = this;
+            }
+        }
+    }
+
+  if (best_icon)
+    {
+      int width = gdk_pixbuf_get_width (best_icon);
+      int height = gdk_pixbuf_get_height (best_icon);
+      cairo_t *cr;
+
+      toplevel->icon_pixmap = gdk_x11_window_create_pixmap_surface (window,
+                                                                    width,
+                                                                    height);
+
+      cr = cairo_create (toplevel->icon_pixmap);
+      cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+      gdk_cairo_set_source_pixbuf (cr, best_icon, 0, 0);
+      if (gdk_pixbuf_get_has_alpha (best_icon))
+        {
+          /* Saturate the image, so it has bilevel alpha */
+          cairo_push_group_with_content (cr, CAIRO_CONTENT_COLOR_ALPHA);
+          cairo_paint (cr);
+          cairo_set_operator (cr, CAIRO_OPERATOR_SATURATE);
+          cairo_paint (cr);
+          cairo_pop_group_to_source (cr);
+        }
+      cairo_paint (cr);
+      cairo_destroy (cr);
+
+      if (gdk_pixbuf_get_has_alpha (best_icon))
+        {
+          toplevel->icon_mask = _gdk_x11_window_create_bitmap_surface (window,
+                                                                       width,
+                                                                       height);
+
+          cr = cairo_create (toplevel->icon_mask);
+          gdk_cairo_set_source_pixbuf (cr, best_icon, 0, 0);
+          cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+          cairo_paint (cr);
+          cairo_destroy (cr);
+        }
+    }
+
+  update_wm_hints (window, FALSE);
+}
+
+static void
+gdk_x11_window_set_icon_list (GdkWindow *window,
+                             GList     *pixbufs)
 {
   gulong *data;
   guchar *pixels;
@@ -3738,7 +3454,7 @@ gdk_window_set_icon_list (GdkWindow *window,
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     return;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   
   l = pixbufs;
   size = 0;
@@ -3821,62 +3537,8 @@ gdk_window_set_icon_list (GdkWindow *window,
     }
   
   g_free (data);
-}
-
-/**
- * gdk_window_set_icon:
- * @window: a toplevel #GdkWindow
- * @icon_window: a #GdkWindow to use for the icon, or %NULL to unset
- * @pixmap: a #GdkPixmap to use as the icon, or %NULL to unset
- * @mask: a 1-bit pixmap (#GdkBitmap) to use as mask for @pixmap, or %NULL to have none
- *
- * Sets the icon of @window as a pixmap or window. If using GTK+, investigate
- * gtk_window_set_default_icon_list() first, and then gtk_window_set_icon_list()
- * and gtk_window_set_icon(). If those don't meet your needs, look at
- * gdk_window_set_icon_list(). Only if all those are too high-level do you
- * want to fall back to gdk_window_set_icon().
- * 
- **/
-void          
-gdk_window_set_icon (GdkWindow *window, 
-                    GdkWindow *icon_window,
-                    GdkPixmap *pixmap,
-                    GdkBitmap *mask)
-{
-  GdkToplevelX11 *toplevel;
-
-  if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
-    return;
-
-  toplevel = _gdk_x11_window_get_toplevel (window);
 
-  if (toplevel->icon_window != icon_window)
-    {
-      if (toplevel->icon_window)
-       g_object_unref (toplevel->icon_window);
-      toplevel->icon_window = g_object_ref (icon_window);
-    }
-  
-  if (toplevel->icon_pixmap != pixmap)
-    {
-      if (pixmap)
-       g_object_ref (pixmap);
-      if (toplevel->icon_pixmap)
-       g_object_unref (toplevel->icon_pixmap);
-      toplevel->icon_pixmap = pixmap;
-    }
-  
-  if (toplevel->icon_mask != mask)
-    {
-      if (mask)
-       g_object_ref (mask);
-      if (toplevel->icon_mask)
-       g_object_unref (toplevel->icon_mask);
-      toplevel->icon_mask = mask;
-    }
-  
-  update_wm_hints (window, FALSE);
+  gdk_window_update_icon (window, pixbufs);
 }
 
 static gboolean
@@ -3886,33 +3548,17 @@ gdk_window_icon_name_set (GdkWindow *window)
                                               g_quark_from_static_string ("gdk-icon-name-set")));
 }
 
-/**
- * gdk_window_set_icon_name:
- * @window: a toplevel #GdkWindow
- * @name: name of window while iconified (minimized)
- *
- * Windows may have a name used while minimized, distinct from the
- * name they display in their titlebar. Most of the time this is a bad
- * idea from a user interface standpoint. But you can set such a name
- * with this function, if you like.
- *
- * After calling this with a non-%NULL @name, calls to gdk_window_set_title()
- * will not update the icon title.
- *
- * Using %NULL for @name unsets the icon title; further calls to
- * gdk_window_set_title() will again update the icon title as well.
- **/
-void
-gdk_window_set_icon_name (GdkWindow   *window, 
-                         const gchar *name)
+static void
+gdk_x11_window_set_icon_name (GdkWindow   *window,
+                             const gchar *name)
 {
   GdkDisplay *display;
 
   if (GDK_WINDOW_DESTROYED (window) ||
-      WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     return;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   g_object_set_qdata (G_OBJECT (window), g_quark_from_static_string ("gdk-icon-name-set"),
                       GUINT_TO_POINTER (name != NULL));
@@ -3940,19 +3586,8 @@ gdk_window_set_icon_name (GdkWindow   *window,
     }
 }
 
-/**
- * gdk_window_iconify:
- * @window: a toplevel #GdkWindow
- * 
- * Asks to iconify (minimize) @window. The window manager may choose
- * to ignore the request, but normally will honor it. Using
- * gtk_window_iconify() is preferred, if you have a #GtkWindow widget.
- *
- * This function only makes sense when @window is a toplevel window.
- *
- **/
-void
-gdk_window_iconify (GdkWindow *window)
+static void
+gdk_x11_window_iconify (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -3961,7 +3596,7 @@ gdk_window_iconify (GdkWindow *window)
   if (GDK_WINDOW_IS_MAPPED (window))
     {  
       XIconifyWindow (GDK_WINDOW_XDISPLAY (window),
-                     GDK_WINDOW_XWINDOW (window),
+                     GDK_WINDOW_XID (window),
                      gdk_screen_get_number (GDK_WINDOW_SCREEN (window)));
     }
   else
@@ -3973,19 +3608,8 @@ gdk_window_iconify (GdkWindow *window)
     }
 }
 
-/**
- * gdk_window_deiconify:
- * @window: a toplevel #GdkWindow
- *
- * Attempt to deiconify (unminimize) @window. On X11 the window manager may
- * choose to ignore the request to deiconify. When using GTK+,
- * use gtk_window_deiconify() instead of the #GdkWindow variant. Or better yet,
- * you probably want to use gtk_window_present(), which raises the window, focuses it,
- * unminimizes it, and puts it on the current desktop.
- *
- **/
-void
-gdk_window_deiconify (GdkWindow *window)
+static void
+gdk_x11_window_deiconify (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -4004,23 +3628,8 @@ gdk_window_deiconify (GdkWindow *window)
     }
 }
 
-/**
- * gdk_window_stick:
- * @window: a toplevel #GdkWindow
- *
- * "Pins" a window such that it's on all workspaces and does not scroll
- * with viewports, for window managers that have scrollable viewports.
- * (When using #GtkWindow, gtk_window_stick() may be more useful.)
- *
- * On the X11 platform, this function depends on window manager
- * support, so may have no effect with many window managers. However,
- * GDK will do the best it can to convince the window manager to stick
- * the window. For window managers that don't support this operation,
- * there's nothing you can do to force it to happen.
- * 
- **/
-void
-gdk_window_stick (GdkWindow *window)
+static void
+gdk_x11_window_stick (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -4042,7 +3651,7 @@ gdk_window_stick (GdkWindow *window)
       /* Request desktop 0xFFFFFFFF */
       memset (&xclient, 0, sizeof (xclient));
       xclient.type = ClientMessage;
-      xclient.window = GDK_WINDOW_XWINDOW (window);
+      xclient.window = GDK_WINDOW_XID (window);
       xclient.display = GDK_WINDOW_XDISPLAY (window);
       xclient.message_type = gdk_x11_get_xatom_by_name_for_display (GDK_WINDOW_DISPLAY (window), 
                                                                        "_NET_WM_DESKTOP");
@@ -4067,16 +3676,8 @@ gdk_window_stick (GdkWindow *window)
     }
 }
 
-/**
- * gdk_window_unstick:
- * @window: a toplevel #GdkWindow
- *
- * Reverse operation for gdk_window_stick(); see gdk_window_stick(),
- * and gtk_window_unstick().
- * 
- **/
-void
-gdk_window_unstick (GdkWindow *window)
+static void
+gdk_x11_window_unstick (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -4101,25 +3702,8 @@ gdk_window_unstick (GdkWindow *window)
     }
 }
 
-/**
- * gdk_window_maximize:
- * @window: a toplevel #GdkWindow
- *
- * Maximizes the window. If the window was already maximized, then
- * this function does nothing.
- * 
- * On X11, asks the window manager to maximize @window, if the window
- * manager supports this operation. Not all window managers support
- * this, and some deliberately ignore it or don't have a concept of
- * "maximized"; so you can't rely on the maximization actually
- * happening. But it will happen with most standard window managers,
- * and GDK makes a best effort to get it to happen.
- *
- * On Windows, reliably maximizes the window.
- * 
- **/
-void
-gdk_window_maximize (GdkWindow *window)
+static void
+gdk_x11_window_maximize (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -4135,25 +3719,8 @@ gdk_window_maximize (GdkWindow *window)
                                 GDK_WINDOW_STATE_MAXIMIZED);
 }
 
-/**
- * gdk_window_unmaximize:
- * @window: a toplevel #GdkWindow
- *
- * Unmaximizes the window. If the window wasn't maximized, then this
- * function does nothing.
- * 
- * On X11, asks the window manager to unmaximize @window, if the
- * window manager supports this operation. Not all window managers
- * support this, and some deliberately ignore it or don't have a
- * concept of "maximized"; so you can't rely on the unmaximization
- * actually happening. But it will happen with most standard window
- * managers, and GDK makes a best effort to get it to happen.
- *
- * On Windows, reliably unmaximizes the window.
- * 
- **/
-void
-gdk_window_unmaximize (GdkWindow *window)
+static void
+gdk_x11_window_unmaximize (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -4169,28 +3736,8 @@ gdk_window_unmaximize (GdkWindow *window)
                                 0);
 }
 
-/**
- * gdk_window_fullscreen:
- * @window: a toplevel #GdkWindow
- *
- * Moves the window into fullscreen mode. This means the
- * window covers the entire screen and is above any panels
- * or task bars.
- *
- * If the window was already fullscreen, then this function does nothing.
- * 
- * On X11, asks the window manager to put @window in a fullscreen
- * state, if the window manager supports this operation. Not all
- * window managers support this, and some deliberately ignore it or
- * don't have a concept of "fullscreen"; so you can't rely on the
- * fullscreenification actually happening. But it will happen with
- * most standard window managers, and GDK makes a best effort to get
- * it to happen.
- *
- * Since: 2.2
- **/
-void
-gdk_window_fullscreen (GdkWindow *window)
+static void
+gdk_x11_window_fullscreen (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -4207,25 +3754,8 @@ gdk_window_fullscreen (GdkWindow *window)
                                  GDK_WINDOW_STATE_FULLSCREEN);
 }
 
-/**
- * gdk_window_unfullscreen:
- * @window: a toplevel #GdkWindow
- *
- * Moves the window out of fullscreen mode. If the window was not
- * fullscreen, does nothing.
- * 
- * On X11, asks the window manager to move @window out of the fullscreen
- * state, if the window manager supports this operation. Not all
- * window managers support this, and some deliberately ignore it or
- * don't have a concept of "fullscreen"; so you can't rely on the
- * unfullscreenification actually happening. But it will happen with
- * most standard window managers, and GDK makes a best effort to get
- * it to happen. 
- *
- * Since: 2.2
- **/
-void
-gdk_window_unfullscreen (GdkWindow *window)
+static void
+gdk_x11_window_unfullscreen (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -4242,26 +3772,9 @@ gdk_window_unfullscreen (GdkWindow *window)
                                 0);
 }
 
-/**
- * gdk_window_set_keep_above:
- * @window: a toplevel #GdkWindow
- * @setting: whether to keep @window above other windows
- *
- * Set if @window must be kept above other windows. If the
- * window was already above, then this function does nothing.
- * 
- * On X11, asks the window manager to keep @window above, if the window
- * manager supports this operation. Not all window managers support
- * this, and some deliberately ignore it or don't have a concept of
- * "keep above"; so you can't rely on the window being kept above.
- * But it will happen with most standard window managers,
- * and GDK makes a best effort to get it to happen.
- *
- * Since: 2.4
- **/
-void
-gdk_window_set_keep_above (GdkWindow *window,
-                           gboolean   setting)
+static void
+gdk_x11_window_set_keep_above (GdkWindow *window,
+                              gboolean   setting)
 {
   g_return_if_fail (GDK_IS_WINDOW (window));
 
@@ -4285,25 +3798,8 @@ gdk_window_set_keep_above (GdkWindow *window,
                                 setting ? GDK_WINDOW_STATE_ABOVE : 0);
 }
 
-/**
- * gdk_window_set_keep_below:
- * @window: a toplevel #GdkWindow
- * @setting: whether to keep @window below other windows
- *
- * Set if @window must be kept below other windows. If the
- * window was already below, then this function does nothing.
- * 
- * On X11, asks the window manager to keep @window below, if the window
- * manager supports this operation. Not all window managers support
- * this, and some deliberately ignore it or don't have a concept of
- * "keep below"; so you can't rely on the window being kept below.
- * But it will happen with most standard window managers,
- * and GDK makes a best effort to get it to happen.
- *
- * Since: 2.4
- **/
-void
-gdk_window_set_keep_below (GdkWindow *window, gboolean setting)
+static void
+gdk_x11_window_set_keep_below (GdkWindow *window, gboolean setting)
 {
   g_return_if_fail (GDK_IS_WINDOW (window));
 
@@ -4327,18 +3823,8 @@ gdk_window_set_keep_below (GdkWindow *window, gboolean setting)
                                 setting ? GDK_WINDOW_STATE_BELOW : 0);
 }
 
-/**
- * gdk_window_get_group:
- * @window: a toplevel #GdkWindow
- * 
- * Returns the group leader window for @window. See gdk_window_set_group().
- * 
- * Return value: the group leader window for @window
- *
- * Since: 2.4
- **/
-GdkWindow *
-gdk_window_get_group (GdkWindow *window)
+static GdkWindow *
+gdk_x11_window_get_group (GdkWindow *window)
 {
   GdkToplevelX11 *toplevel;
   
@@ -4351,25 +3837,9 @@ gdk_window_get_group (GdkWindow *window)
   return toplevel->group_leader;
 }
 
-/**
- * gdk_window_set_group:
- * @window: a toplevel #GdkWindow
- * @leader: group leader window, or %NULL to restore the default group leader window
- *
- * Sets the group leader window for @window. By default,
- * GDK sets the group leader for all toplevel windows
- * to a global window implicitly created by GDK. With this function
- * you can override this default.
- *
- * The group leader window allows the window manager to distinguish
- * all windows that belong to a single application. It may for example
- * allow users to minimize/unminimize all windows belonging to an
- * application at once. You should only set a non-default group window
- * if your application pretends to be multiple applications.
- **/
-void          
-gdk_window_set_group (GdkWindow *window,
-                     GdkWindow *leader)
+static void
+gdk_x11_window_set_group (GdkWindow *window,
+                         GdkWindow *leader)
 {
   GdkToplevelX11 *toplevel;
   
@@ -4385,7 +3855,7 @@ gdk_window_set_group (GdkWindow *window,
   toplevel = _gdk_x11_window_get_toplevel (window);
 
   if (leader == NULL)
-    leader = gdk_display_get_default_group (gdk_drawable_get_display (window));
+    leader = gdk_display_get_default_group (gdk_window_get_display (window));
   
   if (toplevel->group_leader != leader)
     {
@@ -4412,7 +3882,7 @@ gdk_window_get_mwm_hints (GdkWindow *window)
   if (GDK_WINDOW_DESTROYED (window))
     return NULL;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   
   hints_atom = gdk_x11_get_xatom_by_name_for_display (display, _XA_MOTIF_WM_HINTS);
 
@@ -4443,7 +3913,7 @@ gdk_window_set_mwm_hints (GdkWindow *window,
   if (GDK_WINDOW_DESTROYED (window))
     return;
   
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   
   hints_atom = gdk_x11_get_xatom_by_name_for_display (display, _XA_MOTIF_WM_HINTS);
 
@@ -4478,30 +3948,9 @@ gdk_window_set_mwm_hints (GdkWindow *window,
     XFree (hints);
 }
 
-/**
- * gdk_window_set_decorations:
- * @window: a toplevel #GdkWindow
- * @decorations: decoration hint mask
- *
- * "Decorations" are the features the window manager adds to a toplevel #GdkWindow.
- * This function sets the traditional Motif window manager hints that tell the
- * window manager which decorations you would like your window to have.
- * Usually you should use gtk_window_set_decorated() on a #GtkWindow instead of
- * using the GDK function directly.
- *
- * The @decorations argument is the logical OR of the fields in
- * the #GdkWMDecoration enumeration. If #GDK_DECOR_ALL is included in the
- * mask, the other bits indicate which decorations should be turned off.
- * If #GDK_DECOR_ALL is not included, then the other bits indicate
- * which decorations should be turned on.
- *
- * Most window managers honor a decorations hint of 0 to disable all decorations,
- * but very few honor all possible combinations of bits.
- * 
- **/
-void
-gdk_window_set_decorations (GdkWindow      *window,
-                           GdkWMDecoration decorations)
+static void
+gdk_x11_window_set_decorations (GdkWindow      *window,
+                               GdkWMDecoration decorations)
 {
   MotifWmHints hints;
 
@@ -4517,17 +3966,9 @@ gdk_window_set_decorations (GdkWindow      *window,
   gdk_window_set_mwm_hints (window, &hints);
 }
 
-/**
- * gdk_window_get_decorations:
- * @window: The toplevel #GdkWindow to get the decorations from
- * @decorations: The window decorations will be written here
- *
- * Returns the decorations set on the GdkWindow with #gdk_window_set_decorations
- * Returns: TRUE if the window has decorations set, FALSE otherwise.
- **/
-gboolean
-gdk_window_get_decorations(GdkWindow       *window,
-                          GdkWMDecoration *decorations)
+static gboolean
+gdk_x11_window_get_decorations(GdkWindow       *window,
+                              GdkWMDecoration *decorations)
 {
   MotifWmHints *hints;
   gboolean result = FALSE;
@@ -4553,28 +3994,8 @@ gdk_window_get_decorations(GdkWindow       *window,
   return result;
 }
 
-/**
- * gdk_window_set_functions:
- * @window: a toplevel #GdkWindow
- * @functions: bitmask of operations to allow on @window
- *
- * Sets hints about the window management functions to make available
- * via buttons on the window frame.
- * 
- * On the X backend, this function sets the traditional Motif window 
- * manager hint for this purpose. However, few window managers do
- * anything reliable or interesting with this hint. Many ignore it
- * entirely.
- *
- * The @functions argument is the logical OR of values from the
- * #GdkWMFunction enumeration. If the bitmask includes #GDK_FUNC_ALL,
- * then the other bits indicate which functions to disable; if
- * it doesn't include #GDK_FUNC_ALL, it indicates which functions to
- * enable.
- * 
- **/
-void
-gdk_window_set_functions (GdkWindow    *window,
+static void
+gdk_x11_window_set_functions (GdkWindow    *window,
                          GdkWMFunction functions)
 {
   MotifWmHints hints;
@@ -4593,25 +4014,26 @@ gdk_window_set_functions (GdkWindow    *window,
   gdk_window_set_mwm_hints (window, &hints);
 }
 
-static GdkRegion *
-xwindow_get_shape (Display *xdisplay,
-                  Window window,
-                  gint shape_type)
+cairo_region_t *
+_xwindow_get_shape (Display *xdisplay,
+                   Window window,
+                   gint shape_type)
 {
-  GdkRegion *shape;
+  cairo_region_t *shape;
   GdkRectangle *rl;
   XRectangle *xrl;
   gint rn, ord, i;
 
   shape = NULL;
-  
+  rn = 0;
+
   xrl = XShapeGetRectangles (xdisplay,
                             window,
                             shape_type, &rn, &ord);
-  
-  if (rn == 0)
-    return gdk_region_new (); /* Empty */
-  
+
+  if (xrl == NULL || rn == 0)
+    return cairo_region_create (); /* Empty */
+
   if (ord != YXBanded)
     {
       /* This really shouldn't happen with any xserver, as they
@@ -4631,60 +4053,31 @@ xwindow_get_shape (Display *xdisplay,
     }
   XFree (xrl);
   
-  shape = _gdk_region_new_from_yxbanded_rects (rl, rn);
+  shape = cairo_region_create_rectangles (rl, rn);
   g_free (rl);
   
   return shape;
 }
 
 
-GdkRegion *
-_gdk_windowing_get_shape_for_mask (GdkBitmap *mask)
-{
-  GdkDisplay *display;
-  Window window;
-  GdkRegion *region;
-
-  display = gdk_drawable_get_display (GDK_DRAWABLE (mask));
-
-  window = XCreateSimpleWindow (GDK_DISPLAY_XDISPLAY (display),
-                               GDK_SCREEN_XROOTWIN (gdk_display_get_default_screen (display)),
-                               -1, -1, 1, 1, 0,
-                               0, 0);
-  XShapeCombineMask (GDK_DISPLAY_XDISPLAY (display),
-                    window,
-                    ShapeBounding,
-                    0, 0,
-                    GDK_PIXMAP_XID (mask),
-                    ShapeSet);
-  
-  region = xwindow_get_shape (GDK_DISPLAY_XDISPLAY (display),
-                             window, ShapeBounding);
-
-  XDestroyWindow (GDK_DISPLAY_XDISPLAY (display),
-                 window);
-
-  return region;
-}
-
-GdkRegion *
-_gdk_windowing_window_get_shape (GdkWindow *window)
+static cairo_region_t *
+gdk_x11_window_get_shape (GdkWindow *window)
 {
   if (!GDK_WINDOW_DESTROYED (window) &&
       gdk_display_supports_shapes (GDK_WINDOW_DISPLAY (window)))
-    return xwindow_get_shape (GDK_WINDOW_XDISPLAY (window),
+    return _xwindow_get_shape (GDK_WINDOW_XDISPLAY (window),
                              GDK_WINDOW_XID (window), ShapeBounding);
 
   return NULL;
 }
 
-GdkRegion *
-_gdk_windowing_window_get_input_shape (GdkWindow *window)
+static cairo_region_t *
+gdk_x11_window_get_input_shape (GdkWindow *window)
 {
 #if defined(ShapeInput)
   if (!GDK_WINDOW_DESTROYED (window) &&
       gdk_display_supports_shapes (GDK_WINDOW_DISPLAY (window)))
-    return xwindow_get_shape (GDK_WINDOW_XDISPLAY (window),
+    return _xwindow_get_shape (GDK_WINDOW_XDISPLAY (window),
                              GDK_WINDOW_XID (window),
                              ShapeInput);
 #endif
@@ -4697,13 +4090,11 @@ gdk_window_set_static_bit_gravity (GdkWindow *window,
                                    gboolean   on)
 {
   XSetWindowAttributes xattributes;
-  GdkWindowObject *private;
   guint xattributes_mask = 0;
   
   g_return_if_fail (GDK_IS_WINDOW (window));
 
-  private = GDK_WINDOW_OBJECT (window);
-  if (private->input_only)
+  if (window->input_only)
     return;
   
   xattributes.bit_gravity = StaticGravity;
@@ -4733,19 +4124,18 @@ static gboolean
 gdk_window_x11_set_static_gravities (GdkWindow *window,
                                      gboolean   use_static)
 {
-  GdkWindowObject *private = (GdkWindowObject *)window;
   GList *tmp_list;
   
-  if (!use_static == !private->guffaw_gravity)
+  if (!use_static == !window->guffaw_gravity)
     return TRUE;
 
-  private->guffaw_gravity = use_static;
+  window->guffaw_gravity = use_static;
   
   if (!GDK_WINDOW_DESTROYED (window))
     {
       gdk_window_set_static_bit_gravity (window, use_static);
       
-      tmp_list = private->children;
+      tmp_list = window->children;
       while (tmp_list)
        {
          gdk_window_set_static_win_gravity (tmp_list->data, use_static);
@@ -5054,21 +4444,18 @@ gboolean
 _gdk_moveresize_handle_event (XEvent *event)
 {
   guint button_mask = 0;
-  GdkWindowObject *window_private;
   GdkDisplay *display = gdk_x11_lookup_xdisplay (event->xany.display);
   MoveResizeData *mv_resize = get_move_resize_data (display, FALSE);
 
   if (!mv_resize || !mv_resize->moveresize_window)
     return FALSE;
 
-  window_private = (GdkWindowObject *) mv_resize->moveresize_window;
-
   button_mask = GDK_BUTTON1_MASK << (mv_resize->moveresize_button - 1);
 
   switch (event->xany.type)
     {
     case MotionNotify:
-      if (window_private->resize_count > 0)
+      if (mv_resize->moveresize_window->resize_count > 0)
        {
          if (mv_resize->moveresize_pending_event)
            *mv_resize->moveresize_pending_event = *event;
@@ -5199,7 +4586,7 @@ calculate_unmoving_origin (MoveResizeData *mv_resize)
     {
       gdk_window_get_frame_extents (mv_resize->moveresize_window, &rect);
       gdk_window_get_geometry (mv_resize->moveresize_window, 
-                              NULL, NULL, &width, &height, NULL);
+                              NULL, NULL, &width, &height);
       
       switch (mv_resize->moveresize_geometry.win_gravity) 
        {
@@ -5264,9 +4651,8 @@ emulate_resize_drag (GdkWindow     *window,
   mv_resize->moveresize_y = root_y;
   mv_resize->moveresize_window = g_object_ref (window);
 
-  gdk_drawable_get_size (window,
-                        &mv_resize->moveresize_orig_width,
-                        &mv_resize->moveresize_orig_height);
+  mv_resize->moveresize_orig_width = gdk_window_get_width (window);
+  mv_resize->moveresize_orig_height = gdk_window_get_height (window);
 
   mv_resize->moveresize_geom_mask = 0;
   gdk_window_get_geometry_hints (window,
@@ -5299,29 +4685,13 @@ emulate_move_drag (GdkWindow     *window,
   create_moveresize_window (mv_resize, timestamp);
 }
 
-/**
- * gdk_window_begin_resize_drag:
- * @window: a toplevel #GdkWindow
- * @edge: the edge or corner from which the drag is started
- * @button: the button being used to drag
- * @root_x: root window X coordinate of mouse click that began the drag
- * @root_y: root window Y coordinate of mouse click that began the drag
- * @timestamp: timestamp of mouse click that began the drag (use gdk_event_get_time())
- *
- * Begins a window resize operation (for a toplevel window).
- * You might use this function to implement a "window resize grip," for
- * example; in fact #GtkStatusbar uses it. The function works best
- * with window managers that support the <ulink url="http://www.freedesktop.org/Standards/wm-spec">Extended Window Manager Hints</ulink>, but has a 
- * fallback implementation for other window managers.
- * 
- **/
-void
-gdk_window_begin_resize_drag (GdkWindow     *window,
-                              GdkWindowEdge  edge,
-                              gint           button,
-                              gint           root_x,
-                              gint           root_y,
-                              guint32        timestamp)
+static void
+gdk_x11_window_begin_resize_drag (GdkWindow     *window,
+                                 GdkWindowEdge  edge,
+                                 gint           button,
+                                 gint           root_x,
+                                 gint           root_y,
+                                 guint32        timestamp)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -5334,28 +4704,12 @@ gdk_window_begin_resize_drag (GdkWindow     *window,
     emulate_resize_drag (window, edge, button, root_x, root_y, timestamp);
 }
 
-/**
- * gdk_window_begin_move_drag:
- * @window: a toplevel #GdkWindow
- * @button: the button being used to drag
- * @root_x: root window X coordinate of mouse click that began the drag
- * @root_y: root window Y coordinate of mouse click that began the drag
- * @timestamp: timestamp of mouse click that began the drag
- *
- * Begins a window move operation (for a toplevel window).  You might
- * use this function to implement a "window move grip," for
- * example. The function works best with window managers that support
- * the <ulink url="http://www.freedesktop.org/Standards/wm-spec">Extended 
- * Window Manager Hints</ulink>, but has a fallback implementation for
- * other window managers.
- * 
- **/
-void
-gdk_window_begin_move_drag (GdkWindow *window,
-                            gint       button,
-                            gint       root_x,
-                            gint       root_y,
-                            guint32    timestamp)
+static void
+gdk_x11_window_begin_move_drag (GdkWindow *window,
+                               gint       button,
+                               gint       root_x,
+                               gint       root_y,
+                               guint32    timestamp)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL (window))
@@ -5369,33 +4723,15 @@ gdk_window_begin_move_drag (GdkWindow *window,
     emulate_move_drag (window, button, root_x, root_y, timestamp);
 }
 
-/**
- * gdk_window_enable_synchronized_configure:
- * @window: a toplevel #GdkWindow
- * 
- * Indicates that the application will cooperate with the window
- * system in synchronizing the window repaint with the window
- * manager during resizing operations. After an application calls
- * this function, it must call gdk_window_configure_finished() every
- * time it has finished all processing associated with a set of
- * Configure events. Toplevel GTK+ windows automatically use this
- * protocol.
- * 
- * On X, calling this function makes @window participate in the
- * _NET_WM_SYNC_REQUEST window manager protocol.
- * 
- * Since: 2.6
- **/
-void
-gdk_window_enable_synchronized_configure (GdkWindow *window)
+static void
+gdk_x11_window_enable_synchronized_configure (GdkWindow *window)
 {
-  GdkWindowObject *private = (GdkWindowObject *)window;
   GdkWindowImplX11 *impl;
 
-  if (!GDK_IS_WINDOW_IMPL_X11 (private->impl))
+  if (!GDK_IS_WINDOW_IMPL_X11 (window->impl))
     return;
   
-  impl = GDK_WINDOW_IMPL_X11 (private->impl);
+  impl = GDK_WINDOW_IMPL_X11 (window->impl);
          
   if (!impl->use_synchronized_configure)
     {
@@ -5408,30 +4744,15 @@ gdk_window_enable_synchronized_configure (GdkWindow *window)
     }
 }
 
-/**
- * gdk_window_configure_finished:
- * @window: a toplevel #GdkWindow
- * 
- * Signal to the window system that the application has finished
- * handling Configure events it has received. Window Managers can
- * use this to better synchronize the frame repaint with the
- * application. GTK+ applications will automatically call this
- * function when appropriate.
- *
- * This function can only be called if gdk_window_enable_synchronized_configure()
- * was called previously.
- *
- * Since: 2.6
- **/
-void
-gdk_window_configure_finished (GdkWindow *window)
+static void
+gdk_x11_window_configure_finished (GdkWindow *window)
 {
   GdkWindowImplX11 *impl;
 
   if (!WINDOW_IS_TOPLEVEL (window))
     return;
   
-  impl = GDK_WINDOW_IMPL_X11 (((GdkWindowObject *)window)->impl);
+  impl = GDK_WINDOW_IMPL_X11 (window->impl);
   if (!impl->use_synchronized_configure)
     return;
   
@@ -5455,47 +4776,30 @@ gdk_window_configure_finished (GdkWindow *window)
 #endif
 }
 
-void
-_gdk_windowing_window_beep (GdkWindow *window)
+static gboolean
+gdk_x11_window_beep (GdkWindow *window)
 {
   GdkDisplay *display;
 
-  g_return_if_fail (GDK_IS_WINDOW (window));
-
   display = GDK_WINDOW_DISPLAY (window);
 
 #ifdef HAVE_XKB
   if (GDK_DISPLAY_X11 (display)->use_xkb)
-    XkbBell (GDK_DISPLAY_XDISPLAY (display),
-            GDK_WINDOW_XID (window),
-            0,
-            None);
-  else
+    {
+      XkbBell (GDK_DISPLAY_XDISPLAY (display),
+               GDK_WINDOW_XID (window),
+               0,
+               None);
+      return TRUE;
+    }
 #endif
-    gdk_display_beep (display);
+
+  return FALSE;
 }
 
-/**
- * gdk_window_set_opacity:
- * @window: a top-level #GdkWindow
- * @opacity: opacity
- *
- * Request the windowing system to make @window partially transparent,
- * with opacity 0 being fully transparent and 1 fully opaque. (Values
- * of the opacity parameter are clamped to the [0,1] range.) 
- *
- * On X11, this works only on X screens with a compositing manager 
- * running.
- *
- * For setting up per-pixel alpha, see gdk_screen_get_rgba_colormap().
- * For making non-toplevel windows translucent, see 
- * gdk_window_set_composited().
- *
- * Since: 2.12
- */
-void
-gdk_window_set_opacity (GdkWindow *window,
-                       gdouble    opacity)
+static void
+gdk_x11_window_set_opacity (GdkWindow *window,
+                           gdouble    opacity)
 {
   GdkDisplay *display;
   guint32 cardinal;
@@ -5506,7 +4810,7 @@ gdk_window_set_opacity (GdkWindow *window,
       !WINDOW_IS_TOPLEVEL (window))
     return;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   if (opacity < 0)
     opacity = 0;
@@ -5528,22 +4832,21 @@ gdk_window_set_opacity (GdkWindow *window,
                     (guchar *) &cardinal, 1);
 }
 
-void
-_gdk_windowing_window_set_composited (GdkWindow *window,
-                                      gboolean   composited)
+static void
+gdk_x11_window_set_composited (GdkWindow *window,
+                               gboolean   composited)
 {
 #if defined(HAVE_XCOMPOSITE) && defined(HAVE_XDAMAGE) && defined (HAVE_XFIXES)
-  GdkWindowObject *private = (GdkWindowObject *) window;
   GdkWindowImplX11 *impl;
   GdkDisplay *display;
   Display *dpy;
   Window xid;
 
-  impl = GDK_WINDOW_IMPL_X11 (private->impl);
+  impl = GDK_WINDOW_IMPL_X11 (window->impl);
 
-  display = gdk_screen_get_display (GDK_DRAWABLE_IMPL_X11 (impl)->screen);
+  display = gdk_window_get_display (window);
   dpy = GDK_DISPLAY_XDISPLAY (display);
-  xid = GDK_WINDOW_XWINDOW (private);
+  xid = GDK_WINDOW_XID (window);
 
   if (composited)
     {
@@ -5561,7 +4864,7 @@ _gdk_windowing_window_set_composited (GdkWindow *window,
 
 void
 _gdk_windowing_window_process_updates_recurse (GdkWindow *window,
-                                               GdkRegion *region)
+                                               cairo_region_t *region)
 {
   _gdk_window_process_updates_recurse (window, region);
 }
@@ -5576,37 +4879,177 @@ _gdk_windowing_after_process_all_updates (void)
 {
 }
 
+static Bool
+timestamp_predicate (Display *display,
+                    XEvent  *xevent,
+                    XPointer arg)
+{
+  Window xwindow = GPOINTER_TO_UINT (arg);
+  GdkDisplay *gdk_display = gdk_x11_lookup_xdisplay (display);
+
+  if (xevent->type == PropertyNotify &&
+      xevent->xproperty.window == xwindow &&
+      xevent->xproperty.atom == gdk_x11_get_xatom_by_name_for_display (gdk_display,
+                                                                      "GDK_TIMESTAMP_PROP"))
+    return True;
+
+  return False;
+}
+
+/**
+ * gdk_x11_get_server_time:
+ * @window: a #GdkWindow, used for communication with the server.
+ *          The window must have GDK_PROPERTY_CHANGE_MASK in its
+ *          events mask or a hang will result.
+ *
+ * Routine to get the current X server time stamp.
+ *
+ * Return value: the time stamp.
+ **/
+guint32
+gdk_x11_get_server_time (GdkWindow *window)
+{
+  Display *xdisplay;
+  Window   xwindow;
+  guchar c = 'a';
+  XEvent xevent;
+  Atom timestamp_prop_atom;
+
+  g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
+  g_return_val_if_fail (!GDK_WINDOW_DESTROYED (window), 0);
+
+  xdisplay = GDK_WINDOW_XDISPLAY (window);
+  xwindow = GDK_WINDOW_XID (window);
+  timestamp_prop_atom =
+    gdk_x11_get_xatom_by_name_for_display (GDK_WINDOW_DISPLAY (window),
+                                          "GDK_TIMESTAMP_PROP");
+
+  XChangeProperty (xdisplay, xwindow, timestamp_prop_atom,
+                  timestamp_prop_atom,
+                  8, PropModeReplace, &c, 1);
+
+  XIfEvent (xdisplay, &xevent,
+           timestamp_predicate, GUINT_TO_POINTER(xwindow));
+
+  return xevent.xproperty.time;
+}
+
+/**
+ * gdk_x11_window_get_xid:
+ * @window: a native #GdkWindow.
+ * 
+ * Returns the X resource (window) belonging to a #GdkWindow.
+ * 
+ * Return value: the ID of @drawable's X resource.
+ **/
+XID
+gdk_x11_window_get_xid (GdkWindow *window)
+{
+  /* Try to ensure the window has a native window */
+  if (!_gdk_window_has_impl (window))
+    {
+      gdk_window_ensure_native (window);
+
+      /* We sync here to ensure the window is created in the Xserver when
+       * this function returns. This is required because the returned XID
+       * for this window must be valid immediately, even with another
+       * connection to the Xserver */
+      gdk_display_sync (gdk_window_get_display (window));
+    }
+  
+  if (!GDK_WINDOW_IS_X11 (window))
+    {
+      g_warning (G_STRLOC " drawable is not a native X11 window");
+      return None;
+    }
+  
+  return GDK_WINDOW_IMPL_X11 (window->impl)->xid;
+}
+
+extern GdkDragContext * _gdk_x11_window_drag_begin (GdkWindow *window,
+                                                    GdkDevice *device,
+                                                    GList     *targets);
+
 static void
-gdk_window_impl_iface_init (GdkWindowImplIface *iface)
-{
-  iface->show = gdk_window_x11_show;
-  iface->hide = gdk_window_x11_hide;
-  iface->withdraw = gdk_window_x11_withdraw;
-  iface->set_events = gdk_window_x11_set_events;
-  iface->get_events = gdk_window_x11_get_events;
-  iface->raise = gdk_window_x11_raise;
-  iface->lower = gdk_window_x11_lower;
-  iface->restack_under = gdk_window_x11_restack_under;
-  iface->restack_toplevel = gdk_window_x11_restack_toplevel;
-  iface->move_resize = gdk_window_x11_move_resize;
-  iface->set_background = gdk_window_x11_set_background;
-  iface->set_back_pixmap = gdk_window_x11_set_back_pixmap;
-  iface->reparent = gdk_window_x11_reparent;
-  iface->clear_region = gdk_window_x11_clear_region;
-  iface->set_cursor = gdk_window_x11_set_cursor;
-  iface->get_geometry = gdk_window_x11_get_geometry;
-  iface->get_root_coords = gdk_window_x11_get_root_coords;
-  iface->get_pointer = gdk_window_x11_get_pointer;
-  iface->get_deskrelative_origin = gdk_window_x11_get_deskrelative_origin;
-  iface->shape_combine_region = gdk_window_x11_shape_combine_region;
-  iface->input_shape_combine_region = gdk_window_x11_input_shape_combine_region;
-  iface->set_static_gravities = gdk_window_x11_set_static_gravities;
-  iface->queue_antiexpose = _gdk_x11_window_queue_antiexpose;
-  iface->queue_translation = _gdk_x11_window_queue_translation;
-  iface->destroy = _gdk_x11_window_destroy;
-  iface->input_window_destroy = _gdk_input_window_destroy;
-  iface->input_window_crossing = _gdk_input_crossing_event;
-}
-
-#define __GDK_WINDOW_X11_C__
-#include "gdkaliasdef.c"
+gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GdkWindowImplClass *impl_class = GDK_WINDOW_IMPL_CLASS (klass);
+  
+  object_class->finalize = gdk_window_impl_x11_finalize;
+  
+  impl_class->ref_cairo_surface = gdk_x11_ref_cairo_surface;
+  impl_class->show = gdk_window_x11_show;
+  impl_class->hide = gdk_window_x11_hide;
+  impl_class->withdraw = gdk_window_x11_withdraw;
+  impl_class->set_events = gdk_window_x11_set_events;
+  impl_class->get_events = gdk_window_x11_get_events;
+  impl_class->raise = gdk_window_x11_raise;
+  impl_class->lower = gdk_window_x11_lower;
+  impl_class->restack_under = gdk_window_x11_restack_under;
+  impl_class->restack_toplevel = gdk_window_x11_restack_toplevel;
+  impl_class->move_resize = gdk_window_x11_move_resize;
+  impl_class->set_background = gdk_window_x11_set_background;
+  impl_class->reparent = gdk_window_x11_reparent;
+  impl_class->set_device_cursor = gdk_window_x11_set_device_cursor;
+  impl_class->get_geometry = gdk_window_x11_get_geometry;
+  impl_class->get_root_coords = gdk_window_x11_get_root_coords;
+  impl_class->get_device_state = gdk_window_x11_get_device_state;
+  impl_class->shape_combine_region = gdk_window_x11_shape_combine_region;
+  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;
+  impl_class->get_shape = gdk_x11_window_get_shape;
+  impl_class->get_input_shape = gdk_x11_window_get_input_shape;
+  impl_class->beep = gdk_x11_window_beep;
+
+  impl_class->focus = gdk_x11_window_focus;
+  impl_class->set_type_hint = gdk_x11_window_set_type_hint;
+  impl_class->get_type_hint = gdk_x11_window_get_type_hint;
+  impl_class->set_modal_hint = gdk_x11_window_set_modal_hint;
+  impl_class->set_skip_taskbar_hint = gdk_x11_window_set_skip_taskbar_hint;
+  impl_class->set_skip_pager_hint = gdk_x11_window_set_skip_pager_hint;
+  impl_class->set_urgency_hint = gdk_x11_window_set_urgency_hint;
+  impl_class->set_geometry_hints = gdk_x11_window_set_geometry_hints;
+  impl_class->set_title = gdk_x11_window_set_title;
+  impl_class->set_role = gdk_x11_window_set_role;
+  impl_class->set_startup_id = gdk_x11_window_set_startup_id;
+  impl_class->set_transient_for = gdk_x11_window_set_transient_for;
+  impl_class->get_root_origin = gdk_x11_window_get_root_origin;
+  impl_class->get_frame_extents = gdk_x11_window_get_frame_extents;
+  impl_class->set_override_redirect = gdk_x11_window_set_override_redirect;
+  impl_class->set_accept_focus = gdk_x11_window_set_accept_focus;
+  impl_class->set_focus_on_map = gdk_x11_window_set_focus_on_map;
+  impl_class->set_icon_list = gdk_x11_window_set_icon_list;
+  impl_class->set_icon_name = gdk_x11_window_set_icon_name;
+  impl_class->iconify = gdk_x11_window_iconify;
+  impl_class->deiconify = gdk_x11_window_deiconify;
+  impl_class->stick = gdk_x11_window_stick;
+  impl_class->unstick = gdk_x11_window_unstick;
+  impl_class->maximize = gdk_x11_window_maximize;
+  impl_class->unmaximize = gdk_x11_window_unmaximize;
+  impl_class->fullscreen = gdk_x11_window_fullscreen;
+  impl_class->unfullscreen = gdk_x11_window_unfullscreen;
+  impl_class->set_keep_above = gdk_x11_window_set_keep_above;
+  impl_class->set_keep_below = gdk_x11_window_set_keep_below;
+  impl_class->get_group = gdk_x11_window_get_group;
+  impl_class->set_group = gdk_x11_window_set_group;
+  impl_class->set_decorations = gdk_x11_window_set_decorations;
+  impl_class->get_decorations = gdk_x11_window_get_decorations;
+  impl_class->set_functions = gdk_x11_window_set_functions;
+  impl_class->set_functions = gdk_x11_window_set_functions;
+  impl_class->begin_resize_drag = gdk_x11_window_begin_resize_drag;
+  impl_class->begin_move_drag = gdk_x11_window_begin_move_drag;
+  impl_class->enable_synchronized_configure = gdk_x11_window_enable_synchronized_configure;
+  impl_class->configure_finished = gdk_x11_window_configure_finished;
+  impl_class->set_opacity = gdk_x11_window_set_opacity;
+  impl_class->set_composited = gdk_x11_window_set_composited;
+  impl_class->destroy_notify = gdk_x11_window_destroy_notify;
+  impl_class->register_dnd = _gdk_x11_window_register_dnd;
+  impl_class->drag_begin = _gdk_x11_window_drag_begin;
+}
+