Merge lp:~smspillaz/compiz-core/decor.input_extents_update into lp:compiz-core

[Sam Spilsbury]

Don't update the frame window until input extents are updated

[Alan Griffiths (alan-griffiths)]

CompWindowExtents (a.k.a. compiz::window::extents::Extents) has a default constructor, if that works, then "memset (&emptyExtents, 0, sizeof (CompWindowExtents));" shouldn't be necessary, if it doesn't then the ctor should be fixed.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Also, bug 981703 is still present. Not fixed.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Doesn't work, rejecting

review: Disapprove

Unmerged revisions

3093. By Sam Spilsbury on 2012-04-16

Check against input extents and don't update the frame window until all
input extents are updated

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2012-04-08 10:09:51 +0000
+++ plugins/decor/src/decor.cpp	2012-04-16 08:17:21 +0000
@@ -1436,8 +1436,7 @@
 
 	/* Do not allow windows which are later undecorated
 	 * to have a set _NET_FRAME_EXTENTS */
-	if (decorate)
-	    frameExtentsRequested = false;
+	frameExtentsRequested = false;
     }
     else
     {
@@ -1531,16 +1530,16 @@
 	CompWindowExtents emptyExtents;
 	wd = NULL;
 
+	memset (&emptyExtents, 0, sizeof (CompWindowExtents));
+
+	window->setWindowFrameExtents (&emptyExtents, &emptyExtents);
+
 	/* Undecorated windows need to have the
 	 * input and output frame removed and the
 	 * frame window geometry reset */
 	if (decorate)
 	    updateFrame ();
 
-	memset (&emptyExtents, 0, sizeof (CompWindowExtents));
-
-	window->setWindowFrameExtents (&emptyExtents, &emptyExtents);
-
 	movement -= oldShift;
     }
 
@@ -1609,8 +1608,8 @@
 {
     /* Destroy the input and output frames in case the window can't
      * actually be decorated */
-    if (!wd || !(window->border ().left || window->border ().right ||
-		 window->border ().top || window->border ().bottom) ||
+    if (!wd || !(window->input ().left || window->input ().right ||
+		 window->input ().top || window->input ().bottom) ||
         (wd->decor->type == WINDOW_DECORATION_TYPE_PIXMAP && outputFrame) ||
         (wd->decor->type == WINDOW_DECORATION_TYPE_WINDOW && inputFrame))
     {
@@ -1650,8 +1649,8 @@
 	}
     }
     /* If the window can be decorated, update the frames */
-    if (wd && (window->border ().left || window->border ().right ||
-	       window->border ().top || window->border ().bottom))
+    if (wd && (window->input ().left || window->input ().right ||
+	       window->input ().top || window->input ().bottom))
     {
 	if (wd->decor->type == WINDOW_DECORATION_TYPE_PIXMAP)
 	    updateInputFrame ();
@@ -2291,7 +2290,12 @@
 	    {
 		w = screen->findWindow (event->xclient.window);
 		if (w)
+		{
+		    DECOR_WINDOW (w);
+
+		    dw->frameExtentsRequested = true;
 		    DecorWindow::get (w)->update (true);
+		}
 	    }
 	default:
 	    /* Check for damage events. If the output or input window