Merge lp:~smspillaz/compiz-core/fix_894633_geometry_saver_class into lp:compiz-core/0.9.5

[Sam Spilsbury]

This branch adds a new class GeometrySaver which handles selective geometry save / restore.

This was previously done by using the old XWindowChanges structure and change masks, but since we want to break the dependency with X in order to do things like unit testing, we need to use our own class.

GeometrySaver::push () will save some geometry specified by the change mask
GeometrySaver::pop () will write to the geoemtry the saved geometry specified by the change mask and returns the change mask of the actual restored geometry.
GeometrySaver::update () allows you to force-update already pushed geometry, eg, for viewport changes where a window is maximized.
GeoemtrySaver::get () will allow you to inspect the state of the GeoemtrySaver object without actually clearing the mask bits.

CompWindow::SyncPosition was removed.

Geometry related functions in CompWindow which were in windowgeometry.cpp were moved to window.cpp

Code snippits which might look like:

if (!(w->saveMask () & CWX))
{
    w->saveWc ().x = foo;
    w->saveMask () |= CWX;
}

were changed to

compiz::window::Geometry (foo, 0, 0, 0, 0);

saver.push (foo, CHANGE_X);

Added unit tests for compiz::window::Geometry and compiz::window::GeoemtrySaver

Next pipe: lp:~smspillaz/compiz-core/fix_894685

[lp:~smspillaz/compiz-core/fix_894633_geometry_saver_class]

2900. By Sam Spilsbury on 2011-12-02

Added tests for GeometrySaver

2901. By Sam Spilsbury on 2011-12-02

Added test for compiz::window::Geometry

2902. By Sam Spilsbury on 2011-12-02

Added missing file

2903. By Sam Spilsbury on 2011-12-03

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2904. By Sam Spilsbury on 2011-12-03

Update the window geometry test to cover that case

2905. By Sam Spilsbury on 2011-12-05

Merged fix-893567

2906. By Sam Spilsbury on 2011-12-05

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2907. By Sam Spilsbury on 2011-12-05

Cleanup dead code

[Thomi Richards (thomir-deactivatedaccount)]

Hi,

A few notes:

First, I'm not qualified to ensure that your changes actually do what they're supposed to - I know next to nothing about Compiz, and, to be honest, the sight of the compiz code fills me with trepidation. What I *can* do is check for stylistic consistency, and point out any places in the public API where I feel a comment or two would help. My point is that we really need to get someone else who understands compiz to look at these branches.

window.h:
 * ln 219 - comments above preprocessor macros need to be Doxygen-style comments, like the others on the lines above.

 * In your Geometry class, the border() and setBorder() methods should be declared next to each other.

 * The unit tests for this class need to be landed as part of this merge, not later in the pipeline.

As a general rule, #defining things makes me nervous, but it's obviously the "compiz way", so you'd better stick with the established coding standards. I'm nervous because #define ignores all scoping rules.

composite.h:
 * ln 318 - need comment.
 * is it called positionOffset or paintOffset? The comment and the method name should be the same, whichever you pick.

privates.h:
 * ln 125 - need comment.

move.cpp:
 * ln 451 - don't comment out code - delete it. This looks especially odd when compared to the previous revision.

privatewindow.h:
 * ln 82 - it's not obvious to me what the difference is between configureXWindow and reconfigureXWindow - perhaps a comment explaining what the difference is?

That's it!

review: Needs Resubmitting

[Thomi Richards (thomir-deactivatedaccount)]

Please ignore me - I posted my review to the wrong merge proposal.

[Thomi Richards (thomir-deactivatedaccount)]

include/core/windowgeometry.h:

Comments in GeometrySaver class should be doxygen comments - either start them with '///' or '/**' if you're using block comments.

plugins/place/src/place.cpp
You have two instances in this file of code being commented with with a 'XXX' label. If you don't need the code, delete it. At the very least tell us why it's commented out. If you're not sure whether you need the code or not, you need to find out before landing the merge.

src/windowgeometry.cpp
You have a comment that says:

/* XXX: Do not allow geometry to be saved if window
 * has not been placed */

Is this something that needs to be fixed before this lands?

You also have this interesting logic within the push(...) method:

unsigned int useMask = mask & ~mMask;
mMask |= useMask;

Perhaps I'm being dense, but surely this is the same as "mMask |= mask" ?

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

> include/core/windowgeometry.h:
>
> Comments in GeometrySaver class should be doxygen comments - either start them
> with '///' or '/**' if you're using block comments.
>

+1

> plugins/place/src/place.cpp
> You have two instances in this file of code being commented with with a 'XXX'
> label. If you don't need the code, delete it. At the very least tell us why
> it's commented out. If you're not sure whether you need the code or not, you
> need to find out before landing the merge.
>

+1

> src/windowgeometry.cpp
> You have a comment that says:
>
> /* XXX: Do not allow geometry to be saved if window
> * has not been placed */
>
> Is this something that needs to be fixed before this lands?
>

fixed

> You also have this interesting logic within the push(...) method:
>
> unsigned int useMask = mask & ~mMask;
> mMask |= useMask;
>
> Perhaps I'm being dense, but surely this is the same as "mMask |= mask" ?

useMask is the return value here to indicate which bits were actually pushed (eg the class doesn't allow you to overwrite some saved geometry with the push () method).

[lp:~smspillaz/compiz-core/fix_894633_geometry_saver_class]

2908. By Sam Spilsbury on 2011-12-08

Merge

2909. By Sam Spilsbury on 2011-12-08

Cleanup

2910. By Sam Spilsbury on 2011-12-08

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

[lp:~smspillaz/compiz-core/fix_894633_geometry_saver_class]

2911. By Sam Spilsbury on 2011-12-20

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2912. By Sam Spilsbury on 2011-12-23

Merge

2913. By Sam Spilsbury on 2012-01-03

Migrated the window geometry tests to the new directory layout

2914. By Sam Spilsbury on 2012-01-03

Switch the geometry tests to Google Test

2915. By Sam Spilsbury on 2012-01-04

Added geometry includes to plugins list

2916. By Sam Spilsbury on 2012-01-04

Merge

2917. By Sam Spilsbury on 2012-01-04

Fix typo

[Thomas Voß (thomas-voss)]

Looks good to me except for unnecessary custom c'tors and d'tors in the test fixtures.

review: Needs Fixing

[lp:~smspillaz/compiz-core/fix_894633_geometry_saver_class]

2918. By Sam Spilsbury on 2012-01-05

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2919. By Sam Spilsbury on 2012-01-09

Remove dead code

2920. By Sam Spilsbury on 2012-01-09

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2921. By Sam Spilsbury on 2012-01-09

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2922. By Sam Spilsbury on 2012-01-09

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2923. By Sam Spilsbury on 2012-01-10

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2924. By Sam Spilsbury on 2012-01-11

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2925. By Sam Spilsbury on 2012-01-11

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2926. By Sam Spilsbury on 2012-01-11

Remove unnecessary file in build

Unmerged revisions

2926. By Sam Spilsbury on 2012-01-11

Remove unnecessary file in build

2925. By Sam Spilsbury on 2012-01-11

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2924. By Sam Spilsbury on 2012-01-11

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2923. By Sam Spilsbury on 2012-01-10

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2922. By Sam Spilsbury on 2012-01-09

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2921. By Sam Spilsbury on 2012-01-09

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2920. By Sam Spilsbury on 2012-01-09

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2919. By Sam Spilsbury on 2012-01-09

Remove dead code

2918. By Sam Spilsbury on 2012-01-05

Merged fix-timer-warnings-893998 into compiz-core.fix_894633_geometry_saver_class.

2917. By Sam Spilsbury on 2012-01-04

Fix typo

=== modified file 'include/core/rect.h'
--- include/core/rect.h	2011-03-16 19:39:09 +0000
+++ include/core/rect.h	2012-01-11 08:47:28 +0000
@@ -26,6 +26,15 @@
 #ifndef _COMPRECT_H
 #define _COMPRECT_H
 
+#include <core/point.h>
+#include <core/size.h>
+#include <vector>
+#include <list>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xregion.h>
+
+
 /**
  * A 2D rectangle, which is likely in screen space. It's data is
  * isolated and can only be mutated with set() methods.
 
=== modified file 'include/core/window.h'
--- include/core/window.h	2012-01-11 08:47:27 +0000
+++ include/core/window.h	2012-01-11 08:47:28 +0000
@@ -41,6 +41,8 @@
 #include <core/size.h>
 #include <core/point.h>
 #include <core/region.h>
+#include <core/windowgeometry.h>
+#include <core/windowgeometrysaver.h>
 
 #include <core/wrapsystem.h>
 
@@ -241,31 +243,9 @@
  */
 static const unsigned int ConstrainPositionVirtualScreen (1 << 2);
 
-/**
-  * A mutable object about the dimensions and location of a CompWindow.
-  */
-class Geometry :
-    public CompRect
-{
-public:
-    Geometry ();
-    Geometry (int x, int y, int width, int height, int border);
-
-    int border () const;
-    void setBorder (int border);
-
-    void set (int x, int y, int width, int height, int border);
-
-    unsigned int changeMask (const compiz::window::Geometry &g) const;
-    void         applyChange (const compiz::window::Geometry &g, unsigned int mask);
-
-private:
-    int mBorder;
-};
-
-}
-}
-
+
+}
+}
 /**
  * Wrappable core window functions. Derive from this class
  * and overload these functions in order to have your function called
 
=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2012-01-11 08:47:27 +0000
+++ plugins/CMakeLists.txt	2012-01-11 08:47:28 +0000
@@ -15,6 +15,8 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/string/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/pluginclasshandler/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/logmessage/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/../src/window/geometry/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/../src/window/geometry-saver/include
 )
 
 compiz_add_plugins_in_folder (${CMAKE_CURRENT_SOURCE_DIR})
 
=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2012-01-11 08:47:27 +0000
+++ plugins/decor/src/decor.cpp	2012-01-11 08:47:28 +0000
@@ -1588,12 +1588,6 @@
 	if (window->state () & CompWindowStateMaximizedVertMask)
 	    mask &= ~CHANGE_Y;
 
-	if (window->saveMask () & CWX)
-	    window->saveWc ().x += moveDx;
-
-	if (window->saveMask () & CWY)
-	    window->saveWc ().y += moveDy;
-
 	if (mask)
 	{
 	    /* allowDecoration is only false in the case of
@@ -2826,12 +2820,6 @@
 	moveDx = shiftX () - oldShiftX;
 	moveDy = shiftY () - oldShiftY;
 
-	if (window->saveMask () & CWX)
-	    window->saveWc ().x += moveDx;
-
-	if (window->saveMask () & CWY)
-	    window->saveWc ().y += moveDy;
-
 	updateFrame ();
     }
 
 
=== modified file 'plugins/move/src/move.cpp'
--- plugins/move/src/move.cpp	2012-01-11 08:47:27 +0000
+++ plugins/move/src/move.cpp	2012-01-11 08:47:28 +0000
@@ -419,14 +419,6 @@
 			{
 			    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;
 
 			    w->maximize (0);
 
=== modified file 'plugins/place/src/place.cpp'
--- plugins/place/src/place.cpp	2012-01-11 08:47:27 +0000
+++ plugins/place/src/place.cpp	2012-01-11 08:47:28 +0000
@@ -110,22 +110,13 @@
 	pivotX = winRect.x ();
 	pivotY = winRect.y ();
 
+	/* FIXME: used the saved geometry for windows that are maximized
+	 * or fullscreen to determine which screen or viewport they actually
+	 * lie on */
 	if (w->type () & CompWindowTypeFullscreenMask ||
 	    (w->state () & (CompWindowStateMaximizedVertMask |
 	    		    CompWindowStateMaximizedHorzMask)))
 	{
-	    if (w->saveMask () & CWX)
-		winRect.setX (w->saveWc ().x);
-
-	    if (w->saveMask () & CWY)
-		winRect.setY (w->saveWc ().y);
-
-	    if (w->saveMask () & CWWidth)
-		winRect.setWidth (w->saveWc ().width);
-
-	    if (w->saveMask () & CWHeight)
-		winRect.setHeight (w->saveWc ().height);
-
 	    pivotX = pw->mPrevServer.x ();
 	    pivotY = pw->mPrevServer.y ();
 	}
