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

[Sam Spilsbury]

Rework the window shading system a bit.

There were a few changes in core to integrate better with window re-parenting which broke
the old method of doing shading. Now we update the shade state of the window when the window
is actually unmapped due to a shade and also ensure that the frame window is the right size
without touching the geometry of the client (such that CompWindow::geometry is representative
of the actual client geometry).

Also use the input extents last sent to server as a means to determine whether or not
window shading should be allowed rather than the extents last received as we don't update
the allowed window actions on input extents ConfigureNotify.

Fix LP#864478

[Robert Carr (robertcarr)]

Wheeeeeeeeeeeeeeeeeeeeeeeeeeeeee

review: Approve

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2011-09-30 04:54:21 +0000
+++ plugins/decor/src/decor.cpp	2011-10-02 07:28:08 +0000
@@ -259,8 +259,6 @@
     if (wd &&
 	wd->decor->type == WINDOW_DECORATION_TYPE_PIXMAP)
     {
-
-
 	CompRect box;
 	GLTexture::MatrixList ml (1);
 	mask |= PAINT_WINDOW_BLEND_MASK;
@@ -1019,10 +1017,13 @@
     for (i = 0; i < wd->nQuad; i++)
     {
 	int x, y;
-
-	/* Recompute scaled quad box */
-	computeQuadBox (&wd->decor->quad[i], window->size ().width (),
-			window->size ().height (),
+	unsigned int width = window->size ().width ();
+	unsigned int height = window->size ().height ();
+
+	if (window->shaded ())
+	    height = 0;
+
+	computeQuadBox (&wd->decor->quad[i], width, height,
 			&x1, &y1, &x2, &y2, &sx, &sy);
 
 	/* Translate by x and y points of this window */

=== modified file 'src/event.cpp'
--- src/event.cpp	2011-09-19 13:00:51 +0000
+++ src/event.cpp	2011-10-02 07:28:08 +0000
@@ -1831,7 +1831,7 @@
          * and the passive button grabs and then we will
          * get the DestroyNotify later and change the focus
          * there
-         */
+	 */
 
 	if (wa.root == priv->root)
 	{
@@ -1845,7 +1845,6 @@
 		    if (w->id () != priv->activeWindow)
 		    {
 			CompWindow     *active = screen->findWindow (priv->activeWindow);
-			w->windowNotify (CompWindowNotifyFocusChange);
 
 			priv->activeWindow = w->id ();
 			w->priv->activeNum = priv->activeNum++;
@@ -1861,6 +1860,8 @@
 					 Atoms::winActive,
 					 XA_WINDOW, 32, PropModeReplace,
 					 (unsigned char *) &priv->activeWindow, 1);
+
+			w->windowNotify (CompWindowNotifyFocusChange);
 		    }
 
 		    state &= ~CompWindowStateDemandsAttentionMask;

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-09-30 04:54:21 +0000
+++ src/window.cpp	2011-10-02 07:28:08 +0000
@@ -604,7 +604,7 @@
 	break;
     }
 
-    if (priv->input.top)
+    if (priv->serverInput.top)
 	actions |= CompWindowActionShadeMask;
 
     actions |= (CompWindowActionAboveMask | CompWindowActionBelowMask);
@@ -813,7 +813,10 @@
 	xwc.x      = serverGeometry.x () - serverInput.left;
 	xwc.y      = serverGeometry.y () - serverInput.top;
 	xwc.width  = serverGeometry.width () + serverInput.left + serverInput.right + bw;
-	xwc.height = serverGeometry.height () + serverInput.top  + serverInput.bottom + bw;
+	if (shaded)
+	    xwc.height = serverInput.top  + serverInput.bottom + bw;
+	else
+	    xwc.height = serverGeometry.height () + serverInput.top  + serverInput.bottom + bw;
 
 	if (shaded)
 	    height = serverInput.top + serverInput.bottom;
@@ -905,6 +908,7 @@
 	}
 	else
 	    XConfigureWindow (screen->dpy (), serverFrame, valueMask, &xwc);
+
 	if (shaded)
 	{
 	    XUnmapWindow (screen->dpy (), wrapper);
@@ -927,7 +931,13 @@
 	xwc.x      = serverGeometry.x ();
 	xwc.y      = serverGeometry.y ();
 	xwc.width  = serverGeometry.width () + bw;
-	xwc.height = serverGeometry.height () + bw;
+
+	/* FIXME: It doesn't make much sense to allow undecorated windows to be
+	 * shaded */
+	if (shaded)
+	    xwc.height = bw;
+	else
+	    xwc.height = bw;
 
 	if (shaded)
 	    height = 0;
@@ -1132,10 +1142,10 @@
 
     }
 
-    r.x      = -priv->attrib.border_width;
-    r.y      = -priv->attrib.border_width;
-    r.width  = priv->width + priv->attrib.border_width;
-    r.height = priv->height + priv->attrib.border_width;
+    r.x      = -priv->geometry.border ();
+    r.y      = -priv->geometry.border ();
+    r.width  = priv->width + priv->geometry.border ();
+    r.height = priv->height + priv->geometry.border ();
 
     if (nBounding < 1)
     {
@@ -1607,11 +1617,10 @@
 	if (!overrideRedirect ())
 	{
 	    /* been shaded */
-	    if (!priv->height)
+	    if (priv->shaded)
 	    {
-		priv->geometry.setHeight (priv->geometry.height () + 1);
-		resize (priv->geometry.x (), priv->geometry.y (), priv->geometry.width (),
-			priv->geometry.height () - 1, priv->geometry.border ());
+		priv->shaded = false;
+		priv->updateFrameWindow ();
 	    }
 	}
     }
@@ -1637,10 +1646,12 @@
      * pixmap of the window around, it's safe to
      * unmap the frame window since there's no use
      * for it at this point anyways and it just blocks
-     * input */
+     * input, but keep it around if shaded */
 
     XUnmapWindow (screen->dpy (), priv->wrapper);
-    XUnmapWindow (screen->dpy (), priv->serverFrame);
+
+    if (!priv->shaded)
+	XUnmapWindow (screen->dpy (), priv->serverFrame);
 
     priv->unmapRefCnt--;
     if (priv->unmapRefCnt > 0)
@@ -1668,7 +1679,7 @@
 	priv->unmanaging = false;
     }
 
