Merge lp:~compiz-team/compiz/compiz.fix_1198000.update-tests.1 into lp:compiz/0.9.10

[Sam Spilsbury]

Adjust acceptance tests for the fix to LP: #1198000

  1. Always set frame extents before updating the frame
  2. Added COMPIZ_NO_CONFIGURE_BUFFER_LOCKS so that we don't have to deal
     with the delayed configure requests logic in the tests where it
     does not help
  3. Split restoredDecorationSize in to restoredDecorationBorderSize
     and restoredDecorationInputSize so that we can measure the size of
     the decoration both in terms of its visible and invisible border
  4. Wait for the default decoration properly
  5. Capture the initial geometry of the window with and without decorations
     when the window gets its first decoration. Use these values to calculate
     the size changes in the window from then on instead of its creation
     values
  6. Just flag when the window was first decorated in setWindowFrameExtents
     rather than checking if it is mapped. We only want to not resize
     the window once.

  Adjust acceptance tests for the fix to LP: #1198000

  1. Always set frame extents before updating the frame
  2. Added COMPIZ_NO_CONFIGURE_BUFFER_LOCKS so that we don't have to deal
     with the delayed configure requests logic in the tests where it
     does not help
  3. Split restoredDecorationSize in to restoredDecorationBorderSize
     and restoredDecorationInputSize so that we can measure the size of
     the decoration both in terms of its visible and invisible border
  4. Wait for the default decoration properly
  5. Capture the initial geometry of the window with and without decorations
     when the window gets its first decoration. Use these values to calculate
     the size changes in the window from then on instead of its creation
     values
  6. Just flag when the window was first decorated in setWindowFrameExtents
     rather than checking if it is mapped. We only want to not resize
     the window once.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3755
http://jenkins.qa.ubuntu.com/job/compiz-ci/260/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/301/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/73/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/73/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/73/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/260/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3756
http://jenkins.qa.ubuntu.com/job/compiz-ci/264/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/77

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/264/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-autolanding/132/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-autolanding/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-autolanding/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-autolanding/44/console
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/931/console

review: Needs Fixing (continuous-integration)

[lp:~compiz-team/compiz/compiz.fix_1198000.update-tests.1]

3757. By Sam Spilsbury on 2013-07-19

Merge lp:compiz

[Sam Spilsbury (smspillaz)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3757
http://jenkins.qa.ubuntu.com/job/compiz-ci/266/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/79

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/266/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2013-06-28 01:10:57 +0000
+++ plugins/decor/src/decor.cpp	2013-07-19 04:17:27 +0000
@@ -1651,14 +1651,16 @@
 	CompWindowExtents emptyExtents;
 	wd = NULL;
 
+	/* _NET_FRAME_EXTENTS should be updated before the frame
+	 * atom is */
+	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 */
 	updateFrame ();
-
-	memset (&emptyExtents, 0, sizeof (CompWindowExtents));
-
-	window->setWindowFrameExtents (&emptyExtents, &emptyExtents);
     }
 
     /* We need to damage the current output extents

=== modified file 'plugins/decor/tests/acceptance/xorg-gtest/CMakeLists.txt'
--- plugins/decor/tests/acceptance/xorg-gtest/CMakeLists.txt	2013-06-28 21:07:41 +0000
+++ plugins/decor/tests/acceptance/xorg-gtest/CMakeLists.txt	2013-07-19 04:17:27 +0000
@@ -22,6 +22,7 @@
          decoration
          compiz_point
          compiz_size
+         compiz_rect
          ${GMOCK_LIBRARY}
          ${GMOCK_MAIN_LIBRARY}
          ${GTEST_BOTH_LIBRARIES}

=== modified file 'plugins/decor/tests/acceptance/xorg-gtest/compiz_decor_acceptance_tests.cpp'
--- plugins/decor/tests/acceptance/xorg-gtest/compiz_decor_acceptance_tests.cpp	2013-06-29 07:07:12 +0000
+++ plugins/decor/tests/acceptance/xorg-gtest/compiz_decor_acceptance_tests.cpp	2013-07-19 04:17:27 +0000
@@ -38,10 +38,13 @@
 
 #include <core/point.h>
 #include <core/size.h>
+#include <core/rect.h>
 
 #include <xorg/gtest/xorg-gtest.h>
 #include <compiz-xorg-gtest.h>
 
+#include <gtest_shared_tmpenv.h>
+
 namespace xt = xorg::testing;
 namespace ct = compiz::testing;
 
@@ -83,6 +86,8 @@
 	Atom   mDecorationInputFrameAtom;
 	Atom   mDecorationOutputFrameAtom;
 
+	TmpEnv mDisableConfigureBufferLocksEnv;
+
     private:
 
 	int GetEventMask () const;
@@ -96,7 +101,10 @@
     mDecorationTypePixmap (0),
     mDecorationTypeWindow (0),
     mDecorationInputFrameAtom (0),
-    mDecorationOutputFrameAtom (0)
+    mDecorationOutputFrameAtom (0),
+    /* Disable configure buffer locks as they cause event delivery indeterminacy
+     * that isn't useful for a testing environment */
+    mDisableConfigureBufferLocksEnv ("COMPIZ_NO_CONFIGURE_BUFFER_LOCKS", "1")
 {
 }
 
