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

[Sam Spilsbury]

Unrevert 3728, fix failing tests.

Change the behaviour of undecorating windows.

Previously when a window was undecorated, we would shift it back to an appropriate position according to its gravity member. That behaviour was problematic because in the StaticGravity case the window has to just stay in the same place. But then if you had a window with StaticGravity which then did get a decoration and later removed it, it would be placed as though it was decorated and appear to be in the wrong place.

The correct behaviour is to place all windows as though they have decorations, and then when decorations are removed, to move the window back to the corner as indicated in its gravity and then expand its size to cover the obscured regions no longer hidden because the decorations went away.

(LP: #1165343).

  1. Completely remove decorOffsetMove and other related code from
     decor.cpp. Put the logic to handle the window->input () - window->border ()
     placement offset inside of setWindowFrameExtents instead. Now the window
     will always be offset from its original non-decorated position to the new
     decorated position, rather than having to guess between decoration sizes.
  2. Make saveGeometry and restoreGeometry work relative to window->border ()
     as opposed to including it in the saved geometry. It is possible that the
     border size might change during maximization, as such, we don't want to
     save the position with the border before maximizing. Instead save the position
     as if it were never decorated so that when the window is restored it can be
     restored to its original position and then adjusted for its new border size.
  3. Fix a few typoes in the tests.
  4. Moved some commonly used matchers into compiz::testing
  5. Make COMPIZ_PLUGIN_DIR accept multiple directories and look in each one
     of them for the plugin
  6. Set COMPIZ_PLUGIN_DIR appropriately for each plugin that we wish to load
     on startup so that we load locally built plugins as opposed to installed
     ones.
  7. Uncomment compiz_discover_tests for the acceptance tests. Now they are
     run by default.

(LP: #1195522)

Unrevert 3728, fix failing tests.

Change the behaviour of undecorating windows.

Previously when a window was undecorated, we would shift it back to an appropriate position according to its gravity member. That behaviour was problematic because in the StaticGravity case the window has to just stay in the same place. But then if you had a window with StaticGravity which then did get a decoration and later removed it, it would be placed as though it was decorated and appear to be in the wrong place.

The correct behaviour is to place all windows as though they have decorations, and then when decorations are removed, to move the window back to the corner as indicated in its gravity and then expand its size to cover the obscured regions no longer hidden because the decorations went away.

(LP: #1165343).

  1. Completely remove decorOffsetMove and other related code from
     decor.cpp. Put the logic to handle the window->input () - window->border ()
     placement offset inside of setWindowFrameExtents instead. Now the window
     will always be offset from its original non-decorated position to the new
     decorated position, rather than having to guess between decoration sizes.
  2. Make saveGeometry and restoreGeometry work relative to window->border ()
     as opposed to including it in the saved geometry. It is possible that the
     border size might change during maximization, as such, we don't want to
     save the position with the border before maximizing. Instead save the position
     as if it were never decorated so that when the window is restored it can be
     restored to its original position and then adjusted for its new border size.
  3. Fix a few typoes in the tests.
  4. Moved some commonly used matchers into compiz::testing
  5. Make COMPIZ_PLUGIN_DIR accept multiple directories and look in each one
     of them for the plugin
  6. Set COMPIZ_PLUGIN_DIR appropriately for each plugin that we wish to load
     on startup so that we load locally built plugins as opposed to installed
     ones.
  7. Uncomment compiz_discover_tests for the acceptance tests. Now they are
     run by default.

(LP: #1195522)

[Brandon Schaefer (brandontschaefer)]

368 + int GetEventMask ();

Const?

The following tests FAILED:
 1481 - PixmapDecoratedWindowAcceptance.MaximizeBorderExtentsOnMaximize (Failed)
 1482 - PixmapDecoratedWindowAcceptance.MaximizeBorderExtentsOnVertMaximize (Failed)
 1483 - PixmapDecoratedWindowAcceptance.MaximizeBorderExtentsOnHorzMaximize (Failed)
 1484 - PixmapDecoratedWindowAcceptance.MaximizeFrameWindowSizeEqOutputSize (Failed)
 1485 - PixmapDecoratedWindowAcceptance.VertMaximizeFrameWindowSizeEqOutputYHeight (Failed)
 1486 - PixmapDecoratedWindowAcceptance.HorzMaximizeFrameWindowSizeEqOutputXWidth (Failed)
 1487 - PixmapDecoratedWindowAcceptance.VertMaximizeFrameWindowSizeSameXWidth (Failed)
 1488 - PixmapDecoratedWindowAcceptance.HorzMaximizeFrameWindowSizeSameYHeight (Failed)
 1489 - PixmapDecoratedWindowAcceptance.UndecoratedWindowExpandToOrigSize (Failed)
 1490 - PixmapDecoratedWindowAcceptance.UndecorateStaticGravityWindow (Failed)

Note this is just with a compiled branch...though it shoudn't depend on if I have the branch running or not if they are unit tests.

        Start 1451: AdjustmentExtents/PixmapDecorationAdjustment.AdjustRestoredWindowBorderShrinkClient/0

This test hangs sometimes forever. (At lease as far as im willing to let it sit :)

        Start 1485: PixmapDecoratedWindowAcceptance.VertMaximizeFrameWindowSizeEqOutputYHeight

Then this wont hung...as well as some others :)...not entirely sure why.

Still have some more reviewing to go :)

[Sam Spilsbury (smspillaz)]

> 368 + int GetEventMask ();
>
> Const?

Yeah, I can fix that, cheers.

>
> The following tests FAILED:
> 1481 - PixmapDecoratedWindowAcceptance.MaximizeBorderExtentsOnMaximize
> (Failed)
> 1482 -
> PixmapDecoratedWindowAcceptance.MaximizeBorderExtentsOnVertMaximize (Failed)
> 1483 -
> PixmapDecoratedWindowAcceptance.MaximizeBorderExtentsOnHorzMaximize (Failed)
> 1484 -
> PixmapDecoratedWindowAcceptance.MaximizeFrameWindowSizeEqOutputSize (Failed)
> 1485 -
> PixmapDecoratedWindowAcceptance.VertMaximizeFrameWindowSizeEqOutputYHeight
> (Failed)
> 1486 -
> PixmapDecoratedWindowAcceptance.HorzMaximizeFrameWindowSizeEqOutputXWidth
> (Failed)
> 1487 -
> PixmapDecoratedWindowAcceptance.VertMaximizeFrameWindowSizeSameXWidth (Failed)
> 1488 -
> PixmapDecoratedWindowAcceptance.HorzMaximizeFrameWindowSizeSameYHeight
> (Failed)
> 1489 -
> PixmapDecoratedWindowAcceptance.UndecoratedWindowExpandToOrigSize (Failed)
> 1490 - PixmapDecoratedWindowAcceptance.UndecorateStaticGravityWindow
> (Failed)
>
> Note this is just with a compiled branch...though it shoudn't depend on if I
> have the branch running or not if they are unit tests.
>
> Start 1451: AdjustmentExtents/PixmapDecorationAdjustment.AdjustRestore
> dWindowBorderShrinkClient/0
>
> This test hangs sometimes forever. (At lease as far as im willing to let it
> sit :)
>
> Start 1485:
> PixmapDecoratedWindowAcceptance.VertMaximizeFrameWindowSizeEqOutputYHeight
>
> Then this wont hung...as well as some others :)...not entirely sure why.
>
> Still have some more reviewing to go :)

I've had some trouble with llvmpipe hanging on the tests. My plan is to make decor not depend on opengl and drop in a "fakecompositor" plugin instead which allows us to use the pixmap decorations without drawing anything.

... try running them when your system has cooled off a bit. I'll remove my local installation and check if there's some kind of hidden dependency but there shouldn't be.

[MC Return (mc-return)]

Thanks a lot for this, Sam.
Your last version in r3278 already brought massive improvements, especially when running Emerald.

I am quite sure that this one will finally get rid of all decor problems.
Will test this ASAP.

[MC Return (mc-return)]

First review:

