Merge lp:~brandontschaefer/compiz/revert-merge-3891 into lp:compiz/0.9.12

[Brandon Schaefer]

Rev 3891 change caused 2 known regressions. (Could be more). Reverting.

Rev 3891 change caused 2 known regressions. (Could be more). Reverting.

[Christopher Townsend (townsend)]

Yes, this needs to be reverted due to regressions.

review: Approve

[Stephen M. Webb (bregma)]

review: Needs Information

=== modified file 'metadata/core.xml.in'
--- metadata/core.xml.in	2014-10-02 15:56:29 +0000
+++ metadata/core.xml.in	2014-12-02 19:48:38 +0000
@@ -141,11 +141,6 @@
 			<_long>Focus prevention windows</_long>
 			<default>any</default>
 			</option>
-			<option type="bool" name="remember_vp_focus">
-			<_short>Remember Focus</_short>
-			<_long>Remember Focus Per Workspace</_long>
-			<default>true</default>
-			</option>
 		</group>
 		<group>
 		<_short>Key bindings</_short>

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2014-10-02 15:56:29 +0000
+++ src/privatescreen.h	2014-12-02 19:48:38 +0000
@@ -47,7 +47,6 @@
 
 #include "core_options.h"
 
-#include <map>
 #include <set>
 
 CompPlugin::VTable * getCoreVTable ();
@@ -90,17 +89,6 @@
     unsigned int		viewportY;
 };
 
-// to allow using CompPoint as std::map keys
-struct PointCompare
-{
-    bool operator () (const CompPoint& p1, const CompPoint& p2)
-    {
-	if (p1.x () == p2.x ())
-	    return p1.y () < p2.y ();
-	return p1.x () < p2.x ();
-    }
-};
-
 namespace compiz
 {
 namespace core
@@ -1177,9 +1165,6 @@
 
         bool handlePingTimeout();
 
-	void saveViewportFocus ();
-	CompWindow * findViewportFocusCandidate ();
-
         Window below;
 	CompTimer autoRaiseTimer_;
 	Window    autoRaiseWindow_;
@@ -1190,8 +1175,6 @@
         PrivateScreen privateScreen;
         compiz::private_screen::WindowManager windowManager;
         unsigned int showingDesktopMask_;
-	typedef std::map<CompPoint, Window, PointCompare> FocusMap;
-	FocusMap savedViewportFocus;
 };
 
 #endif

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2014-10-03 10:14:50 +0000
+++ src/screen.cpp	2014-12-02 19:48:38 +0000
@@ -2688,11 +2688,6 @@
 	    }
 	}
     }
-    else
-    {
-	// check if there was a focused window stored
-	focus = findViewportFocusCandidate ();
-    }
 
     if (!focus)
     {
@@ -3789,8 +3784,6 @@
     if (!tx && !ty)
 	return;
 
-    saveViewportFocus ();
-
     privateScreen.viewPort.vp.setX (privateScreen.viewPort.vp.x () + tx);
     privateScreen.viewPort.vp.setY (privateScreen.viewPort.vp.y () + ty);
 
@@ -5162,37 +5155,6 @@
     return true;
 }
 
-void
-CompScreenImpl::saveViewportFocus ()
-{
-    if ((privateScreen.optionGetHsize () > 1 || privateScreen.optionGetVsize () > 1) &&
-	privateScreen.optionGetRememberVpFocus ())
-    {
-	Window id = activeWindow ();
-	if (id != None)
-	{
-	    savedViewportFocus[privateScreen.viewPort.vp] = id;
-	}
-    }
-}
-
-CompWindow *
-CompScreenImpl::findViewportFocusCandidate ()
-{
-    if ((privateScreen.optionGetHsize () > 1 || privateScreen.optionGetVsize () > 1) &&
-	privateScreen.optionGetRememberVpFocus ())
-    {
-	FocusMap::iterator it = savedViewportFocus.find (privateScreen.viewPort.vp);
-	if (it != savedViewportFocus.end ())
-	{
-	    Window id = it->second;
-	    savedViewportFocus.erase (it);
-	    return findWindow (id);
-	}
-    }
-    return NULL;
-}
-
 CompScreenImpl::~CompScreenImpl ()
 {
     privateScreen.startupSequence.removeAllSequences ();