@@ -256,7 +264,8 @@
 		    unsigned int actions) const;
 
 	virtual CompPoint restoredFrameWindowOffset () const = 0;
-	virtual CompSize restoredDecorationSize () const = 0;
+	virtual CompSize restoredDecorationBorderSize () const = 0;
+	virtual CompSize restoredDecorationInputSize () const = 0;
 
     protected:
 
@@ -290,7 +299,8 @@
 	size_t propertyDataSize () const;
 	void addPropertyData (std::vector<long> &) const;
 	CompPoint restoredFrameWindowOffset () const;
-	CompSize restoredDecorationSize () const;
+	CompSize restoredDecorationBorderSize () const;
+	CompSize restoredDecorationInputSize () const;
 
 	static const unsigned int WindowDecorationSize = 8;
 
@@ -323,7 +333,8 @@
 	void changeRestoredInput (const decor_extents_t &input);
 
 	CompPoint restoredFrameWindowOffset () const;
-	CompSize restoredDecorationSize () const;
+	CompSize restoredDecorationBorderSize () const;
+	CompSize restoredDecorationInputSize () const;
 
     protected:
 
@@ -619,12 +630,18 @@
 }
 
 CompSize
-cdt::FakeWindowTypeDecoration::restoredDecorationSize () const
+cdt::FakeWindowTypeDecoration::restoredDecorationBorderSize () const
 {
     return CompSize (mRestored.left + mRestored.right,
 		     mRestored.top + mRestored.bottom);
 }
 
+CompSize
+cdt::FakeWindowTypeDecoration::restoredDecorationInputSize () const
+{
+    return restoredDecorationBorderSize ();
+}
+
 cdt::FakePixmapTypeDecoration::FakePixmapTypeDecoration (unsigned int type,
 							 unsigned int state,
 							 unsigned int actions,
@@ -713,7 +730,14 @@
 }
 
 CompSize