726 + /* As the window is shrunk to accomadate the border size, we must subtract

should be (typo):

726 + /* As the window is shrunk to accommodate the border size, we must subtract

===

738 + ct::WINDOW_WIDTH - shrink.width () + size.width (),
739 + ct::WINDOW_HEIGHT - shrink.height () + size.height ());

795 + ct::WINDOW_WIDTH - shrink.width () + size.width (),
796 + ct::WINDOW_HEIGHT - shrink.height () + size.height (),

I would align those (just a suggestion, no real need to fix):

738 + ct::WINDOW_WIDTH - shrink.width () + size.width (),
739 + ct::WINDOW_HEIGHT - shrink.height () + size.height ());

===

You could remove the brackets here:

832 + xwc.x = xRoot - (width / 2);

855 + xwc.x = xRoot - (width / 2);

===

I guess this was just an indentation fix ?

871 - gw->priv->configureLock->release ();
872 + gw->priv->configureLock->release ();

===

The rest LGTM also.
As this touches many source-files it is not really easy to manually test though, but the old version of this was already great and now this additionally has massive test coverage, so "Approve" from me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3751
http://jenkins.qa.ubuntu.com/job/compiz-ci/218/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/259/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/31/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/31
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/31/console

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

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

> First review:
>
> 726 + /* As the window is shrunk to accomadate the border size, we must
> subtract
>
> should be (typo):
>
> 726 + /* As the window is shrunk to accommodate the border size, we
> must subtract

Fixed.

>
> I guess this was just an indentation fix ?
>
> 871 - gw->priv->configureLock->release ();
> 872 + gw->priv->configureLock->release ();
>
> ===

Pretty much

>
> The rest LGTM also.
> As this touches many source-files it is not really easy to manually test
> though, but the old version of this was already great and now this
> additionally has massive test coverage, so "Approve" from me.

[Sam Spilsbury (smspillaz)]

Note: I've removed the acceptance tests from the CI target as llvmpipe does not work correctly there. We'll re-enable them once we can run the tests without llvmpipe.

[MC Return (mc-return)]

I would say -> let's give it a try.
With the PPAs in place we will notice possible regressions early and can combat them then, if any will occur, which I doubt to happen...

The final decision to merge is yours. +1 from me. :)

review: Approve

[MC Return (mc-return)]

One note:
If r3747 of this MP ( http://bazaar.launchpad.net/~compiz-team/compiz/compiz.fix_1195522/revision/3747 ) fixes LP: #1165343, shouldn't we link this branch to the bug report then and add the bug number to the main commit message ?

[Brandon Schaefer (brandontschaefer)]

Your branch hates me:

The following tests FAILED:
 1481 - PixmapDecoratedWindowAcceptance.MaximizeBorderExtentsOnMaximize (Failed)
 1482 - PixmapDecoratedWindowAcceptance.MaximizeBorderExtentsOnVertMaximize (Failed)
 1483 - PixmapDecoratedWindowAcceptance.MaximizeBorderExtentsOnHorzMaximize (Failed)
 1484 - PixmapDecoratedWindowAcceptance.MaximizeFrameWindowSizeEqOutputSize (Failed)
 1485 - PixmapDecoratedWindowAcceptance.VertMaximizeFrameWindowSizeEqOutputYHeight (Failed)
 1486 - PixmapDecoratedWindowAcceptance.HorzMaximizeFrameWindowSizeEqOutputXWidth (Failed)
 1487 - PixmapDecoratedWindowAcceptance.VertMaximizeFrameWindowSizeSameXWidth (Failed)
 1488 - PixmapDecoratedWindowAcceptance.HorzMaximizeFrameWindowSizeSameYHeight (Failed)
 1489 - PixmapDecoratedWindowAcceptance.UndecoratedWindowExpandToOrigSize (Failed)
 1490 - PixmapDecoratedWindowAcceptance.UndecorateStaticGravityWindow (Failed)
 1494 - CompizXorgSystemStackingTest.TestSetup (Failed)

[Brandon Schaefer (brandontschaefer)]

I need to fix my system up though...

[Brandon Schaefer (brandontschaefer)]

After talking with Sam its turning out that the tests failures are due to llvmpipe and some timeout problems. Since this branch fixes some blockers, and each failing tests passes when ran individually, Im approving this branch.

The tests do need to be fixed up, but lets get the blockers fixed first :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

review: Needs Fixing (continuous-integration)

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

3755. By Sam Spilsbury on 2013-06-29

Fix typo

[MC Return (mc-return)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3752
http://jenkins.qa.ubuntu.com/job/compiz-ci/226/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/267/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/39/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/39
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/39/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3755
http://jenkins.qa.ubuntu.com/job/compiz-ci/228/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/269
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/41

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

review: Approve (continuous-integration)

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-06-29 07:09:28 +0000
@@ -0,0 +1,1 @@
+.bzr-repo
 
=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2013-06-07 05:51:45 +0000
+++ plugins/decor/src/decor.cpp	2013-06-29 07:09:28 +0000
@@ -1147,31 +1147,6 @@
 }
 
 /*
- * decorOffsetMove
- *
- * Function called on a timer (to avoid calling configureXWindow from
- * within a ::moveNotify) which actually moves the window by the offset
- * specified in the xwc. Also sends a notification that the window
- * was decorated
- *
- */
-static bool
-decorOffsetMove (CompWindow *w, XWindowChanges xwc, unsigned int mask)
-{
-    CompOption::Vector o (1);
-
-    o.at (0).setName ("window", CompOption::TypeInt);
-    o.at (0).value ().set ((int) w->id ());
-
-    xwc.x += w->serverGeometry ().x ();
-    xwc.y += w->serverGeometry ().y ();
-
-    w->configureXWindow (mask, &xwc);
-    screen->handleCompizEvent ("decor", "window_decorated", o);
-    return false;
-}
-
-/*
  * DecorWindow::matchType
  *
  * Converts libdecoration window types packed
@@ -1507,60 +1482,6 @@
     return decoration;
 }
 
-void
-DecorWindow::moveDecoratedWindowBy (const CompPoint &movement,
-				    bool            instant)
-{
-    /* Need to actually move the window */
-    if (window->placed () && !window->overrideRedirect () &&
-	(movement.x () || movement.y ()))
-    {
-	XWindowChanges xwc;
-	unsigned int   mask = CWX | CWY;
-
-	memset (&xwc, 0, sizeof (XWindowChanges));
-
-	/* Grab the geometry last sent to server at configureXWindow
-	 * time and not here since serverGeometry may be updated by
-	 * the time that we do call configureXWindow */
-	xwc.x = movement.x ();
-	xwc.y = movement.y ();
-
-	/* Except if it's fullscreen, maximized or such */
-	if (window->state () & CompWindowStateFullscreenMask)
-	    mask &= ~(CWX | CWY);
-
-	if (window->state () & CompWindowStateMaximizedHorzMask)
-	    mask &= ~CWX;
-
-	if (window->state () & CompWindowStateMaximizedVertMask)
-	    mask &= ~CWY;
-
-	if (window->saveMask () & CWX)
-	    window->saveWc ().x += movement.x ();
-
-	if (window->saveMask () & CWY)
-	    window->saveWc ().y += movement.y ();
-
-	if (mask)
-	{
-	    /* instant is only true in the case of
-	     * the destructor calling the update function so since it
-	     * is not safe to put the function in a timer (since
-	     * it will get unref'd on the vtable destruction) we
-	     * need to do it immediately
-	     *
-	     * FIXME: CompTimer should really be PIMPL and allow
-	     * refcounting in case we need to keep it alive
-	     */
-	    if (instant)
-		decorOffsetMove (window, xwc, mask);
-	    else
-		moveUpdate.start (boost::bind (decorOffsetMove, window, xwc, mask), 0);
-	}
-    }
-}
-
 namespace
 {
 bool
@@ -1568,14 +1489,30 @@
                       bool       shadowOnly,
                       bool       isSwitcher)
 {
-    const bool visible = (w->frame () ||
+    const bool frameOrUnmapReference = (w->frame () ||
 		          w->hasUnmapReference ());
-    const bool realDecoration = visible && !shadowOnly;
+    const bool realDecoration = frameOrUnmapReference && !shadowOnly;
     const bool forceDecoration = isSwitcher;
 
     return realDecoration || forceDecoration;
 }
-}
+
+/*
+ * notifyDecoration
+ *
+ * Notify other plugins that the window is now fully decorated
+ */
+void notifyDecoration (CompWindow *window)
+{
+    CompOption::Vector o (1);
+
+    o.at (0).setName ("window", CompOption::TypeInt);
+    o.at (0).value ().set ((int) window->id ());
+
+    screen->handleCompizEvent ("decor", "window_decorated", o);
+}
+}
+
 /*
  * DecorWindow::update
  * This is the master function for managing decorations on windows
@@ -1616,7 +1553,8 @@
 DecorWindow::update (bool allowDecoration)
 {
     Decoration::Ptr  old, decoration;
-    CompPoint        oldShift, movement;
+    CompPoint        movement;
+    CompSize         sizeDelta;
 
     if (wd)
 	old = wd->decor;
@@ -1625,6 +1563,7 @@
 
     bool shadowOnly = bareDecorationOnly ();
     bool decorate = shouldDecorateWindow (window, shadowOnly, isSwitcher);
+    unsigned int decorMaximizeState = window->state () & MAXIMIZE_STATE;
 
     if (decorate || frameExtentsRequested)
     {
@@ -1647,16 +1586,13 @@
     /* Don't bother going any further if
      * this window is going to get the same
      * decoration, just use the old one */
-    if (decoration == old)
+    if (decoration == old &&
+        lastMaximizedStateDecorated == decorMaximizeState)
 	return false;
 
-    /* Determine how much we moved the window for the old
-     * decoration and save that, also destroy the old
-     * WindowDecoration */
+    /* Destroy the old WindowDecoration */
     if (old)
     {
-	oldShift = cwe::shift (window->border (), window->sizeHints ().win_gravity);
-
 	WindowDecoration::destroy (wd);
 	wd = NULL;
     }
@@ -1672,13 +1608,15 @@
 	/* Set extents based on maximize/unmaximize state
 	 * FIXME: With the new type system, this should be
 	 * removed */
-	if ((window->state () & MAXIMIZE_STATE))
+	if (decorMaximizeState)
 	    window->setWindowFrameExtents (&decoration->maxBorder,
 					   &decoration->maxInput);
 	else if (!window->hasUnmapReference ())
 	    window->setWindowFrameExtents (&decoration->border,
 					   &decoration->input);
 
+	lastMaximizedStateDecorated = decorMaximizeState;
+
 	/* This window actually needs its decoration contents updated
 	 * as it was actually visible */
 	if (decorate ||
@@ -1694,9 +1632,6 @@
 		return false;
 	    }
 
-	    movement = cwe::shift (window->border (), window->sizeHints ().win_gravity);
-	    movement -= oldShift;
-
 	    window->updateWindowOutputExtents ();
 
 	    updateReg = true;
@@ -1724,8 +1659,6 @@
 	memset (&emptyExtents, 0, sizeof (CompWindowExtents));
 
 	window->setWindowFrameExtents (&emptyExtents, &emptyExtents);
-
-	movement -= oldShift;
     }
 
     /* We need to damage the current output extents
@@ -1738,8 +1671,7 @@
 	updateGroupShadows ();
     }
 
-    moveDecoratedWindowBy (movement,
-			   !allowDecoration);
+    notifyDecoration (window);
 
     return true;
 }
@@ -2280,6 +2212,20 @@
 }
 
 /*
+ * DecorWindow::place
+ *
+ * Update any windows just before placement
+ * so that placement algorithms will have the
+ * border size at place-time
+ */
+bool
+DecorWindow::place (CompPoint &pos)
+{
+    update (true);
+    return window->place (pos);
+}
+
+/*
  * DecorWindow::windowNotify
  *
  * Window event notification handler. On various
@@ -2924,13 +2870,7 @@
 	shading = false;
 	unshading = false;
     }
-    /* FIXME: we should not need a timer for calling decorWindowUpdate,
-       and only call updateWindowDecorationScale if decorWindowUpdate
-       returns false. Unfortunately, decorWindowUpdate may call
-       updateWindowOutputExtents, which may call WindowResizeNotify. As
-       we never should call a wrapped function that's currently
-       processed, we need the timer for the moment. updateWindowOutputExtents
-       should be fixed so that it does not emit a resize notification. */
+
     updateMatrix = true;
     updateReg = true;
 
@@ -2955,33 +2895,7 @@
 void
 DecorWindow::stateChangeNotify (unsigned int lastState)
 {
-    if (wd && wd->decor)
-    {
-	CompPoint oldShift = compiz::window::extents::shift (window->border (), window->sizeHints ().win_gravity);
-	
-
-	if ((window->state () & MAXIMIZE_STATE))
-	    window->setWindowFrameExtents (&wd->decor->maxBorder,
-					   &wd->decor->maxInput);
-	else
-	    window->setWindowFrameExtents (&wd->decor->border,
-					   &wd->decor->input);
-
-	/* Since we immediately update the frame extents, we must
-	 * also update the stored saved window geometry in order
-	 * to prevent the window from shifting back too far once
-	 * unmaximized */
-
-	CompPoint movement = compiz::window::extents::shift (window->border (), window->sizeHints ().win_gravity) - oldShift;
-
-	if (window->saveMask () & CWX)
-	    window->saveWc ().x += movement.x ();
-
-	if (window->saveMask () & CWY)
-	    window->saveWc ().y += movement.y ();
-
-	updateFrame ();
-    }
+    update (true);
 
     window->stateChangeNotify (lastState);
 }
@@ -3218,7 +3132,8 @@
     mClipGroup (NULL),
     mOutputRegion (window->outputRect ()),
     mInputRegion (window->inputRect ()),
-    mRequestor (screen->dpy (), w->id (), &decor)
+    mRequestor (screen->dpy (), w->id (), &decor),
+    lastMaximizedStateDecorated (0)
 {
     WindowInterface::setHandler (window);
 
 
=== modified file 'plugins/decor/src/decor.h'
--- plugins/decor/src/decor.h	2013-06-07 05:51:45 +0000
+++ plugins/decor/src/decor.h	2013-06-29 07:09:28 +0000
@@ -293,6 +293,8 @@
 
 	bool damageRect (bool, const CompRect &);
 
+	bool place (CompPoint &pos);
+
 	bool glDraw (const GLMatrix &, const GLWindowPaintAttrib &,
 		     const CompRegion &, unsigned int);
 	void glDecorate (const GLMatrix &, const GLWindowPaintAttrib &,
@@ -380,13 +382,15 @@
 
 	X11DecorPixmapRequestor   mRequestor;
 
+	unsigned int            lastMaximizedStateDecorated;
+
     private:
 
 	bool            bareDecorationOnly ();
 	Decoration::Ptr findRealDecoration ();
 	Decoration::Ptr findBareDecoration ();
 	void            moveDecoratedWindowBy (const CompPoint &movement,
-					       bool instant);
+					       const CompSize &sizeDelta);
 };
 
 class DecorPluginVTable :
 
=== modified file 'plugins/decor/tests/acceptance/xorg-gtest/CMakeLists.txt'
--- plugins/decor/tests/acceptance/xorg-gtest/CMakeLists.txt	2013-06-22 12:27:36 +0000
+++ plugins/decor/tests/acceptance/xorg-gtest/CMakeLists.txt	2013-06-29 07:09:28 +0000
@@ -31,7 +31,7 @@
     target_link_libraries (compiz_test_decor_acceptance
                            ${COMPIZ_DECOR_ACCEPTANCE_TEST_LIBRARIES})
 
-    # Not run by default yet until we're able to load plugins locally
+    # Disabled until the tests can be run without opengl
     #compiz_discover_tests (compiz_test_decor_acceptance WITH_XORG_GTEST)
 
 endif (BUILD_XORG_GTEST)
 
