gtk+ r22441 - in trunk: . gdk

[alexl svn gnome org]

Author: alexl
Date: Mon Mar  2 15:09:27 2009
New Revision: 22441
URL: http://svn.gnome.org/viewvc/gtk+?rev=22441&view=rev

Log:
2009-03-02  Alexander Larsson  <alexl redhat com>

	Bug 573087 â gdkwindow.c: {x,y}_offset used uninitialized

	* gdk/gdkwindow.c (gdk_window_clear_backing_rect_redirect):
	Don't use uninitialized vars.
	Fix offsets for redirected pixmap, draw to pixmap not window.




Modified:
   trunk/ChangeLog
   trunk/gdk/gdkwindow.c

Modified: trunk/gdk/gdkwindow.c
==============================================================================
--- trunk/gdk/gdkwindow.c	(original)
+++ trunk/gdk/gdkwindow.c	Mon Mar  2 15:09:27 2009
@@ -2116,8 +2116,8 @@
   if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  paint.x_offset = x_offset;
-  paint.y_offset = y_offset;
+  paint.x_offset = 0;
+  paint.y_offset = 0;
   paint.pixmap = redirect->pixmap;
   paint.surface = _gdk_drawable_ref_cairo_surface (redirect->pixmap);
   
@@ -2125,10 +2125,19 @@
 							GDK_WINDOW (redirect->redirected),
 							NULL, TRUE,
 							&x_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 and rect to pixmap coords */
+  gdk_region_offset (clip_region, x_offset, y_offset);
+  x += x_offset;
+  y += y_offset;
+
   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)
     {
@@ -2147,7 +2156,7 @@
       g_assert (method.gc != NULL);
 
       gdk_gc_set_clip_region (method.gc, clip_region);
-      gdk_draw_rectangle (window, method.gc, TRUE, x, y, width, height);
+      gdk_draw_rectangle (redirect->pixmap, method.gc, TRUE, x, y, width, height);
       g_object_unref (method.gc);
 
     }