-    if (priv->serverFrame)
+    if (priv->serverFrame && !priv->shaded)
 	priv->unreparent ();
 
     if (priv->struts)
@@ -1681,13 +1692,12 @@
 	screen->priv->desktopWindowCount--;
 
     priv->attrib.map_state = IsUnmapped;
-
     priv->invisible = true;
 
     if (priv->shaded && priv->height)
-	resize (priv->attrib.x, priv->attrib.y,
-		priv->attrib.width, ++priv->attrib.height - 1,
-		priv->attrib.border_width);
+    {
+	priv->updateFrameWindow ();
+    }
 
     screen->priv->updateClientList ();
 
@@ -1792,9 +1802,6 @@
 	pw = gm.width () + gm.border () * 2;
 	ph = gm.height () + gm.border () * 2;
 
-	if (priv->shaded)
-	    ph = 0;
-
 	dx      = gm.x () - priv->geometry.x ();
 	dy      = gm.y () - priv->geometry.y ();
 	dwidth  = gm.width () - priv->geometry.width ();
@@ -2111,7 +2118,15 @@
     x      = ce->x + priv->serverInput.left;
     y      = ce->y + priv->serverInput.top;
     width  = ce->width - priv->serverGeometry.border () * 2 - priv->serverInput.left - priv->serverInput.right;