=== 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-22 14:31:25 +0000
+++ plugins/decor/tests/acceptance/xorg-gtest/compiz_decor_acceptance_tests.cpp	2013-06-29 07:09:28 +0000
@@ -57,6 +57,10 @@
 using ::testing::WithParamInterface;
 using ::testing::_;
 
+using ::compiz::testing::HasGeometry;
+using ::compiz::testing::RelativeWindowGeometry;
+using ::compiz::testing::AbsoluteWindowGeometry;
+
 class BaseDecorAcceptance :
     public ct::AutostartCompizXorgSystemTestWithTestHelper
 {
@@ -78,6 +82,10 @@
 	Atom   mDecorationTypeWindow;
 	Atom   mDecorationInputFrameAtom;
 	Atom   mDecorationOutputFrameAtom;
+
+    private:
+
+	int GetEventMask () const;
 };
 
 BaseDecorAcceptance::BaseDecorAcceptance () :
@@ -92,6 +100,13 @@
 {
 }
 
+int
+BaseDecorAcceptance::GetEventMask () const
+{
+    return ct::AutostartCompizXorgSystemTestWithTestHelper::GetEventMask () |
+	       SubstructureNotifyMask;
+}
+
 void
 BaseDecorAcceptance::SetUp ()
 {
@@ -151,9 +166,12 @@
     ct::CompizProcess::PluginList baseList (Base::GetPluginList ());
     ct::CompizProcess::PluginList list;
 
-    list.push_back ("composite");
-    list.push_back ("opengl");
-    list.push_back ("decor");
+    list.push_back (ct::CompizProcess::Plugin ("composite",
+					       ct::CompizProcess::Real));
+    list.push_back (ct::CompizProcess::Plugin ("opengl",
+					       ct::CompizProcess::Real));
+    list.push_back (ct::CompizProcess::Plugin ("decor",
+					       ct::CompizProcess::Real));
 
     for (ct::CompizProcess::PluginList::iterator it = baseList.begin ();
 	 it != baseList.end ();
@@ -1122,17 +1140,13 @@
 					      height,
 					      mask);
 
-    /* The use of the timeout is currently because some functionality
-     * is broken which would cause these barrier conditions to never
-     * eventuate. For now just get to the fail condition */
     Advance (display,
 	     ct::WaitForEventOfTypeOnWindowMatching (display,
 						     window,
 						     ConfigureNotify,
 						     -1,
 						     -1,
-						     matcher,
-						     1000));
+						     matcher));
 }
 
 void WaitForFrameExtents (Display *dpy,
@@ -1729,9 +1743,6 @@
 						    Window             window,
 						    const FakeDecorPtr &decor)
 {
-    /* Wait for the frame extents to change */
-    WaitForPropertyNotify (display, window, "_NET_FRAME_EXTENTS");
-
     const CompPoint &framePos (decor->restoredFrameWindowOffset ());
 
     /* Wait for the ConfigureNotify on the frame window
@@ -1743,6 +1754,9 @@
 			0,
 			0,
 			CWX | CWY);
+
+    /* Wait for the frame extents to change */
+    WaitForPropertyNotify (display, window, "_NET_FRAME_EXTENTS");
 }
 
 void
@@ -1802,6 +1816,8 @@
 {
     public:
 
+	PixmapDecoratedWindowAcceptance ();
+
 	virtual void SetUp ();
 	virtual void TearDown ();
 
@@ -1809,12 +1825,19 @@
 
     protected:
 
+	unsigned int RealDecorationActiveBorderExtent;
+
 	Window mTestWindow;
 	Window mTestWindowParent;
 
 	cdt::FakePixmapTypeDecoration::Ptr mTestWindowDecoration;
 };
 
+PixmapDecoratedWindowAcceptance::PixmapDecoratedWindowAcceptance () :
+    RealDecorationActiveBorderExtent (ActiveBorderExtent + 1)
+{
+}
+
 void
 PixmapDecoratedWindowAcceptance::SetUp ()
 {
@@ -1828,7 +1851,9 @@
     /* Start the decorator */
     SetUpDecorator ();
 
-    unsigned int ResBo = ActiveBorderExtent;
+    /* We need to change the border extent so that the window
+     * will move from its position in the default decoration */
+    unsigned int ResBo = RealDecorationActiveBorderExtent;
     unsigned int ResIn = ActiveInputExtent;
     unsigned int MaxEx = MaximizedBorderExtent;
 
@@ -2077,167 +2102,6 @@
 
 namespace
 {
-void RelativeWindowGeometry (Display      *dpy,
-			     Window       w,
-			     int          &x,
-			     int          &y,
-			     unsigned int &width,
-			     unsigned int &height,
-			     unsigned int &border)
-{
-    Window       root;
-    unsigned int depth;
-
-    if (!XGetGeometry (dpy, w, &root, &x, &y, &width, &height, &border, &depth))
-	throw std::logic_error ("XGetGeometry failed");
-}
-
-void AbsoluteWindowGeometry (::Display    *display,
-			     Window       window,
-			     int          &x,
-			     int          &y,
-			     unsigned int &width,
-			     unsigned int &height,
-			     unsigned int &border)
-{
-    Window       root;
-    Window       child;
-    unsigned int depth;
-
-    if (!XGetGeometry (display, window, &root,
-		       &x, &y, &width, &height,
-		       &border, &depth))
-	throw std::logic_error ("XGetGeometry failed");
-
-    if (!XTranslateCoordinates (display, window, root, x, y,
-				&x, &y, &child))
-	throw std::logic_error ("XTranslateCoordinates failed");
-}
-
-typedef void (*RetrievalFunc) (Display      *dpy,
-			       Window       window,
-			       int          &x,
-			       int          &y,
-			       unsigned int &width,
-			       unsigned int &height,
-			       unsigned int &border);
-
-class WindowGeometryMatcher :
-    public MatcherInterface <Window>
-{
-    public:
-
-	WindowGeometryMatcher (Display             *dpy,
-			       RetrievalFunc       func,
-			       const Matcher <int> &x,
-			       const Matcher <int> &y,
-			       const Matcher <unsigned int> &width,
-			       const Matcher <unsigned int> &height,
-			       const Matcher <unsigned int> &border);
-
-	bool MatchAndExplain (Window x, MatchResultListener *listener) const;
-	void DescribeTo (std::ostream *os) const;
-
-    private:
-
-	Display       *mDpy;
-
-	RetrievalFunc mFunc;
-
-	Matcher <int> mX;
-	Matcher <int> mY;
-	Matcher <unsigned int> mWidth;
-	Matcher <unsigned int> mHeight;
-	Matcher <unsigned int> mBorder;
-};
-
-Matcher <Window>
-HasGeometry (Display             *dpy,
-	     RetrievalFunc       func,
-	     const Matcher <int> &x,
-	     const Matcher <int> &y,
-	     const Matcher <unsigned int> &width,
-	     const Matcher <unsigned int> &height,
-	     const Matcher <unsigned int> &border)
-{
-    return MakeMatcher (new WindowGeometryMatcher (dpy,
-						   func,
-						   x,
-						   y,
-						   width,
-						   height,
-						   border));
-}
-}
-
-WindowGeometryMatcher::WindowGeometryMatcher (Display             *dpy,
-					      RetrievalFunc       func,
-					      const Matcher <int> &x,
-					      const Matcher <int> &y,
-					      const Matcher <unsigned int> &width,
-					      const Matcher <unsigned int> &height,
-					      const Matcher <unsigned int> &border) :
-    mDpy (dpy),
-    mFunc (func),
-    mX (x),
-    mY (y),
-    mWidth (width),
-    mHeight (height),
-    mBorder (border)
-{
-}
-
-bool
-WindowGeometryMatcher::MatchAndExplain (Window w,
-					MatchResultListener *listener) const
-{
-    int          x, y;
-    unsigned int width, height, border;
-
-    mFunc (mDpy, w, x, y, width, height, border);
-
-    bool match = mX.MatchAndExplain (x, listener) &&
-		 mY.MatchAndExplain (y, listener) &&
-		 mWidth.MatchAndExplain (width, listener) &&
-		 mHeight.MatchAndExplain (height, listener) &&
-		 mBorder.MatchAndExplain (border, listener);
-
-    if (!match)
-    {
-	*listener << "Geometry:"
-		  << " x: " << x
-		  << " y: " << y
-		  << " width: " << width
-		  << " height: " << height
-		  << " border: " << border;
-    }
-
-    return match;
-}
-
-void
-WindowGeometryMatcher::DescribeTo (std::ostream *os) const
-{
-    *os << "Window geometry matching :";
-
-    *os << std::endl << " - ";
-    mX.DescribeTo (os);
-
-    *os << std::endl << " - ";
-    mY.DescribeTo (os);
-
-    *os << std::endl << " - ";
-    mWidth.DescribeTo (os);
-
-    *os << std::endl << " - ";
-    mHeight.DescribeTo (os);
-
-    *os << std::endl << " - ";
-    mBorder.DescribeTo (os);
-}
-
-namespace
-{
 void WindowBorderPositionAttributes (Display *dpy,
 				     Window  w,
 				     XWindowAttributes &attrib,
@@ -2246,16 +2110,15 @@
 {
     XGetWindowAttributes (dpy, w, &attrib);
 
-    /* Remove border - input offset */
-    attrib.x -= (ActiveBorderExtent - ActiveInputExtent);
-    attrib.y -= (ActiveBorderExtent - ActiveInputExtent);
-    attrib.width -= (ActiveBorderExtent - ActiveInputExtent) * 2;
-    attrib.height -= (ActiveBorderExtent - ActiveInputExtent) * 2;
+    /* Remove input - border offset */
+    attrib.x += (ActiveInputExtent - ActiveBorderExtent);
+    attrib.y += (ActiveInputExtent - ActiveBorderExtent);
+    attrib.width -= (ActiveInputExtent - ActiveBorderExtent) * 2;
+    attrib.height -= (ActiveInputExtent - ActiveBorderExtent) * 2;
 }
 }
 
-/* DISABLED - Upon maximization, x offset is 1, width offset is 10 */
-TEST_F (PixmapDecoratedWindowAcceptance, DISABLED_VertMaximizeFrameWindowSizeSameXWidth)
+TEST_F (PixmapDecoratedWindowAcceptance, VertMaximizeFrameWindowSizeSameXWidth)
 {
     XWindowAttributes rootAttrib, attrib;
     XGetWindowAttributes (Display (), DefaultRootWindow (Display ()), &rootAttrib);
@@ -2263,7 +2126,7 @@
     WindowBorderPositionAttributes (Display (),
 				    mTestWindowParent,
 				    attrib,
-				    ActiveBorderExtent,
+				    RealDecorationActiveBorderExtent,
 				    ActiveInputExtent);
 
     ChangeStateOfWindow (Display (),
@@ -2293,8 +2156,7 @@
 			      _));
 }
 
-/* DISABLED - Upon maximization, y offset is 1, height offset is 10 */
-TEST_F (PixmapDecoratedWindowAcceptance, DISABLED_HorzMaximizeFrameWindowSizeSameYHeight)
+TEST_F (PixmapDecoratedWindowAcceptance, HorzMaximizeFrameWindowSizeSameYHeight)
 {
     XWindowAttributes rootAttrib, attrib;
     XGetWindowAttributes (Display (), DefaultRootWindow (Display ()), &rootAttrib);
@@ -2302,7 +2164,7 @@
     WindowBorderPositionAttributes (Display (),
 				    mTestWindowParent,
 				    attrib,
-				    ActiveBorderExtent,
+				    RealDecorationActiveBorderExtent,
 				    ActiveInputExtent);
 
     ChangeStateOfWindow (Display (),
@@ -2356,12 +2218,7 @@
 			      _));
 }
 