-cdt::FakePixmapTypeDecoration::restoredDecorationSize () const
+cdt::FakePixmapTypeDecoration::restoredDecorationBorderSize () const
+{
+    return CompSize (mRestoredBorder.left + mRestoredBorder.right,
+		     mRestoredBorder.top + mRestoredBorder.bottom);
+}
+
+CompSize
+cdt::FakePixmapTypeDecoration::restoredDecorationInputSize () const
 {
     return CompSize (mRestoredInput.left + mRestoredInput.right,
 		     mRestoredInput.top + mRestoredInput.bottom);
@@ -1314,6 +1338,11 @@
 
     protected:
 
+	cdt::FakeDecoration::Ptr defaultActiveDecoration ();
+
+	cdt::FakeDecoration::Ptr rootActiveDecoration;
+	cdt::FakeDecoration::Ptr rootBareDecoration;
+
 	cdt::FakeDecorationList rootActiveDecorationList;
 	cdt::FakeDecorationList rootBareDecorationList;
 
@@ -1484,7 +1513,7 @@
 
     decor_extents_t emptyExtents (DecorationExtents (0, 0, 0, 0));
 
-    cdt::FakeDecoration::Ptr rootActiveDecoration =
+    rootActiveDecoration =
 	MakeFakePixmapTypeDecoration (DECOR_WINDOW_TYPE_NORMAL,
 				      0,
 				      0,
@@ -1495,7 +1524,7 @@
 				      activeInputMaximized,
 				      Display ());
 
-    cdt::FakeDecoration::Ptr rootBareDecoration =
+    rootBareDecoration =
 	MakeFakePixmapTypeDecoration (0, 0, 0,
 				      1, 1,
 				      emptyExtents,
@@ -1519,10 +1548,15 @@
 DecorWithPixmapDefaultsAcceptance::TearDown ()
 {
     /* Remove inserted decorations */
-    rootActiveDecorationList.RemoveDecoration (DECOR_WINDOW_TYPE_NORMAL,
-					       0,
-					       0);
-    rootBareDecorationList.RemoveDecoration (0, 0, 0);
+    rootActiveDecorationList.RemoveAllDecorations ();
+    rootBareDecorationList.RemoveAllDecorations ();
+
+    /* This is a bit of a kludge, but we also need to reset
+     * the two decorations manually before TearDown. We can
+     * probably fix this later by encapsulating it all in one
+     * class, but that's a bit of an effort */
+    rootActiveDecoration.reset ();
+    rootBareDecoration.reset ();
 
     DecorFakeDecoratorAcceptance::TearDown ();
 }
@@ -1644,6 +1678,8 @@
 	typedef cdt::FakeDecoration::Ptr FakeDecorPtr;
 	typedef cdt::FakePixmapTypeDecoration::Ptr FakePixDecorPtr;
 
+	virtual void TearDown ();
+
 	Window CreateDecoratableWindow (::Display *display);
 	Window MapAndReparent (::Display *display,
 			       Window window);
@@ -1654,6 +1690,10 @@
 	void WaitForDecoration (::Display          *display,
 				Window             window,
 				const FakeDecorPtr &decoration);
+	void WaitForDefaultDecoration (::Display *display,
+				       Window    window,
+				       CompRect  &testFrameDecorationGeometry,
+				       CompRect  &testWindowDecorationGeometry);
 	void WaitForDecorationUpdate (::Display          *display,
 				      Window             window,
 				      const FakeDecorPtr &decor);
@@ -1678,6 +1718,14 @@
 	std::map <Window, Window> windowParents;
 };
 
+void
+PixmapDecoratorAcceptance::TearDown ()
+{
+    windowDecorations.clear ();
+
+    DecorWithPixmapDefaultsAcceptance::TearDown ();
+}
+
 Window
 PixmapDecoratorAcceptance::CreateDecoratableWindow (::Display *display)
 {
@@ -1734,8 +1782,47 @@
 					      Window             window,
 					      const FakeDecorPtr &decoration)
 {
+    WaitForDecorationUpdate (display, window, decoration);
     WaitForPropertyNotify (display, window, DECOR_INPUT_FRAME_ATOM_NAME);
-    WaitForDecorationUpdate (display, window, decoration);
+}
+
+void
+PixmapDecoratorAcceptance::WaitForDefaultDecoration (::Display *display,
+						     Window    window,
+						     CompRect  &decoratedWindowGeometry,
+						     CompRect  &decoratedFrameGeometry)
+{
+    WaitForDecoration (display, window, rootActiveDecoration);
+
+    /* Fetch the window's absolute geometry */
+    int x, y;
+    unsigned int width, height, border;
+
+    ct::AbsoluteWindowGeometry (display, window, x, y, width, height, border);
+
+    /* Fetch frame extents */
+    boost::shared_ptr <unsigned char> data;
+
+    FetchAndVerifyProperty (Display (),
+			    window,
+			    NETWMFrameExtentsAtom,
+			    XA_CARDINAL,
+			    32,
+			    4,
+			    0,
+			    data);
+
+    unsigned long *frameExtents =
+	reinterpret_cast <unsigned long *> (data.get ());
+
+    decoratedWindowGeometry.setGeometry (x, y, width, height);
+
+    /* Adjust for decoration size. This is what future decorations
+     * will add and subtract from */
+    decoratedFrameGeometry.setGeometry (x - frameExtents[0],
+					y - frameExtents[2],
+					width + (frameExtents[0] + frameExtents[1]),
+					height + (frameExtents[2] + frameExtents[3]));
 }
 
 void
@@ -1811,6 +1898,123 @@
     return windowDecorations[window];
 }
 
