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

[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)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3634
http://jenkins.qa.ubuntu.com/job/compiz-ci/107/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/144/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/496/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/107//rebuild/?

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

Code looks good. Works here!

review: Approve

[Andrea Azzarone (azzar1)]

The branch for lp:compiz does not need lp:~compiz-team/compiz/raring.fix_1138517. Why?

review: Needs Information

[Sam Spilsbury (smspillaz)]

That branch has now been fixed.

[Sam Spilsbury (smspillaz)]

New changes backported, haven't got time to test them yet. Wait for CI

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3635
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~compiz-team/compiz/raring.fix_1140505/+merge/152621/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/compiz-ci/109/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/146/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/498/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/109//rebuild/?

review: Needs Fixing (continuous-integration)

Unmerged revisions

3635. By Sam Spilsbury on 2013-03-11

Merge prereq branch

3634. By Sam Spilsbury on 2013-03-06

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)

3633. By Sam Spilsbury on 2013-03-06

Unmerge lp:~sil2100/compiz/raring_revert_3616

3632. By Sam Spilsbury on 2013-03-06

Merge lp:~sil2100/compiz/raring_revert_3616

3631. By Sam Spilsbury on 2013-03-06

Don't set lastFrameExtents unless the window geometry actually changed - as
that variable only exists to track changes in the actual geometry of
the window and not the apparant frame extents.

Added tests to verify that behaviour.

(LP: #1138517)

3630. By PS Jenkins bot on 2013-03-01

Releasing 1:0.9.9~daily13.03.01-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

=== modified file 'src/window.cpp'
--- src/window.cpp	2013-03-11 06:50:27 +0000
+++ src/window.cpp	2013-03-11 06:50:27 +0000
@@ -3331,11 +3331,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-03-11 06:50:27 +0000
+++ tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp	2013-03-11 06:50:27 +0000
@@ -714,3 +714,39 @@
 				   currentWidth,
 				   currentHeight));
 }
+
+/* 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));
+}