-/* DISABLED - Ensure that a window with StaticGravity expands to its
- * original size when it is undecorated
- *
- * X and Y positions do not revert back to their original state.
- */
-TEST_F (PixmapDecoratedWindowAcceptance, DISABLED_UndecorateStaticGravityWindow)
+TEST_F (PixmapDecoratedWindowAcceptance, UndecorateStaticGravityWindow)
 {
     XSizeHints hints;
 
@@ -2474,7 +2331,7 @@
 					   _));
 }
 
-TEST_P (PixmapDecorationAdjustment, DISABLED_AdjustRestoredWindowBorderShrinkClient)
+TEST_P (PixmapDecorationAdjustment, AdjustRestoredWindowBorderShrinkClient)
 {
     ReconfigureDecoration (Display (),
 			   mTestWindow,
@@ -2494,7 +2351,7 @@
 					   _));
 }
 
-TEST_P (PixmapDecorationAdjustment, DISABLED_ClientExpandsAsBorderShrinks)
+TEST_P (PixmapDecorationAdjustment, ClientExpandsAsBorderShrinks)
 {
     decor_extents_t newExtents = GetParam ();
 
@@ -2523,7 +2380,7 @@
 					   _));
 }
 
-TEST_P (PixmapDecorationAdjustment, DISABLED_ClientExpandsAsBorderShrinksWhilstMaximized)
+TEST_P (PixmapDecorationAdjustment, ClientExpandsAsBorderShrinksWhilstMaximized)
 {
     decor_extents_t newExtents = GetParam ();
 
@@ -2546,16 +2403,21 @@
     const CompPoint &off (mTestWindowDecoration->restoredFrameWindowOffset ());
     const CompSize  &size (mTestWindowDecoration->restoredDecorationSize ());
 
+    /* As the window is shrunk to accomodate the border size, we must subtract
+     * the border from the original window size */
+    CompSize shrink ((newExtents.left + newExtents.right),
+		     (newExtents.top + newExtents.bottom));
+
     RestoreWindow (mTestWindow,
-		   ct::WINDOW_X - off.x (),
-		   ct::WINDOW_Y - off.y (),
-		   ct::WINDOW_WIDTH + size.width (),
-		   ct::WINDOW_HEIGHT + size.height ());
+		   ct::WINDOW_X + off.x (),
+		   ct::WINDOW_Y + off.y (),
+		   ct::WINDOW_WIDTH - shrink.width () + size.width (),
+		   ct::WINDOW_HEIGHT - shrink.height () + size.height ());
 
     EXPECT_THAT (mTestWindow, HasGeometry (Display (),
 					   AbsoluteWindowGeometry,
 					   ct::WINDOW_X + newExtents.left,
-					   ct::WINDOW_Y + newExtents.right,
+					   ct::WINDOW_Y + newExtents.top,
 					   ct::WINDOW_WIDTH - (newExtents.left +
 							       newExtents.right),
 					   ct::WINDOW_HEIGHT - (newExtents.top +
@@ -2563,7 +2425,7 @@
 					   _));
 }
 
-TEST_P (PixmapDecorationAdjustment, DISABLED_ClientExpandsAsBorderShrinksWhilstUndecorated)
+TEST_P (PixmapDecorationAdjustment, ClientExpandsAsBorderShrinksWhilstUndecorated)
 {
     decor_extents_t newExtents = GetParam ();
 
@@ -2574,16 +2436,11 @@
 			   DecorationExtents (10, 10, 10, 10),
 			   DecorationExtents (10, 10, 10, 10));
 
+    /* When decorations are disabled on this window, the frame window
+     * will retain the exact same size, as border == input in the previous
+     * case. So there's no need to wait */
     DisallowDecorationsOnWindow (mTestWindow);
 
-    WaitForConfigureOn (Display (),
-			mTestWindowParent,
-			ct::WINDOW_X,
-			ct::WINDOW_Y,
-			ct::WINDOW_WIDTH,
-			ct::WINDOW_HEIGHT,
-			CWX | CWY | CWWidth | CWHeight);
-
     /* Set the property on the window, then decorate without waiting
      * for a response we will continue to use the maximized window decoration */
     mTestWindowDecoration->changeRestoredBorder (newExtents);
@@ -2596,18 +2453,23 @@
     const CompPoint &off (mTestWindowDecoration->restoredFrameWindowOffset ());
     const CompSize  &size (mTestWindowDecoration->restoredDecorationSize ());
 
+    /* As the window is shrunk to accomadate the border size, we must subtract
+     * the border from the original window size */
+    CompSize shrink ((newExtents.left + newExtents.right),
+		     (newExtents.top + newExtents.bottom));
+
     WaitForConfigureOn (Display (),
 			mTestWindowParent,
-			ct::WINDOW_X - off.x (),
-			ct::WINDOW_Y - off.y (),
-			ct::WINDOW_WIDTH + size.width (),
-			ct::WINDOW_HEIGHT + size.height (),
+			ct::WINDOW_X + off.x (),
+			ct::WINDOW_Y + off.y (),
+			ct::WINDOW_WIDTH - shrink.width () + size.width (),
+			ct::WINDOW_HEIGHT - shrink.height () + size.height (),
 			CWX | CWY | CWWidth | CWHeight);
 
     EXPECT_THAT (mTestWindow, HasGeometry (Display (),
 					   AbsoluteWindowGeometry,
 					   ct::WINDOW_X + newExtents.left,
-					   ct::WINDOW_Y + newExtents.right,
+					   ct::WINDOW_Y + newExtents.top,
 					   ct::WINDOW_WIDTH - (newExtents.left +
 							       newExtents.right),
 					   ct::WINDOW_HEIGHT - (newExtents.top +
 
=== modified file 'plugins/move/src/move.cpp'
--- plugins/move/src/move.cpp	2013-05-09 13:43:07 +0000
+++ plugins/move/src/move.cpp	2013-06-29 07:09:28 +0000
@@ -395,18 +395,23 @@
 			{
 			    int width = w->serverGeometry ().width ();
 
-			    w->saveMask () |= CWX | CWY;
-
 			    if (w->saveMask () & CWWidth)
 				width = w->saveWc ().width;
 
-			    w->saveWc ().x = xRoot - (width >> 1);
-			    w->saveWc ().y = yRoot + (w->border ().top >> 1);
-
 			    ms->x = ms->y = 0;
 
+			    /* Get a lock on configure requests so that we can make
+			     * any movement here atomic */
+			    compiz::window::configure_buffers::ReleasablePtr lock (w->obtainLockOnConfigureRequests ());
+
 			    w->maximize (0);
 
+			    XWindowChanges xwc;
+			    xwc.x = xRoot - (width / 2);
+			    xwc.y = yRoot + w->border ().top / 2;
+
+			    w->configureXWindow (CWX | CWY, &xwc);
+
 			    ms->snapOffY = ms->snapBackY;
 
 			    return;
@@ -440,13 +445,18 @@
 			    if (w->saveMask () & CWWidth)
 				width = w->saveWc ().width;
 
-			    w->saveWc ().x = xRoot - (width >> 1);
-			    w->saveWc ().y = yRoot + (w->border ().top >> 1);
-
-			    ms->x = ms->y = 0;
+			    /* Get a lock on configure requests so that we can make
+			     * any movement here atomic */
+			    compiz::window::configure_buffers::ReleasablePtr lock (w->obtainLockOnConfigureRequests ());
 
 			    w->maximize (0);
 
+			    XWindowChanges xwc;
+			    xwc.x = xRoot - (width / 2);
+			    xwc.y = yRoot + w->border ().top / 2;
+
+			    w->configureXWindow (CWX | CWY, &xwc);
+
 			    ms->snapOffX = ms->snapBackX;
 
 			    return;
 
=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2013-05-08 15:13:28 +0000
+++ plugins/opengl/src/paint.cpp	2013-06-29 07:09:28 +0000
@@ -426,7 +426,7 @@
         gw = GLWindow::get (w);
 
         /* Release any queued ConfigureWindow requests now */
-        gw->priv->configureLock->release ();
+	gw->priv->configureLock->release ();
 
 	if (unredirected.find (w) != unredirected.end ())
 	    continue;
 
=== modified file 'plugins/place/src/constrain-to-workarea/include/constrain-to-workarea.h'
--- plugins/place/src/constrain-to-workarea/include/constrain-to-workarea.h	2013-06-07 05:51:45 +0000
+++ plugins/place/src/constrain-to-workarea/include/constrain-to-workarea.h	2013-06-29 07:09:28 +0000
@@ -45,8 +45,7 @@
 CompPoint & constrainPositionToWorkArea (CompPoint                      &pos,
 				         const compiz::window::Geometry &serverGeometry,
                                          const CompWindowExtents        &border,
-                                         const CompRect                 &workArea,
-                                         bool                           staticGravity);
+					 const CompRect                 &workArea);
 
 
 CompPoint getViewportRelativeCoordinates (const compiz::window::Geometry &geom,
@@ -54,8 +53,7 @@
 
 CompWindowExtents getWindowEdgePositions (const CompPoint                &position,
 					  const compiz::window::Geometry &geom,
-					  const CompWindowExtents        &border,
-					  unsigned int                   gravity);
+					  const CompWindowExtents        &border);
 
 void clampHorizontalEdgePositionsToWorkArea (CompWindowExtents &edgePositions,
 					    const CompRect    &workArea);
@@ -64,8 +62,7 @@
 
 void subtractBordersFromEdgePositions (CompWindowExtents       &edgePositions,
 				       const CompWindowExtents &border,
-				       unsigned int            legacyBorder,
-				       unsigned int            gravity);
+				       unsigned int            legacyBorder);
 
 bool onlySizeChanged (unsigned int mask);
 bool applyWidthChange (const CompWindowExtents &edgePositions,
 
=== modified file 'plugins/place/src/constrain-to-workarea/src/constrain-to-workarea.cpp'
--- plugins/place/src/constrain-to-workarea/src/constrain-to-workarea.cpp	2013-06-07 05:51:45 +0000
+++ plugins/place/src/constrain-to-workarea/src/constrain-to-workarea.cpp	2013-06-29 07:09:28 +0000
@@ -140,35 +140,21 @@
 
 CompPoint &
 cp::constrainPositionToWorkArea (CompPoint               &pos,
-			         const cw::Geometry      &serverGeometry,
-			         const CompWindowExtents &border,
-			         const CompRect          &workArea,
-			         bool                    staticGravity)
+				 const cw::Geometry      &serverGeometry,
+				 const CompWindowExtents &border,
+				 const CompRect          &workArea)
 {
     CompWindowExtents extents;
     int               delta;
 
-    CompWindowExtents effectiveBorders = border;
-
-    /* Ignore borders in the StaticGravity case for placement
-     * because the window intended to be placed as if it didn't
-     * have them */
-    if (staticGravity)
-    {
-	effectiveBorders.left = 0;
-	effectiveBorders.right = 0;
-	effectiveBorders.top = 0;
-	effectiveBorders.bottom = 0;
-    }
-
-    extents.left   = pos.x () - effectiveBorders.left;
-    extents.top    = pos.y () - effectiveBorders.top;
+    extents.left   = pos.x () - border.left;
+    extents.top    = pos.y () - border.top;
     extents.right  = extents.left + serverGeometry.widthIncBorders () +
-		     (effectiveBorders.left +
-		      effectiveBorders.right);
+		     (border.left +
+		      border.right);
     extents.bottom = extents.top + serverGeometry.heightIncBorders () +
-		     (effectiveBorders.top +
-		      effectiveBorders.bottom);
+		     (border.top +
+		      border.bottom);
 
     delta = workArea.right () - extents.right;
     if (delta < 0)
@@ -186,8 +172,8 @@
     if (delta > 0)
 	extents.top += delta;
 
-    pos.setX (extents.left + effectiveBorders.left);
-    pos.setY (extents.top  + effectiveBorders.top);
+    pos.setX (extents.left + border.left);
+    pos.setY (extents.top  + border.top);
 
     return pos;
 }
@@ -213,23 +199,18 @@
 
 CompWindowExtents cp::getWindowEdgePositions (const CompPoint         &position,
 					      const cw::Geometry      &geom,
-					      const CompWindowExtents &border,
-					      unsigned int            gravity)
+					      const CompWindowExtents &border)
 {
     CompWindowExtents edgePositions;
-    CompWindowExtents effectiveBorder (border);
-
-    if (gravity & StaticGravity)
-	effectiveBorder = CompWindowExtents (0, 0, 0, 0);
-
-    edgePositions.left   = position.x () - effectiveBorder.left;
+
+    edgePositions.left   = position.x () - border.left;
     edgePositions.right  = edgePositions.left +
-			   geom.widthIncBorders () +  (effectiveBorder.left +
-						       effectiveBorder.right);
-    edgePositions.top    = position.y () - effectiveBorder.top;
+			   geom.widthIncBorders () +  (border.left +
+						       border.right);
+    edgePositions.top    = position.y () - border.top;
     edgePositions.bottom = edgePositions.top +
-			   geom.heightIncBorders () + (effectiveBorder.top +
-						       effectiveBorder.bottom);
+			   geom.heightIncBorders () + (border.top +
+						       border.bottom);
 
     return edgePositions;
 }
@@ -285,19 +266,14 @@
 
 void cp::subtractBordersFromEdgePositions (CompWindowExtents       &edgePositions,
 					   const CompWindowExtents &border,
-					   unsigned int            legacyBorder,
-					   unsigned int            gravity)
+					   unsigned int            legacyBorder)
 {
     const unsigned int doubleBorder = 2 * legacyBorder;
-    CompWindowExtents  effectiveBorder = border;
-
-    if (gravity & StaticGravity)
-	effectiveBorder = CompWindowExtents (0, 0, 0, 0);
-
-    edgePositions.left   += effectiveBorder.left;
-    edgePositions.right  -= effectiveBorder.right + doubleBorder;
-    edgePositions.top    += effectiveBorder.top;
-    edgePositions.bottom -= effectiveBorder.bottom + doubleBorder;
+
+    edgePositions.left   += border.left;
+    edgePositions.right  -= border.right + doubleBorder;
+    edgePositions.top    += border.top;
+    edgePositions.bottom -= border.bottom + doubleBorder;
 }
 
 bool cp::onlySizeChanged (unsigned int mask)
 