-    height = ce->height - priv->serverGeometry.border () * 2 - priv->serverInput.top - priv->serverInput.bottom;
+
+    /* Don't use the server side frame geometry
+     * to determine the geometry of shaded
+     * windows since we didn't resize them
+     * on configureXWindow */
+    if (priv->shaded)
+	height = priv->serverGeometry.height () - priv->serverGeometry.border () * 2 - priv->serverInput.top - priv->serverInput.bottom;
+    else
+	height = ce->height - priv->serverGeometry.border () * 2 - priv->serverInput.top - priv->serverInput.bottom;
 
     /* set the frame geometry */
     priv->frameGeometry.set (ce->x, ce->y, ce->width, ce->height, ce->border_width);
@@ -3175,9 +3190,22 @@
 				      + serverInput.left + serverInput.right)
 	frameValueMask &= ~(CWWidth);
 
-    if (serverFrameGeometry.height () == xwc->height + serverGeometry.border () * 2
-				      + serverInput.top + serverInput.bottom)
-	frameValueMask &= ~(CWHeight);
+    /* shaded windows are not allowed to have their frame window
+     * height changed (but are allowed to have their client height
+     * changed */
+
+    if (shaded)
+    {
+	if (serverFrameGeometry.height () == serverGeometry.border () * 2
+	    + serverInput.top + serverInput.bottom)
+	    frameValueMask &= ~(CWHeight);
+    }
+    else
+    {
+	if (serverFrameGeometry.height () == xwc->height + serverGeometry.border () * 2
+	    + serverInput.top + serverInput.bottom)
+	    frameValueMask &= ~(CWHeight);
+    }
 
     /* Can't set the border width of frame windows */
     frameValueMask &= ~(CWBorderWidth);
@@ -3192,9 +3220,18 @@
 	serverFrameGeometry.setWidth (xwc->width + serverGeometry.border () * 2
 				      + serverInput.left + serverInput.right);
 
-    if (frameValueMask & CWHeight)
-	serverFrameGeometry.setHeight (xwc->height + serverGeometry.border () * 2
-				      + serverInput.top + serverInput.bottom);
+    if (shaded)
+    {
+	if (frameValueMask & CWHeight)
+	    serverFrameGeometry.setHeight (serverGeometry.border () * 2
+					   + serverInput.top + serverInput.bottom);
+    }
+    else
+    {
+	if (frameValueMask & CWHeight)
+	    serverFrameGeometry.setHeight (xwc->height + serverGeometry.border () * 2
+					   + serverInput.top + serverInput.bottom);
+    }
 
 
     if (serverFrame)
@@ -4217,7 +4254,7 @@
     if (overrideRedirect () || !priv->managed)
 	return;
 
-    if (priv->state & CompWindowStateShadedMask)
+    if (priv->state & CompWindowStateShadedMask && !priv->shaded)
     {
 	windowNotify (CompWindowNotifyShade);
 
@@ -4627,20 +4664,10 @@
 	if (serverFrame)
 	    XMapWindow (screen->dpy (), serverFrame);
 
-	if (height)
-	{
-	    priv->geometry.setHeight (priv->geometry.height () + 1);
-	    window->resize (geometry.x (), geometry.y (),
-			    geometry.width (), geometry.height () - 1,
-			    geometry.border ());
-	}
+	updateFrameWindow ();
 
 	return;
     }
-    else
-    {
-	shaded = false;
-    }
 
     window->windowNotify (CompWindowNotifyShow);
 
@@ -6266,12 +6293,7 @@
     priv->updateIconGeometry ();
 
     if (priv->shaded)
-    {
-	priv->geometry.setHeight (priv->geometry.height () + 1);
-	resize (priv->geometry.x (), priv->geometry.y (),
-		priv->geometry.width (), priv->geometry.height () - 1,
-		priv->geometry.border ());
-    }
+	priv->updateFrameWindow ();
 
     if (priv->attrib.map_state == IsViewable)
     {