]> Pileus Git - ~andy/gtk/blobdiff - gdk/gdkwindow.c
Fill in string, length and is_modifier for key events. Map some more keys
[~andy/gtk] / gdk / gdkwindow.c
index 320b5dff5fb8f9da56bb5e5e3d202a838af2f289..128b1c6aa7e033a56a09ef9bc45b46522c2f7bb6 100644 (file)
@@ -24,6 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <config.h>
 #include "gdkwindow.h"
 #include "gdkinternals.h"
 #include "gdk.h"               /* For gdk_rectangle_union() */
@@ -31,6 +32,7 @@
 #include "gdkdrawable.h"
 #include "gdkpixmap.h"
 #include "gdkscreen.h"
+#include "gdkalias.h"
 
 #define USE_BACKING_STORE      /* Appears to work on Win32, too, now. */
 
@@ -42,28 +44,22 @@ struct _GdkWindowPaint
   GdkPixmap *pixmap;
   gint x_offset;
   gint y_offset;
+  cairo_surface_t *surface;
 };
 
-static const GdkPointerHooks default_pointer_hooks = {
-  _gdk_windowing_window_get_pointer,
-  _gdk_windowing_window_at_pointer
-};
-
-const GdkPointerHooks *_gdk_current_pointer_hooks = &default_pointer_hooks;
-
 static GdkGC *gdk_window_create_gc      (GdkDrawable     *drawable,
                                          GdkGCValues     *values,
                                          GdkGCValuesMask  mask);
 static void   gdk_window_draw_rectangle (GdkDrawable     *drawable,
                                          GdkGC           *gc,
-                                         gint             filled,
+                                         gboolean         filled,
                                          gint             x,
                                          gint             y,
                                          gint             width,
                                          gint             height);
 static void   gdk_window_draw_arc       (GdkDrawable     *drawable,
                                          GdkGC           *gc,
-                                         gint             filled,
+                                         gboolean         filled,
                                          gint             x,
                                          gint             y,
                                          gint             width,
@@ -72,7 +68,7 @@ static void   gdk_window_draw_arc       (GdkDrawable     *drawable,
                                          gint             angle2);
 static void   gdk_window_draw_polygon   (GdkDrawable     *drawable,
                                          GdkGC           *gc,
-                                         gint             filled,
+                                         gboolean         filled,
                                          GdkPoint        *points,
                                          gint             npoints);
 static void   gdk_window_draw_text      (GdkDrawable     *drawable,
@@ -110,12 +106,20 @@ static void   gdk_window_draw_lines     (GdkDrawable     *drawable,
                                         GdkGC           *gc,
                                         GdkPoint        *points,
                                         gint             npoints);
-static void   gdk_window_draw_glyphs    (GdkDrawable      *drawable,
-                                        GdkGC            *gc,
-                                        PangoFont        *font,
-                                        gint              x,
-                                        gint              y,
-                                        PangoGlyphString *glyphs);
+
+static void gdk_window_draw_glyphs             (GdkDrawable      *drawable,
+                                               GdkGC            *gc,
+                                               PangoFont        *font,
+                                               gint              x,
+                                               gint              y,
+                                               PangoGlyphString *glyphs);
+static void gdk_window_draw_glyphs_transformed (GdkDrawable      *drawable,
+                                               GdkGC            *gc,
+                                               PangoMatrix      *matrix,
+                                               PangoFont        *font,
+                                               gint              x,
+                                               gint              y,
+                                               PangoGlyphString *glyphs);
 
 static void   gdk_window_draw_image     (GdkDrawable     *drawable,
                                          GdkGC           *gc,
@@ -140,6 +144,11 @@ static void gdk_window_draw_pixbuf (GdkDrawable     *drawable,
                                    gint             x_dither,
                                    gint             y_dither);
 
+static void gdk_window_draw_trapezoids (GdkDrawable   *drawable,
+                                       GdkGC         *gc,
+                                       GdkTrapezoid  *trapezoids,
+                                       gint           n_trapezoids);
+
 static GdkImage* gdk_window_copy_to_image (GdkDrawable *drawable,
                                           GdkImage    *image,
                                           gint         src_x,
@@ -149,6 +158,8 @@ static GdkImage* gdk_window_copy_to_image (GdkDrawable *drawable,
                                           gint         width,
                                           gint         height);
 
+static cairo_surface_t *gdk_window_ref_cairo_surface (GdkDrawable *drawable);
+
 static void   gdk_window_real_get_size  (GdkDrawable     *drawable,
                                          gint            *width,
                                          gint            *height);
@@ -175,6 +186,11 @@ static void gdk_window_free_paint_stack (GdkWindow *window);
 static void gdk_window_init       (GdkWindowObject      *window);
 static void gdk_window_class_init (GdkWindowObjectClass *klass);
 static void gdk_window_finalize   (GObject              *object);
+static void gdk_window_clear_backing_rect (GdkWindow *window,
+                                          gint       x,
+                                          gint       y,
+                                          gint       width,
+                                          gint       height);
 
 static gpointer parent_class = NULL;
 
@@ -184,26 +200,39 @@ gdk_window_object_get_type (void)
   static GType object_type = 0;
 
   if (!object_type)
+    object_type = g_type_register_static_simple (GDK_TYPE_DRAWABLE,
+                                                "GdkWindow",
+                                                sizeof (GdkWindowObjectClass),
+                                                (GClassInitFunc) gdk_window_class_init,
+                                                sizeof (GdkWindowObject),
+                                                (GInstanceInitFunc) gdk_window_init,
+                                                0);
+  
+  return object_type;
+}
+
+GType
+_gdk_paintable_get_type (void)
+{
+  static GType paintable_type = 0;
+
+  if (!paintable_type)
     {
-      static const GTypeInfo object_info =
+      static const GTypeInfo paintable_info =
       {
-        sizeof (GdkWindowObjectClass),
-        (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) gdk_window_class_init,
-        NULL,           /* class_finalize */
-        NULL,           /* class_data */
-        sizeof (GdkWindowObject),
-        0,              /* n_preallocs */
-        (GInstanceInitFunc) gdk_window_init,
+       sizeof (GdkPaintableIface),  /* class_size */
+       NULL,                        /* base_init */
+       NULL,                        /* base_finalize */
       };
-      
-      object_type = g_type_register_static (GDK_TYPE_DRAWABLE,
-                                            "GdkWindow",
-                                            &object_info, 0);
+
+      paintable_type = g_type_register_static (G_TYPE_INTERFACE,
+                                              g_intern_static_string ("GdkPaintable"),
+                                              &paintable_info, 0);
+
+      g_type_interface_add_prerequisite (paintable_type, G_TYPE_OBJECT);
     }
-  
-  return object_type;
+
+  return paintable_type;
 }
 
 static void
@@ -239,8 +268,10 @@ gdk_window_class_init (GdkWindowObjectClass *klass)
   drawable_class->draw_segments = gdk_window_draw_segments;
   drawable_class->draw_lines = gdk_window_draw_lines;
   drawable_class->draw_glyphs = gdk_window_draw_glyphs;
+  drawable_class->draw_glyphs_transformed = gdk_window_draw_glyphs_transformed;
   drawable_class->draw_image = gdk_window_draw_image;
   drawable_class->draw_pixbuf = gdk_window_draw_pixbuf;
+  drawable_class->draw_trapezoids = gdk_window_draw_trapezoids;
   drawable_class->get_depth = gdk_window_real_get_depth;
   drawable_class->get_screen = gdk_window_real_get_screen;
   drawable_class->get_size = gdk_window_real_get_size;
@@ -248,6 +279,7 @@ gdk_window_class_init (GdkWindowObjectClass *klass)
   drawable_class->get_colormap = gdk_window_real_get_colormap;
   drawable_class->get_visual = gdk_window_real_get_visual;
   drawable_class->_copy_to_image = gdk_window_copy_to_image;
+  drawable_class->ref_cairo_surface = gdk_window_ref_cairo_surface;
   drawable_class->get_clip_region = gdk_window_get_clip_region;
   drawable_class->get_visible_region = gdk_window_get_visible_region;
   drawable_class->get_composite_drawable = gdk_window_get_composite_drawable;
@@ -279,6 +311,23 @@ gdk_window_finalize (GObject *object)
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
+static void
+window_remove_filters (GdkWindow *window)
+{
+  GdkWindowObject *obj = (GdkWindowObject*) window;
+
+  if (obj->filters)
+    {
+      GList *tmp_list;
+      
+      for (tmp_list = obj->filters; tmp_list; tmp_list = tmp_list->next)
+       g_free (tmp_list->data);
+    
+      g_list_free (obj->filters);
+      obj->filters = NULL;
+    }
+}
+
 /**
  * _gdk_window_destroy_hierarchy:
  * @window: a #GdkWindow
@@ -303,6 +352,7 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
   GdkWindowObject *private;
   GdkWindowObject *temp_private;
   GdkWindow *temp_window;
+  GdkScreen *screen;
   GList *children;
   GList *tmp;
   
@@ -310,14 +360,43 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
   
   private = (GdkWindowObject*) window;
   
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+    
   switch (GDK_WINDOW_TYPE (window))
     {
+    case GDK_WINDOW_ROOT:
+      screen = gdk_drawable_get_screen (GDK_DRAWABLE (window));
+      if (!screen->closed)
+       {
+         g_error ("attempted to destroy root window");
+         break;
+       }
+      /* else fall thru */
     case GDK_WINDOW_TOPLEVEL:
     case GDK_WINDOW_CHILD:
     case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TEMP:
     case GDK_WINDOW_FOREIGN:
-      if (!GDK_WINDOW_DESTROYED (window))
+      if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_FOREIGN && !foreign_destroy)
+       {
+         /* Logically, it probably makes more sense to send
+          * a "destroy yourself" message to the foreign window
+          * whether or not it's in our heirarchy; but for historical
+          * reasons, we only send "destroy yourself" messages to
+          * foreign windows in our heirarchy.
+          */
+         if (private->parent)
+           _gdk_windowing_window_destroy_foreign (window);
+
+         /* Also for historical reasons, we remove any filters
+          * on a foreign window when it or a parent is destroyed;
+          * this likely causes problems if two separate portions
+          * of code are maintaining filter lists on a foreign window.
+          */
+         window_remove_filters (window);
+       }
+      else
        {
          private->state |= GDK_WINDOW_STATE_WITHDRAWN;
          
@@ -361,29 +440,14 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
            }
          
          _gdk_windowing_window_destroy (window, recursing, foreign_destroy);
+         private->parent = NULL;
          private->destroyed = TRUE;
 
-         if (private->filters)
-           {
-             tmp = private->filters;
-             
-             while (tmp)
-               {
-                 g_free (tmp->data);
-                 tmp = tmp->next;
-               }
-             
-             g_list_free (private->filters);
-             private->filters = NULL;
-           }
+         window_remove_filters (window);
 
           gdk_drawable_set_colormap (GDK_DRAWABLE (window), NULL);
        }
       break;
-      
-    case GDK_WINDOW_ROOT:
-      g_error ("attempted to destroy root window");
-      break;
     }
 }
 