=== modified file 'plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea/src/test-place-constrain-to-workarea.cpp'
--- plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea/src/test-place-constrain-to-workarea.cpp	2013-06-07 05:51:45 +0000
+++ plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea/src/test-place-constrain-to-workarea.cpp	2013-06-29 07:09:28 +0000
@@ -226,7 +226,7 @@
     extents = WindowExtents (GetParam ());
 
     CompPoint pos = InitialPosition (GetParam ());
-    pos = cp::constrainPositionToWorkArea (pos, g, extents, WArea, false);
+    pos = cp::constrainPositionToWorkArea (pos, g, extents, WArea);
 
     const CompPoint expectedAfterExtentsAdjustment = ExpectedPosition +
 						     CompPoint (extents.left,
@@ -235,19 +235,6 @@
     EXPECT_EQ (expectedAfterExtentsAdjustment, pos);
 }
 
-TEST_P (PlaceConstrainPositionToWorkArea, PositionConstrainedStaticGravity)
-{
-    g = WindowGeometry (GetParam ());
-    extents = WindowExtents (GetParam ());
-
-    CompPoint pos = InitialPosition (GetParam ());
-    pos = cp::constrainPositionToWorkArea (pos, g, extents, WArea, true);
-
-    /* Do not adjust residual position for extents with windows
-     * that have a static gravity */
-    EXPECT_EQ (ExpectedPosition, pos);
-}
-
 namespace
 {
 cwe::Extents PossibleExtents[] =
@@ -297,7 +284,7 @@
 	CompPoint    pos;
 };
 
-TEST_F (PlaceGetEdgePositions, GetEdgePositionsNWGravity)
+TEST_F (PlaceGetEdgePositions, GetEdgePositions)
 {
     int left = geom.x () - border.left;
     int right = left + (geom.widthIncBorders ()) +
@@ -309,25 +296,7 @@
     const cwe::Extents ExpectedExtents (left, right, top, bottom);
     cwe::Extents actualExtents (cp::getWindowEdgePositions (pos,
 							    geom,
-							    border,
-							    NorthWestGravity));
-
-    EXPECT_EQ (ExpectedExtents, actualExtents);
-}
-
-TEST_F (PlaceGetEdgePositions, GetEdgePositionsStaticGravity)
-{
-    /* Don't count borders in validation */
-    int left = geom.x ();
-    int right = left + (geom.widthIncBorders ());
-    int top = geom.y ();
-    int bottom = top + (geom.heightIncBorders ());
-
-    const cwe::Extents ExpectedExtents (left, right, top, bottom);
-    cwe::Extents actualExtents (cp::getWindowEdgePositions (pos,
-							    geom,
-							    border,
-							    StaticGravity));
+							    border));
 
     EXPECT_EQ (ExpectedExtents, actualExtents);
 }
@@ -527,29 +496,7 @@
 
     cp::subtractBordersFromEdgePositions (modifiedEdgePositions,
 					  borders,
-					  legacyBorder,
-					  NorthWestGravity);
-
-    EXPECT_EQ (expectedEdgePositions, modifiedEdgePositions);
-}
-
-TEST (PlaceSubtractBordersFromEdgePositions, StaticGravityDefinition)
-{
-    const CompWindowExtents borders (1, 2, 3, 4);
-    const CompWindowExtents edgePositions (100, 200, 100, 200);
-    const unsigned int      legacyBorder = 1;
-
-    CompWindowExtents       expectedEdgePositions (edgePositions.left,
-						   edgePositions.right - (2 * legacyBorder),
-						   edgePositions.top,
-						   edgePositions.bottom - (2 * legacyBorder));
-
-    CompWindowExtents       modifiedEdgePositions (edgePositions);
-
-    cp::subtractBordersFromEdgePositions (modifiedEdgePositions,
-					  borders,
-					  legacyBorder,
-					  StaticGravity);
+					  legacyBorder);
 
     EXPECT_EQ (expectedEdgePositions, modifiedEdgePositions);
 }
 
=== modified file 'plugins/place/src/place.cpp'
--- plugins/place/src/place.cpp	2013-06-07 05:51:45 +0000
+++ plugins/place/src/place.cpp	2013-06-29 07:09:28 +0000
@@ -362,8 +362,7 @@
 
     CompWindowExtents edgePositions = cp::getWindowEdgePositions (pos,
 								  geom,
-								  window->border (),
-								  window->sizeHints ().win_gravity);
+								  window->border ());
 
     int      output   = screen->outputDeviceForGeometry (geom);
     CompRect workArea = screen->getWorkareaForOutput (output);
@@ -386,8 +385,7 @@
     /* bring left/right/top/bottom to actual window coordinates */
     cp::subtractBordersFromEdgePositions (edgePositions,
 					  window->border (),
-					  geom.border (),
-					  window->sizeHints ().win_gravity);
+					  geom.border ());
 
     /* always validate position if the application changed only its size,
      * as it might become partially offscreen because of that */
@@ -436,7 +434,9 @@
     if (!mask)
 	return;
 
-    if (source == ClientTypePager)
+    /* Clamp all windows initially on placement */
+    if (window->placed () &&
+	source == ClientTypePager)
 	return;
 
     if (window->state () & CompWindowStateFullscreenMask)
@@ -446,14 +446,16 @@
 			     CompWindowTypeDesktopMask))
 	return;
 
-    /* do nothing if the window was already (at least partially) offscreen */
-    if (window->serverX () < 0                         ||
-	window->serverX () + window->serverWidth () > screen->width () ||
-	window->serverY () < 0                         ||
-	window->serverY () + window->serverHeight () > screen->height ())
-    {
+    /* do nothing if the window was already (at least partially) offscreen
+     * and already placed */
+    bool onscreen =
+	CompRect (0,
+		  0,
+		  screen->width (),
+		  screen->height ()).contains (window->geometry ());
+
+    if (window->placed () && !onscreen)
 	return;
-    }
 
     if (hasUserDefinedPosition (false))
 	/* try to keep the window position intact for USPosition -
@@ -1143,13 +1145,10 @@
 PlaceWindow::constrainToWorkarea (const CompRect &workArea,
 				  CompPoint      &pos)
 {
-    bool staticGravity = window->sizeHints ().win_gravity & StaticGravity;
-
     pos = cp::constrainPositionToWorkArea (pos,
                                            window->serverGeometry (),
                                            window->border (),
-                                           workArea,
-                                           staticGravity);
+                                           workArea);
 
 }
 
 
=== modified file 'src/event.cpp'
--- src/event.cpp	2013-03-19 10:00:10 +0000
+++ src/event.cpp	2013-06-29 07:09:28 +0000
@@ -1343,8 +1343,13 @@
 	     * that to wait until the map request */
 	    if (wa.root == privateScreen.rootWindow())
 	    {
-		PrivateWindow::createCompWindow (CompWindowToWindow (getTopWindow ()), CompWindowToWindow (getTopServerWindow ()), wa, event->xcreatewindow.window);
-            }
+		Window top = CompWindowToWindow (getTopWindow ());
+		Window topServer = CompWindowToWindow (getTopServerWindow ());
+		PrivateWindow::createCompWindow (top,
+						 topServer,
+						 wa,
+						 event->xcreatewindow.window);
+	    }
 	    else
 		XSelectInput (privateScreen.dpy, event->xcreatewindow.window,
 			      FocusChangeMask);
 
=== modified file 'src/plugin.cpp'
--- src/plugin.cpp	2013-06-22 14:47:34 +0000
+++ src/plugin.cpp	2013-06-29 07:09:28 +0000
@@ -31,6 +31,8 @@
 #include <boost/scoped_array.hpp>
 #include <boost/foreach.hpp>
 
+#include <boost/algorithm/string.hpp>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -424,8 +426,19 @@
 
     if (compiz_plugin_dir_override)
     {
-	if (loaderLoadPlugin (p.get (), compiz_plugin_dir_override, name))
-	    return p.release ();
+	std::vector <std::string> paths;
+	boost::split (paths,
+		      compiz_plugin_dir_override,
+		      boost::is_any_of (":"));
+
+	foreach (const std::string &path, paths)
+	{
+	    if (path.empty ())
+		continue;
+
+	    if (loaderLoadPlugin (p.get (), path.c_str (), name))
+		return p.release ();
+	}
     }
 
     if (char* home = getenv ("HOME"))
 
=== modified file 'src/plugin/tests/test-plugin.cpp'
--- src/plugin/tests/test-plugin.cpp	2013-05-28 23:36:08 +0000
+++ src/plugin/tests/test-plugin.cpp	2013-06-29 07:09:28 +0000
@@ -182,6 +182,46 @@
     CompPlugin::unload(cp);
 }
 
