Merge lp:~townsend/compiz/fix-minimize-unredirect-window-0.9.9 into lp:compiz/0.9.9

[Christopher Townsend]

Fixed issue where minimizing an unredirect full screen window would repaint the full screen window after minimizing it even though it isn't really there. This is a backport of lp:compiz revno. 3686.

Note: This is a backport of lp:compiz revno. 3686.

= Issue =
Minimizing an unredirect full screen window will display the full screen window after the minimization even though it isn't really there.

= Fix =
Do not unredirect a full screen window if no occlusion is detected meaning that it has been minimized.

= Test =
Added some unit test coverage with Sam's guidance.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3654
http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-raring-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-raring-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-raring-i386-ci/4
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/210/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-0.9.9-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

I've filed bug https://bugs.launchpad.net/compiz/+bug/1178514 about the failing tests. Its not an issue here specifically.

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

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/opengl/src/fsregion/fsregion.cpp'
--- plugins/opengl/src/fsregion/fsregion.cpp	2012-11-29 10:51:38 +0000
+++ plugins/opengl/src/fsregion/fsregion.cpp	2013-05-09 15:31:55 +0000
@@ -48,7 +48,7 @@
 {
     bool fullscreen = false;
 
-    if (!(flags & (Desktop | Alpha)) &&
+    if (!(flags & (Desktop | Alpha | NoOcclusionDetection)) &&
         region == untouched &&
         region == orig)
     {

=== modified file 'plugins/opengl/src/fsregion/fsregion.h'
--- plugins/opengl/src/fsregion/fsregion.h	2012-11-29 10:51:38 +0000
+++ plugins/opengl/src/fsregion/fsregion.h	2013-05-09 15:31:55 +0000
@@ -37,7 +37,8 @@
     typedef enum
     {
 	Desktop = 1,
-	Alpha = 2
+	Alpha = 2,
+	NoOcclusionDetection = 3
     } WinFlag;
 
     typedef unsigned int WinFlags;

=== modified file 'plugins/opengl/src/fsregion/tests/test-fsregion.cpp'
--- plugins/opengl/src/fsregion/tests/test-fsregion.cpp	2012-11-29 10:51:38 +0000
+++ plugins/opengl/src/fsregion/tests/test-fsregion.cpp	2013-05-09 15:31:55 +0000
@@ -68,6 +68,25 @@
                                        FullscreenRegion::Desktop));
 }
 
+TEST (OpenGLFullscreenRegion, NoOcclusionFullscreen)
+{
+    FullscreenRegion monitor (CompRect (0, 0, 1024, 768));
+    EXPECT_FALSE (monitor.isCoveredBy (CompRegion (0, 0, 1024, 768),
+                                       FullscreenRegion::NoOcclusionDetection));
+    EXPECT_FALSE (monitor.isCoveredBy (CompRegion (0, 0, 1024, 768),
+                                       FullscreenRegion::Desktop));
+}
+
+TEST (OpenGLFullscreenRegion, NoOcclusionOverFullscreen)
+{
+    FullscreenRegion monitor (CompRect (0, 0, 1024, 768));
+    EXPECT_FALSE (monitor.isCoveredBy (CompRegion (50, 60, 70, 80),
+                                       FullscreenRegion::NoOcclusionDetection));
+    EXPECT_FALSE (monitor.isCoveredBy (CompRegion (0, 0, 1024, 768)));
+    EXPECT_FALSE (monitor.isCoveredBy (CompRegion (0, 0, 1024, 768),
+                                       FullscreenRegion::Desktop));
+}
+
 TEST (OpenGLFullscreenRegion, NormalWindows)
 {
     FullscreenRegion monitor (CompRect (0, 0, 1024, 768));

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2013-01-03 16:05:26 +0000
+++ plugins/opengl/src/paint.cpp	2013-05-09 15:31:55 +0000
@@ -353,6 +353,11 @@
 	        flags |= FullscreenRegion::Desktop;
 	    if (w->alpha ())
 		flags |= FullscreenRegion::Alpha;
+
+	    /* Anything which was not occlusion detected is not a suitable
+	     * candidate for unredirection either */
+	    if (!status)
+		flags |= FullscreenRegion::NoOcclusionDetection;
 	    
 	    CompositeWindow *cw = CompositeWindow::get (w);