metacity r3724 - in branches/gnome-2-22: . src/core

[iain svn gnome org]

Author: iain
Date: Sat May 24 11:10:24 2008
New Revision: 3724
URL: http://svn.gnome.org/viewvc/metacity?rev=3724&view=rev

Log:
2008-04-07  iain  <iain gnome org>

        * src/core/compositor.c (add_repair): Turn on idle repainting.
        (hide_overlay_window): Hide overlay window
        (meta_compositor_unmanage_screen): Release overlay window.
        Fixes #526770.



Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/src/core/compositor.c

Modified: branches/gnome-2-22/src/core/compositor.c
==============================================================================
--- branches/gnome-2-22/src/core/compositor.c	(original)
+++ branches/gnome-2-22/src/core/compositor.c	Sat May 24 11:10:24 2008
@@ -1290,7 +1290,7 @@
   if (compositor->repaint_id > 0)
     return;
 
-#if 0
+#if 1
   compositor->repaint_id = g_idle_add_full (G_PRIORITY_HIGH_IDLE,
                                             compositor_idle_cb, compositor,
                                             NULL);
@@ -2330,11 +2330,11 @@
 #endif
 }
 
-#if 0
 static void
 hide_overlay_window (MetaScreen *screen,
                      Window      cow)
 {
+#ifdef HAVE_COW
   MetaDisplay *display = screen->display;
   XserverRegion region;
 
@@ -2343,8 +2343,8 @@
                               cow, ShapeBounding,
                               0, 0, region);
   XFixesDestroyRegion (display->xdisplay, region);
-}
 #endif
+}
 
 static Window
 get_output_window (MetaScreen *screen)
@@ -2460,6 +2460,8 @@
 
   info = screen->compositor_data;
 
+  hide_overlay_window (screen, info->output);
+
   /* Destroy the windows */
   for (index = info->windows; index; index = index->next) 
     {
@@ -2481,6 +2483,10 @@
                                   CompositeRedirectManual);
   meta_screen_unset_cm_selection (screen);
 
+#ifdef HAVE_COW
+  XCompositeReleaseOverlayWindow (display->xdisplay, info->output);
+#endif
+
   g_free (info);
   screen->compositor_data = NULL;
 #endif