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

[Sam Spilsbury]

Fix bug 869316

[David Barth (dbarth)]

A word of warning for reviews (that's you Robert ;) : please be very cautious in verifying that the change will not introduce regressions.

In particular:
- crashers due to changing conditions where a call may fail where it could not before; or a property be invalid
- behavior changes introducing regressions elsewhere

For example, I see that there are changes to if/else condition statements. Some of that can be the object of the patch. But if the condition is more restrictive or more loose on the contrary: what will happen to objects and code that were run previously if they are not processed anymore? how will objects/code behave with the new conditions, where they were never called before.

[Robert Carr (robertcarr)]

+1

review: Approve

=== modified file 'src/event.cpp'
--- src/event.cpp	2011-10-04 03:27:37 +0000
+++ src/event.cpp	2011-10-07 12:03:26 +0000
@@ -1842,13 +1842,24 @@
 
 	if (wa.root == priv->root)
 	{
-	    if (event->xfocus.mode != NotifyGrab)
+	    if (event->xfocus.mode == NotifyGrab)
+		priv->grabbed = true;
+	    else if (event->xfocus.mode == NotifyUngrab)
+		priv->grabbed = false;
+	    else
 	    {
+		CompWindowList dockWindows;
+		XWindowChanges xwc;
+		unsigned int   mask;
+
 		w = findTopLevelWindow (event->xfocus.window);
 		if (w && w->managed ())
 		{
 		    unsigned int state = w->state ();
 
+		    if (priv->nextActiveWindow == event->xfocus.window)
+			priv->nextActiveWindow = None;
+
 		    if (w->id () != priv->activeWindow)
 		    {
 			CompWindow     *active = screen->findWindow (priv->activeWindow);
@@ -1857,7 +1868,47 @@
 			w->priv->activeNum = priv->activeNum++;
 
 			if (active)
+			{
+			    CompWindowList windowsLostFocus;
+			    /* If this window lost focus and was above a fullscreen window
+			     * and is no longer capable of being focused (eg, it is
+			     * not visible on this viewport) then we need to check if
+			     * any other windows below it are also now no longer capable
+			     * of being focused and restack them in the highest position
+			     * below docks that they are allowed to take */
+			    if (!active->focus ())
+			    {
+				windowsLostFocus.push_back (active);
+				for (CompWindow *fsw = active->prev; fsw; fsw = fsw->prev)
+				{
+				    if (!fsw->focus () &&
+					fsw->managed () &&
+					!(fsw->type () & (CompWindowTypeDockMask |
+							  CompWindowTypeFullscreenMask)) &&
+					!fsw->overrideRedirect ())
+					windowsLostFocus.push_back (fsw);
+
+				    if (fsw->type () & CompWindowTypeFullscreenMask)
+				    {
+					/* This will be the window that we must lower relative to */
+					CompWindow *sibling = PrivateWindow::findValidStackSiblingBelow (active, fsw);
+
+					if (sibling)
+					{
+					    for (CompWindowList::reverse_iterator rit = windowsLostFocus.rbegin ();
+						 rit != windowsLostFocus.rend (); rit++)
+					    {
+						(*rit)->restackAbove (sibling);
+					    }
+					}
+
+					break;
+				    }
+				}
+			    }
+
 			    active->priv->updatePassiveButtonGrabs ();
+			}
 
 			w->priv->updatePassiveButtonGrabs ();
 
@@ -1873,9 +1924,6 @@
 
 		    state &= ~CompWindowStateDemandsAttentionMask;
 		    w->changeState (state);
-
-		    if (priv->nextActiveWindow == event->xfocus.window)
-			priv->nextActiveWindow = None;
 	        }
 		else if (event->xfocus.window == priv->root)
 		{
@@ -1901,9 +1949,31 @@
 			}
 		    }
 		}
+
+		/* Ensure that docks are stacked in the right place
+		 *
+		 * When a normal window gets the focus and is above a
+		 * fullscreen window, restack the docks to be above
+		 * the highest level mapped and visible normal window,
+		 * otherwise put them above the highest fullscreen window
+		 */
+		if (w)
+		{
+		    if (PrivateWindow::stackDocks (w, dockWindows, &xwc, &mask))
+		    {
+			Window sibling = xwc.sibling;
+			xwc.stack_mode = Above;
+
+			/* Then update the dock windows */
+			foreach (CompWindow *dw, dockWindows)
+			{
+			    xwc.sibling = sibling;
+			    dw->configureXWindow (mask, &xwc);
+			}
+		    }
+		}
+
 	    }
-	    else
-		priv->grabbed = true;
 	}
 	else
 	{
 
=== modified file 'src/stackdebugger.cpp'
--- src/stackdebugger.cpp	2011-09-29 03:29:41 +0000
+++ src/stackdebugger.cpp	2011-10-07 12:03:26 +0000
@@ -344,7 +344,7 @@
 
 		/* search down the stack to check if there is a fullscreen
 		 * window, otherwise we are not on the fullscreen layer */
-		for (CompWindow *rw = w->serverPrev; rw; rw = rw->serverPrev)
+		for (CompWindow *rw = w->prev; rw; rw = rw->prev)
 		{
 		    if (rw->type () & CompWindowTypeFullscreenMask)
 		    {
@@ -384,9 +384,9 @@
 
 		    /* search down the stack to check if there is a fullscreen
 		     * window, otherwise we are not on the fullscreen layer */
-		    for (CompWindow *rw = w->serverPrev; rw; rw = rw->serverPrev)
+		    for (CompWindow *rw = w->prev; rw; rw = rw->prev)
 		    {
-			if (rw->type () == CompWindowTypeFullscreenMask)
+			if (rw->type () & CompWindowTypeFullscreenMask)
 			{
 			    fullscreenWindow = true;
 			    break;
@@ -412,9 +412,9 @@
 
 		    /* search down the stack to check if there is a fullscreen
 		     * window, otherwise we are not on the fullscreen layer */
-		    for (CompWindow *rw = w->serverPrev; rw; rw = rw->serverPrev)
+		    for (CompWindow *rw = w->prev; rw; rw = rw->prev)
 		    {
-			if (rw->type () == CompWindowTypeFullscreenMask)
+			if (rw->type () & CompWindowTypeFullscreenMask)
 			{
 			    fullscreenWindow = true;
 			    break;
 
=== modified file 'src/window.cpp'
--- src/window.cpp	2011-10-03 12:58:36 +0000
+++ src/window.cpp	2011-10-07 12:03:26 +0000
@@ -2608,34 +2608,8 @@
 	}
 
 	if (setFocus)
-	{
-	    CompWindowList dockWindows;
-	    XWindowChanges xwc;
-	    unsigned int   mask;
-
 	    screen->priv->nextActiveWindow = priv->id;
 
-	    /* Ensure that docks are stacked in the right place
-	     *
-	     * When a normal window gets the focus and is above a
-	     * fullscreen window, restack the docks to be above
-	     * the highest level mapped and visible normal window,
-	     * otherwise put them above the highest fullscreen window
-	     */
-	    if (PrivateWindow::stackDocks (this, dockWindows, &xwc, &mask))
-	    {
-		Window sibling = xwc.sibling;
-		xwc.stack_mode = Above;
-
-                /* Then update the dock windows */
-                foreach (CompWindow *dw, dockWindows)
-                {
-                    xwc.sibling = sibling;
-                    dw->configureXWindow (mask, &xwc);
-                }
-            }
-        }
-
 	if (!setFocus && !modalTransient)
 	{
 	    CompWindow *ancestor;
@@ -2836,6 +2810,10 @@
 	{
 	    bool allowedRelativeToLayer = !(below->priv->type & belowMask);
 
+	    if (aboveFs && below->priv->type & CompWindowTypeFullscreenMask)
+		if (!below->focus ())
+		    break;
+
 	    t = screen->findWindow (below->transientFor ());
 
 	    while (t && allowedRelativeToLayer)
@@ -3291,12 +3269,12 @@
         {
 	    /* If there is another toplevel window above the fullscreen one
 	     * then we need to stack above that */
-            if (dw->focus () &&
+	    if ((dw->priv->managed && !dw->priv->unmanaging) &&
+		!(dw->priv->state & CompWindowStateHiddenMask) &&
                 !PrivateWindow::isAncestorTo (w, dw) &&
                 !(dw->type () & (CompWindowTypeFullscreenMask |
                                  CompWindowTypeDockMask)) &&
-                !dw->overrideRedirect () &&
-                dw->defaultViewport () == screen->vp () &&
+		!dw->overrideRedirect () &&
 		dw->isViewable ())
             {
                 belowDocks = dw;
@@ -3310,10 +3288,11 @@
             firstFullscreenWindow = dw;
 	    for (CompWindow *dww = dw->serverPrev; dww; dww = dww->serverPrev)
             {
-                if (!(dww->type () & (CompWindowTypeFullscreenMask |
+		if ((dw->priv->managed && !dw->priv->unmanaging) &&
+		    !(dw->priv->state & CompWindowStateHiddenMask) &&
+		    !(dww->type () & (CompWindowTypeFullscreenMask |
                                       CompWindowTypeDockMask)) &&
-                    !dww->overrideRedirect () &&
-                    dww->defaultViewport () == screen->vp () &&
+		    !dww->overrideRedirect () &&
 		    dww->isViewable ())
                 {
                     belowDocks = dww;
@@ -4099,6 +4078,17 @@
 	if (priv->id == screen->activeWindow ())
 	    aboveFs = true;
 
+    for (CompWindow *pw = serverPrev; pw; pw = pw->serverPrev)
+    {
+	if (pw->priv->type & CompWindowTypeFullscreenMask)
+	{
+	    if (priv->id == screen->activeWindow ())
+		aboveFs = true;
+
+	    break;
+	}
+    }
+
     mask = priv->addWindowStackChanges (&xwc,
 	PrivateWindow::findSiblingBelow (this, aboveFs));