+class PixmapInitialDecorationAcceptance :
+    public PixmapDecoratorAcceptance
+{
+    public:
+
+	virtual void SetUp ();
+	virtual void TearDown ();
+
+	virtual bool StartDecoratorOnSetUp () const;
+
+	Window CreateDecoratedWindow ();
+
+    protected:
+
+	cdt::FakePixmapTypeDecoration::Ptr mTestWindowDecoration;
+	CompRect                           mClientGeometryOnInitialDecoration;
+	CompRect                           mBorderGeometryOnInitialDecoration;
+};
+
+void
+PixmapInitialDecorationAcceptance::SetUp ()
+{
+    PixmapDecoratorAcceptance::SetUp ();
+
+    unsigned int ResBo = ActiveBorderExtent + 1;
+    unsigned int ResIn = ActiveInputExtent;
+    unsigned int MaxEx = MaximizedBorderExtent;
+
+    mTestWindowDecoration =
+	MakeFakePixmapTypeDecoration (DECOR_WINDOW_TYPE_NORMAL,
+				      0,
+				      0,
+				      10,
+				      10,
+				      DecorationExtents (ResBo, ResBo, ResBo, ResBo),
+				      DecorationExtents (ResIn, ResIn, ResIn, ResIn),
+				      DecorationExtents (MaxEx, MaxEx, MaxEx, MaxEx),
+				      DecorationExtents (MaxEx, MaxEx, MaxEx, MaxEx),
+				      Display ());
+}
+
+bool
+PixmapInitialDecorationAcceptance::StartDecoratorOnSetUp () const
+{
+    return false;
+}
+
+void
+PixmapInitialDecorationAcceptance::TearDown ()
+{
+    mTestWindowDecoration.reset ();
+    PixmapDecoratorAcceptance::TearDown ();
+}
+
+Window
+PixmapInitialDecorationAcceptance::CreateDecoratedWindow ()
+{
+    Window testWindow = CreateDecoratableWindow (Display ());
+
+    /* We need to first explicitly recieve PropertyNotify events before
+     * core starts sending them */
+    RecievePropertyNotifyEvents (Display (), testWindow);
+
+    /* Map and reparent the window so that it gets a decoration */
+    MapAndReparent (Display (), testWindow);
+
+    /* Start the decorator */
+    SetUpDecorator ();
+
+    WaitForDefaultDecoration (Display (),
+			      testWindow,
+			      mClientGeometryOnInitialDecoration,
+			      mBorderGeometryOnInitialDecoration);
+    DecorateWindow (Display (), testWindow, mTestWindowDecoration);
+    WaitForDecorationUpdate (Display (), testWindow, mTestWindowDecoration);
+
+    return testWindow;
+}
+
+std::ostream &
+operator<< (std::ostream &os, const CompSize &sz)
+{
+    return os << "Size: (width: "
+	      << sz.width ()
+	      << " height: "
+	      << sz.height ()
+	      << ")";
+}
+
+TEST_F (PixmapInitialDecorationAcceptance, NoSizeChangeInitially)
+{
+    CreateDecoratedWindow ();
+    EXPECT_EQ (CompSize (mClientGeometryOnInitialDecoration.width (),
+			 mClientGeometryOnInitialDecoration.height ()),
+	       CompSize (ct::WINDOW_WIDTH,
+			 ct::WINDOW_HEIGHT));
+}
+
+TEST_F (PixmapInitialDecorationAcceptance, SizeChangesApplySubsequently)
+{
+    Window testWindow = CreateDecoratedWindow ();
+
+    /* Measuring size change from default decoration to real decoration */
+    const CompSize &size (mTestWindowDecoration->restoredDecorationBorderSize ());
+
+    EXPECT_THAT (testWindow,
+		 HasGeometry (Display (),
+			      RelativeWindowGeometry,
+			      _,
+			      _,
+			      mBorderGeometryOnInitialDecoration.width () -
+				  size.width (),
+			      mBorderGeometryOnInitialDecoration.height () -
+				  size.height (),
+			      _));
+}
+
 class PixmapDecoratedWindowAcceptance :
     public PixmapDecoratorAcceptance
 {
@@ -1831,6 +2035,8 @@
 	Window mTestWindowParent;
 
 	cdt::FakePixmapTypeDecoration::Ptr mTestWindowDecoration;
+	CompRect mClientGeometryOnInitialDecoration;
+	CompRect mBorderGeometryOnInitialDecoration;
 };
 
 PixmapDecoratedWindowAcceptance::PixmapDecoratedWindowAcceptance () :
