[gtk+/client-side-windows: 280/284] Fix coordinates for background clearing when redirecting

[Alexander Larsson <alexl src gnome org>]

commit d64b51de4dc4f9af461ca0d54a2e38f5b98cd95f
Author: Alexander Larsson <alexl redhat com>
Date:   Mon Mar 2 16:32:44 2009 +0100

    Fix coordinates for background clearing when redirecting
    
    Backport from svn of this fix
---
 gdk/gdkwindow.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 38fac4b..d2798ba 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -3764,14 +3764,22 @@ gdk_window_clear_backing_region_redirect (GdkWindow *window,
 							&x_offset, &y_offset);
   gdk_region_intersect (clip_region, region);
 
-  paint.x_offset = x_offset;
-  paint.y_offset = y_offset;
+  /* offset is from redirected window origin to window origin, convert to
+     the offset from the redirected pixmap origin to the window origin */
+  x_offset += redirect->dest_x - redirect->src_x;
+  y_offset += redirect->dest_y - redirect->src_y;
+
+  /* Convert region to pixmap coords */
+  gdk_region_offset (clip_region, x_offset, y_offset);
+  
+  paint.x_offset = 0;
+  paint.y_offset = 0;
   paint.pixmap = redirect->pixmap;
   paint.surface = _gdk_drawable_ref_cairo_surface (redirect->pixmap);
   
   method.cr = NULL;
   method.gc = NULL;
-  setup_backing_rect_method (&method, window, &paint, 0, 0);
+  setup_backing_rect_method (&method, window, &paint, -x_offset, -y_offset);
 
   if (method.cr)
     {
@@ -3788,7 +3796,7 @@ gdk_window_clear_backing_region_redirect (GdkWindow *window,
 
       gdk_region_get_clipbox (clip_region, &clipbox);
       gdk_gc_set_clip_region (method.gc, clip_region);
-      gdk_draw_rectangle (window, method.gc, TRUE,
+      gdk_draw_rectangle (redirect->pixmap, method.gc, TRUE,
 			  clipbox.x, clipbox.y,
 			  clipbox.width, clipbox.height);
       g_object_unref (method.gc);