Merge lp:~compiz-team/compiz-core/compiz-core.fix_860286 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Fix bug 860286

[Robert Carr (robertcarr)]

+1

review: Approve

=== modified file 'plugins/composite/src/window.cpp'
--- plugins/composite/src/window.cpp	2011-09-19 12:54:22 +0000
+++ plugins/composite/src/window.cpp	2011-09-27 11:57:56 +0000
@@ -268,7 +268,7 @@
 	return;
 
     if (priv->window->shaded () ||
-	(priv->window->isViewable () && priv->damaged))
+	(priv->window->isViewable ()))
     {
 	int x1, x2, y1, y2;
 
@@ -339,7 +339,7 @@
 	return;
 
     if (priv->window->shaded () || force ||
-	(priv->window->isViewable () && priv->damaged))
+	(priv->window->isViewable ()))
     {
 	int    border = priv->window->geometry ().border ();
 
@@ -561,7 +561,7 @@
     CompSize size = CompSize ();
 
 
-    if (window->shaded () || (window->isViewable () && damaged))
+    if (window->shaded () || (window->isViewable ()))
     {
 	int x, y, x1, x2, y1, y2;
 
@@ -618,7 +618,7 @@
 void
 PrivateCompositeWindow::moveNotify (int dx, int dy, bool now)
 {
-    if (window->shaded () || (window->isViewable () && damaged))
+    if (window->shaded () || (window->isViewable ()))
     {
 	int x, y, x1, x2, y1, y2;
 

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2011-09-16 06:51:02 +0000
+++ plugins/opengl/src/paint.cpp	2011-09-27 11:57:56 +0000
@@ -241,8 +241,15 @@
 
 	    if (!w->shaded ())
 	    {
-		if (!w->isViewable () ||
-		    !CompositeWindow::get (w)->damaged ())
+		/* Non-damaged windows don't have valid pixmap
+		 * contents and we aren't displaying them yet
+		 * so don't factor them into occlusion detection */
+		if (!gw->priv->cWindow->damaged ())
+		{
+		    gw->priv->clip = region;
+		    continue;
+		}
+		if (!w->isViewable ())
 		    continue;
 	    }
 
@@ -322,8 +329,7 @@
 
 	if (!w->shaded ())
 	{
-	    if (!w->isViewable () ||
-		!CompositeWindow::get (w)->damaged ())
+	    if (!w->isViewable ())
 		continue;
 	}
 
@@ -1171,7 +1177,8 @@
     if (reg.isEmpty ())
 	return true;
 
-    if (!priv->window->isViewable ())
+    if (!priv->window->isViewable () ||
+	!priv->cWindow->damaged ())
 	return true;
 
     if (priv->textures.empty () && !bind ())