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

[Sam Spilsbury]

Fix bug 869967

[Jason Smith (jassmith)]

code looks good, comment is clear

review: Approve

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-10-05 18:00:49 +0000
+++ src/window.cpp	2011-10-07 14:42:25 +0000
@@ -2576,6 +2576,8 @@
 	XChangeProperty (s->dpy (), s->root (), Atoms::winActive,
 			 XA_WINDOW, 32, PropModeReplace,
 			 (unsigned char *) &priv->id, 1);
+
+	screen->priv->nextActiveWindow = priv->serverFrame;
     }
     else
     {
@@ -2661,6 +2663,7 @@
 	priv->id == screen->priv->nextActiveWindow)
     {
 	CompWindow *ancestor;
+	Window     lastNextActiveWindow = screen->priv->nextActiveWindow;
 
 	if (priv->transientFor && priv->transientFor != screen->root ())
 	{
@@ -2712,6 +2715,26 @@
 	}
 	else
 	    screen->focusDefaultWindow ();
+
+	/* FIXME:
+	 * moveInputFocusTo and focusDefaultWindow should really
+	 * return booleans */
+	if (lastNextActiveWindow != screen->priv->nextActiveWindow &&
+	    screen->priv->optionGetRaiseOnClick ())
+	{
+	    /* If this window just got the focus because another window
+	     * was unmanaged then we should also raise it if click raise
+	     * is on, since another plugin might have raised another window
+	     * without wanting to focus it and this window will be beneath
+	     * it in the stack but above it in the active window history
+	     * so when the focus moves here this window should be raised
+	     * That's the tradeoff for maintaining a predictable focus order
+	     * as compared to eg a predictable stacking order */
+
+	    CompWindow *nextActive = screen->findWindow (screen->priv->nextActiveWindow);
+	    if (nextActive)
+		nextActive->raise ();
+	}
     }
 }