@@ -1851,6 +2057,11 @@
     /* Start the decorator */
     SetUpDecorator ();
 
+    WaitForDefaultDecoration (display,
+			      mTestWindow,
+			      mClientGeometryOnInitialDecoration,
+			      mBorderGeometryOnInitialDecoration);
+
     /* We need to change the border extent so that the window
      * will move from its position in the default decoration */
     unsigned int ResBo = RealDecorationActiveBorderExtent;
@@ -1870,15 +2081,16 @@
 				      Display ());
 
     DecorateWindow (display, mTestWindow, mTestWindowDecoration);
-    WaitForDecoration (display, mTestWindow, mTestWindowDecoration);
+    WaitForDecorationUpdate (display, mTestWindow, mTestWindowDecoration);
 }
 
 void
 PixmapDecoratedWindowAcceptance::TearDown ()
 {
+    mTestWindowDecoration.reset ();
     DestroyWindow (Display (), mTestWindow);
 
-    DecorWithPixmapDefaultsAcceptance::TearDown ();
+    PixmapDecoratorAcceptance::TearDown ();
 }
 
 bool
@@ -2196,25 +2408,25 @@
 
 /* Ensure that a window expands to its original size when it is
  * undecorated */
-TEST_F (PixmapDecoratedWindowAcceptance, UndecoratedWindowExpandToOrigSize)
+TEST_F (PixmapDecoratedWindowAcceptance, UndecoratedWindowExpandToOrigSizePlusInitialBorder)
 {
     DisallowDecorationsOnWindow (mTestWindow);
 
     WaitForConfigureOn (Display (),
 			mTestWindowParent,
-			ct::WINDOW_X,
-			ct::WINDOW_Y,
-			ct::WINDOW_WIDTH,
-			ct::WINDOW_HEIGHT,
+			mBorderGeometryOnInitialDecoration.x (),
+			mBorderGeometryOnInitialDecoration.y (),
+			mBorderGeometryOnInitialDecoration.width (),
+			mBorderGeometryOnInitialDecoration.height (),
 			CWX | CWY | CWWidth | CWHeight);
 
     EXPECT_THAT (mTestWindow,
 		 HasGeometry (Display (),
 			      AbsoluteWindowGeometry,
-			      ct::WINDOW_X,
-			      ct::WINDOW_Y,
-			      ct::WINDOW_WIDTH,
-			      ct::WINDOW_HEIGHT,
+			      mBorderGeometryOnInitialDecoration.x (),
+			      mBorderGeometryOnInitialDecoration.y (),
+			      mBorderGeometryOnInitialDecoration.width (),
+			      mBorderGeometryOnInitialDecoration.height (),
 			      _));
 }
 
@@ -2230,19 +2442,19 @@
 
     WaitForConfigureOn (Display (),
 			mTestWindowParent,
-			ct::WINDOW_X,
-			ct::WINDOW_Y,
-			ct::WINDOW_WIDTH,
-			ct::WINDOW_HEIGHT,
+			mBorderGeometryOnInitialDecoration.x (),
+			mBorderGeometryOnInitialDecoration.y (),
+			mBorderGeometryOnInitialDecoration.width (),
+			mBorderGeometryOnInitialDecoration.height (),
 			CWX | CWY | CWWidth | CWHeight);
 
     EXPECT_THAT (mTestWindow,
 		 HasGeometry (Display (),
 			      AbsoluteWindowGeometry,
-			      ct::WINDOW_X,
-			      ct::WINDOW_Y,
-			      ct::WINDOW_WIDTH,
-			      ct::WINDOW_HEIGHT,
+			      mBorderGeometryOnInitialDecoration.x (),
+			      mBorderGeometryOnInitialDecoration.y (),
+			      mBorderGeometryOnInitialDecoration.width (),
+			      mBorderGeometryOnInitialDecoration.height (),
 			      _));
 }
 
