Merge lp:~unity-team/compiz-core/compiz-core.fix_800592 into lp:compiz-core/trunk

[Sam Spilsbury]

Fixes some stacking issues: LP#800592 . There was a typo in PrivateWindow::stackDocks which would allow docks to be stacked relative to unmapped or override redirect windows

[Jason Smith (jassmith)]

+1

review: Approve

=== modified file 'gtk/window-decorator/metacity.c'
--- gtk/window-decorator/metacity.c	2011-05-07 08:58:10 +0000
+++ gtk/window-decorator/metacity.c	2011-06-23 03:29:24 +0000
@@ -658,11 +658,9 @@
 
 	if (d->frame_window)
 	{
-	    int         depth;
 	    GdkColormap *cmap;
 
 	    cmap   = get_colormap_for_drawable (GDK_DRAWABLE (d->pixmap));
-	    depth  = gdk_drawable_get_depth (GDK_DRAWABLE (d->frame_window));
 	    pixmap = create_pixmap (rect.width, size, d->frame->style_window_rgb);
 	    gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), cmap);
 	}
@@ -774,11 +772,9 @@
 
 	if (d->frame_window)
 	{
-	    int         depth;
 	    GdkColormap *cmap;
 
 	    cmap   = get_colormap_for_drawable (GDK_DRAWABLE (d->pixmap));
-	    depth  = gdk_drawable_get_depth (GDK_DRAWABLE (d->frame_window));
 	    pixmap = create_pixmap (size, rect.height, d->frame->style_window_rgb);
 	    gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), cmap);
 	}
@@ -1224,12 +1220,10 @@
     MetaFrameGeometry fgeom;
     MetaFrameFlags    flags;
     MetaTheme	      *theme;
-    WnckWindowType    win_type;
     GdkRectangle      clip;
 
     theme = meta_theme_get_current ();
 
-    win_type = wnck_window_get_window_type (d->win);
     meta_get_decoration_geometry (d, theme, &flags, &fgeom, &button_layout,
 				  meta_frame_type_from_string (d->frame->type),
 				  &clip);

=== modified file 'plugins/move/src/move.cpp'
--- plugins/move/src/move.cpp	2011-03-14 16:12:45 +0000
+++ plugins/move/src/move.cpp	2011-06-23 03:29:24 +0000
@@ -127,7 +127,11 @@
 
 	    w->grabNotify (x, y, mods, grabMask);
 
-	    if (screen->getOption ("raise_on_click")->value ().b ())
+	    /* Click raise happens implicitly on buttons 1, 2 and 3 so don't
+	     * restack this window again if the action buttonbinding was from
+	     * one of those buttons */
+	    if (screen->getOption ("raise_on_click")->value ().b () &&
+		button != Button1 && button != Button2 && button != Button3)
 		w->updateAttributes (CompStackingUpdateModeAboveFullscreen);
 
 	    if (state & CompAction::StateInitKey)

=== modified file 'plugins/resize/src/resize.cpp'
--- plugins/resize/src/resize.cpp	2011-05-01 20:59:20 +0000
+++ plugins/resize/src/resize.cpp	2011-06-23 03:29:24 +0000
@@ -450,7 +450,11 @@
 
 	    w->grabNotify (x, y, state, grabMask);
 
-	    if (screen->getOption ("raise_on_click")->value ().b ())
+	    /* Click raise happens implicitly on buttons 1, 2 and 3 so don't
+	     * restack this window again if the action buttonbinding was from
+	     * one of those buttons */
+	    if (screen->getOption ("raise_on_click")->value ().b () &&
+		button != Button1 && button != Button2 && button != Button3)
 		w->updateAttributes (CompStackingUpdateModeAboveFullscreen);
 
 	    /* using the paint rectangle is enough here

=== modified file 'src/event.cpp'
--- src/event.cpp	2011-06-18 01:12:12 +0000
+++ src/event.cpp	2011-06-23 03:29:24 +0000
@@ -1203,12 +1203,6 @@
 	}
 	else if (!(event->xreparent.parent == priv->root))
 	{
-	    bool     remove = false;
-	    Window   xid = event->xreparent.window;
-	    Window   root_return;
-	    unsigned int ui;
-	    int		 x, y;
-
 	    /* This is the only case where a window is removed but not
 	       destroyed. We must remove our event mask and all passive
 	       grabs. */

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-06-18 01:12:12 +0000
+++ src/window.cpp	2011-06-23 03:29:24 +0000
@@ -2542,25 +2542,32 @@
         /* fullscreen window found */
         if (firstFullscreenWindow)
         {
+	    /* If there is another toplevel window above the fullscreen one
+	     * then we need to stack above that */
             if (dw->focus () &&
                 !PrivateWindow::isAncestorTo (w, dw) &&
                 !(dw->type () & (CompWindowTypeFullscreenMask |
                                  CompWindowTypeDockMask)) &&
                 !dw->overrideRedirect () &&
-                dw->defaultViewport () == screen->vp ())
+                dw->defaultViewport () == screen->vp () &&
+		dw->isViewable ())
             {
                 belowDocks = dw;
             }
         }
         else if (dw->type () & CompWindowTypeFullscreenMask)
         {
+	    /* First fullscreen window found when checking up the stack
+	     * now go back down to find a suitable candidate client
+	     * window to put the docks above */
             firstFullscreenWindow = dw;
             for (CompWindow *dww = dw->prev; dww; dww = dww->prev)
             {
                 if (!(dww->type () & (CompWindowTypeFullscreenMask |
-                                      CompWindowTypeDockMask) &&
+                                      CompWindowTypeDockMask)) &&
                     !dww->overrideRedirect () &&
-                    dww->defaultViewport () == screen->vp ()))
+                    dww->defaultViewport () == screen->vp () &&
+		    dww->isViewable ())
                 {
                     belowDocks = dww;
                     break;
@@ -3428,7 +3435,8 @@
 	{
 	    /* put active or soon-to-be-active fullscreen windows over
 	       all others in their layer */
-	    if (priv->id == screen->activeWindow ())
+	    if (priv->id == screen->activeWindow () ||
+		priv->id == screen->priv->nextActiveWindow)
 	    {
 		aboveFs = true;
 	    }