[mutter/override-redirect-exclusion: 3/3] Merge branch 'master' into override-redirect-exclusion

[Owen Taylor <otaylor src gnome org>]

commit 2bf0b2b6de1e6f5b8bf6a4241f082da978bbf5d6
Merge: eed2a2d... c012105...
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Fri Jun 19 11:42:03 2009 -0400

    Merge branch 'master' into override-redirect-exclusion

 src/core/window-private.h |    2 -
 src/core/window.c         |  153 +++++++++++++++++++++++++--------------------
 src/include/window.h      |    2 +
 3 files changed, 88 insertions(+), 69 deletions(-)
---
diff --cc src/core/window.c
index dd63222,585adc2..973b0d5
--- a/src/core/window.c
+++ b/src/core/window.c
@@@ -2311,8 -2307,77 +2311,77 @@@ window_would_be_covered (const MetaWind
    return FALSE; /* none found */
  }
  
+ static gboolean
+ map_frame (MetaWindow *window)
+ {
+   if (window->frame && !window->frame->mapped)
+     {
+       meta_topic (META_DEBUG_WINDOW_STATE,
+                   "Frame actually needs map\n");
+       window->frame->mapped = TRUE;
+       meta_ui_map_frame (window->screen->ui, window->frame->xwindow);
+       return TRUE;
+     }
+   else
+     return FALSE;
+ }
+ 
+ static gboolean
+ unmap_frame (MetaWindow *window)
+ {
+   if (window->frame && window->frame->mapped)
+     {
+       meta_topic (META_DEBUG_WINDOW_STATE, "Frame actually needs unmap\n");
+       window->frame->mapped = FALSE;
+       meta_ui_unmap_frame (window->screen->ui, window->frame->xwindow);
+       return TRUE;
+     }
+   else
+     return FALSE;
+ }
+ 
+ static gboolean
+ map_client_window (MetaWindow *window)
+ {
+   if (!window->mapped)
+     {
+       meta_topic (META_DEBUG_WINDOW_STATE,
+                   "%s actually needs map\n", window->desc);
+       window->mapped = TRUE;
+       meta_error_trap_push (window->display);
+       XMapWindow (window->display->xdisplay, window->xwindow);
+       meta_error_trap_pop (window->display, FALSE);
+       return TRUE;
+     }
+   else
+     return FALSE;
+ }
+ 
+ static gboolean
+ unmap_client_window (MetaWindow *window,
+                      const char *reason)
+ {
+   if (window->mapped)
+     {
+       meta_topic (META_DEBUG_WINDOW_STATE,
+                   "%s actually needs unmap%s\n",
+                   window->desc, reason);
+       meta_topic (META_DEBUG_WINDOW_STATE,
+                   "Incrementing unmaps_pending on %s%s\n",
+                   window->desc, reason);
+       window->mapped = FALSE;
+       window->unmaps_pending += 1;
+       meta_error_trap_push (window->display);
+       XUnmapWindow (window->display->xdisplay, window->xwindow);
+       meta_error_trap_pop (window->display, FALSE);
+       return TRUE;
+     }
+   else
+     return FALSE;
+ }
+ 
  /* XXX META_EFFECT_*_MAP */
 -void
 +static void
  meta_window_show (MetaWindow *window)
  {
    gboolean did_show;