Merge lp:~dgadomski/compiz/remember-focus-0.9.11 into lp:compiz/0.9.11

[Dariusz Gadomski]

CompScreen: Save focused window id before changing viewport.

This allows to restore focus after returning to one of the previous viewport positions.
Introduces a new setting (General Options / Focus & Raise Behaviour / Remember Focus)

Backport of the feature to the 0.9.11 series.

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

[Christopher Townsend (townsend)]

This code introduces regressions as seen in bug #1393020 and bug #1398512. We have to revert this change in lp:compiz because of this, so I'm going to move this MP to work in progress pending a proper fix.

Thanks!

review: Needs Fixing

Unmerged revisions

3867. By Dariusz Gadomski on 2014-10-08

CompScreen: Save focused window id before changing viewport.

This allows to restore focus after returning to one of the previous viewport positions.
Introduces a new setting (General Options / Focus & Raise Behaviour / Remember Focus)

=== modified file 'metadata/core.xml.in'
--- metadata/core.xml.in	2014-04-16 12:35:24 +0000
+++ metadata/core.xml.in	2014-10-08 15:59:00 +0000
@@ -141,6 +141,11 @@
 			<_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	2013-12-17 21:35:41 +0000
+++ src/privatescreen.h	2014-10-08 15:59:00 +0000
@@ -89,6 +89,17 @@
     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
@@ -1165,6 +1176,9 @@
 
         bool handlePingTimeout();
 
+	void saveViewportFocus ();
+	CompWindow * findViewportFocusCandidate ();
+
         Window below;
 	CompTimer autoRaiseTimer_;
 	Window    autoRaiseWindow_;
@@ -1175,6 +1189,8 @@
         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-06-11 14:44:06 +0000
+++ src/screen.cpp	2014-10-08 15:59:00 +0000
@@ -2688,6 +2688,11 @@
 	    }
 	}
     }
+    else
+    {
+	// check if there was a focused window stored
+	focus = findViewportFocusCandidate ();
+    }
 
     if (!focus)
     {
@@ -3784,6 +3789,8 @@
     if (!tx && !ty)
 	return;
 
+    saveViewportFocus ();
+
     privateScreen.viewPort.vp.setX (privateScreen.viewPort.vp.x () + tx);
     privateScreen.viewPort.vp.setY (privateScreen.viewPort.vp.y () + ty);
 
@@ -5155,6 +5162,37 @@
     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 ();