+TEST_F (PluginTest, load_plugin_from_multi_COMPIZ_PLUGIN_DIR_env_succeeds)
+{
+    std::string COMPIZ_PLUGIN_DIR_PART1 = "/path/to/plugin/dir";
+    std::string COMPIZ_PLUGIN_DIR_PART2 = "/dir/plugin/to/path";
+    std::string COMPIZ_PLUGIN_DIR_VALUE = COMPIZ_PLUGIN_DIR_PART1 + ":" +
+					  COMPIZ_PLUGIN_DIR_PART2;
+    TmpEnv env ("COMPIZ_PLUGIN_DIR", COMPIZ_PLUGIN_DIR_VALUE.c_str ());
+
+    using namespace testing;
+
+    EXPECT_CALL(mockfs, LoadPlugin(_,
+				   EndsWith(COMPIZ_PLUGIN_DIR_PART1),
+				   StrEq("dummy"))).
+	WillOnce(Return(false));
+
+    EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0),
+				   StrEq(COMPIZ_PLUGIN_DIR_PART2),
+				   StrEq("dummy"))).
+	WillOnce(Return(true));
+
+    EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0),
+				   EndsWith(HOME_PLUGINDIR), StrEq("dummy"))).
+	Times(AtMost(0));
+
+    EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0),
+				   EndsWith(PLUGINDIR), StrEq("dummy"))).
+	Times(AtMost(0));
+
+    EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0),
+				   Eq((void*)0), StrEq("dummy"))).
+	    Times(AtMost(0));
+
+    EXPECT_CALL(mockfs, UnloadPlugin(_)).Times(1);
+
+    CompPlugin* cp = CompPlugin::load("dummy");
+    ASSERT_NE((void*)0, cp);
+
+    CompPlugin::unload(cp);
+}
+
 TEST_F (PluginTest, load_plugin_from_void_succeeds)
 {
     using namespace testing;
 
=== modified file 'src/window.cpp'
--- src/window.cpp	2013-05-27 16:19:59 +0000
+++ src/window.cpp	2013-06-29 07:09:28 +0000
@@ -2884,17 +2884,21 @@
 
     int m = mask & ~saveMask;
 
+    /* The saved window geometry is always saved in terms of the non-decorated
+     * geometry as we may need to restore it with a different decoration size */
     if (m & CWX)
-	saveWc.x = serverGeometry.x ();
+	saveWc.x = serverGeometry.x () - window->border ().left;
 
     if (m & CWY)
-	saveWc.y = serverGeometry.y ();
+	saveWc.y = serverGeometry.y () - window->border ().top;
 
     if (m & CWWidth)
-	saveWc.width = serverGeometry.width ();
+	saveWc.width = serverGeometry.width () + (window->border ().left +
+						  window->border ().right);
 
     if (m & CWHeight)
-	saveWc.height = serverGeometry.height ();
+	saveWc.height = serverGeometry.height () + (window->border ().top +
+						    window->border ().bottom);
 
     if (m & CWBorderWidth)
 	saveWc.border_width = serverGeometry.border ();
@@ -2909,44 +2913,18 @@
     int m = mask & saveMask;
 
     if (m & CWX)
-	xwc->x = saveWc.x;
+	xwc->x = saveWc.x + window->border ().left;
 
     if (m & CWY)
-	xwc->y = saveWc.y;
+	xwc->y = saveWc.y + window->border ().top;
 
     if (m & CWWidth)
-    {
-	xwc->width = saveWc.width;
-
-	/* This is not perfect but it works OK for now. If the saved width is
-	   the same as the current width then make it a little be smaller so
-	   the user can see that it changed and it also makes sure that
-	   windowResizeNotify is called and plugins are notified.
-	   TODO: Eliminate these arbitrary magic numbers here */
-	if (xwc->width == (int) serverGeometry.width ())
-	{
-	    xwc->width -= 10;
-
-	    if (m & CWX)
-		xwc->x += 5;
-	}
-    }
+	xwc->width = saveWc.width - (window->border ().left +
+				     window->border ().right);
 
     if (m & CWHeight)
-    {
-	xwc->height = saveWc.height;
-
-	/* As above, if the saved height is the same as the current height
-	   then make it a little be smaller.
-	   TODO: As above, find a better solution without magic numbers here */
-	if (xwc->height == (int) serverGeometry.height ())
-	{
-	    xwc->height -= 10;
-
-	    if (m & CWY)
-		xwc->y += 5;
-	}
-    }
+	xwc->height = saveWc.height - (window->border ().top +
+				       window->border ().bottom);
 
     if (m & CWBorderWidth)
 	xwc->border_width = saveWc.border_width;
@@ -5493,8 +5471,8 @@
 	unsigned int   xwcm;
 
 	/* adjust for gravity, but only for frame size */
-	xwc.x      = priv->serverGeometry.x ();
-	xwc.y      = priv->serverGeometry.y ();
+	xwc.x      = priv->serverGeometry.x () - priv->border.left;
+	xwc.y      = priv->serverGeometry.y () - priv->border.top;
 	xwc.width  = 0;
 	xwc.height = 0;
 
@@ -5503,6 +5481,9 @@
 	xwc.width  = priv->serverGeometry.width ();
 	xwc.height = priv->serverGeometry.height ();
 
+	/* Validate size */
+	xwcm |= CWWidth | CWHeight;
+
 	window->validateResizeRequest (xwcm, &xwc, ClientTypeApplication);
 
 	CompPoint pos (xwc.x, xwc.y);
@@ -6605,24 +6586,39 @@
 	priv->border.top    != b->top		||
 	priv->border.bottom != b->bottom)
     {
+	CompPoint movement =
+	    compiz::window::extents::shift (*b,
+					    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)));
+
 	priv->serverInput = *i;
 	priv->border      = *b;
 
+	/* Offset client for any new decoration size */
+	XWindowChanges xwc;
+
+	xwc.x = movement.x () + priv->serverGeometry.x ();
+	xwc.y = movement.y () + priv->serverGeometry.y ();
+	xwc.width = sizeDelta.width () + priv->serverGeometry.width ();
+	xwc.height = sizeDelta.height () + priv->serverGeometry.height ();
+
+	configureXWindow (CWX | CWY | CWWidth | CWHeight, &xwc);
+
+	windowNotify (CompWindowNotifyFrameUpdate);
 	recalcActions ();
 
-	bool sizeUpdated = false;
-
-	sizeUpdated |= priv->updateSize ();
-	sizeUpdated |= priv->updateFrameWindow ();
-
 	/* Always send a moveNotify
 	 * whenever the frame extents update
 	 * so that plugins can re-position appropriately */
 	moveNotify (0, 0, true);
 
 	/* Once we have updated everything, re-set lastServerInput */
-	if (sizeUpdated)
-	    priv->lastServerInput = priv->serverInput;
+	priv->lastServerInput = priv->serverInput;
     }
 
     /* Use b for _NET_WM_FRAME_EXTENTS here because
@@ -6746,11 +6742,28 @@
     /* Gravity here is assumed to be SouthEast, clients can update
      * that if need be */
 
+    serverFrameGeometry.set (serverInput.left - border.left,
+			     serverInput.top - border.top,
+			     wa.width + (serverInput.left +
+					 serverInput.right),
+			     wa.height + (serverInput.top +
+					  serverInput.bottom),
+			     0);
+
     /* Awaiting a new frame to be given to us */
     frame       = None;
-    serverFrame = XCreateWindow (dpy, screen->root (), 0, 0,
-				 wa.width, wa.height, 0, wa.depth,
-				 InputOutput, visual, mask, &attr);
+    serverFrame = XCreateWindow (dpy,
+				 screen->root (),
+				 serverFrameGeometry.x (),
+				 serverFrameGeometry.y (),
+				 serverFrameGeometry.width (),
+				 serverFrameGeometry.height (),
+				 serverFrameGeometry.border (),
+				 wa.depth,
+				 InputOutput,
+				 visual,
+				 mask,
+				 &attr);
 
     /* Do not get any events from here on */
     XSelectInput (dpy, screen->root (), NoEventMask);
@@ -6758,11 +6771,16 @@
     /* If we have some frame extents, we should apply them here and
      * set lastFrameExtents */
     wrapper = XCreateWindow (dpy, serverFrame,
-			    serverInput.left, serverInput.top,
-			    wa.width - (serverInput.left + serverInput.right),
-			    wa.height - (serverInput.top + serverInput.bottom),
-			    0, wa.depth,
-			    InputOutput, visual, mask, &attr);
+			     serverInput.left,
+			     serverInput.top,
+			     wa.width,
+			     wa.height,
+			     0,
+			     wa.depth,
+			     InputOutput,
+			     visual,
+			     mask,
+			     &attr);
 
     lastServerInput = serverInput;
     xwc.stack_mode  = Above;
@@ -6836,11 +6854,6 @@
     attr.event_mask = SubstructureRedirectMask | SubstructureNotifyMask |
 		      EnterWindowMask          | LeaveWindowMask;
 
-    serverFrameGeometry = serverGeometry;
-
-    XMoveResizeWindow (dpy, serverFrame, serverFrameGeometry.x (), serverFrameGeometry.y (),
-		       serverFrameGeometry.width (), serverFrameGeometry.height ());
-
     XChangeWindowAttributes (dpy, serverFrame, CWEventMask, &attr);
     XChangeWindowAttributes (dpy, wrapper, CWEventMask, &attr);
 
 
=== modified file 'src/window/extents/src/windowextents.cpp'
--- src/window/extents/src/windowextents.cpp	2013-06-07 05:51:45 +0000
+++ src/window/extents/src/windowextents.cpp	2013-06-29 07:09:28 +0000
@@ -35,6 +35,11 @@
     CompPoint rv = CompPoint ();
 
     switch (gravity) {
+	/* We treat StaticGravity like NorthWestGravity here
+	 * as when decorating / undecorating the window we
+	 * really do need to move it in order to handle
+	 * any cases where it goes offscreen */
+	case StaticGravity:
 	case NorthGravity:
 	case NorthWestGravity:
 	case NorthEastGravity:
@@ -50,6 +55,11 @@
     }
 
     switch (gravity) {
+	/* We treat StaticGravity like NorthWestGravity here
+	 * as when decorating / undecorating the window we
+	 * really do need to move it in order to handle
+	 * any cases where it goes offscreen */
+	case StaticGravity:
 	case WestGravity:
 	case NorthWestGravity:
 	case SouthWestGravity:
 
=== added file 'tests/manual/README.txt'
--- tests/manual/README.txt	1970-01-01 00:00:00 +0000
+++ tests/manual/README.txt	2013-06-29 07:09:28 +0000
@@ -0,0 +1,9 @@
+Compiz Manual Tests
+===================
+
+Avoid writing manual tests if you can. Acceptance tests that can be run
+on an automatic basis are always preferred.
+
+If getting some part of the code would be too difficult or invasive, then
+write a manual test in here so that we can remind ourselves to deploy test
+frameworks for the code in quesiton.
 
=== added file 'tests/manual/plugins/decor.txt'
--- tests/manual/plugins/decor.txt	1970-01-01 00:00:00 +0000
+++ tests/manual/plugins/decor.txt	2013-06-29 07:09:28 +0000
@@ -0,0 +1,40 @@
+COMPIZ DECOR PLUGIN
+===================
+Sam Spilsbury <[e-mail]>
+
+Static Gravity Handling - no decorations
+----------------------------------------
+Setup:
+# Install guake
+
+Actions:
+# Start and launch guake
+
+Expected Result:
+  Guake should sit flush with the panels and work area
+
+Static Gravity Handling - decorations
+-------------------------------------
+Setup:
+# Install friends-app
+
+Actions:
+# Start and launch friends-app
+
+Expected Result:
+  The QML window should have its decorations visible and
+  be contained in the top left hand corner of the work area
+
+_NET_REQUEST_FRAME_EXTENTS handling
+-----------------------------------
+Setup:
+# Install any sun-awt application - examples:
+  1. netbeans
+  2. ecplise
+
+Actions:
+# Run the application
+
+Expected Result:
+  The application should not have its contents offset
+  by its decoration size
 
=== 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-06-22 12:27:36 +0000
+++ tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp	2013-06-29 07:09:28 +0000
@@ -44,6 +44,11 @@
 using ::testing::MatchResultListener;
 using ::testing::MakeMatcher;
 using ::testing::Matcher;
+using ::testing::_;
+
+using ::compiz::testing::HasGeometry;
+using ::compiz::testing::RelativeWindowGeometry;
+using ::compiz::testing::AbsoluteWindowGeometry;
 
 namespace ct = compiz::testing;
 
@@ -191,7 +196,6 @@
 	void SendConfigureLockRequest (Window w, bool lockRequests);
 	bool VerifyConfigureResponse (Window w, int x, int y, int width, int height);
 	bool VerifySetFrameExtentsResponse (Window w, int left, int right, int top, int bottom);
-	bool VerifyWindowSize (Window w, int x, int y, int width, int height);
 
 	/* Helper functions for the Create*WindowOverrideRedirect* tests */
 	Window GrabAndCreateWindowWithAttrs (::Display *dpy,
@@ -204,7 +208,7 @@
     protected:
 
 	ReparentedWindow CreateWindow (::Display *);
-	int GetEventMask ();
+	int GetEventMask () const;
 
     private:
 
@@ -212,7 +216,7 @@
 };
 
 int
-CompizXorgSystemConfigureWindowTest::GetEventMask ()
+CompizXorgSystemConfigureWindowTest::GetEventMask () const
 {
     return ct::AutostartCompizXorgSystemTestWithTestHelper::GetEventMask () |
 	    SubstructureNotifyMask;
@@ -336,28 +340,6 @@
     return false;
 }
 
-bool
-CompizXorgSystemConfigureWindowTest::VerifyWindowSize (Window w,
-						       int x,
-						       int y,
-						       int width,
-						       int height)
-{
-    ::Display *dpy = Display ();
-
-    int          xRet, yRet;
-    unsigned int widthRet, heightRet;
-    if (!QueryGeometry (dpy, w, xRet, yRet, widthRet, heightRet))
-	return false;
-
-    EXPECT_EQ (x, xRet);
-    EXPECT_EQ (y, yRet);
-    EXPECT_EQ (width, widthRet);
-    EXPECT_EQ (height, heightRet);
-
-    return true;
-}
-
 ReparentedWindow
 CompizXorgSystemConfigureWindowTest::CreateWindow (::Display *dpy)
 {
@@ -385,7 +367,13 @@
     ASSERT_TRUE (VerifyConfigureResponse (w.client, x, y, width, height));
 
     /* Query the window size again */
-    ASSERT_TRUE (VerifyWindowSize (w.frame, x, y, width, height));
+    ASSERT_THAT (w.frame, HasGeometry (dpy,
+				       RelativeWindowGeometry,
+				       x,
+				       y,
+				       width,
+				       height,
+				       _));
 
 }
 
@@ -410,7 +398,13 @@
     ASSERT_TRUE (VerifySetFrameExtentsResponse (w.client, left, right, top, bottom));
 
     /* Client geometry is always unchanged */
-    ASSERT_TRUE (VerifyWindowSize (w.client, x, y, width, height));
+    ASSERT_THAT (w.client, HasGeometry (dpy,
+					RelativeWindowGeometry,
+					x,
+					y,
+					width,
+					height,
+				       _));
 
     /* Frame geometry is frame geometry offset by extents */
     x -= left;
@@ -418,7 +412,13 @@
     width += left + right;
     height += top + bottom;
 
-    ASSERT_TRUE (VerifyWindowSize (w.frame, x, y, width, height));
+    ASSERT_THAT (w.frame, HasGeometry (dpy,
+				       RelativeWindowGeometry,
+				       x,
+				       y,
+				       width,
+				       height,
+				       _));
 }
 
 TEST_F (CompizXorgSystemConfigureWindowTest, MoveFrameLocked)
