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

[Sam Spilsbury]

== Problem ==

See LP#888704 - a window that was raised but not focused with alt-tab would not have the focus returned to it once the preceeding window was closed

== Solution ==

Restore focus based on stacking order in the non click raise case.

[Alan Griffiths (alan-griffiths)]

Should not be a line continuation here:

CompWindow *nextActive = screen->findWindow (screen->priv->nextActiveWindow);\

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

No obvious problems in testing. And I can fix the aforementioned typo when I merge.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-02-02 17:10:07 +0000
+++ CMakeLists.txt	2012-03-27 06:16:19 +0000
@@ -121,6 +121,30 @@
 
 # Build Google Test and make its headers known
 find_package (GTest)
+
+if (NOT GTEST_FOUND)
+
+    # Check for google test and build it locally
+    set (GTEST_ROOT_DIR
+	"/usr/src/gtest" # Default value, adjustable by user with e.g., ccmake
+	CACHE
+	PATH
+	"Path to Google test srcs"
+    )
+
+    find_path (GTEST_INCLUDE_DIR gtest/gtest.h)
+
+    if (GTEST_INCLUDE_DIR)
+    #FIXME - hardcoded is bad!
+    add_subdirectory (${GTEST_ROOT_DIR}
+		      gtest)
+    endif(GTEST_INCLUDE_DIR)
+
+    set (GTEST_BOTH_LIBRARIES gtest gtest_main)
+    set (GTEST_FOUND TRUE)
+
+endif (NOT GTEST_FOUND)
+
 find_library (GMOCK_LIBRARY gmock)
 find_library (GMOCK_MAIN_LIBRARY gmock_main)
 

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-03-24 09:49:30 +0000
+++ src/screen.cpp	2012-03-27 06:16:19 +0000
@@ -2698,6 +2698,7 @@
 
     if (!focus)
     {
+	/* Traverse down the stack */
 	for (CompWindowList::reverse_iterator rit = priv->windows.rbegin ();
 	     rit != priv->windows.rend (); rit++)
 	{
@@ -2714,12 +2715,27 @@
 				      CompWindowTypeDialogMask |
 				      CompWindowTypeModalDialogMask))
 		    {
-			if (PrivateWindow::compareWindowActiveness (focus, w) < 0)
+			if (!priv->optionGetClickToFocus ())
+			{
+			    /* We should favor the more active window in the mouse focus
+			     * case since the user does not care if the focused window is on top */
+			    if (PrivateWindow::compareWindowActiveness (focus, w) < 0)
+				focus = w;
+			}
+			else
+			{
 			    focus = w;
+			    break;
+			}
 		    }
 		}
 		else
+		{
 		    focus = w;
+
+		    if (priv->optionGetClickToFocus ())
+			break;
+		}
 	    }
 	}
     }

=== modified file 'src/window.cpp'
--- src/window.cpp	2012-03-12 10:35:21 +0000
+++ src/window.cpp	2012-03-27 06:16:19 +0000
@@ -2864,8 +2864,7 @@
 	priv->id == screen->priv->nextActiveWindow)
     {
 	CompWindow *ancestor;
-	CompWindow *nextActive = screen->findWindow (screen->priv->nextActiveWindow);
-	Window     lastNextActiveWindow = screen->priv->nextActiveWindow;
+	CompWindow *nextActive = screen->findWindow (screen->priv->nextActiveWindow);\
 
         /* Window pending focus */
 	if (priv->id != screen->priv->nextActiveWindow &&
@@ -2924,26 +2923,6 @@
 	}
 	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 ();
-	}
     }
 }