@@ -2324,8 +2536,10 @@
 
     EXPECT_THAT (mTestWindow, HasGeometry (Display (),
 					   AbsoluteWindowGeometry,
-					   ct::WINDOW_X + GetParam ().left,
-					   ct::WINDOW_Y + GetParam ().top,
+					   mBorderGeometryOnInitialDecoration.x () +
+					       GetParam ().left,
+					   mBorderGeometryOnInitialDecoration.y () +
+					       GetParam ().top,
 					   _,
 					   _,
 					   _));
@@ -2344,10 +2558,12 @@
 					   AbsoluteWindowGeometry,
 					   _,
 					   _,
-					   ct::WINDOW_WIDTH - (GetParam ().left +
-							       GetParam ().right),
-					   ct::WINDOW_HEIGHT - (GetParam ().top +
-								GetParam ().bottom),
+					   mBorderGeometryOnInitialDecoration.width () -
+					       (GetParam ().left +
+						GetParam ().right),
+					   mBorderGeometryOnInitialDecoration.height () -
+					       (GetParam ().top +
+						GetParam ().bottom),
 					   _));
 }
 
@@ -2373,10 +2589,12 @@
 					   AbsoluteWindowGeometry,
 					   _,
 					   _,
-					   ct::WINDOW_WIDTH - (newExtents.left +
-							       newExtents.right),
-					   ct::WINDOW_HEIGHT - (newExtents.top +
-								newExtents.bottom),
+					   mBorderGeometryOnInitialDecoration.width () -
+					       (newExtents.left +
+						newExtents.right),
+					   mBorderGeometryOnInitialDecoration.height () -
+					       (newExtents.top +
+						newExtents.bottom),
 					   _));
 }
 
@@ -2401,7 +2619,7 @@
 							WindowDecorationAtom);
 
     const CompPoint &off (mTestWindowDecoration->restoredFrameWindowOffset ());
-    const CompSize  &size (mTestWindowDecoration->restoredDecorationSize ());
+    const CompSize &size (mTestWindowDecoration->restoredDecorationInputSize ());
 
     /* As the window is shrunk to accomodate the border size, we must subtract
      * the border from the original window size */
@@ -2409,19 +2627,26 @@
 		     (newExtents.top + newExtents.bottom));
 
     RestoreWindow (mTestWindow,
-		   ct::WINDOW_X + off.x (),
-		   ct::WINDOW_Y + off.y (),
-		   ct::WINDOW_WIDTH - shrink.width () + size.width (),
-		   ct::WINDOW_HEIGHT - shrink.height () + size.height ());
+		   mBorderGeometryOnInitialDecoration.x () + off.x (),
+		   mBorderGeometryOnInitialDecoration.y () + off.y (),
+		   mBorderGeometryOnInitialDecoration.width () -
+		       shrink.width () + size.width (),
+		   mBorderGeometryOnInitialDecoration.height () -
+		       shrink.height () + size.height ());
 
+    /* Subtract the old offset and size and add on the new decoration geometry */
     EXPECT_THAT (mTestWindow, HasGeometry (Display (),
 					   AbsoluteWindowGeometry,
-					   ct::WINDOW_X + newExtents.left,
-					   ct::WINDOW_Y + newExtents.top,
-					   ct::WINDOW_WIDTH - (newExtents.left +
-							       newExtents.right),
-					   ct::WINDOW_HEIGHT - (newExtents.top +
-								newExtents.bottom),
+					   mBorderGeometryOnInitialDecoration.x () +
+					       newExtents.left,
+					   mBorderGeometryOnInitialDecoration.y () +
+					       newExtents.top,
+					   mBorderGeometryOnInitialDecoration.width () -
+					       ((newExtents.left +
+						 newExtents.right)),
+					   mBorderGeometryOnInitialDecoration.height () -
+					       ((newExtents.top +
+						 newExtents.bottom)),
 					   _));
 }
 
@@ -2451,7 +2676,7 @@
     AllowDecorationsOnWindow (mTestWindow);
 
     const CompPoint &off (mTestWindowDecoration->restoredFrameWindowOffset ());
-    const CompSize  &size (mTestWindowDecoration->restoredDecorationSize ());
+    const CompSize  &size (mTestWindowDecoration->restoredDecorationInputSize ());
 
     /* As the window is shrunk to accomadate the border size, we must subtract
      * the border from the original window size */