@@ -448,11 +448,13 @@
     ASSERT_TRUE (VerifyConfigureResponse (w.client, x, y, width, height));
 
     /* Query the window size again - it should be the same */
-    ASSERT_TRUE (VerifyWindowSize (w.frame,
-				   currentX,
-				   currentY,
-				   currentWidth,
-				   currentHeight));
+    ASSERT_THAT (w.frame, HasGeometry (dpy,
+				       RelativeWindowGeometry,
+				       currentX,
+				       currentY,
+				       currentWidth,
+				       currentHeight,
+				       _));
 
 
     SendConfigureLockRequest (w.client, false);
@@ -510,11 +512,13 @@
     SendConfigureLockRequest (w.client, false);
 
     /* Query the window size again - it should be the same */
-    ASSERT_TRUE (VerifyWindowSize (w.frame,
-				   currentX,
-				   currentY,
-				   width,
-				   height));
+    ASSERT_THAT (w.frame, HasGeometry (dpy,
+				       RelativeWindowGeometry,
+				       currentX,
+				       currentY,
+				       width,
+				       height,
+				       _));
 }
 
 TEST_F (CompizXorgSystemConfigureWindowTest, SetFrameExtentsLocked)
@@ -562,11 +566,13 @@
     SendConfigureLockRequest (w.client, false);
 
     /* Query the window size again - it should be the same */
-    ASSERT_TRUE (VerifyWindowSize (w.frame,
-				   currentX - left,
-				   currentY - top,
-				   currentWidth + (left + right),
-				   currentHeight + (top + bottom)));
+    ASSERT_THAT (w.frame, HasGeometry (dpy,
+				       RelativeWindowGeometry,
+				       currentX - left,
+				       currentY - top,
+				       currentWidth + (left + right),
+				       currentHeight + (top + bottom),
+				       _));
 }
 
 /* Check that changing the frame extents by one on each side
@@ -598,11 +604,13 @@
     /* Wrapper geometry is extents.xy, size.wh */
     Window root;
     Window wrapper = ct::GetImmediateParent (dpy, w.client, root);
-    ASSERT_TRUE (VerifyWindowSize (wrapper,
-				   left,
-				   top,
-				   currentWidth,
-				   currentHeight));
+    ASSERT_THAT (wrapper, HasGeometry (dpy,
+				       RelativeWindowGeometry,
+				       left,
+				       top,
+				       currentWidth,
+				       currentHeight,
+				       _));
 }
 
 TEST_F (CompizXorgSystemConfigureWindowTest, SetFrameExtentsUnmapped)
@@ -632,11 +640,13 @@
     SendSetFrameExtentsRequest (client, left, right, top, bottom);
     ASSERT_TRUE (VerifySetFrameExtentsResponse (client, left, right, top, bottom));
 
-    ASSERT_TRUE (VerifyWindowSize (client,
-				   currentX,
-				   currentY,
-				   currentWidth,
-				   currentHeight));
+    ASSERT_THAT (client, HasGeometry (dpy,
+				      RelativeWindowGeometry,
+				      currentX,
+				      currentY,
+				      currentWidth,
+				      currentHeight,
+				      _));
 }
 
 TEST_F (CompizXorgSystemConfigureWindowTest, SetFrameExtentsCorrectMapBehaviour)
@@ -670,20 +680,24 @@
 
     /* Check the geometry of the frame */
     Window frame = GetTopParent (dpy, client);
-    ASSERT_TRUE (VerifyWindowSize (frame,
-				   currentX,
-				   currentY,
-				   currentWidth + (left + right),
-				   currentHeight + (top + bottom)));
+    ASSERT_THAT (frame, HasGeometry (dpy,
+				     RelativeWindowGeometry,
+				     currentX - left,
+				     currentY - top,
+				     currentWidth + (left + right),
+				     currentHeight + (top + bottom),
+				     _));
 
     /* Wrapper geometry is extents.xy, size.wh */
     Window root;
     Window wrapper = ct::GetImmediateParent (dpy, client, root);
-    ASSERT_TRUE (VerifyWindowSize (wrapper,
-				   left,
-				   top,
-				   currentWidth,
-				   currentHeight));
+    ASSERT_THAT (wrapper, HasGeometry (dpy,
+				       RelativeWindowGeometry,
+				       left,
+				       top,
+				       currentWidth,
+				       currentHeight,
+				       _));
 }
 
 TEST_F (CompizXorgSystemConfigureWindowTest, SetFrameExtentsConsistentBehaviourAfterMap)
@@ -725,20 +739,24 @@
 
     /* Check the geometry of the frame */
     Window frame = GetTopParent (dpy, client);
-    ASSERT_TRUE (VerifyWindowSize (frame,
-				   currentX,
-				   currentY,
-				   currentWidth + (left + right),
-				   currentHeight + (top + bottom)));
+    ASSERT_THAT (frame, HasGeometry (dpy,
+				     RelativeWindowGeometry,
+				     currentX - left,
+				     currentY - top,
+				     currentWidth + (left + right),
+				     currentHeight + (top + bottom),
+				     _));
 
     /* Wrapper geometry is extents.xy, size.wh */
     Window root;
     Window wrapper = ct::GetImmediateParent (dpy, client, root);
-    ASSERT_TRUE (VerifyWindowSize (wrapper,
-				   left,
-				   top,
-				   currentWidth,
-				   currentHeight));
+    ASSERT_THAT (wrapper, HasGeometry (dpy,
+				       RelativeWindowGeometry,
+				       left,
+				       top,
+				       currentWidth,
+				       currentHeight,
+				       _));
 }
 
 
 
=== modified file 'tests/xorg-gtest/CMakeLists.txt'
--- tests/xorg-gtest/CMakeLists.txt	2013-06-10 08:43:28 +0000
+++ tests/xorg-gtest/CMakeLists.txt	2013-06-29 07:09:28 +0000
@@ -4,7 +4,8 @@
 set (COMPIZ_XORG_GTEST_COMMUNICATOR_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/communicator CACHE PATH "" FORCE)
 set (COMPIZ_XORG_GTEST_COMMUNICATOR_LIBRARY_DIRS ${CMAKE_CURRENT_BINARY_DIR}/communicator CACHE PATH "" FORCE)
 set (COMPIZ_XORG_GTEST_COMMUNICATOR_LIBRARY compiz_xorg_gtest_communicator CACHE STRING "" FORCE)
-set (COMPIZ_OVERRIDE_PLUGIN_PATH ${CMAKE_CURRENT_BINARY_DIR}/plugins/testhelper)
+set (COMPIZ_TEST_ONLY_PLUGIN_PATH ${CMAKE_CURRENT_BINARY_DIR}/plugins/)
+set (COMPIZ_REAL_PLUGIN_PATH ${CMAKE_BINARY_DIR}/plugins/)
 
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/compiz-xorg-gtest-config.h.in
 		${CMAKE_CURRENT_BINARY_DIR}/src/compiz-xorg-gtest-config.h
 
=== modified file 'tests/xorg-gtest/include/compiz-xorg-gtest.h'
--- tests/xorg-gtest/include/compiz-xorg-gtest.h	2013-06-22 12:27:36 +0000
+++ tests/xorg-gtest/include/compiz-xorg-gtest.h	2013-06-29 07:09:28 +0000
@@ -30,6 +30,7 @@
 
 using ::testing::MatcherInterface;
 using ::testing::MatchResultListener;
+using ::testing::Matcher;
 
 namespace compiz
 {
@@ -143,6 +144,62 @@
 						 const XEventMatcher &matcher,
 						 int                 timeout = 0);
 
+	void RelativeWindowGeometry (Display      *dpy,
+				     Window       w,
+				     int          &x,
+				     int          &y,
+				     unsigned int &width,
+				     unsigned int &height,
+				     unsigned int &border);
+
+	void AbsoluteWindowGeometry (::Display    *display,
+				     Window       window,
+				     int          &x,
+				     int          &y,
+				     unsigned int &width,
+				     unsigned int &height,
+				     unsigned int &border);
+
+	typedef void (*RetrievalFunc) (Display      *dpy,
+				       Window       window,
+				       int          &x,
+				       int          &y,
+				       unsigned int &width,
+				       unsigned int &height,
+				       unsigned int &border);
+
+	class WindowGeometryMatcher :
+	    public MatcherInterface <Window>
+	{
+	    public:
+
+		WindowGeometryMatcher (Display             *dpy,
+				       RetrievalFunc       func,
+				       const Matcher <int> &x,
+				       const Matcher <int> &y,
+				       const Matcher <unsigned int> &width,
+				       const Matcher <unsigned int> &height,
+				       const Matcher <unsigned int> &border);
+
+		bool MatchAndExplain (Window x, MatchResultListener *listener) const;
+		void DescribeTo (std::ostream *os) const;
+
+	    private:
+
+		class Private;
+
+		std::auto_ptr <Private> priv;
+	};
+
+	Matcher <Window>
+	HasGeometry (Display             *dpy,
+		     RetrievalFunc       func,
+		     const Matcher <int> &x,
+		     const Matcher <int> &y,
+		     const Matcher <unsigned int> &width,
+		     const Matcher <unsigned int> &height,
+		     const Matcher <unsigned int> &border);
+
 	class PrivateCompizProcess;
 	class CompizProcess
 	{
@@ -154,7 +211,26 @@
 		    ExpectStartupFailure = (1 << 2)
 		} StartupFlags;
 
