Merge lp:~compiz-team/compiz/compiz.fix_1140505 into lp:compiz/0.9.9

[Sam Spilsbury]

Use the actual change in window size to determine if we need to change
  the frame window size, don't just use the difference in frame extents
  to determine that.

  (LP: #1140505)

Use the actual change in window size to determine if we need to change
  the frame window size, don't just use the difference in frame extents
  to determine that.

  (LP: #1140505)

[MC Return (mc-return)]

LGTM.

review: Approve

[Andrea Azzarone (azzar1)]

Code looks good. Works here. Thanks! :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-trunk-autolanding/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-trunk-raring-amd64-autolanding/1//console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-trunk-raring-i386-autolanding/5//console

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

The test seems to fail at 'GetImmediateParent' according to jenkins logs.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

I'll get on to this later tonight.

On Mon, Mar 11, 2013 at 12:58 PM, Timo Jyrinki
<email address hidden> wrote:
> Review: Needs Fixing
>
> The test seems to fail at 'GetImmediateParent' according to jenkins logs.
> --
> https://code.launchpad.net/~compiz-team/compiz/compiz.fix_1140505/+merge/151951
> Your team Compiz Maintainers is subscribed to branch lp:compiz.

--
Sam Spilsbury

[lp:~compiz-team/compiz/compiz.fix_1140505]

3632. By Sam Spilsbury on 2013-03-11

Merge lp:~compiz-team/compiz/compiz.fix_1138517

Unmerged revisions

=== modified file 'src/window.cpp'
--- src/window.cpp	2013-02-27 03:24:45 +0000
+++ src/window.cpp	2013-03-06 13:29:21 +0000
@@ -3330,11 +3330,19 @@
 	if (lastServerInput.top != serverInput.top)
 	    valueMask |= CWY;
 
-	if (lastServerInput.right - lastServerInput.left !=
-	    serverInput.right - serverInput.left)
+	/* Calculate frame extents and protect against underflow */
+	const unsigned int lastWrapperWidth = std::max (0, serverFrameGeometry.width () -
+							   (lastServerInput.right + lastServerInput.left));
+	const unsigned int lastWrapperHeight = std::max (0, serverFrameGeometry.height () -
+							    (lastServerInput.bottom + lastServerInput.top));
+	const unsigned int wrapperWidth = std::max (0, serverFrameGeometry.width () -
+						       (serverInput.right + serverInput.left));
+	const unsigned int wrapperHeight = std::max (0, serverFrameGeometry.height () -
+						        (serverInput.bottom + serverInput.top));
+
+	if (lastWrapperWidth != wrapperWidth)
 	    valueMask |= CWWidth;
-	if (lastServerInput.bottom - lastServerInput.top !=
-	    serverInput.bottom - serverInput.top)
+	if (lastWrapperHeight != wrapperHeight)
 	    valueMask |= CWHeight;
 
 	if (valueMask)

=== modified file 'tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp'
--- tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp	2013-02-26 00:52:32 +0000
+++ tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp	2013-03-06 13:29:21 +0000
@@ -565,3 +565,39 @@
 				   currentWidth + (left + right),
 				   currentHeight + (top + bottom)));
 }
+
+/* Check that changing the frame extents by one on each side
+ * adjusts the wrapper window appropriately */
+TEST_F (CompizXorgSystemConfigureWindowTest, SetFrameExtentsAdjWrapperWindow)
+{
+    ::Display *dpy = Display ();
+
+    ReparentedWindow w = CreateWindow (dpy);
+
+    int currentX, currentY;
+    unsigned int currentWidth, currentHeight;
+    ASSERT_TRUE (QueryGeometry (dpy,
+				w.frame,
+				currentX,
+				currentY,
+				currentWidth,
+				currentHeight));
+
+    /* Set frame extents and get a response */
+    int left = 1;
+    int right = 1;
+    int top = 1;
+    int bottom = 1;
+
+    SendSetFrameExtentsRequest (w.client, left, right, top, bottom);
+    ASSERT_TRUE (VerifySetFrameExtentsResponse (w.client, left, right, top, bottom));
+
+    /* Wrapper geometry is extents.xy, size.wh */
+    Window root;
+    Window wrapper = GetImmediateParent (dpy, w.client, root);
+    ASSERT_TRUE (VerifyWindowSize (wrapper,
+				   left,
+				   top,
+				   currentWidth,
+				   currentHeight));
+}