Merge lp:~compiz-team/compiz/compiz.fix_1067246 into lp:compiz/0.9.10

[Sam Spilsbury]

Remove redundant src/logmessage/include/core/logmessage.h

(LP: #1067246)

Remove redundant src/logmessage/include/core/logmessage.h

(LP: #1067246)

[Micheal Hsu (mkhu)]

there is a lot of inconsistency in src/:

1. headers. where should we put public headers?
   some headers are in $(top_srcdir)/include, : e.g. plugin.h, point.h
   some are in $(top_srcdir)/src/<sub_directory>/include/: e.g. string.h
   my proposal: put all public headers in $(top_srcdir)/include
2. .cpp files. where should we put source files?
   some .cpp files are in $(top_srcdir)/src : e.g. plugin.cpp
   some .cpp files are in $(top_srcdir)/<sub_directory>/src/: e.g. point.cpp
   my proposal: put all .cpp files in $(top_srcdir)/src/
3. tests. where should we put tests?
   some tests are in $(top_srcdir)/src/<sub_directory>/tests: e.g. plugin, point
   some tests are in $(top_srcdir)/tests/
   my proposal: put all tests in $(top_srcdir)/src/tests
4. tests naming inconsistency:
   e.g. compiz_option_test, option.cpp for option/tests
        compiz_plugin_test, test-plugin.cpp for plugin/tests
        compiz_test_outputdevices, test_outputdevices.cpp for tests/
   my proposal: all test executables should be "compiz_test_xxxx"
                all test files should be "test-xxxx"

[Micheal Hsu (mkhu)]

I' like to know your opinion

[Sam Spilsbury (smspillaz)]

On Mon, May 20, 2013 at 11:16 AM, Hu Kang <email address hidden> wrote:
> there is a lot of inconsistency in src/:

You'd be right. There was a half-finished effort to split the compiz
core code into "modules" - although these days that model doesn't
really make sense.

>
> 1. headers. where should we put public headers?
> some headers are in $(top_srcdir)/include, : e.g. plugin.h, point.h
> some are in $(top_srcdir)/src/<sub_directory>/include/: e.g. string.h
> my proposal: put all public headers in $(top_srcdir)/include

Lets put all the public headers in include/.

> 2. .cpp files. where should we put source files?
> some .cpp files are in $(top_srcdir)/src : e.g. plugin.cpp
> some .cpp files are in $(top_srcdir)/<sub_directory>/src/: e.g. point.cpp
> my proposal: put all .cpp files in $(top_srcdir)/src/

They can probably all go in src/ - as long as they are still compiled
into independent static libraries.

> 3. tests. where should we put tests?
> some tests are in $(top_srcdir)/src/<sub_directory>/tests: e.g. plugin, point
> some tests are in $(top_srcdir)/tests/
> my proposal: put all tests in $(top_srcdir)/src/tests

Likewise.

The only places where (2) and (3) cannot apply is in the plugins,
because CompizPlugin.cmake will take all the files in src/*.cpp and
compile that into the plugin, which isn't really what we want for
testing purposes.

> 4. tests naming inconsistency:
> e.g. compiz_option_test, option.cpp for option/tests
> compiz_plugin_test, test-plugin.cpp for plugin/tests
> compiz_test_outputdevices, test_outputdevices.cpp for tests/
> my proposal: all test executables should be "compiz_test_xxxx"
> all test files should be "test-xxxx"
>

I think compiz_test_xxx for executables and compiz_test_xxx.cpp for
the test files really.

> --
> https://code.launchpad.net/~stevenhooke11/compiz/compiz.fix_1067246/+merge/164665
> Your team Compiz Maintainers is requested to review the proposed merge of lp:~stevenhooke11/compiz/compiz.fix_1067246 into lp:compiz.

--
Sam Spilsbury

[Micheal Hsu (mkhu)]

Sam. thanks for your comment

some corrections for my previous comment:
(I am talking about files in $(top_srcdir)/src/)
////////////////////
2. .cpp files. where should we put source files?
   some .cpp files are in $(top_srcdir)/src : e.g. plugin.cpp
   some .cpp files are in $(top_srcdir)/src/<sub_directory>/src/: e.g. point.cpp
   my proposal: put all .cpp files in $(top_srcdir)/src/
3. tests. where should we put tests?
   some tests are in $(top_srcdir)/src/<sub_directory>/tests: e.g. point
   some tests are in $(top_srcdir)/src/tests/
   my proposal: put all tests in $(top_srcdir)/src/tests/
////////////////////

I'll push a new branch with 1, 2, 3, 4, applied to $(top_srcdir)/src/.

[MC Return (mc-return)]

Hu, great to see that you are helping with the cleanup/inconsistency-elimination !
This was one point on my TODO list. :) Thanks for taking care of it...

+1

[Sam Spilsbury (smspillaz)]

Just before this can be merged in, the install () command which installs whatever is in PUBLIC_HEADERS needs to be removed to (and that would effectively make the SET_TARGET_PROPERTIES call setting PUBLIC_HEADERS redundant in that directory too).

Right now, there are two install () statements that cover the same file.

(Sorry for the late review on that one, today's been kind of hectic, and the next week is going to be a bit all over the place too).

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Hey Hu.

Were you going to get to this? I should be able to make the required changes myself - I just don't want to accidentally step on you! :)

[Micheal Hsu (mkhu)]

sorry, i've been a little busy recently. i do have a branch, but haven't tested throughly.
so i guess i won't have time to do that.

[MC Return (mc-return)]

> sorry, i've been a little busy recently. i do have a branch, but haven't
> tested throughly.
> so i guess i won't have time to do that.

Please take your time, but do not throw away work you've already done...
We will simply wait :)

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

3759. By Sam Spilsbury on 2013-07-15

Fixes LP: #1067246

[Sam Spilsbury (smspillaz)]

review: Approve

Unmerged revisions

3759. By Sam Spilsbury on 2013-07-15

Fixes LP: #1067246

3758. By Sam Spilsbury on 2013-07-15

Install logmessage.h

3757. By Sam Spilsbury on 2013-07-15

Don't install files twice

3756. By Sam Spilsbury on 2013-07-15

lp:~stevenhooke11/compiz/compiz.fix_1067246

=== modified file 'include/core/CMakeLists.txt'
--- include/core/CMakeLists.txt	2013-01-03 16:05:26 +0000
+++ include/core/CMakeLists.txt	2013-07-15 21:00:34 +0000
@@ -6,6 +6,7 @@
     countedlist.h
     global.h
     icon.h
+    logmessage.h
     match.h
     modifierhandler.h
     option.h

=== 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-15 21:00:34 +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/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-15 21:00:34 +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/logmessage/CMakeLists.txt'
--- src/logmessage/CMakeLists.txt	2012-01-23 17:46:28 +0000
+++ src/logmessage/CMakeLists.txt	2013-07-15 21:00:34 +0000
@@ -1,15 +1,9 @@
-
 INCLUDE_DIRECTORIES(  
-  ${CMAKE_CURRENT_SOURCE_DIR}/include
-  
   ${compiz_SOURCE_DIR}/include
     
   ${Boost_INCLUDE_DIRS}
 )
 
-SET( PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/core/logmessage.h )
-SET( PRIVATE_HEADERS )
-
 SET( SRCS ${CMAKE_CURRENT_SOURCE_DIR}/src/logmessage.cpp )
 
 ADD_LIBRARY( 
@@ -24,10 +18,3 @@
 IF (COMPIZ_BUILD_TESTING)
 ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
 ENDIF (COMPIZ_BUILD_TESTING)
-
-SET_TARGET_PROPERTIES(
-  compiz_logmessage PROPERTIES
-  PUBLIC_HEADER "${PUBLIC_HEADERS}"
-)
-
-install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})

=== removed directory 'src/logmessage/include'
=== removed directory 'src/logmessage/include/core'
=== removed file 'src/logmessage/include/core/logmessage.h'
--- src/logmessage/include/core/logmessage.h	2011-10-31 13:51:00 +0000
+++ src/logmessage/include/core/logmessage.h	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright © 2007 Novell, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Novell, Inc. not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Novell, Inc. makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: David Reveman <[e-mail]>
- */
-
-#ifndef _COMPIZ_LOGMESSAGE_H
-#define _COMPIZ_LOGMESSAGE_H
-
-typedef enum {
-    CompLogLevelFatal = 0,
-    CompLogLevelError,
-    CompLogLevelWarn,
-    CompLogLevelInfo,
-    CompLogLevelDebug
-} CompLogLevel;
-
-void
-logMessage (const char   *componentName,
-	    CompLogLevel level,
-	    const char   *message);
-
-void
-compLogMessage (const char   *componentName,
-		CompLogLevel level,
-		const char   *format,
-		...);
-
-const char *
-logLevelToString (CompLogLevel level);
-
-#endif

=== modified file 'src/privatewindow.h'
--- src/privatewindow.h	2013-03-06 12:31:24 +0000
+++ src/privatewindow.h	2013-07-15 21:00:34 +0000
@@ -400,6 +400,7 @@
 	bool shaded;
 	bool hidden;
 	bool grabbed;
+	bool alreadyDecorated;
 
 	unsigned int desktop;
 

=== modified file 'src/window.cpp'
--- src/window.cpp	2013-06-28 01:10:57 +0000
+++ src/window.cpp	2013-07-15 21:00:34 +0000
@@ -6299,9 +6299,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);
 }
 }
@@ -6348,6 +6364,7 @@
     shaded (false),
     hidden (false),
     grabbed (false),
+    alreadyDecorated (false),
 
     desktop (0),
 
@@ -6591,10 +6608,20 @@
 					    priv->sizeHints.win_gravity) -
 	    compiz::window::extents::shift (priv->border,
 					    priv->sizeHints.win_gravity);
-	CompSize  sizeDelta = CompSize (-((b->left + b->right) -
-					  (priv->border.left + priv->border.right)),
-					-((b->top + b->bottom) -
-					  (priv->border.top + priv->border.bottom)));
+
+	CompSize sizeDelta;
+
+	/* 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;