@@ -2460,20 +2685,26 @@
 
     WaitForConfigureOn (Display (),
 			mTestWindowParent,
-			ct::WINDOW_X + off.x (),
-			ct::WINDOW_Y + off.y (),
-			ct::WINDOW_WIDTH - shrink.width () + size.width (),
-			ct::WINDOW_HEIGHT - shrink.height () + size.height (),
+			mBorderGeometryOnInitialDecoration.x () + off.x (),
+			mBorderGeometryOnInitialDecoration.y () + off.y (),
+			mBorderGeometryOnInitialDecoration.width () -
+			    shrink.width () + size.width (),
+			mBorderGeometryOnInitialDecoration.height () -
+			    shrink.height () + size.height (),
 			CWX | CWY | CWWidth | CWHeight);
 
     EXPECT_THAT (mTestWindow, HasGeometry (Display (),
 					   AbsoluteWindowGeometry,
-					   ct::WINDOW_X + newExtents.left,
-					   ct::WINDOW_Y + newExtents.top,
-					   ct::WINDOW_WIDTH - (newExtents.left +
-							       newExtents.right),
-					   ct::WINDOW_HEIGHT - (newExtents.top +
-								newExtents.bottom),
+					   mBorderGeometryOnInitialDecoration.x () +
+					       newExtents.left,
+					   mBorderGeometryOnInitialDecoration.y () +
+					       newExtents.top,
+					   mBorderGeometryOnInitialDecoration.width () -
+					       (newExtents.left +
+						newExtents.right),
+					   mBorderGeometryOnInitialDecoration.height () -
+					       (newExtents.top +
+						newExtents.bottom),
 					   _));
 }
 
@@ -2490,8 +2721,8 @@
 
     EXPECT_THAT (mTestWindow, HasGeometry (Display (),
 					   AbsoluteWindowGeometry,
-					   ct::WINDOW_X + 1,
-					   ct::WINDOW_Y + 1,
+					   mBorderGeometryOnInitialDecoration.x () + 1,
+					   mBorderGeometryOnInitialDecoration.y () + 1,
 					   _,
 					   _,
 					   _));

=== modified file 'src/privatewindow.h'
--- src/privatewindow.h	2013-06-26 10:49:55 +0000
+++ src/privatewindow.h	2013-07-19 04:17:27 +0000
@@ -401,6 +401,7 @@
 	bool shaded;
 	bool hidden;
 	bool grabbed;
+	bool alreadyDecorated;
 
 	unsigned int desktop;
 

=== modified file 'src/window.cpp'
--- src/window.cpp	2013-07-18 13:06:24 +0000
+++ src/window.cpp	2013-07-19 04:17:27 +0000
@@ -6273,9 +6273,25 @@
 
 namespace
 {
+class NullConfigureBufferLock :
+    public crb::BufferLock
+{
+    public:
+
+	NullConfigureBufferLock (crb::CountedFreeze *cf) {}
+
+	void lock () {}
+	void release () {}
+};
+
 crb::BufferLock::Ptr
 createConfigureBufferLock (crb::CountedFreeze *cf)
 {
+    /* Return an implementation that does nothing if the user explicitly
+     * disabled buffer locks for this running instance */
+    if (getenv ("COMPIZ_NO_CONFIGURE_BUFFER_LOCKS"))
+	return boost::make_shared <NullConfigureBufferLock> (cf);
+
     return boost::make_shared <crb::ConfigureBufferLock> (cf);
 }
 }
@@ -6322,6 +6338,7 @@
     shaded (false),
     hidden (false),
     grabbed (false),
+    alreadyDecorated (false),
 
     desktop (0),
 
@@ -6568,11 +6585,17 @@
 
 	CompSize sizeDelta;
 
-        if (isMapped())
-	    sizeDelta = CompSize (-((b->left + b->right) -
-				     (priv->border.left + priv->border.right)),
-				  -((b->top + b->bottom) -
-				     (priv->border.top + priv->border.bottom)));
+	/* We don't want to change the size of the window the first time we
+	 * decorate it, but we do thereafter */
+	if (priv->alreadyDecorated)
+	{
+	    sizeDelta.setWidth (-((b->left + b->right) -
+				  (priv->border.left + priv->border.right)));
+	    sizeDelta.setHeight (-((b->top + b->bottom) -
+				   (priv->border.top + priv->border.bottom)));
+	}
+	else
+	    priv->alreadyDecorated = true;
 
 	priv->serverInput = *i;
 	priv->border      = *b;