Merge lp:~compiz-team/compiz-core/compiz-core.fix_860397 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Fix bug 860397

[Robert Carr (robertcarr)]

+1

review: Approve

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-09-25 04:16:18 +0000
+++ src/window.cpp	2011-09-27 12:16:25 +0000
@@ -2490,6 +2490,7 @@
 				 bool       aboveFs)
 {
     CompWindow   *below;
+    CompWindow   *t = screen->findWindow (w->transientFor ());
     Window	 clientLeader = w->priv->clientLeader;
     unsigned int type = w->priv->type;
     unsigned int belowMask;
@@ -2504,6 +2505,15 @@
 	(w->priv->state & CompWindowStateBelowMask))
 	type = CompWindowTypeNormalMask;
 
+    while (t && type != CompWindowTypeDockMask)
+    {
+	/* dock stacking of transients for docks */
+	if (t->type () & CompWindowTypeDockMask)
+	    type = CompWindowTypeDockMask;
+
+	t = screen->findWindow (t->transientFor ());
+    }
+
     if (w->priv->transientFor || w->priv->isGroupTransient (clientLeader))
 	clientLeader = None;
 
@@ -2539,14 +2549,28 @@
 	    }
 	    break;
 	default:
+	{
+	    bool allowedRelativeToLayer = !(below->priv->type & belowMask);
+
+	    t = screen->findWindow (below->transientFor ());
+
+	    while (t && allowedRelativeToLayer)
+	    {
+		/* dock stacking of transients for docks */
+		allowedRelativeToLayer = !(t->priv->type & belowMask);
+
+		t = screen->findWindow (t->transientFor ());
+	    }
+
 	    /* fullscreen and normal layer */
-	    if (!(below->priv->type & belowMask))
+	    if (allowedRelativeToLayer)
 	    {
 		if (stackLayerCheck (w, clientLeader, below))
 		    return below;
 	    }
 	    break;
 	}
+	}
     }
 
     return NULL;
@@ -2558,6 +2582,7 @@
 PrivateWindow::findLowestSiblingBelow (CompWindow *w)
 {
     CompWindow   *below, *lowest = screen->serverWindows ().back ();
+    CompWindow   *t = screen->findWindow (w->transientFor ());
     Window	 clientLeader = w->priv->clientLeader;
     unsigned int type = w->priv->type;
 
@@ -2566,6 +2591,16 @@
 	(w->priv->state & CompWindowStateBelowMask))
 	type = CompWindowTypeNormalMask;
 
+    while (t && type != CompWindowTypeDockMask)
+    {
+	/* dock stacking of transients for docks */
+	if (t->type () & CompWindowTypeDockMask)
+	    type = CompWindowTypeDockMask;
+
+	t = screen->findWindow (t->transientFor ());
+    }
+
+
     if (w->priv->transientFor || w->priv->isGroupTransient (clientLeader))
 	clientLeader = None;
 
@@ -2600,14 +2635,28 @@
 	    }
 	    break;
 	default:
+	{
+	    bool allowedRelativeToLayer = !(below->priv->type & CompWindowTypeDockMask);
+
+	    t = screen->findWindow (below->transientFor ());
+
+	    while (t && allowedRelativeToLayer)
+	    {
+		/* dock stacking of transients for docks */
+		allowedRelativeToLayer = !(t->priv->type & CompWindowTypeDockMask);
+
+		t = screen->findWindow (t->transientFor ());
+	    }
+
 	    /* fullscreen and normal layer */
-	    if (!(below->priv->type & CompWindowTypeDockMask))
+	    if (allowedRelativeToLayer)
 	    {
 		if (!stackLayerCheck (below, clientLeader, w))
 		    return lowest;
 	    }
 	    break;
 	}
+	}
 
 	lowest = below;
     }
@@ -2619,6 +2668,7 @@
 PrivateWindow::validSiblingBelow (CompWindow *w,
 				  CompWindow *sibling)
 {
+    CompWindow   *t = screen->findWindow (w->transientFor ());
     Window	 clientLeader = w->priv->clientLeader;
     unsigned int type = w->priv->type;
 
@@ -2627,6 +2677,16 @@
 	(w->priv->state & CompWindowStateBelowMask))
 	type = CompWindowTypeNormalMask;
 
+    while (t && type != CompWindowTypeDockMask)
+    {
+	/* dock stacking of transients for docks */
+	if (t->type () & CompWindowTypeDockMask)
+	    type = CompWindowTypeDockMask;
+
+	t = screen->findWindow (t->transientFor ());
+    }
+
+
     if (w->priv->transientFor || w->priv->isGroupTransient (clientLeader))
 	clientLeader = None;
 
@@ -2656,14 +2716,28 @@
 	}
 	break;
     default:
+    {
+	bool allowedRelativeToLayer = !(sibling->priv->type & CompWindowTypeDockMask);
+
+	t = screen->findWindow (sibling->transientFor ());
+
+	while (t && allowedRelativeToLayer)
+	{
+	    /* dock stacking of transients for docks */
+	    allowedRelativeToLayer = !(t->priv->type & CompWindowTypeDockMask);
+
+	    t = screen->findWindow (t->transientFor ());
+	}
+
 	/* fullscreen and normal layer */
-	if (!(sibling->priv->type & CompWindowTypeDockMask))
+	if (allowedRelativeToLayer)
 	{
 	    if (stackLayerCheck (w, clientLeader, sibling))
 		return true;
 	}
 	break;
     }
+    }
 
     return false;
 }
@@ -2895,10 +2969,6 @@
 	if (t->priv->transientFor == w->priv->id ||
 	    t->priv->isGroupTransient (clientLeader))
 	{
-	    if (w->priv->type & CompWindowTypeDockMask)
-		if (!(t->priv->type & CompWindowTypeDockMask))
-		    return false;
-
 	    if (!stackTransients (t, avoid, xwc, updateList))
 		return false;