Merge lp:~3v1n0/compiz/extents-clamp-workarea into lp:compiz/0.9.11

[Marco Trevisan (Treviño)]

CompWindow: make sure we don't move a window outside its workarea when setting the extents

When setting the extents, if the window has not been decorated before, we make sure that we don't reposition it outside the workarea.

[Christopher Townsend (townsend)]

Very nice!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3841
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/45

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/45/rebuild

review: Approve (continuous-integration)

=== modified file 'src/window.cpp'
--- src/window.cpp	2014-02-20 01:03:41 +0000
+++ src/window.cpp	2014-03-10 13:06:12 +0000
@@ -6185,6 +6185,8 @@
 
     if (!priv->destroyed)
     {
+    	CompWindowExtents empty;
+    	setWindowFrameExtents (&empty, &empty);
 	StackDebugger *dbg = StackDebugger::Default ();
 
 	screen->unhookWindow (this);
@@ -6589,12 +6591,9 @@
 	CompSize sizeDelta;
 
 	/* We don't want to change the size of the window in general, but this is
-	 * needed in case that a normal windows has just been decorated or if
-	 * the window was maximized or fullscreen, so that it will extend
-	 * to use the whole available space. */
-
-	if (((priv->type & CompWindowTypeNormalMask) && !priv->alreadyDecorated) ||
-	    (priv->state & MAXIMIZE_STATE) == MAXIMIZE_STATE ||
+	 * needed in case the window was maximized or fullscreen, so that it
+	 * will be extended to use the whole available space. */
+	if ((priv->state & MAXIMIZE_STATE) == MAXIMIZE_STATE ||
 	    (priv->state & CompWindowStateFullscreenMask) ||
 	    (priv->type & CompWindowTypeFullscreenMask))
 	{
@@ -6602,12 +6601,8 @@
 				  (priv->border.left + priv->border.right)));
 	    sizeDelta.setHeight (-((b->top + b->bottom) -
 				   (priv->border.top + priv->border.bottom)));
-	    priv->alreadyDecorated = true;
 	}
 
-	priv->serverInput = *i;
-	priv->border      = *b;
-
 	/* Offset client for any new decoration size */
 	XWindowChanges xwc;
 
@@ -6616,6 +6611,44 @@
 	xwc.width = sizeDelta.width () + priv->serverGeometry.width ();
 	xwc.height = sizeDelta.height () + priv->serverGeometry.height ();
 
+	if (!priv->alreadyDecorated)
+	{
+	    /* Make sure we don't move the window outside the workarea */
+	    CompRect const& workarea = screen->getWorkareaForOutput (outputDevice ());
+	    CompPoint boffset((b->left + b->right) - (priv->border.left + priv->border.right),
+			      (b->top + b->bottom) - (priv->border.top + priv->border.bottom));
+
+	    if (xwc.x + xwc.width > workarea.x2 ())
+	    {
+		xwc.x -= boffset.x ();
+
+		if (xwc.x < workarea.x ())
+		    xwc.x = workarea.x () + movement.x ();
+	    }
+
+	    if (xwc.y + xwc.height > workarea.y2 ())
+	    {
+		xwc.y -= boffset.y ();
+
+		if (xwc.y < workarea.y ())
+		    xwc.y = workarea.y () + movement.y ();
+	    }
+
+	    if (priv->actions & CompWindowActionResizeMask)
+	    {
+		if (xwc.width + boffset.x () > workarea.width ())
+		    xwc.width = workarea.width () - boffset.x ();
+
+		if (xwc.height + boffset.y () > workarea.height ())
+		    xwc.height = workarea.height () - boffset.y ();
+	    }
+
+	    priv->alreadyDecorated = true;
+	}
+
+	priv->serverInput = *i;
+	priv->border      = *b;
+
 	configureXWindow (CWX | CWY | CWWidth | CWHeight, &xwc);
 
 	windowNotify (CompWindowNotifyFrameUpdate);
 
=== modified file 'src/window/extents/src/windowextents.cpp'
--- src/window/extents/src/windowextents.cpp	2013-06-26 21:59:35 +0000
+++ src/window/extents/src/windowextents.cpp	2014-03-10 13:06:12 +0000
@@ -75,15 +75,19 @@
     return rv;
 }
 
-compiz::window::extents::Extents::Extents () {}
+compiz::window::extents::Extents::Extents () :
+  left (0),
+  right (0),
+  top (0),
+  bottom (0)
+{}
 
 compiz::window::extents::Extents::Extents (int left, int right, int top, int bottom) :
     left (left),
     right (right),
     top (top),
     bottom (bottom)
-{
-}
+{}
 
 /* Just here to keep ABI compatability */
 bool