-		typedef std::vector <std::string> PluginList;
+		typedef enum _PluginType
+		{
+		    Real = 0,
+		    TestOnly = 1
+		} PluginType;
+
+		struct Plugin
+		{
+		    Plugin (const char *name,
+			    PluginType type) :
+			name (name),
+			type (type)
+		    {
+		    }
+
+		    std::string name;
+		    PluginType  type;
+		};
+
+		typedef std::vector <Plugin> PluginList;
 
 		CompizProcess (Display *dpy,
 			       StartupFlags,
@@ -196,7 +272,7 @@
 		AutostartCompizXorgSystemTest ();
 
 		virtual CompizProcess::StartupFlags GetStartupFlags ();
-		virtual int GetEventMask ();
+		virtual int GetEventMask () const;
 		virtual CompizProcess::PluginList GetPluginList ();
 		virtual void SetUp ();
 
@@ -222,7 +298,7 @@
 		std::vector <long> WaitForWindowCreation (Window w);
 		bool IsOverrideRedirect (std::vector <long> &data);
 
-		virtual int  GetEventMask ();
+		virtual int  GetEventMask () const;
 
 	    private:
 
 
=== modified file 'tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp'
--- tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp	2013-05-09 13:43:07 +0000
+++ tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp	2013-06-29 07:09:28 +0000
@@ -141,14 +141,11 @@
 void
 TestHelperWindow::setFrameExtentsAndReport (long *data)
 {
-    CompWindowExtents input;
-
-    input.left = data[0];
-    input.right = data[1];
-    input.top = data[2];
-    input.bottom = data[3];
-
-    window->setWindowFrameExtents (&input, &input);
+    /* Only change the frame input and not the border */
+    CompWindowExtents input (data[0], data[1], data[2], data[3]);
+    CompWindowExtents border (0, 0, 0, 0);
+
+    window->setWindowFrameExtents (&border, &input);
 
     std::vector <long> response;
 
 
=== modified file 'tests/xorg-gtest/src/compiz-xorg-gtest-config.h.in'
--- tests/xorg-gtest/src/compiz-xorg-gtest-config.h.in	2013-02-14 05:57:39 +0000
+++ tests/xorg-gtest/src/compiz-xorg-gtest-config.h.in	2013-06-29 07:09:28 +0000
@@ -27,7 +27,8 @@
 {
     const std::string compizLDLibraryPath ("@COMPIZ_LD_LIBRARY_PATH@");
     const std::string compizBinaryPath ("@COMPIZ_BINARY@");
-    const std::string compizOverridePluginPath ("@COMPIZ_OVERRIDE_PLUGIN_PATH@");
+    const std::string compizTestOnlyPluginPath ("@COMPIZ_TEST_ONLY_PLUGIN_PATH@");
+    const std::string compizRealPluginPath ("@COMPIZ_REAL_PLUGIN_PATH@");
 }
 
 #endif
 
=== modified file 'tests/xorg-gtest/src/compiz-xorg-gtest.cpp'
--- tests/xorg-gtest/src/compiz-xorg-gtest.cpp	2013-06-22 12:27:36 +0000
+++ tests/xorg-gtest/src/compiz-xorg-gtest.cpp	2013-06-29 07:09:28 +0000
@@ -38,8 +38,10 @@
 
 #include "compiz-xorg-gtest-config.h"
 
+using ::testing::MakeMatcher;
 using ::testing::MatchResultListener;
 using ::testing::MatcherInterface;
+using ::testing::Matcher;
 
 namespace ct = compiz::testing;
 namespace
@@ -512,6 +514,161 @@
 {
 }
 
+void ct::RelativeWindowGeometry (Display      *dpy,
+				 Window       w,
+				 int          &x,
+				 int          &y,
+				 unsigned int &width,
+				 unsigned int &height,
+				 unsigned int &border)
+{
+    Window       root;
+    unsigned int depth;
+
+    if (!XGetGeometry (dpy, w, &root, &x, &y, &width, &height, &border, &depth))
+	throw std::logic_error ("XGetGeometry failed");
+}
+
+void ct::AbsoluteWindowGeometry (Display      *display,
+				 Window       window,
+				 int          &x,
+				 int          &y,
+				 unsigned int &width,
+				 unsigned int &height,
+				 unsigned int &border)
+{
+    Window       root;
+    Window       child;
+    unsigned int depth;
+
+    if (!XGetGeometry (display, window, &root,
+		       &x, &y, &width, &height,
+		       &border, &depth))
+	throw std::logic_error ("XGetGeometry failed");
+
+    if (!XTranslateCoordinates (display, window, root, x, y,
+				&x, &y, &child))
+	throw std::logic_error ("XTranslateCoordinates failed");
+}
+
+class ct::WindowGeometryMatcher::Private
+{
+    public:
+
+	Private (Display                      *dpy,
+		 ct::RetrievalFunc            func,
+		 const Matcher <int>          &x,
+		 const Matcher <int>          &y,
+		 const Matcher <unsigned int> &width,
+		 const Matcher <unsigned int> &height,
+		 const Matcher <unsigned int> &border);
+
+	Display       *mDpy;
+
+	RetrievalFunc mFunc;
+
+	Matcher <int> mX;
+	Matcher <int> mY;
+	Matcher <unsigned int> mWidth;
+	Matcher <unsigned int> mHeight;
+	Matcher <unsigned int> mBorder;
+};
+
+Matcher <Window>
+ct::HasGeometry (Display             *dpy,
+		 RetrievalFunc       func,
+		 const Matcher <int> &x,
+		 const Matcher <int> &y,
+		 const Matcher <unsigned int> &width,
+		 const Matcher <unsigned int> &height,
+		 const Matcher <unsigned int> &border)
+{
+    return MakeMatcher (new WindowGeometryMatcher (dpy,
+						   func,
+						   x,
+						   y,
+						   width,
+						   height,
+						   border));
+}
+
+ct::WindowGeometryMatcher::WindowGeometryMatcher (Display             *dpy,
+						  RetrievalFunc       func,
+						  const Matcher <int> &x,
+						  const Matcher <int> &y,
+						  const Matcher <unsigned int> &width,
+						  const Matcher <unsigned int> &height,
+						  const Matcher <unsigned int> &border) :
+    priv (new Private (dpy, func, x, y, width, height, border))
+{
+}
+
+ct::WindowGeometryMatcher::Private::Private (Display             *dpy,
+					     RetrievalFunc       func,
+					     const Matcher <int> &x,
+					     const Matcher <int> &y,
+					     const Matcher <unsigned int> &width,
+					     const Matcher <unsigned int> &height,
+					     const Matcher <unsigned int> &border):
+    mDpy (dpy),
+    mFunc (func),
+    mX (x),
+    mY (y),
+    mWidth (width),
+    mHeight (height),
+    mBorder (border)
+{
+}
+
+bool
+ct::WindowGeometryMatcher::MatchAndExplain (Window w,
+					    MatchResultListener *listener) const
+{
+    int          x, y;
+    unsigned int width, height, border;
+
+    priv->mFunc (priv->mDpy, w, x, y, width, height, border);
+
+    bool match = priv->mX.MatchAndExplain (x, listener) &&
+		 priv->mY.MatchAndExplain (y, listener) &&
+		 priv->mWidth.MatchAndExplain (width, listener) &&
+		 priv->mHeight.MatchAndExplain (height, listener) &&
+		 priv->mBorder.MatchAndExplain (border, listener);
+
+    if (!match)
+    {
+	*listener << "Geometry:"
+		  << " x: " << x
+		  << " y: " << y
+		  << " width: " << width
+		  << " height: " << height
+		  << " border: " << border;
+    }
+
+    return match;
+}
+
+void
+ct::WindowGeometryMatcher::DescribeTo (std::ostream *os) const
+{
+    *os << "Window geometry matching :";
+
+    *os << std::endl << " - ";
+    priv->mX.DescribeTo (os);
+
+    *os << std::endl << " - ";
+    priv->mY.DescribeTo (os);
+
+    *os << std::endl << " - ";
+    priv->mWidth.DescribeTo (os);
+
+    *os << std::endl << " - ";
+    priv->mHeight.DescribeTo (os);
+
+    *os << std::endl << " - ";
+    priv->mBorder.DescribeTo (os);
+}
+
 class ct::PrivateCompizProcess
 {
     public:
@@ -530,6 +687,9 @@
 	ct::CompizProcess::StartupFlags mFlags;
 	bool                            mIsRunning;
 	xorg::testing::Process          mProcess;
+
+	std::string                     mPluginPaths;
+	std::auto_ptr <TmpEnv>          mPluginPathsEnv;
 };
 
 void
@@ -564,6 +724,26 @@
     XSelectInput (dpy, root, attrib.your_event_mask);
 }
 
+namespace
+{
+std::string PathForPlugin (const std::string             &name,
+			   ct::CompizProcess::PluginType type)
+{
+    switch (type)
+    {
+	case ct::CompizProcess::Real:
+	    return compizRealPluginPath + name;
+	case ct::CompizProcess::TestOnly:
+	    return compizTestOnlyPluginPath + name;
+	default:
+	    throw std::logic_error ("Incorrect value for type");
+    }
+
+    return "";
+}
+
+}
+
 ct::CompizProcess::CompizProcess (::Display                           *dpy,
 				  ct::CompizProcess::StartupFlags     flags,
 				  const ct::CompizProcess::PluginList &plugins,
@@ -579,11 +759,17 @@
 
     args.push_back ("--send-startup-message");
 
-    /* Copy in plugin list */
+    /* Copy in plugin list and set environment variables */
     for (ct::CompizProcess::PluginList::const_iterator it = plugins.begin ();
 	 it != plugins.end ();
 	 ++it)
-	args.push_back (*it);
+    {
+	priv->mPluginPaths += PathForPlugin (it->name, it->type) + ":";
+	args.push_back (it->name);
+    }
+
+    priv->mPluginPathsEnv.reset (new TmpEnv ("COMPIZ_PLUGIN_DIR",
+					     priv->mPluginPaths.c_str ()));
 
     priv->mProcess.Start (compizBinaryPath, args);
     EXPECT_EQ (priv->mProcess.GetState (), xorg::testing::Process::RUNNING);
@@ -703,14 +889,6 @@
 
 class ct::PrivateAutostartCompizXorgSystemTest
 {
-    public:
-
-	PrivateAutostartCompizXorgSystemTest () :
-	    overridePluginDirEnv ("COMPIZ_PLUGIN_DIR", compizOverridePluginPath.c_str ())
-	{
-	}
-
-	TmpEnv overridePluginDirEnv;
 };
 
 ct::AutostartCompizXorgSystemTest::AutostartCompizXorgSystemTest () :
@@ -727,7 +905,7 @@
 }
 
 int
-ct::AutostartCompizXorgSystemTest::GetEventMask ()
+ct::AutostartCompizXorgSystemTest::GetEventMask () const
 {
     return 0;
 }
@@ -805,7 +983,7 @@
 }
 
 int
-ct::AutostartCompizXorgSystemTestWithTestHelper::GetEventMask ()
+ct::AutostartCompizXorgSystemTestWithTestHelper::GetEventMask () const
 {
     return AutostartCompizXorgSystemTest::GetEventMask () |
 	   StructureNotifyMask;
@@ -837,6 +1015,7 @@
 ct::AutostartCompizXorgSystemTestWithTestHelper::GetPluginList ()
 {
     ct::CompizProcess::PluginList list;
-    list.push_back ("testhelper");
+    list.push_back (ct::CompizProcess::Plugin ("testhelper",
+					       ct::CompizProcess::TestOnly));
     return list;
 }