Merge lp:~vanvugt/compiz/fix-1041047 into lp:compiz/0.9.8

[Daniel van Vugt]

Ensure unredirected windows don't stay unredirected if they're no longer
on top. (LP: #1041047)

Ensure unredirected windows don't stay unredirected if they're no longer
on top. (LP: #1041047)

HELP
Still one minor bug: Redirecting an unredirected window (like the menu-opening tests), you see a brief flicker which looks like the previous frame from before the window was unredirected.

Do we need to fix the flicker as part of this one?...

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3339
http://jenkins.qa.ubuntu.com/job/compiz-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/23/console

review: Approve (continuous-integration)

[Sam Spilsbury (smspillaz)]

Looks fine. The flicker can be fixed elsewhere.

I note that autotests are preferable to manual tests in this area, can we spend some time looking into how best we can do that ?

review: Approve

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2012-09-05 09:54:30 +0000
+++ plugins/opengl/src/paint.cpp	2012-09-05 10:23:23 +0000
@@ -350,6 +350,23 @@
 		{
 		    fullscreenWindow = w;
 		}
+		else
+		{
+		    CompositeWindow *cw = CompositeWindow::get (w);
+		    if (!cw->redirected ())
+		    {
+			// 1. GLWindow::release to force gw->priv->needsRebind
+			gw->release ();
+
+			// 2. GLWindow::bind, which redirects the window,
+			//    rebinds the pixmap, and then rebinds the pixmap
+			//    to a texture.
+			gw->bind ();
+
+			// 3. Your window is now redirected again with the
+			//    latest pixmap contents.
+		    }
+		}
 	    }
 	}
     }

=== added file 'tests/manual/Unredirect.txt'
--- tests/manual/Unredirect.txt	1970-01-01 00:00:00 +0000
+++ tests/manual/Unredirect.txt	2012-09-05 10:23:23 +0000
@@ -0,0 +1,61 @@
+WINDOW UNREDIRECTION TESTS
+===========================
+Daniel van Vugt <[e-mail]>
+
+
+Browser unredirect with context menus
+-------------------------------------
+Setup:
+#. Install Chromium or Chrome browser.
+ 
+Actions:
+#. Open Chrome/Chromium and hit F11 to go full screen.
+#. Right click on the web page to open a context menu.
+#. Left click on the web page to close the context menu.
+#. Right click on the web page to open a context menu.
+#. Left click on the web page to close the context menu.
+#. Press F11 to exit from full screen.
+
+Expected Result:
+  Every time you right-clicked, the context menu should be visible.
+
+
+Video unredirect with window menu
+---------------------------------
+Setup:
+#. Install mplayer.
+#. Get a video file you can play in mplayer.
+  
+Actions:
+#. Open the video in mplayer.
+#. Hit F to go fullscreen.
+#. Hit Alt+Space to open the window menu.
+#. Hit Escape to close the window menu.
+#. Hit Alt+Space to open the window menu.
+#. Hit Escape to close the window menu.
+#. Hit Escape to close the video.
+
+Expected Result:
+  Every time you hit Alt+Space the window menu should have appeared and the
+  video should still be playing behind it.
+
+
+Video unredirect with transformed screen
+----------------------------------------
+Setup:
+#. Install mplayer.
+#. Get a video file you can play in mplayer.
+  
+Actions:
+#. Open the video in mplayer.
+#. Hit F to go fullscreen.
+#. Trigger expo mode (Super+E or mouse to top-left corner)
+#. Leave expo mode (click on the full screen video)
+#. Trigger expo mode again.
+#. Leave expo mode (click on the full screen video)
+#. Hit Escape to close the video.
+
+Expected Result:
+  Every time you triggered expo mode, expo mode should have become visible and
+  you should see the video still playing in the expo view.
+