Merge lp:~brandontschaefer/compiz/lp.1034616-fix into lp:compiz/0.9.9

[Brandon Schaefer]

Move CompScreenImpl::focusTopMostWindow() over to use the serverWindows list, as its more up-to-date. Now lowering a window will have an up-to-date stacking order.

(LP: #1034616)

=== Problem ===
focusTopMostWindow() was using the windows() lits. This list is updated by the server which means its not always as up-to-date as the serverWindows list. So when we would call lower() everything would be re-stacked but the server hadn't updated the windows() list which meant the lowered window was stilled on top. So it would just focus that window again.

=== Fix ===
Switch over to using the serverWindows list.

=== Test ===
Theres an AP test in unity that caught this problem.

[Sam Spilsbury (smspillaz)]

As discussed, this is the correct way of doing it. Thanks.

It might be possible to throw a system test into the mix too - now that we have testhelper, we can write AP-like tests for compiz that run atop of xorg-gtest. Have a look into that if you get the chance.

review: Approve

[Brandon Schaefer (brandontschaefer)]

O nice, I was looking through the systems tests and couldn't find a nice place for it. Ill look into that tomorrow!

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2013-01-29 19:40:05 +0000
+++ src/privatescreen.h	2013-02-27 03:32:22 +0000
@@ -177,6 +177,11 @@
 	reverse_iterator rbegin() const { return windows.rbegin(); }
 	reverse_iterator rend() const { return windows.rend(); }
 
+	iterator serverBegin() const { return serverWindows.begin(); }
+	iterator serverEnd() const { return serverWindows.end(); }
+	reverse_iterator rserverBegin() const { return serverWindows.rbegin(); }
+	reverse_iterator rserverEnd() const { return serverWindows.rend(); }
+
 	void clearFullscreenHints() const;
 	void showOrHideForDesktop(unsigned int desktop) const;
 	void setWindowActiveness(::compiz::private_screen::History& history) const;
 
=== modified file 'src/window.cpp'
--- src/window.cpp	2013-02-26 00:52:32 +0000
+++ src/window.cpp	2013-02-27 03:32:22 +0000
@@ -4235,9 +4235,9 @@
     using ::compiz::private_screen::WindowManager;
 
     CompWindow  *focus = NULL;
-    WindowManager::reverse_iterator it = windowManager.rbegin ();
+    WindowManager::reverse_iterator it = windowManager.rserverBegin ();
 
-    for (; it != windowManager.rend (); ++it)
+    for (; it != windowManager.rserverEnd (); ++it)
     {
 	CompWindow *w = *it;