Merge lp:~smspillaz/compiz-core/compiz-core.fix_931958 into lp:compiz-core

[Sam Spilsbury]

Always prefer to move the focus to windows that are pending a FocusIn because they requested it

Bug 931958

[Sam Spilsbury (smspillaz)]

No tests yet, will put that in another branch

[Tim Penhey (thumper)]

Sam, can you talk with Alan about how to get this area under test?

Cheers.

review: Approve

=== modified file 'src/window.cpp'
--- src/window.cpp	2012-01-31 14:52:20 +0000
+++ src/window.cpp	2012-02-15 02:34:18 +0000
@@ -2855,9 +2855,17 @@
 	priv->id == screen->priv->nextActiveWindow)
     {
 	CompWindow *ancestor;
+	CompWindow *nextActive = screen->findWindow (screen->priv->nextActiveWindow);
 	Window     lastNextActiveWindow = screen->priv->nextActiveWindow;
 
-	if (priv->transientFor && priv->transientFor != screen->root ())
+        /* Window pending focus */
+	if (priv->id != screen->priv->nextActiveWindow &&
+	    nextActive &&
+	    nextActive->focus ())
+	{
+	    nextActive->moveInputFocusTo ();
+	}
+	else if (priv->transientFor && priv->transientFor != screen->root ())
 	{
 	    ancestor = screen->findWindow (priv->transientFor);
 	    if (ancestor &&