@@ -237,31 +228,11 @@
 	if (firstPass) /* if first pass, don't actually move the window */
 	    continue;
 
-	/* for maximized/fullscreen windows, update saved pos/size */
+	/* for maximized/fullscreen windows, update saved pos/size XXX */
 	if (w->type () & CompWindowTypeFullscreenMask ||
 	    (w->state () & (CompWindowStateMaximizedVertMask |
 			 CompWindowStateMaximizedHorzMask)))
 	{
-	    if (mask & CWX)
-	    {
-		w->saveWc ().x = xwc.x;
-		w->saveMask () |= CWX;
-	    }
-	    if (mask & CWY)
-	    {
-		w->saveWc ().y = xwc.y;
-		w->saveMask () |= CWY;
-	    }
-	    if (mask & CWWidth)
-	    {
-		w->saveWc ().width = xwc.width;
-		w->saveMask () |= CWWidth;
-	    }
-	    if (mask & CWHeight)
-	    {
-		w->saveWc ().height = xwc.height;
-		w->saveMask () |= CWHeight;
-	    }
 
 	    if (w->type () & CompWindowTypeFullscreenMask)
 	    {
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2011-12-23 06:44:28 +0000
+++ src/CMakeLists.txt	2012-01-11 08:47:28 +0000
@@ -5,6 +5,7 @@
 add_subdirectory( logmessage )
 add_subdirectory( timer )
 add_subdirectory( pluginclasshandler )
+add_subdirectory( window )
 
 compiz_add_bcop_targets (
     core
@@ -39,7 +40,12 @@
     
     ${CMAKE_CURRENT_SOURCE_DIR}/pluginclasshandler/include
     ${CMAKE_CURRENT_SOURCE_DIR}/pluginclasshandler/src
-    
+
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/geometry-saver/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/geometry-saver/src
+
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/geometry/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/geometry/src
 )
 
 add_definitions (
@@ -72,10 +78,8 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/session.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/output.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/rect.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/size.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/point.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/windowgeometry.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/icon.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/modifierhandler.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/propertywriter.cpp
@@ -103,6 +107,8 @@
     compiz_timer
     compiz_logmessage
     compiz_pluginclasshandler
+    compiz_window_geometry
+    compiz_window_geometry_saver
 #    ${CORE_MOD_LIBRARIES}
 )
 
 
=== modified file 'src/event.cpp'
--- src/event.cpp	2012-01-11 08:47:27 +0000
+++ src/event.cpp	2012-01-11 08:47:28 +0000
@@ -1579,9 +1579,9 @@
 	    {
 		compiz::window::Geometry g =  w->serverGeometry ();
 		compiz::window::Geometry ng = compiz::window::Geometry (event->xclient.data.l[1],
-								event->xclient.data.l[2],
-								event->xclient.data.l[3],
-								event->xclient.data.l[4], 0);
+									event->xclient.data.l[2],
+									event->xclient.data.l[3],
+									event->xclient.data.l[4], 0);
 		int                  gravity;
 		int	             value_mask;
 		unsigned int         source;
@@ -1726,12 +1726,20 @@
 	if (w && w->managed ())
 	{
 	    compiz::window::Geometry g (event->xconfigurerequest.x,
-				    event->xconfigurerequest.y,
-				    event->xconfigurerequest.width,
-				    event->xconfigurerequest.height,
-				    event->xconfigurerequest.border_width);
-
-	    w->position (g, event->xconfigurerequest.value_mask, ClientTypeUnknown);
+					event->xconfigurerequest.y,
+					event->xconfigurerequest.width,
+					event->xconfigurerequest.height,
+					event->xconfigurerequest.border_width);
+
+	    /* Revert unset bits to serverGeometry */
+
+	    g.applyChange (w->priv->serverGeometry, ~event->xconfigurerequest.value_mask);
+
+	    /* Use the moveResize logic here */
+	    w->priv->moveResize (g,
+				 event->xconfigurerequest.value_mask,
+				 0,
+				 ClientTypeUnknown);
 
 	    if (event->xconfigurerequest.value_mask & CWStackMode)
 	    {
@@ -1794,13 +1802,14 @@
 		 * to being not override redirect */
 		w->priv->setOverrideRedirect (false);
 
-		compiz::window::Geometry g = w->geometry ();
-
-		g.applyChange (compiz::window::Geometry (xwc.x,
-							 xwc.y,
-							 xwc.width,
-							 xwc.height,
-							 xwc.border_width), xwcm);
+		compiz::window::Geometry g = (compiz::window::Geometry (xwc.x,
+									xwc.y,
+									xwc.width,
+									xwc.height,
+									xwc.border_width));
+
+		g.applyChange (w->priv->serverGeometry, ~xwcm);
+
 		w->position (g);
 	    }
 	    else
 
=== modified file 'src/privatewindow.h'
--- src/privatewindow.h	2012-01-11 08:47:27 +0000
+++ src/privatewindow.h	2012-01-11 08:47:28 +0000
@@ -339,8 +339,7 @@
 
 	CompRect   iconGeometry;
 
-	XWindowChanges saveWc;
-	int		   saveMask;
+	compiz::window::GeometrySaver geometrySaver;
 
 	XSyncCounter  syncCounter;
 	XSyncValue    syncValue;
 
=== modified file 'src/rect.cpp'
--- src/rect.cpp	2011-03-16 19:39:09 +0000
+++ src/rect.cpp	2012-01-11 08:47:28 +0000
@@ -23,7 +23,8 @@
  * Authors: Dennis Kasprzyk <[e-mail]>
  */
 
-#include <core/core.h>
+#include <X11/Xlib.h>
+#include <X11/Xregion.h>
 #include <core/rect.h>
 
 CompRect::CompRect ()
 
=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-01-11 08:47:27 +0000
+++ src/screen.cpp	2012-01-11 08:47:28 +0000
@@ -3522,17 +3522,19 @@
     {
 	unsigned int valueMask = CWX | CWY;
 	XWindowChanges xwc;
+	compiz::window::Geometry saved;
 
 	if (w->onAllViewports ())
 	    continue;
 
 	pnt = w->getMovementForOffset (CompPoint (tx, ty));
 
-	if (w->saveMask () & CWX)
-	    w->saveWc ().x += pnt.x ();
-
-	if (w->saveMask () & CWY)
-	    w->saveWc ().y += pnt.y ();
+	unsigned int saveMask = w->priv->geometrySaver.get (saved) & (CHANGE_X |
+								      CHANGE_Y);
+
+	saved.setPos (saved.pos () + pnt);
+
+	w->priv->geometrySaver.update (saved, saveMask);
 
 	xwc.x = w->serverGeometry ().x () + pnt.x ();
 	xwc.y = w->serverGeometry ().y () + pnt.y ();
 
=== added directory 'src/window'
=== modified file 'src/window.cpp'
--- src/window.cpp	2012-01-11 08:47:27 +0000
+++ src/window.cpp	2012-01-11 08:47:28 +0000
@@ -2445,62 +2445,6 @@
 {
 }
 
-void
-PrivateWindow::syncPosition ()
-{
-    gettimeofday (&priv->lastConfigureRequest, NULL);
-
-    unsigned int   valueMask = CWX | CWY;
-    XWindowChanges xwc;
-
-    if (priv->pendingPositionUpdates && !priv->pendingConfigures.pending ())
-    {
-	if (priv->serverFrameGeometry.x () == priv->frameGeometry.x ())
-	    valueMask &= ~(CWX);
-	if (priv->serverFrameGeometry.y () == priv->frameGeometry.y ())
-	    valueMask &= ~(CWY);
-
-	/* Because CompWindow::move can update the geometry last
-	 * received from the server, we must indicate that no values
-	 * changed, because when the ConfigureNotify comes around
-	 * the values are going to be the same. That's obviously
-	 * broken behaviour and worthy of a FIXME, but requires
-	 * larger changes to the window movement system. */
-	if (valueMask)
-	{
-	    priv->serverGeometry.setX (priv->geometry.x ());
-	    priv->serverGeometry.setY (priv->geometry.y ());
-	    priv->serverFrameGeometry.setX (priv->frameGeometry.x ());
-	    priv->serverFrameGeometry.setY (priv->frameGeometry.y ());
-
-	    xwc.x = priv->serverFrameGeometry.x ();
-	    xwc.y = priv->serverFrameGeometry.y ();
-
-	    compiz::X11::PendingEvent::Ptr pc =
-		    boost::shared_static_cast<compiz::X11::PendingEvent> (compiz::X11::PendingConfigureEvent::Ptr (
-									      new compiz::X11::PendingConfigureEvent (
-										  screen->dpy (), priv->serverFrame, 0, &xwc)));
-
-	    priv->pendingConfigures.add (pc);
-
-	    /* Got 3 seconds to get its stuff together */
-	    if (priv->mClearCheckTimeout.active ())
-		priv->mClearCheckTimeout.stop ();
-	    priv->mClearCheckTimeout.start (boost::bind (&PrivateWindow::checkClear, priv),
-					    2000, 2500);
-	    XConfigureWindow (screen->dpy (), ROOTPARENT (window), valueMask, &xwc);
-
-	    if (priv->serverFrame)
-	    {
-		XMoveWindow (screen->dpy (), priv->wrapper,
-			     priv->serverInput.left, priv->serverInput.top);
-		window->sendConfigureNotify ();
-	    }
-	}
-	priv->pendingPositionUpdates = false;
-    }
-}
-
 bool
 CompWindow::focus ()
 {
@@ -2612,6 +2556,8 @@
 	XWindowChanges xwc;
 	CompPoint      dp = g.pos () - priv->serverGeometry.pos ();
 
+	memset (&xwc, sizeof (XWindowChanges), 0);
+
 	xwc.x = g.x ();
 	xwc.y = g.y ();
 	xwc.width = g.width ();
@@ -3250,81 +3196,165 @@
     return false;
 }
 
-void
-PrivateWindow::saveGeometry (int mask)
-{
-    int m = mask & ~saveMask;
-
-    /* only save geometry if window has been placed */
-    if (!placed)
-	return;
-
-    if (m & CWX)
-	saveWc.x = serverGeometry.x ();
-
-    if (m & CWY)
-	saveWc.y = serverGeometry.y ();
-
-    if (m & CWWidth)
-	saveWc.width = serverGeometry.width ();
-
-    if (m & CWHeight)
-	saveWc.height = serverGeometry.height ();
-
-    if (m & CWBorderWidth)
-	saveWc.border_width = serverGeometry.border ();
-
-    saveMask |= m;
-}
-
-int
-PrivateWindow::restoreGeometry (XWindowChanges *xwc,
-				int            mask)
-{
-    int m = mask & saveMask;
-
-    if (m & CWX)
-	xwc->x = saveWc.x;
-
-    if (m & CWY)
-	xwc->y = saveWc.y;
-
-    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. */
-	if (xwc->width == (int) serverGeometry.width ())
-	{
-	    xwc->width -= 10;
-	    if (m & CWX)
-		xwc->x += 5;
-	}
-    }
-
-    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. */
-	if (xwc->height == (int) serverGeometry.height ())
-	{
-	    xwc->height -= 10;
-	    if (m & CWY)
-		xwc->y += 5;
-	}
-    }
-
-    if (m & CWBorderWidth)
-	xwc->border_width = saveWc.border_width;
-
-    saveMask &= ~mask;
-
-    return m;
+const compiz::window::Geometry &
+CompWindow::serverGeometry () const
+{
+    return priv->serverGeometry;
+}
+
+const compiz::window::Geometry &
+CompWindow::geometry () const
+{
+    return priv->geometry;
+}
+
+int
+CompWindow::x () const
+{
+    return priv->geometry.x ();
+}
+
+int
+CompWindow::y () const
+{
+    return priv->geometry.y ();
+}
+
+CompPoint
+CompWindow::pos () const
+{
+    return CompPoint (priv->geometry.x (), priv->geometry.y ());
+}
+
+/* With border */
+int
+CompWindow::width () const
+{
+    return priv->width +
+	    priv->geometry.border ()  * 2;
+}
+
+int
+CompWindow::height () const
+{
+    return priv->height +
+	    priv->geometry.border ()  * 2;;
+}
+
+CompSize
+CompWindow::size () const
+{
+    return CompSize (priv->width + priv->geometry.border ()  * 2,
+		     priv->height + priv->geometry.border ()  * 2);
+}
+
+int
+CompWindow::serverX () const
+{
+    return priv->serverGeometry.x ();
+}
+
+int
+CompWindow::serverY () const
+{
+    return priv->serverGeometry.y ();
+}
+
+CompPoint
+CompWindow::serverPos () const
+{
+    return CompPoint (priv->serverGeometry.x (),
+		      priv->serverGeometry.y ());
+}
+
+/* With border */
+int
+CompWindow::serverWidth () const
+{
+    return priv->serverGeometry.width () +
+	   2 * priv->serverGeometry.border ();
+}
+
+int
+CompWindow::serverHeight () const
+{
+    return priv->serverGeometry.height () +
+	   2 * priv->serverGeometry.border ();
+}
+
+const CompSize
+CompWindow::serverSize () const
+{
+    return CompSize (priv->serverGeometry.width () +
+		     2 * priv->serverGeometry.border (),
+		     priv->serverGeometry.height () +
+		     2 * priv->serverGeometry.border ());
+}
+
+CompRect
+CompWindow::borderRect () const
+{
+    return CompRect (priv->geometry.x () - priv->geometry.border () - priv->border.left,
+		     priv->geometry.y () - priv->geometry.border () - priv->border.top,
+		     priv->geometry.width () + priv->geometry.border () * 2 +
+		     priv->border.left + priv->border.right,
+		     priv->geometry.height () + priv->geometry.border () * 2 +
+		     priv->border.top + priv->border.bottom);
+}
+
+CompRect
+CompWindow::serverBorderRect () const
+{
+    return CompRect (priv->serverGeometry.x () - priv->geometry.border () - priv->border.left,
+		     priv->serverGeometry.y () - priv->geometry.border () - priv->border.top,
+		     priv->serverGeometry.width () + priv->geometry.border () * 2 +
+		     priv->border.left + priv->border.right,
+		     priv->serverGeometry.height () + priv->geometry.border () * 2 +
+		     priv->border.top + priv->border.bottom);
+}
+
+CompRect
+CompWindow::inputRect () const
+{
+    return CompRect (priv->geometry.x () - priv->geometry.border () - priv->serverInput.left,
+		     priv->geometry.y () - priv->geometry.border () - priv->serverInput.top,
+		     priv->geometry.width () + priv->geometry.border () * 2 +
+		     priv->serverInput.left + priv->serverInput.right,
+		     priv->geometry.height () +priv->geometry.border () * 2 +
+		     priv->serverInput.top + priv->serverInput.bottom);
+}
+
+CompRect
+CompWindow::serverInputRect () const
+{
+    return CompRect (priv->serverGeometry.x () - priv->serverGeometry.border () - priv->serverInput.left,
+		     priv->serverGeometry.y () - priv->serverGeometry.border () - priv->serverInput.top,
+		     priv->serverGeometry.width () + priv->serverGeometry.border () * 2 +
+		     priv->serverInput.left + priv->serverInput.right,
+		     priv->serverGeometry.height () + priv->serverGeometry.border () * 2 +
+		     priv->serverInput.top + priv->serverInput.bottom);
+}
+
+CompRect
+CompWindow::outputRect () const
+{
+    return CompRect (priv->geometry.x () - priv->serverGeometry.border ()- priv->output.left,
+		     priv->geometry.y () - priv->serverGeometry.border () - priv->output.top,
+		     priv->geometry.width () + priv->serverGeometry.border () * 2 +
+		     priv->output.left + priv->output.right,
+		     priv->geometry.height () + priv->serverGeometry.border () * 2 +
+		     priv->output.top + priv->output.bottom);
+}
+
+CompRect
+CompWindow::serverOutputRect () const
+{
+    return CompRect (priv->serverGeometry.x () - priv->serverGeometry.border () -  priv->output.left,
+		     priv->serverGeometry.y () - priv->serverGeometry.border () - priv->output.top,
+		     priv->serverGeometry.width () + priv->serverGeometry.border () * 2 +
+		     priv->output.left + priv->output.right,
+		     priv->serverGeometry.height () + priv->serverGeometry.border () * 2 +
+		     priv->output.top + priv->output.bottom);
 }
 
 static bool isPendingRestack (compiz::X11::PendingEvent::Ptr p)
@@ -3848,204 +3878,205 @@
     output = selectOutputForGeometry (old);
     workArea = output->workArea ();
 
-    if (type & CompWindowTypeFullscreenMask)
-    {
-	saveGeometry (CHANGE_X | CHANGE_Y | CHANGE_WIDTH | CHANGE_HEIGHT | CHANGE_BORDER);
-
-	if (fullscreenMonitorsSet)
-	{
-	    ng = compiz::window::Geometry (x + fullscreenMonitorRect.x (),
-				       y + fullscreenMonitorRect.y (),
-				       fullscreenMonitorRect.width (),
-				       fullscreenMonitorRect.height (), 0);
-	}
-	else
-	{
-	    ng = compiz::window::Geometry (x + output->x (),
-				       y + output->y (),
-				       width + output->width (),
-				       height + output->height (), 0);
-	}
-
-	changeMask |= CHANGE_X | CHANGE_Y | CHANGE_WIDTH | CHANGE_HEIGHT | CHANGE_BORDER;
-    }
-    else
-    {
-	XWindowChanges xwc;
-
-	changeMask |= restoreGeometry (&xwc, CHANGE_BORDER);
-
-	if (state & CompWindowStateMaximizedVertMask)
-	{
-	    saveGeometry (CHANGE_Y | CHANGE_HEIGHT);
-
-	    ng.setHeight (workArea.height () - border.top - border.bottom - old.border () * 2);
-
-	    changeMask |= CHANGE_HEIGHT;
-	}
-	else
-	{
-	    changeMask |= restoreGeometry (&xwc, CHANGE_Y | CHANGE_HEIGHT);
-	}
-
-	if (state & CompWindowStateMaximizedHorzMask)
-	{
-	    saveGeometry (CHANGE_X | CHANGE_WIDTH);
-
-	    ng.setWidth (workArea.width () - border.left - border.right - old.border () * 2);
-
-	    changeMask |= CHANGE_WIDTH;
-	}
-	else
-	{
-	    changeMask |= restoreGeometry (&xwc, CHANGE_X | CHANGE_WIDTH);
-	}
-
-	compiz::window::Geometry xg = compiz::window::Geometry (xwc.x,
-								xwc.y,
-								xwc.width,
-								xwc.height,
-								xwc.border_width);
-
-	ng.applyChange (xg, changeMask);
-
-	/* constrain window width if smaller than minimum width */
-	if (!(changeMask & CHANGE_WIDTH) && (int) old.width () < sizeHints.min_width)
-	{
-	    ng.setWidth (sizeHints.min_width);
-	    changeMask |= CHANGE_WIDTH;
-	}
-
-	/* constrain window width if greater than maximum width */
-	if (!(changeMask & CHANGE_WIDTH) && (int) old.width () > sizeHints.max_width)
-	{
-	    ng.setWidth (sizeHints.max_width);
-	    changeMask |= CHANGE_WIDTH;
-	}
-
-	/* constrain window height if smaller than minimum height */
-	if (!(changeMask & CHANGE_HEIGHT) && (int) old.height () < sizeHints.min_height)
-	{
-	    ng.setHeight (sizeHints.min_height);
-	    changeMask |= CHANGE_HEIGHT;
-	}
-
-	/* constrain window height if greater than maximum height */
-	if (!(changeMask & CHANGE_HEIGHT) && (int) old.height () > sizeHints.max_height)
-	{
-	    ng.setHeight (sizeHints.max_height);
-	    changeMask |= CHANGE_HEIGHT;
-	}
-
-	if (changeMask & (CHANGE_WIDTH | CHANGE_HEIGHT))
-	{
-	    compiz::window::Geometry constrained = old;
-	    int width, height, max;
-
-	    constrained.applyChange (ng, changeMask);
-	    ng.setSize (CompSize (old.width (), old.height ()));
-
-	    width = constrained.width ();
-	    height = constrained.height ();
-
-	    window->constrainNewWindowSize (width, height, &width, &height);
-
-	    if (width != (int) old.width ())
-	    {
-		changeMask |= CHANGE_WIDTH;
-		ng.setWidth (width);
-	    }
-	    else
-		changeMask &= ~CHANGE_WIDTH;
-
-	    if (height != (int) old.height ())
-	    {
-		changeMask |= CHANGE_HEIGHT;
-		ng.setHeight (height);
-	    }
-	    else
-		changeMask &= ~CHANGE_HEIGHT;
+    if (!priv->placed)
+    {
+	if (type & CompWindowTypeFullscreenMask)
+	{
+	    unsigned int fsChangeMask = CHANGE_X |
+					CHANGE_Y |
+					CHANGE_WIDTH |
+					CHANGE_HEIGHT |
+					CHANGE_BORDER;
+	    changeMask |= geometrySaver.push (serverGeometry,
+					      fsChangeMask);
+
+	    /* Only on push success */
+	    if (fsChangeMask == changeMask)
+	    {
+		if (fullscreenMonitorsSet)
+		{
+		    ng = compiz::window::Geometry (x + fullscreenMonitorRect.x (),
+						   y + fullscreenMonitorRect.y (),
+						   fullscreenMonitorRect.width (),
+						   fullscreenMonitorRect.height (), 0);
+		}
+		else
+		{
+		    ng = compiz::window::Geometry (x + output->x (),
+						   y + output->y (),
+						   width + output->width (),
+						   height + output->height (), 0);
+		}
+	    }
+	}
+	else
+	{
+	    changeMask |= geometrySaver.pop (ng, CHANGE_BORDER);
 
 	    if (state & CompWindowStateMaximizedVertMask)
 	    {
-		/* If the window is still offscreen, then we need to constrain it
-		 * by the gravity value (so that the corner that the gravity specifies
-		 * is 'anchored' to that edge of the workarea) */
-
-		ng.setY (y + workArea.y () + border.top);
-		changeMask |= CHANGE_Y;
-
-		switch (priv->sizeHints.win_gravity)
-		{
-		    case SouthWestGravity:
-		    case SouthEastGravity:
-		    case SouthGravity:
-			/* Shift the window so that the bottom meets the top of the bottom */
-			height = ng.height () + old.border () * 2;
-
-			max = y + workArea.bottom ();
-			if (ng.y () + ng.height () + border.bottom > max)
-			{
-			    ng.setY (max - height - border.bottom);
-			    changeMask |= CHANGE_Y;
-			}
-			break;
-		    /* For EastGravity, WestGravity and CenterGravity we default to the top
-		     * of the window since the user should at least be able to close it
-		     * (but not for SouthGravity, SouthWestGravity and SouthEastGravity since
-		     * that indicates that the application has requested positioning in that area
-		     */
-		    case EastGravity:
-		    case WestGravity:
-		    case CenterGravity:
-		    case NorthWestGravity:
-		    case NorthEastGravity:
-		    case NorthGravity:
-		    default:
-			/* Shift the window so that the top meets the top of the screen */
-			break;
-		}
+		changeMask |= geometrySaver.push (serverGeometry, CHANGE_Y | CHANGE_HEIGHT);
+
+		/* Geometry save succeeded */
+		if (changeMask & CHANGE_HEIGHT)
+		    ng.setHeight (workArea.height () - border.top - border.bottom - old.border () * 2);
+	    }
+	    else
+	    {
+		changeMask |= geometrySaver.pop (ng, CHANGE_Y | CHANGE_HEIGHT);
 	    }
 
 	    if (state & CompWindowStateMaximizedHorzMask)
 	    {
-		ng.setX (x + workArea.x () + border.left);
-		changeMask |= CHANGE_X;
-
-		switch (priv->sizeHints.win_gravity)
-		{
-		    case NorthEastGravity:
-		    case SouthEastGravity:
-		    case EastGravity:
-			width = ng.width () + old.border () * 2;
-
-			max = x + workArea.right ();
-
-			if (old.x () + (int) old.width () + border.right > max)
-			{
-			    ng.setX (max - width - border.right);
-			    changeMask |= CHANGE_X;
-			}
-			else if (old.x () + width + border.right > max)
-			{
-			    ng.setX (x + workArea.x () +
-				     (workArea.width () - border.left - width -
-				      border.right) / 2 + border.left);
-			    changeMask |= CHANGE_X;
-			}
-		    /* For NorthGravity, SouthGravity and CenterGravity we default to the top
-		     * of the window since the user should at least be able to close it
-		     * (but not for SouthGravity, SouthWestGravity and SouthEastGravity since
-		     * that indicates that the application has requested positioning in that area
-		     */
-		    case NorthGravity:
-		    case SouthGravity:
-		    case CenterGravity:
-		    case NorthWestGravity:
-		    case SouthWestGravity:
-		    case WestGravity:
-		    default:
-			break;
+		changeMask |= geometrySaver.push (serverGeometry, CHANGE_X | CHANGE_WIDTH);
+
+		/* Geometry save succeeded */
+		if (changeMask & CHANGE_HEIGHT)
+		    ng.setWidth (workArea.width () - border.left - border.right - old.border () * 2);
+	    }
+	    else
+	    {
+		changeMask |= geometrySaver.pop (ng, CHANGE_X | CHANGE_WIDTH);
+	    }
+
+	    /* constrain window width if smaller than minimum width */
+	    if (!(changeMask & CHANGE_WIDTH) && (int) old.width () < sizeHints.min_width)
+	    {
+		ng.setWidth (sizeHints.min_width);
+		changeMask |= CHANGE_WIDTH;
+	    }
+
+	    /* constrain window width if greater than maximum width */
+	    if (!(changeMask & CHANGE_WIDTH) && (int) old.width () > sizeHints.max_width)
+	    {
+		ng.setWidth (sizeHints.max_width);
+		changeMask |= CHANGE_WIDTH;
+	    }
+
+	    /* constrain window height if smaller than minimum height */
+	    if (!(changeMask & CHANGE_HEIGHT) && (int) old.height () < sizeHints.min_height)
+	    {
+		ng.setHeight (sizeHints.min_height);
+		changeMask |= CHANGE_HEIGHT;
+	    }
+
+	    /* constrain window height if greater than maximum height */
+	    if (!(changeMask & CHANGE_HEIGHT) && (int) old.height () > sizeHints.max_height)
+	    {
+		ng.setHeight (sizeHints.max_height);
+		changeMask |= CHANGE_HEIGHT;
+	    }
+
+	    if (changeMask & (CHANGE_WIDTH | CHANGE_HEIGHT))
+	    {
+		compiz::window::Geometry constrained = old;
+		int width, height, max;
+
+		constrained.applyChange (ng, changeMask);
+		ng.setSize (CompSize (old.width (), old.height ()));
+
+		width = constrained.width ();
+		height = constrained.height ();
+
+		window->constrainNewWindowSize (width, height, &width, &height);
+
+		if (width != (int) old.width ())
+		{
+		    changeMask |= CHANGE_WIDTH;
+		    ng.setWidth (width);
+		}
+		else
+		    changeMask &= ~CHANGE_WIDTH;
+
+		if (height != (int) old.height ())
+		{
+		    changeMask |= CHANGE_HEIGHT;
+		    ng.setHeight (height);
+		}
+		else
+		    changeMask &= ~CHANGE_HEIGHT;
+
+		if (state & CompWindowStateMaximizedVertMask)
+		{
+		    /* If the window is still offscreen, then we need to constrain it
+		     * by the gravity value (so that the corner that the gravity specifies
+		     * is 'anchored' to that edge of the workarea) */
+
+		    ng.setY (y + workArea.y () + border.top);
+		    changeMask |= CHANGE_Y;
+
+		    switch (priv->sizeHints.win_gravity)
+		    {
+			case SouthWestGravity:
+			case SouthEastGravity:
+			case SouthGravity:
+			    /* Shift the window so that the bottom meets the top of the bottom */
+			    height = ng.height () + old.border () * 2;
+
+			    max = y + workArea.bottom ();
+			    if (ng.y () + ng.height () + border.bottom > max)
+			    {
+				ng.setY (max - height - border.bottom);
+				changeMask |= CHANGE_Y;
+			    }
+			    break;
+			/* For EastGravity, WestGravity and CenterGravity we default to the top
+			 * of the window since the user should at least be able to close it
+			 * (but not for SouthGravity, SouthWestGravity and SouthEastGravity since
+			 * that indicates that the application has requested positioning in that area
+			 */
+			case EastGravity:
+			case WestGravity:
+			case CenterGravity:
+			case NorthWestGravity:
+			case NorthEastGravity:
+			case NorthGravity:
+			default:
+			    /* Shift the window so that the top meets the top of the screen */
+			    break;
+		    }
+		}
+
+		if (state & CompWindowStateMaximizedHorzMask)
+		{
+		    ng.setX (x + workArea.x () + border.left);
+		    changeMask |= CHANGE_X;
+
+		    switch (priv->sizeHints.win_gravity)
+		    {
+			case NorthEastGravity:
+			case SouthEastGravity:
+			case EastGravity:
+			    width = ng.width () + old.border () * 2;
+
+			    max = x + workArea.right ();
+
+			    if (old.x () + (int) old.width () + border.right > max)
+			    {
+				ng.setX (max - width - border.right);
+				changeMask |= CHANGE_X;
+			    }
+			    else if (old.x () + width + border.right > max)
+			    {
+				ng.setX (x + workArea.x () +
+					 (workArea.width () - border.left - width -
+					  border.right) / 2 + border.left);
+				changeMask |= CHANGE_X;
+			    }
+			/* For NorthGravity, SouthGravity and CenterGravity we default to the top
+			 * of the window since the user should at least be able to close it
+			 * (but not for SouthGravity, SouthWestGravity and SouthEastGravity since
+			 * that indicates that the application has requested positioning in that area
+			 */
+			case NorthGravity:
+			case SouthGravity:
+			case CenterGravity:
+			case NorthWestGravity:
+			case SouthWestGravity:
+			case WestGravity:
+			default:
+			    break;
+		    }
 		}
 	    }
 	}
@@ -4161,17 +4192,6 @@
     /* Revert to serverGeometry on any unset bits */
     ng.applyChange (serverGeometry, ~changeMask);
 
-/*
-    if (!(changeMask & CWX))
-	xwc->x = serverGeometry.x ();
-    if (!(changeMask & CWY))
-	xwc->y = serverGeometry.y ();
-    if (!(changeMask & CWWidth))
-	xwc->width = serverGeometry.width ();
-    if (!(changeMask & CWHeight))
-	xwc->height = serverGeometry.height ();
-*/
-
     if (changeMask & (CHANGE_WIDTH | CHANGE_HEIGHT))
     {
 	int width, height;
@@ -4217,11 +4237,15 @@
        or maximized windows after addWindowSizeChanges, it should be pretty
        safe to assume that the saved coordinates should be updated too, e.g.
        because the window was moved to another viewport by some client */
-    if ((changeMask & CHANGE_X) && (saveMask & CHANGE_X))
-	saveWc.x += (ng.x () - serverGeometry.x ());
-
-    if ((changeMask & CHANGE_Y) && (saveMask & CHANGE_Y))
-	saveWc.y += (ng.y () - serverGeometry.y ());
+    compiz::window::Geometry    update;
+    unsigned int                saveMask = geometrySaver.get (update);
+
+    saveMask &= (changeMask & (CHANGE_X | CHANGE_Y));
+
+    update.setPos (update.pos () + CompPoint (ng.x () - serverGeometry.x (),
+					      ng.y () - serverGeometry.y ()));
+
+    geometrySaver.update (update, saveMask);
 
     if (mapNum && (changeMask & (CHANGE_X | CHANGE_Y)))
 	window->sendSyncRequest ();
@@ -4540,6 +4564,8 @@
 	priv->show ();
     }
 
+    memset (&xwc, 0, sizeof (XWindowChanges));
+
     if (stackingMode != CompStackingUpdateModeNone)
     {
 	bool       aboveFs;
@@ -5863,28 +5889,20 @@
     if (!priv->placed)
     {
 	int                  gravity = priv->sizeHints.win_gravity;
-	unsigned int         changeMask;
 	/* adjust for gravity, but only for frame size */
-	compiz::window::Geometry sg = compiz::window::Geometry (priv->serverGeometry.x (),
-								priv->serverGeometry.y (),
-								0,
-								0,
-								0);
-	compiz::window::Geometry g = window->geometry ();
-
-	changeMask = adjustConfigureRequestForGravity (sg, CHANGE_X | CHANGE_Y, gravity, 1);
-
-	g.applyChange (sg, changeMask);
-
-	window->position (g, ClientTypeApplication);
-
-	CompPoint pos (g.pos ());
+	compiz::window::Geometry sg = priv->serverGeometry;
+
+	adjustConfigureRequestForGravity (sg, CHANGE_X | CHANGE_Y, gravity, 1);
+
+	/* was: validateRequestRequest */
+	window->position (sg, ClientTypeApplication);
+
+	CompPoint pos (sg.pos ());
 	if (window->place (pos))
-	{
-	    g.setPos (g.pos () + pos);
-	}
+	    sg.setPos (pos);
 
-	window->position (g, 0);
+	/* calls through to configureXWindow */
+	window->position (sg, 0);
 
 	priv->placed = true;
     }
@@ -6115,18 +6133,6 @@
     return priv->struts;
 }
 
-int &
-CompWindow::saveMask ()
-{
-    return priv->saveMask;
-}
-
-XWindowChanges &
-CompWindow::saveWc ()
-{
-    return priv->saveWc;
-}
-
 void
 CompWindow::moveToViewportPosition (int  x,
 				    int  y,
@@ -6191,11 +6197,14 @@
 		wy = ty - vHeight;
 	}
 
-	if (priv->saveMask & CWX)
-	    priv->saveWc.x += wx;
-
-	if (priv->saveMask & CWY)
-	    priv->saveWc.y += wy;
+	compiz::window::Geometry update;
+	unsigned int saveMask  = (priv->geometrySaver.get (update) & (CHANGE_X |
+								      CHANGE_Y));
+
+	update.setPos (CompPoint (update.x () + wx,
+				  update.y () + wy));
+
+	priv->geometrySaver.update (update, saveMask);
 
 	xwc.x = serverGeometry ().x () + wx;
 	xwc.y = serverGeometry ().y () + wy;
@@ -6631,9 +6640,23 @@
 	/* restore saved geometry and map if hidden */
 	if (!priv->attrib.override_redirect)
 	{
-	    if (priv->saveMask)
-		XConfigureWindow (screen->dpy (), priv->id,
-				  priv->saveMask, &priv->saveWc);
+	    compiz::window::Geometry restore;
+	    unsigned int mask =  priv->geometrySaver.pop (restore,
+							  CHANGE_X |
+							  CHANGE_Y |
+							  CHANGE_WIDTH |
+							  CHANGE_HEIGHT |
+							  CHANGE_BORDER);
+
+	    XWindowChanges xwc;
+
+	    xwc.x = restore.x ();
+	    xwc.y = restore.y ();
+	    xwc.width = restore.height ();
+	    xwc.height = restore.height ();
+	    xwc.border_width = restore.border ();
+
+	    XConfigureWindow (screen->dpy (), priv->id, mask, &xwc);
 
 	    if (!priv->hidden)
 	    {
@@ -6735,8 +6758,7 @@
     icons (0),
     noIcons (false),
 
-    saveMask (0),
-    syncCounter (0),
+    geometrySaver (serverGeometry),
     syncAlarm (None),
     syncWaitTimer (),
 
 
=== added file 'src/window/CMakeLists.txt'
--- src/window/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/window/CMakeLists.txt	2012-01-11 08:47:28 +0000
@@ -0,0 +1,2 @@
+add_subdirectory (geometry)
+add_subdirectory (geometry-saver)
 
=== added directory 'src/window/geometry'
=== added directory 'src/window/geometry-saver'
=== added file 'src/window/geometry-saver/CMakeLists.txt'
--- src/window/geometry-saver/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/window/geometry-saver/CMakeLists.txt	2012-01-11 08:47:28 +0000
@@ -0,0 +1,68 @@
+pkg_check_modules (
+  GLIBMM
+  REQUIRED
+  glibmm-2.4 glib-2.0
+)
+
+INCLUDE_DIRECTORIES (  
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/src
+  
+  ${compiz_SOURCE_DIR}/include
+    
+  ${Boost_INCLUDE_DIRS}
+  
+  ${GLIBMM_INCLUDE_DIRS}
+
+  ${compiz_SOURCE_DIR}/src/window/geometry/include
+)
+
+LINK_DIRECTORIES (${GLIBMM_LIBRARY_DIRS}) 
+
+SET ( 
+  PUBLIC_HEADERS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/core/windowgeometrysaver.h
+)
+
+SET ( 
+  PRIVATE_HEADERS 
+)
+
+SET( 
+  SRCS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/geometrysaver.cpp
+)
+
+ADD_LIBRARY( 
+  compiz_window_geometry_saver STATIC
+  
+  ${SRCS}
+  
+  ${PUBLIC_HEADERS}
+  ${PRIVATE_HEADERS}
+)
+
+ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
+
+SET_TARGET_PROPERTIES(
+  compiz_window_geometry_saver PROPERTIES
+  PUBLIC_HEADER "${PUBLIC_HEADERS}"
+)
+
+INSTALL(
+  TARGETS                                 compiz_window_geometry_saver
+  RUNTIME             DESTINATION         bin
+  LIBRARY             DESTINATION         lib
+  ARCHIVE             DESTINATION         lib
+  PUBLIC_HEADER       DESTINATION         include/compiz
+)
+
+
+
+TARGET_LINK_LIBRARIES ( 
+  compiz_window_geometry_saver
+
+  compiz_window_geometry
+  
+  ${GLIBMM_LIBRARIES}
+)
 
=== added directory 'src/window/geometry-saver/include'
=== added directory 'src/window/geometry-saver/include/core'
=== added file 'src/window/geometry-saver/include/core/windowgeometrysaver.h'
--- src/window/geometry-saver/include/core/windowgeometrysaver.h	1970-01-01 00:00:00 +0000
+++ src/window/geometry-saver/include/core/windowgeometrysaver.h	2012-01-11 08:47:28 +0000
@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ * Copyright © 2008 Dennis Kasprzyk
+ * 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
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK 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.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ *          David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPWINDOWGEOMETRYSAVER_H
+#define _COMPWINDOWGEOMETRYSAVER_H
+
+#include <core/rect.h>
+#include <core/windowgeometry.h>
+
+namespace compiz
+{
+namespace window
+{
+
+/**
+ * A one-level push-pop stack for saving window geometry
+ * parameters, eg, to maximize and demaximize windows
+ * and make sure they are restored to the same place
+ * relative to the window */
+class GeometrySaver
+{
+public:
+
+    GeometrySaver (const Geometry &g);
+
+    /**
+     * Push some new geometry into the saved bits
+     *
+     * @param g a const compiz::window::Geometry & of the geometry
+     * you wish to push
+     * @param mask an unsigned int indicating which bits of the
+     * specified geometry should be saved
+     * @return the bits actually saved
+     */
+    unsigned int push (const Geometry &g, unsigned int mask);
+
+    /**
+     * Restore saved geometry
+     *
+     * @param g a compiz::window::Geometry & of the geometry
+     * which should be written into
+     * @param mask an unsigned int indicating which bits of the
+     * geometry should be restored
+     * @return the bits actually restored
+     */
+    unsigned int pop (Geometry &g, unsigned int mask);
+
+    /**
+     * Force update certain saved geometry bits
+     *
+     * @param g a const compiz::window::Geometry & of the geometry
+     * you wish to update
+     * @param mask an unsigned int indicating which bits of the
+     * specified geometry should be updated
+     */
+    void update (const Geometry &g, unsigned int mask);
+
+    unsigned int get (Geometry &g);
+
+private:
+
+    Geometry     mGeometry;
+    unsigned int mMask;
+};
+
+}
+}
+
+#endif
 
=== added directory 'src/window/geometry-saver/src'
=== added file 'src/window/geometry-saver/src/geometrysaver.cpp'
--- src/window/geometry-saver/src/geometrysaver.cpp	1970-01-01 00:00:00 +0000
+++ src/window/geometry-saver/src/geometrysaver.cpp	2012-01-11 08:47:28 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2008 Dennis Kasprzyk
+ *
+ * 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
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK 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.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ */
+
+#include <core/windowgeometrysaver.h>
+
+compiz::window::GeometrySaver::GeometrySaver (const Geometry &g) :
+    mGeometry (g),
+    mMask (0)
+{
+}
+
+unsigned int
+compiz::window::GeometrySaver::push (const Geometry &g, unsigned int mask)
+{
+    /* Don't allow overwriting of any already set geometry */
+    unsigned int useMask = mask & ~mMask;
+
+    mMask |= useMask;
+    mGeometry.applyChange (g, useMask);
+
+    return useMask;
+}
+
+unsigned int
+compiz::window::GeometrySaver::pop (Geometry &g, unsigned int mask)
+{
+    unsigned int restoreMask = mask & mMask;
+
+    mMask &= ~restoreMask;
+    g.applyChange (mGeometry, restoreMask);
+
+    return restoreMask;
+}
+
+void
+compiz::window::GeometrySaver::update (const Geometry &g,
+				       unsigned int   mask)
+{
+    /* By default, only update bits that have not been saved */
+    unsigned int updateMask = ~mMask;
+
+    /* But also update bits that we are forcing an update on */
+    updateMask |= mask;
+
+    mGeometry.applyChange (g, updateMask);
+}
+
+unsigned int
+compiz::window::GeometrySaver::get (Geometry &g)
+{
+    g = mGeometry;
+    return mMask;
+}
 
=== added directory 'src/window/geometry-saver/tests'
=== added file 'src/window/geometry-saver/tests/test-window-geometry-saver.cpp'
--- src/window/geometry-saver/tests/test-window-geometry-saver.cpp	1970-01-01 00:00:00 +0000
+++ src/window/geometry-saver/tests/test-window-geometry-saver.cpp	2012-01-11 08:47:28 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ *
+ * 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
+ * Canonical Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL CANONICAL, LTD. 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.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#include "test-window-geometry-saver.h"
 
=== added file 'src/window/geometry-saver/tests/test-window-geometry-saver.h'
--- src/window/geometry-saver/tests/test-window-geometry-saver.h	1970-01-01 00:00:00 +0000
+++ src/window/geometry-saver/tests/test-window-geometry-saver.h	2012-01-11 08:47:28 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ *
+ * 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
+ * Canonical Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL CANONICAL, LTD. 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.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#ifndef _COMPIZ_TEST_WINDOW_GEOMETRY_H
+#define _COMPIZ_TEST_WINDOW_GEOMETRY_H
+
+#include <gtest/gtest.h>
+#include <core/windowgeometrysaver.h>
+#include <core/rect.h>
+#include <iostream>
+#include <boost/bind.hpp>
+
+class CompWindowGeometryTest : public ::testing::Test
+{
+};
+
+#endif
 
=== added directory 'src/window/geometry-saver/tests/window-geometry-saver'
=== added directory 'src/window/geometry-saver/tests/window-geometry-saver/src'
=== added file 'src/window/geometry-saver/tests/window-geometry-saver/src/test-window-geometry-saver.cpp'
--- src/window/geometry-saver/tests/window-geometry-saver/src/test-window-geometry-saver.cpp	1970-01-01 00:00:00 +0000
+++ src/window/geometry-saver/tests/window-geometry-saver/src/test-window-geometry-saver.cpp	2012-01-11 08:47:28 +0000
@@ -0,0 +1,111 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ *
+ * 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
+ * Canonical Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL CANONICAL, LTD. 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.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#include "test-window-geometry-saver.h"
+
+class CompWindowGeometryTestSaver :
+    public CompWindowGeometryTest
+{
+public:
+
+    CompWindowGeometryTestSaver ();
+    virtual ~CompWindowGeometryTestSaver ();
+
+protected:
+
+    compiz::window::Geometry      g;
+    compiz::window::GeometrySaver saver;
+};
+
+CompWindowGeometryTestSaver::CompWindowGeometryTestSaver () :
+    g (100, 100, 300, 300, 5),
+    saver (g)
+{
+}
+
+CompWindowGeometryTestSaver::~CompWindowGeometryTestSaver ()
+{
+}
+
+TEST_F (CompWindowGeometryTestSaver, TestSaver)
+{
+    /* g by default */
+    compiz::window::Geometry rg;
+    unsigned int             mask = saver.get (rg);
+
+    EXPECT_EQ (mask, 0);
+    EXPECT_EQ (rg, compiz::window::Geometry (100, 100, 300, 300, 5));
+
+    /* Push X value on to the saved geometry */
+    saver.push (g, CHANGE_X);
+    mask = saver.get (rg);
+
+    EXPECT_EQ (mask, CHANGE_X);
+    EXPECT_EQ (rg, compiz::window::Geometry (100, 100, 300, 300, 5));
+
+    /* Push Y and Width values on to the saved geometry */
+    saver.push (g, CHANGE_Y | CHANGE_WIDTH);
+    mask = saver.get (rg);
+
+    EXPECT_EQ (mask, CHANGE_X | CHANGE_Y | CHANGE_WIDTH);
+    EXPECT_EQ (rg, compiz::window::Geometry (100, 100, 300, 300, 5));
+
+    /* Pop Y value off the saved geoemtry */
+    rg = compiz::window::Geometry ();
+    mask = saver.pop (rg, CHANGE_Y);
+
+    EXPECT_EQ (mask, CHANGE_Y);
+    EXPECT_EQ (rg, compiz::window::Geometry (0, 100, 0, 0, 0));
+
+    /* Attempt to pop X Y and Height off the saved geometry,
+     * but since Y is not saved, only expect X */
+    rg = compiz::window::Geometry ();
+    mask = saver.pop (rg, CHANGE_X | CHANGE_Y | CHANGE_HEIGHT);
+
+    EXPECT_EQ (mask, CHANGE_X);
+    EXPECT_EQ (rg, compiz::window::Geometry (100, 0, 0, 0, 0));
+
+    /* Update the saved geometry (eg, workspace change) and
+     * pop the new value off */
+    rg = compiz::window::Geometry ();
+    g.setWidth (1200);
+    saver.update (g, CHANGE_WIDTH);
+    mask = saver.pop (rg, CHANGE_WIDTH);
+
+    EXPECT_EQ (mask, CHANGE_WIDTH);
+    EXPECT_EQ (rg, compiz::window::Geometry (0, 0, 1200, 0, 0));
+
+    /* Try to push twice, only allow the first value to be popped off */
+    rg = compiz::window::Geometry ();
+    g.setWidth (1000);
+    saver.push (g, CHANGE_WIDTH);
+    g.setWidth (1200);
+    saver.push (g, CHANGE_WIDTH);
+
+    mask = saver.pop (rg, CHANGE_WIDTH);
+
+    EXPECT_EQ (mask, CHANGE_WIDTH);
+    EXPECT_EQ (rg, compiz::window::Geometry (0, 0, 1000, 0, 0));
+}
 
=== added file 'src/window/geometry/CMakeLists.txt'
--- src/window/geometry/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/window/geometry/CMakeLists.txt	2012-01-11 08:47:28 +0000
@@ -0,0 +1,65 @@
+pkg_check_modules (
+  GLIBMM
+  REQUIRED
+  glibmm-2.4 glib-2.0
+)
+
+INCLUDE_DIRECTORIES (  
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/src
+  
+  ${compiz_SOURCE_DIR}/include
+    
+  ${Boost_INCLUDE_DIRS}
+  
+  ${GLIBMM_INCLUDE_DIRS}
+)
+
+LINK_DIRECTORIES (${GLIBMM_LIBRARY_DIRS}) 
+
+SET ( 
+  PUBLIC_HEADERS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/core/windowgeometry.h
+)
+
+SET ( 
+  PRIVATE_HEADERS 
+)
+
+SET( 
+  SRCS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/windowgeometry.cpp
+  ${compiz_SOURCE_DIR}/src/rect.cpp
+)
+
+ADD_LIBRARY( 
+  compiz_window_geometry STATIC
+  
+  ${SRCS}
+  
+  ${PUBLIC_HEADERS}
+  ${PRIVATE_HEADERS}
+)
+
+ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
+
+SET_TARGET_PROPERTIES(
+  compiz_window_geometry PROPERTIES
+  PUBLIC_HEADER "${PUBLIC_HEADERS}"
+)
+
+INSTALL(
+  TARGETS                                 compiz_window_geometry
+  RUNTIME             DESTINATION         bin
+  LIBRARY             DESTINATION         lib
+  ARCHIVE             DESTINATION         lib
+  PUBLIC_HEADER       DESTINATION         include/compiz
+)
+
+
+
+TARGET_LINK_LIBRARIES( 
+  compiz_window_geometry
+  
+  ${GLIBMM_LIBRARIES}
+)
 
=== added directory 'src/window/geometry/include'
=== added directory 'src/window/geometry/include/core'
=== added file 'src/window/geometry/include/core/windowgeometry.h'
--- src/window/geometry/include/core/windowgeometry.h	1970-01-01 00:00:00 +0000
+++ src/window/geometry/include/core/windowgeometry.h	2012-01-11 08:47:28 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ * Copyright © 2008 Dennis Kasprzyk
+ * 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
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK 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.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ *          David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPWINDOWGEOMETRY_H
+#define _COMPWINDOWGEOMETRY_H
+
+#include <core/rect.h>
+
+/* FIXME: Remove #defines in favor of const variables
+ * inside of the compiz::window namespace */
+#define CHANGE_X       1 << 0
+#define CHANGE_Y       1 << 1
+#define CHANGE_WIDTH   1 << 2
+#define CHANGE_HEIGHT  1 << 3
+#define CHANGE_BORDER  1 << 4
+
+namespace compiz
+{
+namespace window
+{
+
+/**
+  * A mutable object about the dimensions and location of a CompWindow.
+  */
+class Geometry :
+    public CompRect
+{
+public:
+    Geometry ();
+    Geometry (int x, int y, int width, int height, int border);
+
+    int border () const;
+
+    void set (int x, int y, int width, int height, int border);
+    void setBorder (int border);
+
+    unsigned int changeMask (const compiz::window::Geometry &g) const;
+    void         applyChange (const compiz::window::Geometry &g, unsigned int mask);
+
+private:
+    int mBorder;
+};
+
+}
+}
+
+#endif
 
=== added directory 'src/window/geometry/src'
=== renamed file 'src/windowgeometry.cpp' => 'src/window/geometry/src/windowgeometry.cpp'
--- src/windowgeometry.cpp	2012-01-11 08:47:27 +0000
+++ src/window/geometry/src/windowgeometry.cpp	2012-01-11 08:47:28 +0000
@@ -23,9 +23,7 @@
  * Authors: Dennis Kasprzyk <[e-mail]>
  */
 
-#include <core/core.h>
-#include <core/window.h>
-#include <privatewindow.h>
+#include <core/windowgeometry.h>
 
 
 compiz::window::Geometry::Geometry () :
@@ -110,164 +108,3 @@
     if (mask & CHANGE_BORDER)
 	setBorder (g.border ());
 }
-
-const compiz::window::Geometry &
-CompWindow::serverGeometry () const
-{
-    return priv->serverGeometry;
-}
-
-const compiz::window::Geometry &
-CompWindow::geometry () const
-{
-    return priv->geometry;
-}
-
-int
-CompWindow::x () const
-{
-    return priv->geometry.x ();
-}
-
-int
-CompWindow::y () const
-{
-    return priv->geometry.y ();
-}
-
-CompPoint
-CompWindow::pos () const
-{
-    return CompPoint (priv->geometry.x (), priv->geometry.y ());
-}
-
-/* With border */
-int
-CompWindow::width () const
-{
-    return priv->width +
-	    priv->geometry.border ()  * 2;
-}
-
-int
-CompWindow::height () const
-{
-    return priv->height +
-	    priv->geometry.border ()  * 2;;
-}
-
-CompSize
-CompWindow::size () const
-{
-    return CompSize (priv->width + priv->geometry.border ()  * 2,
-		     priv->height + priv->geometry.border ()  * 2);
-}
-
-int
-CompWindow::serverX () const
-{
-    return priv->serverGeometry.x ();
-}
-
-int
-CompWindow::serverY () const
-{
-    return priv->serverGeometry.y ();
-}
-
-CompPoint
-CompWindow::serverPos () const
-{
-    return CompPoint (priv->serverGeometry.x (),
-		      priv->serverGeometry.y ());
-}
-
-/* With border */
-int
-CompWindow::serverWidth () const
-{
-    return priv->serverGeometry.width () +
-	   2 * priv->serverGeometry.border ();
-}
-
-int
-CompWindow::serverHeight () const
-{
-    return priv->serverGeometry.height () +
-	   2 * priv->serverGeometry.border ();
-}
-
-const CompSize
-CompWindow::serverSize () const
-{
-    return CompSize (priv->serverGeometry.width () +
-		     2 * priv->serverGeometry.border (),
-		     priv->serverGeometry.height () +
-		     2 * priv->serverGeometry.border ());
-}
-
-CompRect
-CompWindow::borderRect () const
-{
-    return CompRect (priv->geometry.x () - priv->geometry.border () - priv->border.left,
-		     priv->geometry.y () - priv->geometry.border () - priv->border.top,
-		     priv->geometry.width () + priv->geometry.border () * 2 +
-		     priv->border.left + priv->border.right,
-		     priv->geometry.height () + priv->geometry.border () * 2 +
-		     priv->border.top + priv->border.bottom);
-}
-
-CompRect
-CompWindow::serverBorderRect () const
-{
-    return CompRect (priv->serverGeometry.x () - priv->geometry.border () - priv->border.left,
-		     priv->serverGeometry.y () - priv->geometry.border () - priv->border.top,
-		     priv->serverGeometry.width () + priv->geometry.border () * 2 +
-		     priv->border.left + priv->border.right,
-		     priv->serverGeometry.height () + priv->geometry.border () * 2 +
-		     priv->border.top + priv->border.bottom);
-}
-
-CompRect
-CompWindow::inputRect () const
-{
-    return CompRect (priv->geometry.x () - priv->geometry.border () - priv->serverInput.left,
-		     priv->geometry.y () - priv->geometry.border () - priv->serverInput.top,
-		     priv->geometry.width () + priv->geometry.border () * 2 +
-		     priv->serverInput.left + priv->serverInput.right,
-		     priv->geometry.height () +priv->geometry.border () * 2 +
-		     priv->serverInput.top + priv->serverInput.bottom);
-}
-
-CompRect
-CompWindow::serverInputRect () const
-{
-    return CompRect (priv->serverGeometry.x () - priv->serverGeometry.border () - priv->serverInput.left,
-		     priv->serverGeometry.y () - priv->serverGeometry.border () - priv->serverInput.top,
-		     priv->serverGeometry.width () + priv->serverGeometry.border () * 2 +
-		     priv->serverInput.left + priv->serverInput.right,
-		     priv->serverGeometry.height () + priv->serverGeometry.border () * 2 +
-		     priv->serverInput.top + priv->serverInput.bottom);
-}
-
-CompRect
-CompWindow::outputRect () const
-{
-    return CompRect (priv->geometry.x () - priv->serverGeometry.border ()- priv->output.left,
-		     priv->geometry.y () - priv->serverGeometry.border () - priv->output.top,
-		     priv->geometry.width () + priv->serverGeometry.border () * 2 +
-		     priv->output.left + priv->output.right,
-		     priv->geometry.height () + priv->serverGeometry.border () * 2 +
-		     priv->output.top + priv->output.bottom);
-}
-
-CompRect
-CompWindow::serverOutputRect () const
-{
-    return CompRect (priv->serverGeometry.x () - priv->serverGeometry.border () -  priv->output.left,
-		     priv->serverGeometry.y () - priv->serverGeometry.border () - priv->output.top,
-		     priv->serverGeometry.width () + priv->serverGeometry.border () * 2 +
-		     priv->output.left + priv->output.right,
-		     priv->serverGeometry.height () + priv->serverGeometry.border () * 2 +
-		     priv->output.top + priv->output.bottom);
-}
 
=== added directory 'src/window/geometry/tests'
=== added file 'src/window/geometry/tests/test-window-geometry.cpp'
--- src/window/geometry/tests/test-window-geometry.cpp	1970-01-01 00:00:00 +0000
+++ src/window/geometry/tests/test-window-geometry.cpp	2012-01-11 08:47:28 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ *
+ * 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
+ * Canonical Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL CANONICAL, LTD. 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.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#include "test-window-geometry.h"
 
=== added file 'src/window/geometry/tests/test-window-geometry.h'
--- src/window/geometry/tests/test-window-geometry.h	1970-01-01 00:00:00 +0000
+++ src/window/geometry/tests/test-window-geometry.h	2012-01-11 08:47:28 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ *
+ * 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
+ * Canonical Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL CANONICAL, LTD. 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.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#ifndef _COMPIZ_TEST_WINDOW_GEOMETRY_H
+#define _COMPIZ_TEST_WINDOW_GEOMETRY_H
+
+#include <gtest/gtest.h>
+#include <core/windowgeometry.h>
+#include <core/rect.h>
+#include <iostream>
+#include <boost/bind.hpp>
+
+class CompWindowGeometryTest : public ::testing::Test
+{
+};
+
+#endif
 
=== added directory 'src/window/geometry/tests/window-geometry'
=== added directory 'src/window/geometry/tests/window-geometry/src'
=== added file 'src/window/geometry/tests/window-geometry/src/test-window-geometry.cpp'
--- src/window/geometry/tests/window-geometry/src/test-window-geometry.cpp	1970-01-01 00:00:00 +0000
+++ src/window/geometry/tests/window-geometry/src/test-window-geometry.cpp	2012-01-11 08:47:28 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ *
+ * 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
+ * Canonical Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL CANONICAL, LTD. 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.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#include "test-window-geometry.h"
+
+class CompWindowGeometryTestGeometry :
+    public CompWindowGeometryTest
+{
+    public:
+
+	CompWindowGeometryTestGeometry ();
+	~CompWindowGeometryTestGeometry ();
+
+    protected:
+
+	compiz::window::Geometry g;
+};
+
+CompWindowGeometryTestGeometry::CompWindowGeometryTestGeometry () :
+    g (50, 100, 200, 300, 5)
+{
+}
+
+CompWindowGeometryTestGeometry::~CompWindowGeometryTestGeometry ()
+{
+}
+
+TEST_F (CompWindowGeometryTestGeometry, TestGeometry)
+{
+
+    /* apply x only */
+    compiz::window::Geometry rg = compiz::window::Geometry ();
+    rg.applyChange (g, CHANGE_X);
+
+    EXPECT_EQ (rg, compiz::window::Geometry (50, 0, 0, 0, 0));
+
+    /* apply y only */
+    rg = compiz::window::Geometry ();
+    rg.applyChange (g, CHANGE_Y);
+
+    EXPECT_EQ (rg, compiz::window::Geometry (0, 100, 0, 0, 0));
+
+    /* apply width only */
+    rg = compiz::window::Geometry ();
+    rg.applyChange (g, CHANGE_WIDTH);
+
+    EXPECT_EQ (rg, compiz::window::Geometry (0, 0, 200, 0, 0));
+
+    /* apply height only */
+    rg = compiz::window::Geometry ();
+    rg.applyChange (g, CHANGE_HEIGHT);
+
+    EXPECT_EQ (rg, compiz::window::Geometry (0, 0, 0, 300, 0));
+
+    /* apply width | height */
+    rg = compiz::window::Geometry ();
+    rg.applyChange (g, CHANGE_WIDTH | CHANGE_HEIGHT);
+
+    EXPECT_EQ (rg, compiz::window::Geometry (0, 0, 200, 300, 0));
+
+    /* change mask for x | y | width | height */
+    rg  = compiz::window::Geometry (49, 99, 199, 299, 5);
+    unsigned int mask = rg.changeMask (g);
+
+    EXPECT_EQ (rg, compiz::window::Geometry (49, 99, 199, 299, 5));
+    EXPECT_EQ (mask, CHANGE_X | CHANGE_Y | CHANGE_WIDTH | CHANGE_HEIGHT);
+}