Merge lp:~smspillaz/compiz-core/fix_894685 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Correctly translate regions to fix "black areas" of the screen due to paint occlusion detection.

Next: lp:~smspillaz/compiz-core/fix_894688

[Sam Spilsbury (smspillaz)]

Correctly translate regions to fix "black areas" of the screen due to paint occlusion detection.

[lp:~smspillaz/compiz-core/fix_894685]

2901. By Sam Spilsbury on 2011-12-02

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2902. By Sam Spilsbury on 2011-12-02

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2903. By Sam Spilsbury on 2011-12-03

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2904. By Sam Spilsbury on 2011-12-03

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2905. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2906. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2907. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2908. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2909. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2910. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2911. By Sam Spilsbury on 2011-12-08

Fix merge error

2912. By Sam Spilsbury on 2011-12-20

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2913. By Sam Spilsbury on 2011-12-23

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2914. By Sam Spilsbury on 2012-01-03

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2915. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2916. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2917. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2918. By Sam Spilsbury on 2012-01-05

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2919. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2920. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2921. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2922. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

[Alan Griffiths (alan-griffiths)]

review: Approve

[lp:~smspillaz/compiz-core/fix_894685]

2923. By Sam Spilsbury on 2012-01-10

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2924. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2925. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2926. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

Unmerged revisions

2926. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2925. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2924. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2923. By Sam Spilsbury on 2012-01-10

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2922. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2921. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2920. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2919. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2918. By Sam Spilsbury on 2012-01-05

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2917. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2012-01-11 08:48:24 +0000
+++ plugins/opengl/src/paint.cpp	2012-01-11 08:48:25 +0000
@@ -287,12 +287,14 @@
 
 	    if (status)
 	    {
+		CompRegion pr = w->region ();
+
 		if (withOffset)
-		{
-		    tmpRegion -= w->region ().translated (offXY);
-		}
-		else
-		    tmpRegion -= w->region ();
+		    pr.translate (offXY);
+
+		pr.translate (gw->priv->cWindow->paintOffset ());
+
+		tmpRegion -= pr;
 
 		/* unredirect top most fullscreen windows. */
 		if (count == 0 && unredirectFS)
@@ -340,7 +342,7 @@
 
 	const CompRegion &clip =
 	    (!(mask & PAINT_SCREEN_NO_OCCLUSION_DETECTION_MASK)) ?
-	    gw->clip () : region;
+	    gw->clip () : region.translated (gw->priv->cWindow->paintOffset ());
 
 	CompPoint offset =
 		cScreen->windowPaintOffset ();