@@ -409,14 +473,13 @@ _gdk_window_destroy (GdkWindow *window,
  * gdk_window_destroy:
  * @window: a #GdkWindow
  *
- * Destroys @window (destroys the server-side resource associated with
- * @window).  Memory allocated for @window may not be freed until all
- * references to @window are dropped. All children of @window are also
- * destroyed.
+ * Destroys the window system resources associated with @window and decrements @window's
+ * reference count. The window system resources for all children of @window are also
+ * destroyed, but the children's reference counts are not decremented.
+ *
+ * Note that a window will not be destroyed automatically when its reference count
+ * reaches zero. You must call this function yourself before that happens.
  *
- * There's normally no need to use this function, window are automatically
- * destroyed when their reference count reaches 0.
- * 
  **/
 void
 gdk_window_destroy (GdkWindow *window)
@@ -702,7 +765,7 @@ gdk_window_remove_filter (GdkWindow     *window,
 
 /**
  * gdk_screen_get_toplevel_windows:
- * @screen : The #GdkScreen where the toplevels are located.
+ * @screen: The #GdkScreen where the toplevels are located.
  * 
  * Obtains a list of all toplevel windows known to GDK on the screen @screen.
  * A toplevel window is a child of the root window (see
@@ -712,6 +775,8 @@ gdk_window_remove_filter (GdkWindow     *window,
  * its elements need not be freed.
  * 
  * Return value: list of toplevel windows, free with g_list_free()
+ *
+ * Since: 2.2
  **/
 GList *
 gdk_screen_get_toplevel_windows (GdkScreen *screen)
@@ -739,7 +804,7 @@ gdk_screen_get_toplevel_windows (GdkScreen *screen)
  * gdk_window_get_toplevels:
  * 
  * Obtains a list of all toplevel windows known to GDK on the default
- * screen (see gdk_window_get_toplevels_for_screen()).
+ * screen (see gdk_screen_get_toplevel_windows()).
  * A toplevel window is a child of the root window (see
  * gdk_get_default_root_window()).
  *
@@ -786,17 +851,20 @@ gboolean
 gdk_window_is_viewable (GdkWindow *window)
 {
   GdkWindowObject *private = (GdkWindowObject *)window;
-  GdkScreen *screen = gdk_drawable_get_screen (window);
-  GdkWindow *root_window = gdk_screen_get_root_window (screen);
+  GdkScreen *screen;
+  GdkWindow *root_window;
   
   g_return_val_if_fail (window != NULL, FALSE);
   g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
+
+  screen = gdk_drawable_get_screen (window);
+  root_window = gdk_screen_get_root_window (screen);
   
   while (private && 
         (private != (GdkWindowObject *)root_window) &&
         (GDK_WINDOW_TYPE (private) != GDK_WINDOW_FOREIGN))
     {
-      if (!GDK_WINDOW_IS_MAPPED (window))
+      if (GDK_WINDOW_DESTROYED (private) || !GDK_WINDOW_IS_MAPPED (private))
        return FALSE;
       
       private = (GdkWindowObject *)private->parent;
@@ -848,61 +916,6 @@ gdk_window_begin_paint_rect (GdkWindow    *window,
   gdk_region_destroy (region);
 }
 
-static GdkGC *
-gdk_window_get_bg_gc (GdkWindow *window, GdkWindowPaint *paint)
-{
-  GdkWindowObject *private = (GdkWindowObject *)window;
-
-  guint gc_mask = 0;
-  GdkGCValues gc_values;
-
-  if (private->bg_pixmap == GDK_PARENT_RELATIVE_BG && private->parent)
-    {
-      GdkWindowPaint tmp_paint = *paint;
-      tmp_paint.x_offset += private->x;
-      tmp_paint.y_offset += private->y;
-      
-      return gdk_window_get_bg_gc (GDK_WINDOW (private->parent), &tmp_paint);
-    }
-  else if (private->bg_pixmap && 
-           private->bg_pixmap != GDK_PARENT_RELATIVE_BG && 
-           private->bg_pixmap != GDK_NO_BG)
-    {
-      gc_values.fill = GDK_TILED;
-      gc_values.tile = private->bg_pixmap;
-      gc_values.ts_x_origin = - paint->x_offset;
-      gc_values.ts_y_origin = - paint->y_offset;
-      
-      gc_mask = (GDK_GC_FILL | GDK_GC_TILE | 
-                 GDK_GC_TS_X_ORIGIN | GDK_GC_TS_Y_ORIGIN);
-    }
-  else
-    {
-      gc_values.foreground = private->bg_color;
-      gc_mask = GDK_GC_FOREGROUND;
-    }
-
-  return gdk_gc_new_with_values (paint->pixmap, &gc_values, gc_mask);
-}
-
-static void
-gdk_window_paint_init_bg (GdkWindow      *window,
-                         GdkWindowPaint *paint,
-                         GdkRegion      *init_region)
-{
-  GdkGC *tmp_gc;
-  
-  tmp_gc = gdk_window_get_bg_gc (window, paint);
-
-  gdk_region_offset (init_region,
-                     - paint->x_offset,
-                     - paint->y_offset);
-  gdk_gc_set_clip_region (tmp_gc, init_region);
-
-  gdk_draw_rectangle (paint->pixmap, tmp_gc, TRUE, 0, 0, -1, -1);
-  g_object_unref (tmp_gc);
-}
-
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
 #endif
@@ -960,95 +973,50 @@ gdk_window_begin_paint_region (GdkWindow *window,
   GdkWindowObject *private = (GdkWindowObject *)window;
   GdkRectangle clip_box;
   GdkWindowPaint *paint;
-  GdkRegion *init_region;
-  GdkGC *tmp_gc;
+  GSList *list;
   
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
 
   if (GDK_WINDOW_DESTROYED (window))
     return;
-  
-  paint = g_new (GdkWindowPaint, 1);
 
-  paint->region = gdk_region_copy (region);
-
-  init_region = gdk_region_copy (region);
-  gdk_region_get_clipbox (paint->region, &clip_box);
-
-  if (private->paint_stack)
+  if (GDK_IS_PAINTABLE (private->impl) &&
+      GDK_PAINTABLE_GET_IFACE (private->impl)->begin_paint_region) 
     {
-      gint old_width, old_height;
-      GdkWindowPaint *tmp_paint = private->paint_stack->data;
-      GdkRectangle old_rect, new_rect;
-      GSList *tmp_list;
-
-      gdk_drawable_get_size (tmp_paint->pixmap, &old_width, &old_height);
-      old_rect.x = tmp_paint->x_offset;
-      old_rect.y = tmp_paint->y_offset;
-      old_rect.width = old_width;
-      old_rect.height = old_height;
-
-      gdk_rectangle_union (&clip_box, &old_rect, &new_rect);
+      GDK_PAINTABLE_GET_IFACE (private->impl)->begin_paint_region (GDK_PAINTABLE (private->impl), region);
+      return;
+    }
 
-      if (new_rect.width > old_rect.width || new_rect.height > old_rect.height)
-       {
-         paint->pixmap = gdk_pixmap_new (window,
-                                          new_rect.width, new_rect.height, -1);
-          tmp_gc = gdk_gc_new (paint->pixmap);
-         gdk_draw_drawable (paint->pixmap, tmp_gc, tmp_paint->pixmap,
-                            0, 0,
-                            old_rect.x - new_rect.x, old_rect.y - new_rect.y,
-                             old_rect.width, old_rect.height);
-          g_object_unref (tmp_gc);
-         g_object_unref (tmp_paint->pixmap);
-
-         paint->x_offset = new_rect.x;
-         paint->y_offset = new_rect.y;
-         
-         tmp_list = private->paint_stack;
-         while (tmp_list)
-           {
-             tmp_paint = tmp_list->data;
-             gdk_region_subtract (init_region, tmp_paint->region);
-
-             tmp_paint->pixmap = paint->pixmap;
-             tmp_paint->x_offset = paint->x_offset;
-             tmp_paint->y_offset = paint->y_offset;
-              
-             tmp_list = tmp_list->next;
-           }
-       }
-      else
-       {
-         paint->x_offset = tmp_paint->x_offset;
-         paint->y_offset = tmp_paint->y_offset;
-         paint->pixmap = tmp_paint->pixmap;
+  gdk_region_get_clipbox (region, &clip_box);
 
-         tmp_list = private->paint_stack;
-         while (tmp_list)
-           {
-             tmp_paint = tmp_list->data;
-             gdk_region_subtract (init_region, tmp_paint->region);
+  paint = g_new (GdkWindowPaint, 1);
+  paint->region = gdk_region_copy (region);
+  paint->x_offset = clip_box.x;
+  paint->y_offset = clip_box.y;
+  paint->pixmap =
+    gdk_pixmap_new (window,
+                   MAX (clip_box.width, 1), MAX (clip_box.height, 1), -1);
 
-             tmp_list = tmp_list->next;
-           }
-       }
-    }
-  else
+  paint->surface = _gdk_drawable_ref_cairo_surface (paint->pixmap);
+  cairo_surface_set_device_offset (paint->surface,
+                                  - paint->x_offset, - paint->y_offset);
+  
+  for (list = private->paint_stack; list != NULL; list = list->next)
     {
-      paint->x_offset = clip_box.x;
-      paint->y_offset = clip_box.y;
-      paint->pixmap = gdk_pixmap_new (window, 
-                                      clip_box.width, clip_box.height, -1);
-    }
+      GdkWindowPaint *tmp_paint = list->data;
 
-  if (!gdk_region_empty (init_region))
-    gdk_window_paint_init_bg (window, paint, init_region);
-  
-  gdk_region_destroy (init_region);
+      gdk_region_subtract (tmp_paint->region, paint->region);
+    }
   
   private->paint_stack = g_slist_prepend (private->paint_stack, paint);
+
+  if (!gdk_region_empty (region))
+    {
+      gdk_window_clear_backing_rect (window,
+                                    clip_box.x, clip_box.y,
+                                    clip_box.width, clip_box.height);
+    }
 #endif /* USE_BACKING_STORE */
 }
 
@@ -1081,6 +1049,13 @@ gdk_window_end_paint (GdkWindow *window)
   if (GDK_WINDOW_DESTROYED (window))
     return;
 
+  if (GDK_IS_PAINTABLE (private->impl) &&
+      GDK_PAINTABLE_GET_IFACE (private->impl)->end_paint) 
+    {
+      GDK_PAINTABLE_GET_IFACE (private->impl)->end_paint (GDK_PAINTABLE (private->impl));
+      return;
+    }
+
   if (private->paint_stack == NULL)
     {
       g_warning (G_STRLOC": no preceding call to gdk_window_begin_paint_region(), see documentation");
@@ -1093,34 +1068,24 @@ gdk_window_end_paint (GdkWindow *window)
 
   gdk_region_get_clipbox (paint->region, &clip_box);
 
-  tmp_gc = gdk_gc_new (window);
+  tmp_gc = _gdk_drawable_get_scratch_gc (window, FALSE);
 
   _gdk_windowing_window_get_offsets (window, &x_offset, &y_offset);
 
   gdk_gc_set_clip_region (tmp_gc, paint->region);
-  gdk_gc_set_clip_origin (tmp_gc, -x_offset, -y_offset);
+  gdk_gc_set_clip_origin (tmp_gc, - x_offset, - y_offset);
 
   gdk_draw_drawable (private->impl, tmp_gc, paint->pixmap,
                      clip_box.x - paint->x_offset,
                      clip_box.y - paint->y_offset,
                      clip_box.x - x_offset, clip_box.y - y_offset,
                      clip_box.width, clip_box.height);
-  g_object_unref (tmp_gc);
 
-  if (private->paint_stack)
-    {
-      GSList *tmp_list = private->paint_stack;
-      while (tmp_list)
-       {
-         GdkWindowPaint *tmp_paint = tmp_list->data;
-         gdk_region_subtract (tmp_paint->region, paint->region);
-          
-         tmp_list = tmp_list->next;
-       }
-    }
-  else
-    g_object_unref (paint->pixmap);
+  /* Reset clip region of the cached GdkGC */
+  gdk_gc_set_clip_region (tmp_gc, NULL);
 
+  cairo_surface_destroy (paint->surface);
+  g_object_unref (paint->pixmap);
   gdk_region_destroy (paint->region);
   g_free (paint);
 #endif /* USE_BACKING_STORE */
@@ -1265,7 +1230,7 @@ gdk_window_create_gc (GdkDrawable     *drawable,
 static void
 gdk_window_draw_rectangle (GdkDrawable *drawable,
                           GdkGC       *gc,
-                          gint         filled,
+                          gboolean     filled,
                           gint         x,
                           gint         y,
                           gint         width,
@@ -1293,7 +1258,7 @@ gdk_window_draw_rectangle (GdkDrawable *drawable,
 static void
 gdk_window_draw_arc (GdkDrawable *drawable,
                     GdkGC       *gc,
-                    gint         filled,
+                    gboolean     filled,
                     gint         x,
                     gint         y,
                     gint         width,
@@ -1324,7 +1289,7 @@ gdk_window_draw_arc (GdkDrawable *drawable,
 static void
 gdk_window_draw_polygon (GdkDrawable *drawable,
                         GdkGC       *gc,
-                        gint         filled,
+                        gboolean     filled,
                         GdkPoint    *points,
                         gint         npoints)
 {
@@ -1423,7 +1388,7 @@ gdk_window_draw_text_wc (GdkDrawable    *drawable,
 }
 
 static GdkDrawable*
-gdk_window_get_composite_drawable (GdkDrawable *window,
+gdk_window_get_composite_drawable (GdkDrawable *drawable,
                                    gint         x,
                                    gint         y,
                                    gint         width,
@@ -1431,51 +1396,22 @@ gdk_window_get_composite_drawable (GdkDrawable *window,
                                    gint        *composite_x_offset,
                                    gint        *composite_y_offset)
 {
-  GdkWindowObject *private = (GdkWindowObject *)window;
-  GdkWindowPaint *paint;
-  GdkRegion *buffered_region;
-  GSList *tmp_list;
-  GdkPixmap *buffer;
+  GdkWindowObject *private = (GdkWindowObject *)drawable;
+  GSList *list;
   GdkPixmap *tmp_pixmap;
   GdkRectangle rect;
-  GdkRegion *rect_region;
   GdkGC *tmp_gc;
-  gint windowing_x_offset, windowing_y_offset;
-  gint buffer_x_offset, buffer_y_offset;
-
-  if (GDK_WINDOW_DESTROYED (window) || private->paint_stack == NULL)
-    {
-      /* No backing store */
-      _gdk_windowing_window_get_offsets (window,
-                                         composite_x_offset,
-                                         composite_y_offset);
-      
-      return g_object_ref (window);
-    }
-  
-  buffered_region = NULL;
-  buffer = NULL;
+  gboolean overlap_buffer;
 
-  /* All GtkWindowPaint structs have the same pixmap and offsets, just
-   * get the first one. (should probably be cleaned up so that the
-   * pixmap is stored in the window)
-   */
-  paint = private->paint_stack->data;
-  buffer = paint->pixmap;
-  buffer_x_offset = paint->x_offset;
-  buffer_y_offset = paint->y_offset;
+  _gdk_windowing_window_get_offsets (drawable,
+                                    composite_x_offset,
+                                    composite_y_offset);
   
-  tmp_list = private->paint_stack;
-  while (tmp_list != NULL)
+  if ((GDK_IS_WINDOW (drawable) && GDK_WINDOW_DESTROYED (drawable))
+      || private->paint_stack == NULL)
     {
-      paint = tmp_list->data;
-      
-      if (buffered_region == NULL)
-        buffered_region = gdk_region_copy (paint->region);
-      else
-        gdk_region_union (buffered_region, paint->region);
-
-      tmp_list = g_slist_next (tmp_list);
+      /* No backing store */
+      return g_object_ref (drawable);
     }
 
   /* See if the buffered part is overlapping the part we want
@@ -1486,71 +1422,65 @@ gdk_window_get_composite_drawable (GdkDrawable *window,
   rect.width = width;
   rect.height = height;
 
-  rect_region = gdk_region_rectangle (&rect);
+  overlap_buffer = FALSE;
   
-  gdk_region_intersect (buffered_region, rect_region);
-
-  gdk_region_destroy (rect_region);
-
-  if (gdk_region_empty (buffered_region))
+  for (list = private->paint_stack; list != NULL; list = list->next)
     {
-      gdk_region_destroy (buffered_region);
+      GdkWindowPaint *paint = list->data;
+      GdkOverlapType overlap;
 
-      _gdk_windowing_window_get_offsets (window,
-                                         composite_x_offset,
-                                         composite_y_offset);
+      overlap = gdk_region_rect_in (paint->region, &rect);
 
-      return g_object_ref (window);
+      if (overlap == GDK_OVERLAP_RECTANGLE_IN)
+       {
+         *composite_x_offset = paint->x_offset;
+         *composite_y_offset = paint->y_offset;
+         
+         return g_object_ref (paint->pixmap);
+       }
+      else if (overlap == GDK_OVERLAP_RECTANGLE_PART)
+       {
+         overlap_buffer = TRUE;
+         break;
+       }
     }
-  
-  tmp_pixmap = gdk_pixmap_new (window,
-                               width, height,
-                               -1);
 
-  tmp_gc = gdk_gc_new (tmp_pixmap);
+  if (!overlap_buffer)
+    return g_object_ref (drawable);
+
+  tmp_pixmap = gdk_pixmap_new (drawable, width, height, -1);
+  tmp_gc = _gdk_drawable_get_scratch_gc (tmp_pixmap, FALSE);
 
-  _gdk_windowing_window_get_offsets (window,
-                                     &windowing_x_offset,
-                                     &windowing_y_offset);
-  
   /* Copy the current window contents */
   gdk_draw_drawable (tmp_pixmap,
                      tmp_gc,
                      private->impl,
-                     x - windowing_x_offset,
-                     y - windowing_y_offset,
+                     x - *composite_x_offset,
+                     y - *composite_y_offset,
                      0, 0,
                      width, height);
 
-  /* Make buffered_region relative to the tmp_pixmap */
-  gdk_region_offset (buffered_region,
-                     - x,
-                     - y);
-  
-  /* Set the clip mask to avoid drawing over non-buffered areas of
-   * tmp_pixmap. 
-   */
-  
-  gdk_gc_set_clip_region (tmp_gc, buffered_region);
-  gdk_region_destroy (buffered_region);
-  
-  /* Draw backing pixmap onto the tmp_pixmap, offsetting
-   * appropriately.
-   */
-  gdk_draw_drawable (tmp_pixmap,
-                     tmp_gc,
-                     buffer,
-                     x - buffer_x_offset,
-                     y - buffer_y_offset,
-                     0, 0,
-                     width, height);
-  
+  /* paint the backing stores */
+  for (list = private->paint_stack; list != NULL; list = list->next)
+    {
+      GdkWindowPaint *paint = list->data;
+
+      gdk_gc_set_clip_region (tmp_gc, paint->region);
+      gdk_gc_set_clip_origin (tmp_gc, -x, -y);
+      
+      gdk_draw_drawable (tmp_pixmap, tmp_gc, paint->pixmap,
+                        x - paint->x_offset,
+                        y - paint->y_offset,
+                        0, 0, width, height);
+    }
+
+  /* Reset clip region of the cached GdkGC */
+  gdk_gc_set_clip_region (tmp_gc, NULL);
+
   /* Set these to location of tmp_pixmap within the window */
   *composite_x_offset = x;
   *composite_y_offset = y;
 
-  g_object_unref (tmp_gc);
-  
   return tmp_pixmap;
 }
 
@@ -1782,7 +1712,134 @@ gdk_window_draw_glyphs (GdkDrawable      *drawable,
   RESTORE_GC (gc);
 }
 
-/* Fixme - this is just like gdk_window_paint_init_bg */
+static void
+gdk_window_draw_glyphs_transformed (GdkDrawable      *drawable,
+                                   GdkGC            *gc,
+                                   PangoMatrix      *matrix,
+                                   PangoFont        *font,
+                                   gint              x,
+                                   gint              y,
+                                   PangoGlyphString *glyphs)
+{
+  GdkWindowObject *private = (GdkWindowObject *)drawable;
+  PangoMatrix tmp_matrix;
+
+  OFFSET_GC (gc);
+
+  if (GDK_WINDOW_DESTROYED (drawable))
+    return;
+
+  if (x_offset != 0 || y_offset != 0)
+    {
+      if (matrix)
+       {
+         tmp_matrix = *matrix;
+         tmp_matrix.x0 -= x_offset;
+         tmp_matrix.y0 -= y_offset;
+         matrix = &tmp_matrix;
+       }
+      else
+       {
+         x -= x_offset * PANGO_SCALE;
+         y -= y_offset * PANGO_SCALE;
+       }
+    }
+  
+  if (private->paint_stack)
+    {
+      GdkWindowPaint *paint = private->paint_stack->data;
+
+      gdk_draw_glyphs_transformed (paint->pixmap, gc, matrix, font, x, y, glyphs);
+    }
+  else
+    gdk_draw_glyphs_transformed (private->impl, gc, matrix, font, x, y, glyphs);
+
+  RESTORE_GC (gc);
+}
+
+typedef struct {
+  cairo_t *cr; /* if non-null, it means use this cairo context */
+  GdkGC *gc;   /* if non-null, it means use this GC instead */
+} BackingRectMethod;
+
+static void
+setup_backing_rect_method (BackingRectMethod *method, GdkWindow *window, GdkWindowPaint *paint, int x_offset_cairo, int y_offset_cairo)
+{
+  GdkWindowObject *private = (GdkWindowObject *)window;
+
+  if (private->bg_pixmap == GDK_PARENT_RELATIVE_BG && private->parent)
+    {
+      GdkWindowPaint tmp_paint;
+
+      tmp_paint = *paint;
+      tmp_paint.x_offset += private->x;
+      tmp_paint.y_offset += private->y;
+
+      x_offset_cairo += private->x;
+      y_offset_cairo += private->y;
+
+      setup_backing_rect_method (method, GDK_WINDOW (private->parent), &tmp_paint, x_offset_cairo, y_offset_cairo);
+    }
+  else if (private->bg_pixmap &&
+          private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
+          private->bg_pixmap != GDK_NO_BG)
+    {
+/* This is a workaround for https://bugs.freedesktop.org/show_bug.cgi?id=4320.
+ * In it, using a pixmap as a repeating pattern in Cairo, and painting it to a
+ * pixmap destination surface, can be very slow (on the order of seconds for a
+ * whole-screen copy).  The workaround is to use pretty much the same code that
+ * we used in GTK+ 2.6 (pre-Cairo), which clears the double-buffer pixmap with
+ * a tiled GC XFillRectangle().
+ */
+
+/* Actually computing this flag is left as an exercise for the reader */
+#if defined (G_OS_UNIX)
+#  define GDK_CAIRO_REPEAT_IS_FAST 0
+#else
+#  define GDK_CAIRO_REPEAT_IS_FAST 1
+#endif
+
+#if GDK_CAIRO_REPEAT_IS_FAST
+      cairo_surface_t *surface = _gdk_drawable_ref_cairo_surface (private->bg_pixmap);
+      cairo_pattern_t *pattern = cairo_pattern_create_for_surface (surface);
+      cairo_surface_destroy (surface);
+
+      if (x_offset_cairo != 0 || y_offset_cairo != 0)
+       {
+         cairo_matrix_t matrix;
+         cairo_matrix_init_translate (&matrix, x_offset_cairo, y_offset_cairo);
+         cairo_pattern_set_matrix (pattern, &matrix);
+       }
+
+      cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+
+      method->cr = cairo_create (paint->surface);
+      method->gc = NULL;
+
+      cairo_set_source (method->cr, pattern);
+      cairo_pattern_destroy (pattern);
+#else
+      guint gc_mask;
+      GdkGCValues gc_values;
+
+      gc_values.fill = GDK_TILED;
+      gc_values.tile = private->bg_pixmap;
+      gc_values.ts_x_origin = -x_offset_cairo;
+      gc_values.ts_y_origin = -y_offset_cairo;
+
+      gc_mask = GDK_GC_FILL | GDK_GC_TILE | GDK_GC_TS_X_ORIGIN | GDK_GC_TS_Y_ORIGIN;
+
+      method->gc = gdk_gc_new_with_values (paint->pixmap, &gc_values, gc_mask);
+#endif
+    }
+  else
+    {
+      method->cr = cairo_create (paint->surface);
+
+      gdk_cairo_set_source_color (method->cr, &private->bg_color);
+    }
+}
+
 static void
 gdk_window_clear_backing_rect (GdkWindow *window,
                               gint       x,
@@ -1792,15 +1849,56 @@ gdk_window_clear_backing_rect (GdkWindow *window,
 {
   GdkWindowObject *private = (GdkWindowObject *)window;
   GdkWindowPaint *paint = private->paint_stack->data;
-  GdkGC *tmp_gc;
+  BackingRectMethod method;
+#if 0
+  GTimer *timer;
+  double elapsed;
+#endif
 
   if (GDK_WINDOW_DESTROYED (window))
     return;
-  
-  tmp_gc = gdk_window_get_bg_gc (window, paint);
-  gdk_draw_rectangle (paint->pixmap, tmp_gc, TRUE,
-                     x - paint->x_offset, y - paint->y_offset, width, height);
-  g_object_unref (tmp_gc);
+
+#if 0
+  timer = g_timer_new ();
+#endif
+
+  method.cr = NULL;
+  method.gc = NULL;
+  setup_backing_rect_method (&method, window, paint, 0, 0);
+
+  if (method.cr)
+    {
+      g_assert (method.gc == NULL);
+
+      cairo_rectangle (method.cr, x, y, width, height);
+      cairo_clip (method.cr);
+
+      gdk_cairo_region (method.cr, paint->region);
+      cairo_fill (method.cr);
+
+      cairo_destroy (method.cr);
+#if 0
+      elapsed = g_timer_elapsed (timer, NULL);
+      g_print ("Draw the background with Cairo: %fs\n", elapsed);
+#endif
+    }
+  else
+    {
+      g_assert (method.gc != NULL);
+
+      gdk_gc_set_clip_region (method.gc, paint->region);
+      gdk_draw_rectangle (window, method.gc, TRUE, x, y, width, height);
+      g_object_unref (method.gc);
+
+#if 0
+      elapsed = g_timer_elapsed (timer, NULL);
+      g_print ("Draw the background with GDK: %fs\n", elapsed);
+#endif
+    }
+
+#if 0
+  g_timer_destroy (timer);
+#endif
 }
 
 /**
@@ -1979,6 +2077,52 @@ gdk_window_draw_pixbuf (GdkDrawable     *drawable,
     }
 }
 
+static void
+gdk_window_draw_trapezoids (GdkDrawable   *drawable,
+                           GdkGC         *gc,
+                           GdkTrapezoid  *trapezoids,
+                           gint           n_trapezoids)
+{
+  GdkWindowObject *private = (GdkWindowObject *)drawable;
+  GdkTrapezoid *new_trapezoids = NULL;
+
+  OFFSET_GC (gc);
+
+  if (GDK_WINDOW_DESTROYED (drawable))
+    return;
+  
+  if (x_offset != 0 || y_offset != 0)
+    {
+      gint i;
+
+      new_trapezoids = g_new (GdkTrapezoid, n_trapezoids);
+      for (i=0; i < n_trapezoids; i++)
+       {
+         new_trapezoids[i].y1 = trapezoids[i].y1 - y_offset;
+         new_trapezoids[i].x11 = trapezoids[i].x11 - x_offset;
+         new_trapezoids[i].x21 = trapezoids[i].x21 - x_offset;
+         new_trapezoids[i].y2 = trapezoids[i].y2 - y_offset;
+         new_trapezoids[i].x12 = trapezoids[i].x12 - x_offset;
+         new_trapezoids[i].x22 = trapezoids[i].x22 - x_offset;
+       }
+
+      trapezoids = new_trapezoids;
+    }
+
+  if (private->paint_stack)
+    {
+      GdkWindowPaint *paint = private->paint_stack->data;
+      gdk_draw_trapezoids (paint->pixmap, gc, trapezoids, n_trapezoids);
+    }
+  else
+    gdk_draw_trapezoids (private->impl, gc, trapezoids, n_trapezoids);
+  
+  if (new_trapezoids)
+    g_free (new_trapezoids);
+
+  RESTORE_GC (gc);
+}
+
 static void
 gdk_window_real_get_size (GdkDrawable *drawable,
                           gint *width,
@@ -2061,21 +2205,62 @@ gdk_window_copy_to_image (GdkDrawable     *drawable,
   
   _gdk_windowing_window_get_offsets (drawable, &x_offset, &y_offset);
   
-  return _gdk_drawable_copy_to_image (((GdkWindowObject*)drawable)->impl,
-                                     image,
-                                     src_x - x_offset,
-                                     src_y - y_offset,
-                                     dest_x, dest_y,
-                                     width, height);
+  return gdk_drawable_copy_to_image (((GdkWindowObject*)drawable)->impl,
+                                    image,
+                                    src_x - x_offset,
+                                    src_y - y_offset,
+                                    dest_x, dest_y,
+                                    width, height);
+}
+
+static cairo_surface_t *
+gdk_window_ref_cairo_surface (GdkDrawable *drawable)
+{
+  GdkWindowObject *private = (GdkWindowObject*) drawable;
+  cairo_surface_t *surface;
+
+  if (private->paint_stack)
+    {
+      GdkWindowPaint *paint = private->paint_stack->data;
+
+      surface = paint->surface;
+      cairo_surface_reference (surface);
+    }
+  else
+    surface = _gdk_drawable_ref_cairo_surface (private->impl);
+
+  return surface;
 }
 
 /* Code for dirty-region queueing
  */
-
 static GSList *update_windows = NULL;
 static guint update_idle = 0;
 static gboolean debug_updates = FALSE;
 
+static gboolean
+gdk_window_update_idle (gpointer data)
+{
+  GDK_THREADS_ENTER ();
+  gdk_window_process_all_updates ();
+  GDK_THREADS_LEAVE ();
+  
+  return FALSE;
+}
+
+static void
+gdk_window_schedule_update (GdkWindow *window)
+{
+  if (window && GDK_WINDOW_OBJECT (window)->update_freeze_count)
+    return;
+
+  if (!update_idle)
+    {
+      update_idle = g_idle_add_full (GDK_PRIORITY_REDRAW,
+                                    gdk_window_update_idle, NULL, NULL);
+    }
+}
+
 static void
 gdk_window_process_updates_internal (GdkWindow *window)
 {
@@ -2091,10 +2276,8 @@ gdk_window_process_updates_internal (GdkWindow *window)
       GdkRegion *update_area = private->update_area;
       private->update_area = NULL;
       
-      if (_gdk_event_func && gdk_window_is_viewable (window) &&
-         (private->event_mask & GDK_EXPOSURE_MASK))
+      if (_gdk_event_func && gdk_window_is_viewable (window))
        {
-         GdkEvent event;
          GdkRectangle window_rect;
          GdkRegion *expose_region;
          GdkRegion *window_region;
@@ -2107,45 +2290,72 @@ gdk_window_process_updates_internal (GdkWindow *window)
               g_usleep (70000);
             }
           
-          gdk_drawable_get_size (GDK_DRAWABLE (private), &width, &height);
-          
-         window_rect.x = 0;
-         window_rect.y = 0;
-         window_rect.width = width;
-         window_rect.height = height;
-
          save_region = _gdk_windowing_window_queue_antiexpose (window, update_area);
-      
-         event.expose.type = GDK_EXPOSE;
-         event.expose.window = g_object_ref (window);
-         event.expose.count = 0;
 
          if (save_region)
            expose_region = gdk_region_copy (update_area);
          else
            expose_region = update_area;
+         
+          gdk_drawable_get_size (GDK_DRAWABLE (private), &width, &height);
+
+         window_rect.x = 0;
+         window_rect.y = 0;
+         window_rect.width = width;
+         window_rect.height = height;
+
          window_region = gdk_region_rectangle (&window_rect);
          gdk_region_intersect (expose_region,
                                window_region);
          gdk_region_destroy (window_region);
          
-         event.expose.region = expose_region;
-         gdk_region_get_clipbox (expose_region, &event.expose.area);
-         
-         if (!gdk_region_empty (expose_region))
+         if (!gdk_region_empty (expose_region) &&
+             (private->event_mask & GDK_EXPOSURE_MASK))
            {
+             GdkEvent event;
+             
+             event.expose.type = GDK_EXPOSE;
+             event.expose.window = g_object_ref (window);
+             event.expose.send_event = FALSE;
+             event.expose.count = 0;
+             event.expose.region = expose_region;
+             gdk_region_get_clipbox (expose_region, &event.expose.area);
+             
              (*_gdk_event_func) (&event, _gdk_event_data);
+             
+             g_object_unref (window);
            }
 
          if (expose_region != update_area)
            gdk_region_destroy (expose_region);
-         g_object_unref (window);
        }
       if (!save_region)
        gdk_region_destroy (update_area);
     }
 }
 
+static void
+flush_all_displays (void)
+{
+  GSList *displays = gdk_display_manager_list_displays (gdk_display_manager_get ());
+  GSList *tmp_list;
+
+  for (tmp_list = displays; tmp_list; tmp_list = tmp_list->next)
+    gdk_display_flush (tmp_list->data);
+
+  g_slist_free (displays);
+}
+
+/* Currently it is not possible to override
+ * gdk_window_process_all_updates in the same manner as
+ * gdk_window_process_updates and gdk_window_invalidate_maybe_recurse
+ * by implementing the GdkPaintable interface.  If in the future a
+ * backend would need this, the right solution would be to add a
+ * method to GdkDisplay that can be optionally
+ * NULL. gdk_window_process_all_updates can then walk the list of open
+ * displays and call the mehod.
+ */
+
 /**
  * gdk_window_process_all_updates:
  *
@@ -2169,24 +2379,20 @@ gdk_window_process_all_updates (void)
   
   while (tmp_list)
     {
-      gdk_window_process_updates_internal (tmp_list->data);
+      GdkWindowObject *private = (GdkWindowObject *)tmp_list->data;
+      
+      if (private->update_freeze_count)
+       update_windows = g_slist_prepend (update_windows, private);
+      else
+       gdk_window_process_updates_internal (tmp_list->data);
+      
       g_object_unref (tmp_list->data);
       tmp_list = tmp_list->next;
     }
 
   g_slist_free (old_update_windows);
 
-  gdk_flush();
-}
-
-static gboolean
-gdk_window_update_idle (gpointer data)
-{
-  GDK_THREADS_ENTER ();
-  gdk_window_process_all_updates ();
-  GDK_THREADS_LEAVE ();
-  
-  return FALSE;
+  flush_all_displays ();
 }
 
 /**
@@ -2213,7 +2419,14 @@ gdk_window_process_updates (GdkWindow *window,
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  if (private->update_area)
+  if (GDK_IS_PAINTABLE (private->impl) &&
+      GDK_PAINTABLE_GET_IFACE (private->impl)->process_updates)
+    {
+      GDK_PAINTABLE_GET_IFACE (private->impl)->process_updates (GDK_PAINTABLE (private->impl), update_children);
+      return;
+    }
+  
+  if (private->update_area && !private->update_freeze_count)
     {      
       gdk_window_process_updates_internal (window);
       update_windows = g_slist_remove (update_windows, window);
@@ -2331,6 +2544,7 @@ gdk_window_invalidate_maybe_recurse (GdkWindow *window,
 {
   GdkWindowObject *private = (GdkWindowObject *)window;
   GdkRegion *visible_region;
+  GList *tmp_list;
 
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
@@ -2341,9 +2555,56 @@ gdk_window_invalidate_maybe_recurse (GdkWindow *window,
   if (private->input_only || !GDK_WINDOW_IS_MAPPED (window))
     return;
 
+  if (GDK_IS_PAINTABLE (private->impl) &&
+      GDK_PAINTABLE_GET_IFACE (private->impl)->invalidate_maybe_recurse)
+    {
+      GDK_PAINTABLE_GET_IFACE (private->impl)->invalidate_maybe_recurse (GDK_PAINTABLE (private->impl), region,
+                                                                        child_func, user_data);
+      return;
+    }
+
   visible_region = gdk_drawable_get_visible_region (window);
   gdk_region_intersect (visible_region, region);
 
+  tmp_list = private->children;
+  while (tmp_list)
+    {
+      GdkWindowObject *child = tmp_list->data;
+      
+      if (!child->input_only)
+       {
+         GdkRegion *child_region;
+         GdkRectangle child_rect;
+         
+         gdk_window_get_position ((GdkWindow *)child,
+                                  &child_rect.x, &child_rect.y);
+         gdk_drawable_get_size ((GdkDrawable *)child,
+                                &child_rect.width, &child_rect.height);
+
+         child_region = gdk_region_rectangle (&child_rect);
+         
+         /* remove child area from the invalid area of the parent */
+         if (GDK_WINDOW_IS_MAPPED (child) && !child->shaped)
+           gdk_region_subtract (visible_region, child_region);
+         
+         if (child_func && (*child_func) ((GdkWindow *)child, user_data))
+           {
+             gdk_region_offset (region, - child_rect.x, - child_rect.y);
+             gdk_region_offset (child_region, - child_rect.x, - child_rect.y);
+             gdk_region_intersect (child_region, region);
+             
+             gdk_window_invalidate_maybe_recurse ((GdkWindow *)child,
+                                                  child_region, child_func, user_data);
+             
+             gdk_region_offset (region, child_rect.x, child_rect.y);
+           }
+
+         gdk_region_destroy (child_region);
+       }
+
+      tmp_list = tmp_list->next;
+    }
+  
   if (!gdk_region_empty (visible_region))
     {
       if (debug_updates)
@@ -2358,37 +2619,7 @@ gdk_window_invalidate_maybe_recurse (GdkWindow *window,
          update_windows = g_slist_prepend (update_windows, window);
          private->update_area = gdk_region_copy (visible_region);
          
-         if (!private->update_freeze_count && !update_idle)
-           update_idle = g_idle_add_full (GDK_PRIORITY_REDRAW,
-                                          gdk_window_update_idle, NULL, NULL);
-       }
-      
-      if (child_func)
-       {
-         GList *tmp_list;
-         
-         tmp_list = private->children;
-         while (tmp_list)
-           {
-             GdkWindowObject *child = tmp_list->data;
-             tmp_list = tmp_list->next;
-
-             if (!child->input_only && (*child_func) ((GdkWindow *)child, user_data))
-               {
-                 GdkRegion *child_region;
-                 gint x, y;
-
-                 gdk_window_get_position ((GdkWindow *)child, &x, &y);
-
-                 /* This copy could be saved with a little more complexity */
-                 child_region = gdk_region_copy (visible_region);
-                 gdk_region_offset (child_region, -x, -y);
-                 
-                 gdk_window_invalidate_maybe_recurse ((GdkWindow *)child, child_region, child_func, user_data);
-                 
-                 gdk_region_destroy (child_region);
-               }
-           }
+         gdk_window_schedule_update (window);
        }
     }
   
@@ -2532,10 +2763,8 @@ gdk_window_thaw_updates (GdkWindow *window)
   g_return_if_fail (GDK_IS_WINDOW (window));
   g_return_if_fail (private->update_freeze_count > 0);
 
-  private->update_freeze_count--;
-  if (!private->update_freeze_count && private->update_area && !update_idle)
-    update_idle = g_idle_add_full (GDK_PRIORITY_REDRAW,
-                                  gdk_window_update_idle, NULL, NULL);
+  if (--private->update_freeze_count == 0)
+    gdk_window_schedule_update (window);
 }
 
 /**
@@ -2667,7 +2896,7 @@ gdk_window_constrain_size (GdkGeometry *geometry,
 
       if (geometry->min_aspect * height > width)
        {
-         delta = FLOOR (height - width * geometry->min_aspect, yinc);
+         delta = FLOOR (height - width / geometry->min_aspect, yinc);
          if (height - delta >= min_height)
            height -= delta;
          else
@@ -2698,33 +2927,6 @@ gdk_window_constrain_size (GdkGeometry *geometry,
   *new_height = height;
 }
 
-/**
- * gdk_set_pointer_hooks:
- * @new_hooks: a table of pointers to functions for getting
- *   quantities related to the current pointer position,
- *   or %NULL to restore the default table.
- * 
- * This function allows for hooking into the operation
- * of getting the current location of the pointer. This
- * is only useful for such low-level tools as an
- * event recorder. Applications should never have any
- * reason to use this facility
- * 
- * Return value: the previous pointer hook table
- **/
-GdkPointerHooks *
-gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks)
-{
-  const GdkPointerHooks *result = _gdk_current_pointer_hooks;
-
-  if (new_hooks)
-    _gdk_current_pointer_hooks = new_hooks;
-  else
-    _gdk_current_pointer_hooks = &default_pointer_hooks;
-
-  return (GdkPointerHooks *)result;
-}
-
 /**
  * gdk_window_get_pointer:
  * @window: a #GdkWindow
@@ -2733,7 +2935,8 @@ gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks)
  * @mask: return location for modifier mask
  *
  * Obtains the current pointer position and modifier state.
- * The position is given in coordinates relative to @window.
+ * The position is given in coordinates relative to the upper left 
+ * corner of @window.
  * 
  * Return value: the window containing the pointer (as with
  * gdk_window_at_pointer()), or %NULL if the window containing the
@@ -2743,11 +2946,41 @@ GdkWindow*
 gdk_window_get_pointer (GdkWindow        *window,
                        gint              *x,
                        gint              *y,
-                       GdkModifierType *mask)
+                       GdkModifierType   *mask)
 {
-  g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL);
+  GdkDisplay *display;
+  gint tmp_x, tmp_y;
+  GdkModifierType tmp_mask;
+  GdkWindow *child;
   
-  return _gdk_current_pointer_hooks->get_pointer (window, x, y, mask); 
+  g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL);
+
+  if (window)
+    {
+      display = gdk_drawable_get_display (window);
+    }
+  else
+    {
+      GdkScreen *screen = gdk_screen_get_default ();
+
+      display = gdk_screen_get_display (screen);
+      window = gdk_screen_get_root_window (screen);
+      
+      GDK_NOTE (MULTIHEAD,
+               g_message ("Passing NULL for window to gdk_window_get_pointer()\n"
+                          "is not multihead safe"));
+    }
+
+  child = display->pointer_hooks->window_get_pointer (display, window, &tmp_x, &tmp_y, &tmp_mask);
+
+  if (x)
+    *x = tmp_x;
+  if (y)
+    *y = tmp_y;
+  if (mask)
+    *mask = tmp_mask;
+
+  return child;
 }
 
 /**
@@ -2757,11 +2990,12 @@ gdk_window_get_pointer (GdkWindow         *window,
  * 
  * Obtains the window underneath the mouse pointer, returning the
  * location of that window in @win_x, @win_y. Returns %NULL if the
- * window under the mouse pointer is not known to GDK (for example,
- * belongs to another application).
+ * window under the mouse pointer is not known to GDK (if the window
+ * belongs to another application and a #GdkWindow hasn't been created
+ * for it with gdk_window_foreign_new())
  *
  * NOTE: For multihead-aware widgets or applications use
- * gdk_screen_get_window_at_pointer() instead.
+ * gdk_display_get_window_at_pointer() instead.
  * 
  * Return value: window under the mouse pointer
  **/
@@ -2769,7 +3003,7 @@ GdkWindow*
 gdk_window_at_pointer (gint *win_x,
                       gint *win_y)
 {
-  return gdk_screen_get_window_at_pointer (gdk_screen_get_default (), win_x, win_y);
+  return gdk_display_get_window_at_pointer (gdk_display_get_default (), win_x, win_y);
 }
 
 /**
@@ -2805,3 +3039,5 @@ gdk_window_foreign_new (GdkNativeWindow anid)
   return gdk_window_foreign_new_for_display (gdk_display_get_default (), anid);
 }
 
+#define __GDK_WINDOW_C__
+#include "gdkaliasdef.c"