Merge lp:~smspillaz/compiz-core/compiz-core.maybe_fix_931473 into lp:compiz-core

[Tim Penhey]

Initially we only allowed windows to paint if they had been drawn on at least once, in order to prevent a race condition where the frame would be imperfect before the window draws. However, considering that drawing the decorations is tied in with the concept of drawing the window, if the application failed to draw on its window at all you'd get a big invisible block which blocked all input. So we made it so that the decorations should be drawn but not the window in that case.

There's probably a case where a window can be drawn without being fully damaged, and this tends to happen on override redirect windows like menus. So don't draw their (shadows) until the menu is painted by the application.

[Alan Griffiths (alan-griffiths)]

(priv->window->isViewable () &&
(priv->cWindow->damaged () ||
!priv->window->overrideRedirect ())))

==>

bool PrivateWindow::hasViewableDamage()
{
    return
        (window->isViewable () &&
        (cWindow->damaged () ||
        !window->overrideRedirect ())));
}

[Alan Griffiths (alan-griffiths)]

Doesn't seem to do any harm.

review: Approve

[Tim Penhey (thumper)]

Apparently this patch made it worse. Chatting with didrocks.

Unmerged revisions

2999. By Sam Spilsbury on 2012-02-15

Only show the decorations of windows which aren't override redirect.

(LP #931473)

=== modified file 'plugins/composite/src/window.cpp'
--- plugins/composite/src/window.cpp	2012-02-01 17:49:07 +0000
+++ plugins/composite/src/window.cpp	2012-02-16 01:59:20 +0000
@@ -268,7 +268,9 @@
 	return;
 
     if (priv->window->shaded () ||
-	(priv->window->isViewable ()))
+	(priv->window->isViewable () &&
+         (priv->cWindow->damaged () ||
+          !priv->window->overrideRedirect ())))
     {
 	int x1, x2, y1, y2;
 
@@ -339,7 +341,9 @@
 	return;
 
     if (priv->window->shaded () || force ||
-	(priv->window->isViewable ()))
+	(priv->window->isViewable () &&
+         (priv->cWindow->damaged () ||
+          !priv->window->overrideRedirect ())))
     {
 	int    border = priv->window->geometry ().border ();
 
@@ -618,7 +622,9 @@
 void
 PrivateCompositeWindow::moveNotify (int dx, int dy, bool now)
 {
-    if (window->shaded () || (window->isViewable ()))
+    if (window->shaded () || (window->isViewable () &&
+         (cWindow->damaged () ||
+          !window->overrideRedirect ())))
     {
 	int x, y, x1, x2, y1, y2;
 

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2012-01-30 05:12:24 +0000
+++ plugins/opengl/src/paint.cpp	2012-02-16 01:59:20 +0000
@@ -337,7 +337,9 @@
 
 	if (!w->shaded ())
 	{
-	    if (!w->isViewable ())
+	    if (!w->isViewable () &&
+                (!CompositeWindow::get (w)->damaged () ||
+                 !w->overrideRedirect ()))
 		continue;
 	}