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

[Sam Spilsbury]

Make the decor plugin work with paint offsets.

Moved getting the shift distance due to window gravity into a utility function in core and made it so that whenever a plugin tries to change the frame extents of a window, this will always update the saved co-ordinates of maximized windows so that they restore to the correct position if their frame extents change while they are maximized (eg, the unity case)

CompositeWindow::damageGeometrySets will create a region containing an old an new geometry.

Fixed display matrices not being updated on override redirect windows - ::position never gets called for them, we must do it when the server updates the position.

Moved the geometry and geometry saver tests into a separate subdir

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

[Sam Spilsbury (smspillaz)]

Make the decor plugin work with paint offsets.

Moved getting the shift distance due to window gravity into a utility function in core and made it so that whenever a plugin tries to change the frame extents of a window, this will always update the saved co-ordinates of maximized windows so that they restore to the correct position if their frame extents change while they are maximized (eg, the unity case)

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

2903. By Sam Spilsbury on 2011-12-02

Merged compiz-core.fix_894685

2904. By Sam Spilsbury on 2011-12-02

Fix typo

2905. By Sam Spilsbury on 2011-12-02

Added tests for compiz::window::extents::Extents

2906. By Sam Spilsbury on 2011-12-02

Don't depend on core.h for CompRect

2907. By Sam Spilsbury on 2011-12-02

Added missing files

2908. By Sam Spilsbury on 2011-12-02

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2909. By Sam Spilsbury on 2011-12-03

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2910. By Sam Spilsbury on 2011-12-03

Merge

2911. By Sam Spilsbury on 2011-12-03

Fixed typo in the test-window-geometry test that was causing it to fail

2912. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2913. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2914. By Sam Spilsbury on 2011-12-05

Merge compiz-core.fix_894633

2915. By Sam Spilsbury on 2011-12-05

Fix whitespace

[Thomi Richards (thomir-deactivatedaccount)]

ln 130 - is the change from 'geometry' to 'serverGeometry' intentional?

ln 214 - Why not write this as:

cScreen->damageRegion(oldGeometry + newGeometry);

ln 980 - this obviously only works as long as both structures have exactly
 the same contents and are laid out in exactly the same manner. I assume you have checked that this is the case?

As far as I can tell, this is looking good, with the few points mentioned above.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

> ln 130 - is the change from 'geometry' to 'serverGeometry' intentional?
>

Yes, the serverGeometry is what is used to paint the window while we wait on the server to give us the new geometry for the window (which is always guarunteed to be the geometry last sent (eg serverGeometry) as we are the window manager).

> ln 214 - Why not write this as:
>
> cScreen->damageRegion(oldGeometry + newGeometry);

fixed

>
> ln 980 - this obviously only works as long as both structures have exactly
> the same contents and are laid out in exactly the same manner. I assume you
> have checked that this is the case?

Yes, they are both CompWindowExtents. Perhaps I should make it so that you can't derive from that class though, I might ask Tim about that.

>
>
> As far as I can tell, this is looking good, with the few points mentioned
> above.

[Sam Spilsbury (smspillaz)]

>> ln 214 - Why not write this as:
>>
>> cScreen->damageRegion(oldGeometry + newGeometry);

> fixed

Actually, there's no operator+ defined in CompRect which returns a region, and I'm not really sure if I want to introduce a cyclic dependency like that. So I think the explicit conversion is better off for now.

[Thomi Richards (thomir-deactivatedaccount)]

OK, I'm happy.

review: Approve

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

2916. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2917. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2918. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2919. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

[Tim Penhey (thumper)]

> (memcmp (&priv->serverInput, i, sizeof (CompWindowExtents)) ||
> memcmp (&priv->border, b, sizeof (CompWindowExtents)))

Please write an operator == and not use memcmp. Even for simple structs.
Then implement operator != in terms of operator ==.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

The main reason (other than stylistic and religious) for not using memcmp on structs is because structs are often not perfectly aligned and so contain padding bytes. The padding bytes are uninitialized, unpredictable and inaccessible unless you also guarantee each struct has first been memset(&s,0,sizeof(s)).

In general, memcmp is highly optimized for the architecture and is in fact faster than a bespoke operator. However you can't use memcmp with structs unless you guarantee they're always fully initialized with memset to the full sizeof(yourstruct).

[Sam Spilsbury (smspillaz)]

On Thu, 15 Dec 2011, Daniel van Vugt wrote:

> The main reason (other than stylistic and religious) for not using memcmp on structs is because structs are often not perfectly aligned and so contain padding bytes. The padding bytes are uninitialized, unpredictable and inaccessible unless you also guarantee each struct has first been memset(&s,0,sizeof(s)).
>
> In general, memcmp is highly optimized for the architecture and is in fact faster than a bespoke operator. However you can't use memcmp with structs unless you guarantee they're always fully initialized with memset to the full sizeof(yourstruct).

Thanks Daniel - I didn't know that, so I'll keep it in mind (and probably
just implement operator==)

> --
> https://code.launchpad.net/~smspillaz/compiz-core/fix_894688/+merge/84058
> You are the owner of lp:~smspillaz/compiz-core/fix_894688.
>

[Daniel van Vugt (vanvugt)]

I made the same mistake myself...
http://sourceforge.net/p/dapar/code/ci/d92e7bf1ec46ad6f984efa714483f2e19a40a3ab

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

2920. By Sam Spilsbury on 2011-12-20

Merged previous pipe

2921. By Sam Spilsbury on 2011-12-20

Use operator== in windowextents

2922. By Sam Spilsbury on 2011-12-23

Merge

2923. By Sam Spilsbury on 2012-01-03

Merge

2924. By Sam Spilsbury on 2012-01-03

Moved compiz::window::extents::Extents and CompPoint to the new testing structure and Google Test

2925. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2926. By Sam Spilsbury on 2012-01-04

Expose extents and point in the plugins list

2927. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2928. By Sam Spilsbury on 2012-01-04

Merge

2929. By Sam Spilsbury on 2012-01-04

Fix typo

[Thomas Voß (thomas-voss)]

Looks good to me.

review: Approve

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

2930. By Sam Spilsbury on 2012-01-05

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2931. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2932. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2933. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2934. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2935. By Sam Spilsbury on 2012-01-10

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2936. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2937. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2938. By Sam Spilsbury on 2012-01-11

Merge

Unmerged revisions

2938. By Sam Spilsbury on 2012-01-11

Merge

2937. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2936. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2935. By Sam Spilsbury on 2012-01-10

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2934. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2933. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2932. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2931. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2930. By Sam Spilsbury on 2012-01-05

Merged compiz-core.fix_894685 into compiz-core.fix_894688.

2929. By Sam Spilsbury on 2012-01-04

Fix typo

=== removed file 'include/core/point.h'
--- include/core/point.h	2010-03-24 09:37:19 +0000
+++ include/core/point.h	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-/*
- * 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]>
- */
-
-#ifndef _COMPPOINT_H
-#define _COMPPOINT_H
-
-#include <vector>
-#include <list>
-
-/**
- * A 2D coordinate (likely in screen space) that can only be mutated
- * through set() methods, since it's data members are private.
- */
-class CompPoint {
-
-    public:
-	CompPoint ();
-	CompPoint (int, int);
-	
-	/**
-	 * Get the x coordinate of this point
-	 */
-	int x () const;
-	
-	/**
-	 * Get the y coordinate of this point
-	 */
-	int y () const;
-	
-	/**
-	 * Set the x and y coordinate of this point
-	 */
-	void set (int, int);
-	
-	/**
-	 * Set the x coordinate of this point
-	 */
-	void setX (int);
-	
-	/**
-	 * Set the y coordinate of this point
-	 */
-	void setY (int);
-
-	bool operator== (const CompPoint &) const;
-	bool operator!= (const CompPoint &) const;
-	
-	/**
-	 * Takes from both co-ordinates
-	 */
-	CompPoint & operator-= (const CompPoint &);
-	/**
-	 * Adds to both co-ordinates
-	 */
-	CompPoint & operator+= (const CompPoint &);
-	
-	/**
-	 * Retuns an added point
-	 */
-	CompPoint operator+ (const CompPoint &) const;
-	/**
-	 * Returns a subtracted point
-	 */
-	CompPoint operator- (const CompPoint &) const;
-
-	typedef std::vector<CompPoint> vector;
-	typedef std::vector<CompPoint *> ptrVector;
-	typedef std::list<CompPoint> list;
-	typedef std::list<CompPoint *> ptrList;
-
-    private:
-	int mX, mY;
-};
-
-inline int
-CompPoint::x () const
-{
-    return mX;
-}
-
-inline int
-CompPoint::y () const
-{
-    return mY;
-}
-
-
-#endif

=== modified file 'include/core/window.h'
--- include/core/window.h	2012-01-11 08:48:40 +0000
+++ include/core/window.h	2012-01-11 08:48:40 +0000
@@ -43,6 +43,7 @@
 #include <core/region.h>
 #include <core/windowgeometry.h>
 #include <core/windowgeometrysaver.h>
+#include <core/windowextents.h>
 
 #include <core/wrapsystem.h>
 
@@ -197,16 +198,7 @@
    CompWindowNotifyBeforeMap
 };
 
-/**
- * Specifies the left, right, top and bottom positions of a window's
- * geometry
- */
-struct CompWindowExtents {
-    int left;
-    int right;
-    int top;
-    int bottom;
-};
+
 
 /**
  * Specifies the area of the screen taken up by strut windows

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2012-01-11 08:48:40 +0000
+++ plugins/CMakeLists.txt	2012-01-11 08:48:40 +0000
@@ -17,6 +17,8 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/logmessage/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/window/geometry/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/window/geometry-saver/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/../src/window/extents/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/../src/point/include
 )
 
 compiz_add_plugins_in_folder (${CMAKE_CURRENT_SOURCE_DIR})

=== modified file 'plugins/composite/src/privates.h'
--- plugins/composite/src/privates.h	2012-01-11 08:48:40 +0000
+++ plugins/composite/src/privates.h	2012-01-11 08:48:40 +0000
@@ -134,6 +134,9 @@
 				      int             width,
 				      int             height);
 
+	void damageGeometrySets (const compiz::window::Geometry &ng,
+				 const compiz::window::Geometry &og);
+
     public:
 	CompWindow      *window;
 	CompositeWindow *cWindow;

=== modified file 'plugins/composite/src/window.cpp'
--- plugins/composite/src/window.cpp	2012-01-11 08:48:40 +0000
+++ plugins/composite/src/window.cpp	2012-01-11 08:48:40 +0000
@@ -273,20 +273,20 @@
     {
 	int x1, x2, y1, y2;
 
-	compiz::window::Geometry geom = priv->window->geometry ();
-	CompWindowExtents output  = priv->window->output ();
+	const compiz::window::Geometry &geom = priv->window->serverGeometry ();
+	const CompWindowExtents        &output  = priv->window->output ();
 
 	/* top */
 	x1 = -output.left - geom.border ();
 	y1 = -output.top - geom.border ();
-	x2 = priv->window->size ().width () + output.right - geom.border ();
+	x2 = geom.width () + output.right - geom.border ();
 	y2 = -geom.border ();
 
 	if (x1 < x2 && y1 < y2)
 	    addDamageRect (CompRect (x1, y1, x2 - x1, y2 - y1));
 
 	/* bottom */
-	y1 = priv->window->size ().height () - geom.border ();
+	y1 = geom.height () - geom.border ();
 	y2 = y1 + output.bottom - geom.border ();
 
 	if (x1 < x2 && y1 < y2)
@@ -296,13 +296,13 @@
 	x1 = -output.left - geom.border ();
 	y1 = -geom.border ();
 	x2 = -geom.border ();
-	y2 = priv->window->size ().height () - geom.border ();
+	y2 = geom.height () - geom.border ();
 
 	if (x1 < x2 && y1 < y2)
 	    addDamageRect (CompRect (x1, y1, x2 - x1, y2 - y1));
 
 	/* right */
-	x1 = priv->window->size ().width () - geom.border ();
+	x1 = geom.width () - geom.border ();
 	x2 = x1 + output.right - geom.border ();
 
 	if (x1 < x2 && y1 < y2)
@@ -318,23 +318,11 @@
 
     if (!damageRect (false, rect))
     {
-	int x, y;
-	CompRegion damage = CompRegion ();
-
-	x = rect.x ();
-	y = rect.y ();
-
-	const compiz::window::Geometry &geom = priv->window->geometry ();
-
-	x += geom.x () + geom.border ();
-	y += geom.y () + geom.border ();
-
-	/* Damage this region */
-
-	x += priv->offset.x ();
-	y += priv->offset.y ();
-
-	damage += CompRect (x, y, rect.width (), rect.height ());
+	CompRegion damage = CompRegion (rect);
+	const compiz::window::Geometry &geom = priv->window->serverGeometry ();
+
+	damage.translate (geom.x () + geom.border () + priv->offset.x (),
+			  geom.y () + geom.border () + priv->offset.y ());
 
 	priv->cScreen->damageRegion (damage);
     }
@@ -355,10 +343,10 @@
 		       priv->window->input ().left) - border;
 	int y1 = -MAX (priv->window->output ().top,
 		       priv->window->input ().top) - border;
-	int x2 = priv->window->size ().width () +
+	int x2 = priv->window->geometry ().width () +
 		 MAX (priv->window->output ().right,
 		      priv->window->input ().right) ;
-	int y2 = priv->window->size ().height () +
+	int y2 = priv->window->geometry ().height () +
 		 MAX (priv->window->output ().bottom,
 		      priv->window->input ().bottom) ;
 	CompRect r (x1, y1, x2 - x1, y2 - y1);
@@ -579,14 +567,46 @@
     window->windowNotify (n);
 }
 
+void
+PrivateCompositeWindow::damageGeometrySets (const compiz::window::Geometry &newGeometry,
+					    const compiz::window::Geometry &oldGeometry)
+{
+    CompRegion r (newGeometry);
+    r += oldGeometry;
+
+    cScreen->damageRegion (r);
+}
+
 bool
 PrivateCompositeWindow::position (compiz::window::Geometry &g,
 				  unsigned int             source,
 				  unsigned int             constrainment)
 {
-    cWindow->addDamage ();
     cWindow->applyOffset (CompPoint (-offset.x (), -offset.y ()));
-    cWindow->addDamage ();
+
+    if (window->shaded () || window->isViewable ())
+    {
+	const CompWindowExtents &output = window->output ();
+	compiz::window::Geometry oldGeom = window->serverGeometry ();
+	compiz::window::Geometry newGeom (g);
+
+	/* Apply output offsets */
+	oldGeom.setLeft (oldGeom.left () - output.left);
+	oldGeom.setRight (oldGeom.right () + output.right);
+	oldGeom.setTop (oldGeom.top () - output.top);
+	oldGeom.setBottom (oldGeom.bottom () + output.bottom);
+
+	newGeom.setLeft (newGeom.left () - output.left);
+	newGeom.setRight (newGeom.right () + output.right);
+	newGeom.setTop (newGeom.top () - output.top);
+	newGeom.setBottom (newGeom.bottom () + output.bottom);
+
+	/* Translate by position offset */
+	oldGeom.setPos (oldGeom.pos () + cWindow->paintOffset ());
+	newGeom.setPos (newGeom.pos () + cWindow->paintOffset ());
+
+	damageGeometrySets (newGeom, oldGeom);
+    }
 
     return window->position (g, source, constrainment);
 }
@@ -599,21 +619,32 @@
     Pixmap pixmap = None;
     CompSize size = CompSize ();
 
-    if (window->shaded () || (window->isViewable ()))
+    if (window->overrideRedirect () &&
+	window->isViewable ())
     {
-	int x, y, x1, x2, y1, y2;
-
-	x = window->geometry ().x ();
-	y = window->geometry ().y ();
-
-	x1 = x - window->output ().left - dx;
-	y1 = y - window->output ().top - dy;
-	x2 = x + window->size ().width () +
-	     window->output ().right - dx - dwidth;
-	y2 = y + window->size ().height () +
-	     window->output ().bottom - dy - dheight;
-
-	cScreen->damageRegion (CompRegion (CompRect (x1, y1, x2 - x1, y2 - y1)));
+	const CompWindowExtents &output = window->output ();
+	compiz::window::Geometry oldGeom = window->serverGeometry ();
+
+	/* Apply output offsets */
+	oldGeom.setLeft (oldGeom.left () - output.left);
+	oldGeom.setRight (oldGeom.right () + output.right);
+	oldGeom.setTop (oldGeom.top () - output.top);
+	oldGeom.setBottom (oldGeom.bottom () + output.bottom);
+
+	/* Translate by position offset */
+	oldGeom.setPos (oldGeom.pos () + cWindow->paintOffset ());
+
+	compiz::window::Geometry newGeom = oldGeom;
+
+	/* Since the geometry has already been updated
+	 * at resizeNotify time, we must compute the old
+	 * geometry */
+
+	oldGeom.setPos (oldGeom.pos () - CompPoint (-dx, -dy));
+	oldGeom.setWidth (oldGeom.width () - dwidth);
+	oldGeom.setHeight (oldGeom.height () - dheight);
+
+	damageGeometrySets (oldGeom, window->serverGeometry ());
     }
 
     if (window->mapNum () && redirected)
@@ -654,24 +685,36 @@
 void
 PrivateCompositeWindow::moveNotify (int dx, int dy, bool now)
 {
-    if (window->shaded () || (window->isViewable ()))
-    {
-	int x, y, x1, x2, y1, y2;
-
-	x = window->geometry ().x ();
-	y = window->geometry ().y ();
-
-	x1 = x - window->output ().left - dx;
-	y1 = y - window->output ().top - dy;
-	x2 = x + window->size ().width () +
-	     window->output ().right - dx;
-	y2 = y + window->size ().height () +
-	     window->output ().bottom - dy;
-
-	cScreen->damageRegion (CompRegion (CompRect (x1, y1, x2 - x1, y2 - y1)));
-    }
-
     window->moveNotify (dx, dy, now);
+
+    /* Override redirect windows don't
+     * get a call to position () so
+     * process damage here at ConfigureNotify
+     * time */
+    if (window->overrideRedirect () &&
+	window->isViewable ())
+    {
+	const CompWindowExtents &output = window->output ();
+	compiz::window::Geometry oldGeom = window->serverGeometry ();
+
+	/* Apply output offsets */
+	oldGeom.setLeft (oldGeom.left () - output.left);
+	oldGeom.setRight (oldGeom.right () + output.right);
+	oldGeom.setTop (oldGeom.top () - output.top);
+	oldGeom.setBottom (oldGeom.bottom () + output.bottom);
+
+	/* Translate by position offset */
+	oldGeom.setPos (oldGeom.pos () + cWindow->paintOffset ());
+
+	compiz::window::Geometry newGeom = oldGeom;
+
+	/* Since the geometry has already been updated
+	 * at moveNotify time, we must compute the old
+	 * geometry */
+	oldGeom.setPos (oldGeom.pos () - CompPoint (-dx, -dy));
+
+	damageGeometrySets (oldGeom, newGeom);
+    }
 }
 
 bool

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2012-01-11 08:48:40 +0000
+++ plugins/decor/src/decor.cpp	2012-01-11 08:48:40 +0000
@@ -91,7 +91,10 @@
 void
 DecorWindow::computeShadowRegion ()
 {
-    shadowRegion = CompRegion (window->outputRect ());
+    shadowRegion = CompRegion (window->serverOutputRect ());
+
+    if (dScreen->cmActive)
+	shadowRegion.translate (cWindow->paintOffset ());
 
     if (window->type () == CompWindowTypeDropdownMenuMask ||
         window->type () == CompWindowTypePopupMenuMask)
@@ -140,13 +143,13 @@
          * that will look a lot better.
          */
         if (window->type () == CompWindowTypeDropdownMenuMask &&
-	    shadowRegion == CompRegion (window->outputRect ()))
+	    shadowRegion == CompRegion (window->serverOutputRect ()))
         {
-            CompRect area (window->outputRect ().x1 (),
-                           window->outputRect ().y1 (),
-                           window->outputRect ().width (),
-			   window->inputRect ().y1 () -
-                           window->outputRect ().y1 ());
+	    CompRect area (window->serverOutputRect ().x1 (),
+			   window->serverOutputRect ().y1 (),
+			   window->serverOutputRect ().width (),
+			   window->serverInputRect ().y1 () -
+			   window->serverOutputRect ().y1 ());
 
 	    shadowRegion = shadowRegion.subtracted (area);
         }
@@ -913,6 +916,27 @@
 }
 
 /*
+ * WindowDecoration::translate
+ *
+ * Translate window decoration base region
+ * by a specified size, does not update
+ * the window decoration scaling matrix
+ */
+void
+WindowDecoration::translate (const CompPoint &dp)
+{
+    int		 i;
+
+    for (i = 0; i < nQuad; i++)
+    {
+	quad[i].box.x1 += dp.x ();
+	quad[i].box.y1 += dp.y ();
+	quad[i].box.x2 += dp.x ();
+	quad[i].box.y2 += dp.y ();
+    }
+}
+
+/*
  * DecorWindow::setDecorationMatrices
  *
  * Statically update the quad display matrices
@@ -1019,7 +1043,7 @@
 
     for (i = 0; i < wd->nQuad; i++)
     {
-	int x, y;
+	CompPoint    pos;
 	unsigned int width = window->size ().width ();
 	unsigned int height = window->size ().height ();
 
@@ -1030,13 +1054,15 @@
 			&x1, &y1, &x2, &y2, &sx, &sy);
 
 	/* Translate by x and y points of this window */
-	x = window->geometry ().x ();
-	y = window->geometry ().y ();
-
-	wd->quad[i].box.x1 = x1 + x;
-	wd->quad[i].box.y1 = y1 + y;
-	wd->quad[i].box.x2 = x2 + x;
-	wd->quad[i].box.y2 = y2 + y;
+	pos = window->serverGeometry ().pos ();
+
+	if (cWindow)
+	    pos += cWindow->paintOffset ();
+
+	wd->quad[i].box.x1 = x1 + pos.x ();
+	wd->quad[i].box.y1 = y1 + pos.y ();
+	wd->quad[i].box.x2 = x2 + pos.x ();
+	wd->quad[i].box.y2 = y2 + pos.y ();
 	wd->quad[i].sx     = sx;
 	wd->quad[i].sy     = sy;
     }
@@ -1064,64 +1090,6 @@
 }
 
 /*
- * DecorWindow::shiftX
- *
- * Determines the amount that the window needs to
- * move based on the gravity hint once it is decorated,
- * at least in the X direction
- *
- * FIXME: This should be merged into a function
- * that returns CompPoint, there is no reason for
- * there to be two separate functions
- *
- */
-int
-DecorWindow::shiftX ()
-{
-    switch (window->sizeHints ().win_gravity) {
-	case WestGravity:
-	case NorthWestGravity:
-	case SouthWestGravity:
-	    return window->border ().left;
-	case EastGravity:
-	case NorthEastGravity:
-	case SouthEastGravity:
-	    return -window->border ().right;
-    }
-
-    return 0;
-}
-
-/*
- * DecorWindow::shiftY
- *
- * Determines the amount that the window needs to
- * move based on the gravity hint once it is decorated,
- * at least in the Y direction
- *
- * FIXME: This should be merged into a function
- * that returns CompPoint, there is no reason for
- * there to be two separate functions
- *
- */
-int
-DecorWindow::shiftY ()
-{
-    switch (window->sizeHints ().win_gravity) {
-	case NorthGravity:
-	case NorthWestGravity:
-	case NorthEastGravity:
-	    return window->border ().top;
-	case SouthGravity:
-	case SouthWestGravity:
-	case SouthEastGravity:
-	    return -window->border ().bottom;
-    }
-
-    return 0;
-}
-
-/*
  * decorOffsetMove
  *
  * Function called on a timer (to avoid calling position from
@@ -1387,8 +1355,7 @@
     bool	     decorate = false;
     bool	     shadowOnly = true;
     int		     moveDx, moveDy;
-    int		     oldShiftX = 0;
-    int		     oldShiftY  = 0;
+    CompPoint        oldShift;
 
     old = (wd) ? wd->decor : NULL;
 
@@ -1507,14 +1474,16 @@
      * WindowDecoration */
     if (old)
     {
-	oldShiftX = shiftX ();
-	oldShiftY = shiftY ();
+	oldShift = compiz::window::extents::shift (window->border (),
+					   window->sizeHints ().win_gravity);
 
 	WindowDecoration::destroy (wd);
 
 	wd = NULL;
     }
 
+    CompPoint movement;
+
     /* If a decoration was found for this window, create
      * a new WindowDecoration for it and set the frame
      * extents accordingly. We should also move the
@@ -1537,8 +1506,8 @@
 	    window->setWindowFrameExtents (&wd->decor->border,
 					   &wd->decor->input);
 
-	moveDx = shiftX () - oldShiftX;
-	moveDy = shiftY () - oldShiftY;
+	movement = compiz::window::extents::shift (window->border (),
+					   window->sizeHints ().win_gravity) - oldShift;
 
 	/* Update the input and output frame */
 	if (decorate)
@@ -1563,8 +1532,7 @@
 
 	window->setWindowFrameExtents (&emptyExtents, &emptyExtents);
 
-	moveDx = -oldShiftX;
-	moveDy = -oldShiftY;
+	movement = CompPoint (-oldShift.x (), -oldShift.y ());
     }
 
     /* Need to actually move the window */
@@ -1575,7 +1543,6 @@
 	 * time and not here since serverGeometry may be updated by
 	 * the time that we do call position () */
 
-	CompPoint      d (moveDx, moveDy);
 	unsigned int   mask = CHANGE_X | CHANGE_Y;
 
 	/* Except if it's fullscreen, maximized or such */
@@ -1600,9 +1567,9 @@
 	     * refcounting in case we need to keep it alive
 	     */
 	    if (!allowDecoration)
-		decorOffsetMove (window, d, mask);
+		decorOffsetMove (window, movement, mask);
 	    else
-		moveUpdate.start (boost::bind (decorOffsetMove, window, d, mask), 0);
+		moveUpdate.start (boost::bind (decorOffsetMove, window, movement, mask), 0);
 	}
     }
 
@@ -2129,7 +2096,8 @@
 void
 DecorWindow::updateWindowRegions ()
 {
-    const CompRect &input (window->inputRect ());
+    CompRect input (window->serverInputRect ());
+    input.setPos (input.pos () + cWindow->paintOffset ());
 
     if (regions.size () != gWindow->textures ().size ())
 	regions.resize (gWindow->textures ().size ());
@@ -2691,31 +2659,64 @@
 }
 
 /*
- * DecorWindow::moveNotify
+ * DecorWindow::position
  *
  * Translate window scaled quad boxes for movement
  * and also recompute shadow clip regions
  * for panels and menus
  */
-void
-DecorWindow::moveNotify (int dx, int dy, bool immediate)
+bool
+DecorWindow::position (compiz::window::Geometry &g,
+		       unsigned int             source,
+		       unsigned int             constrainment)
 {
+    CompPoint dp = g.pos () - window->serverGeometry ().pos ();
+    CompSize  dsize = CompSize (g.width () - window->serverGeometry ().width (),
+				g.height () - window->serverGeometry ().height ());
+
     if (wd)
     {
-	int		 i;
-
-	for (i = 0; i < wd->nQuad; i++)
+	wd->translate (dp);
+
+	/* Need to update the scaling factors
+	 * on a size change, but not a position change */
+	if (dsize.width () || dsize.height ())
+	    updateDecorationScale ();
+	else if (dp.x () || dp.y ())
+	    setDecorationMatrices ();
+    }
+
+    if (abs (dp.x ()) || abs (dp.y ()) ||
+	abs (dsize.width ()) || abs (dsize.height ()))
+	updateReg = true;
+
+    bool ret = window->position (g, source, constrainment);
+
+    if (dScreen->cmActive)
+    {
+	foreach (CompWindow *cw,
+		 DecorScreen::get (screen)->cScreen->getWindowPaintList ())
 	{
-	    wd->quad[i].box.x1 += dx;
-	    wd->quad[i].box.y1 += dy;
-	    wd->quad[i].box.x2 += dx;
-	    wd->quad[i].box.y2 += dy;
+	    DecorWindow::get (cw)->computeShadowRegion ();
 	}
-
+    }
+
+    return ret;
+}
+
+void
+DecorWindow::applyOffset (const CompPoint &dOff)
+{
+    if (wd)
+    {
+	wd->translate (dOff);
 	setDecorationMatrices ();
     }
+
     updateReg = true;
 
+    cWindow->applyOffset (dOff);
+
     if (dScreen->cmActive)
     {
 	foreach (CompWindow *cw,
@@ -2724,8 +2725,6 @@
 	    DecorWindow::get (cw)->computeShadowRegion ();
 	}
     }
-
-    window->moveNotify (dx, dy, immediate);
 }
 
 /*
@@ -2751,6 +2750,7 @@
 
     if (!window->hasUnmapReference ())
 	update (true);
+
     return false;
 }
 
@@ -2761,7 +2761,6 @@
  * recompute shadow region
  *
  */
-
 void
 DecorWindow::resizeNotify (int dx, int dy, int dwidth, int dheight)
 {
@@ -2773,21 +2772,70 @@
        processed, we need the timer for the moment. updateWindowOutputExtents
        should be fixed so that it does not emit a resize notification. */
     resizeUpdate.start (boost::bind (&DecorWindow::resizeTimeout, this), 0);
-    updateDecorationScale ();
-    updateReg = true;
 
-    if (dScreen->cmActive)
+    if (window->overrideRedirect ())
     {
-	foreach (CompWindow *cw,
-		 DecorScreen::get (screen)->cScreen->getWindowPaintList ())
-	{
-	    DecorWindow::get (cw)->computeShadowRegion ();
+	if (wd)
+	{
+	    wd->translate (CompPoint (dx, dy));
+
+	    /* Need to update the scaling factors
+	     * on a size change, but not a position change */
+	    if (dwidth || dheight)
+		updateDecorationScale ();
+	    else if (dx || dy)
+		setDecorationMatrices ();
+	}
+
+	updateReg = true;
+
+	if (dScreen->cmActive)
+	{
+	    foreach (CompWindow *cw,
+		     DecorScreen::get (screen)->cScreen->getWindowPaintList ())
+	    {
+		DecorWindow::get (cw)->computeShadowRegion ();
+	    }
 	}
     }
 
     window->resizeNotify (dx, dy, dwidth, dheight);
 }
 
+/*
+ * DecorWindow::position
+ *
+ * Translate window scaled quad boxes for movement
+ * and also recompute shadow clip regions
+ * for panels and menus, but only for override
+ * redirect windows as normal windows were able
+ * to do this at position () time
+ */
+void DecorWindow::moveNotify (int dx, int dy, bool now)
+{
+    if (window->overrideRedirect ())
+    {
+	if (wd)
+	{
+	    wd->translate (CompPoint (dx, dy));
+
+	    setDecorationMatrices ();
+	}
+
+	updateReg = true;
+
+	if (dScreen->cmActive)
+	{
+	    foreach (CompWindow *cw,
+		     DecorScreen::get (screen)->cScreen->getWindowPaintList ())
+	    {
+		DecorWindow::get (cw)->computeShadowRegion ();
+	    }
+	}
+    }
+
+    window->moveNotify (dx, dy, now);
+}
 
 /*
  * DecorWindow::stateChangeNotify
@@ -2801,25 +2849,12 @@
 {
     if (wd && wd->decor)
     {
-	int oldShiftX = shiftX ();
-	int oldShiftY = shiftY ();
-	int moveDx, moveDy;
-
 	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 */
-
-	moveDx = shiftX () - oldShiftX;
-	moveDy = shiftY () - oldShiftY;
-
 	updateFrame ();
     }
 

=== modified file 'plugins/decor/src/decor.h'
--- plugins/decor/src/decor.h	2011-12-15 07:40:03 +0000
+++ plugins/decor/src/decor.h	2012-01-11 08:48:40 +0000
@@ -120,6 +120,8 @@
 	static WindowDecoration * create (Decoration *);
 	static void destroy (WindowDecoration *);
 
+	void translate (const CompPoint &d);
+
     public:
         Decoration *decor;
 	ScaledQuad *quad;
@@ -200,10 +202,14 @@
 	void getOutputExtents (CompWindowExtents&);
 	void resizeNotify (int, int, int, int);
 	void moveNotify (int, int, bool);
+	bool position (compiz::window::Geometry &g,
+		       unsigned int             source,
+		       unsigned int             constrainment);
 	void stateChangeNotify (unsigned int);
 	void updateFrameRegion (CompRegion &region);
 
 	bool damageRect (bool, const CompRect &);
+	void applyOffset (const CompPoint &);
 
 	void computeShadowRegion ();
 

=== modified file 'plugins/opengl/src/privates.h'
--- plugins/opengl/src/privates.h	2012-01-11 08:48:40 +0000
+++ plugins/opengl/src/privates.h	2012-01-11 08:48:40 +0000
@@ -140,6 +140,7 @@
 	void applyOffset (const CompPoint &);
 	bool position (compiz::window::Geometry &g, unsigned int source, unsigned int constrainment);
 	void windowNotify (CompWindowNotify n);
+	void moveNotify (int dx, int dy, bool immediate);
 	void resizeNotify (int dx, int dy, int dwidth, int dheight);
 	void updateFrameRegion (CompRegion &region);
 

=== modified file 'plugins/opengl/src/window.cpp'
--- plugins/opengl/src/window.cpp	2012-01-11 08:48:40 +0000
+++ plugins/opengl/src/window.cpp	2012-01-11 08:48:40 +0000
@@ -208,8 +208,26 @@
 }
 
 void
+PrivateGLWindow::moveNotify (int dx, int dy, bool immediate)
+{
+    if (window->overrideRedirect ())
+    {
+	setWindowMatrix ();
+	updateReg = true;
+    }
+
+    window->moveNotify (dx, dy, immediate);
+}
+
+void
 PrivateGLWindow::resizeNotify (int dx, int dy, int dwidth, int dheight)
 {
+    if (window->overrideRedirect ())
+    {
+	setWindowMatrix ();
+	updateReg = true;
+    }
+
     window->resizeNotify (dx, dy, dwidth, dheight);
     if (!window->hasUnmapReference ())
 	gWindow->release ();

=== modified file 'plugins/wobbly/src/wobbly.cpp'
--- plugins/wobbly/src/wobbly.cpp	2012-01-11 08:48:40 +0000
+++ plugins/wobbly/src/wobbly.cpp	2012-01-11 08:48:40 +0000
@@ -1472,8 +1472,10 @@
 			{
 			    compiz::window::Geometry ng = w->geometry ();
 
-			    ng.setPos (CompPoint (model->topLeft.x,
-						  model->topLeft.y));
+			    ng.setPos (CompPoint (model->topLeft.x +
+						  w->output ().left,
+						  model->topLeft.y +
+						  w->output ().top));
 
 			    w->positionSetEnabled (ww, false);
 			    w->position (ng);

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-01-11 08:48:40 +0000
+++ src/CMakeLists.txt	2012-01-11 08:48:40 +0000
@@ -6,6 +6,7 @@
 add_subdirectory( timer )
 add_subdirectory( pluginclasshandler )
 add_subdirectory( window )
+add_subdirectory( point )
 
 compiz_add_bcop_targets (
     core
@@ -37,7 +38,10 @@
     
     ${CMAKE_CURRENT_SOURCE_DIR}/timer/include
     ${CMAKE_CURRENT_SOURCE_DIR}/timer/src
-    
+
+    ${CMAKE_CURRENT_SOURCE_DIR}/point/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/point/src
+
     ${CMAKE_CURRENT_SOURCE_DIR}/pluginclasshandler/include
     ${CMAKE_CURRENT_SOURCE_DIR}/pluginclasshandler/src
 
@@ -46,6 +50,9 @@
 
     ${CMAKE_CURRENT_SOURCE_DIR}/window/geometry/include
     ${CMAKE_CURRENT_SOURCE_DIR}/window/geometry/src
+
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/extents/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/extents/src
 )
 
 add_definitions (
@@ -79,13 +86,11 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/session.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/output.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/size.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/point.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/icon.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/modifierhandler.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/propertywriter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/eventsource.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/stackdebugger.cpp
-    
     ${_bcop_sources}
 )
 
@@ -105,10 +110,12 @@
     
     compiz_string
     compiz_timer
+    compiz_point
     compiz_logmessage
     compiz_pluginclasshandler
     compiz_window_geometry
     compiz_window_geometry_saver
+    compiz_window_extents
 #    ${CORE_MOD_LIBRARIES}
 )
 

=== added directory 'src/point'
=== removed file 'src/point.cpp'
--- src/point.cpp	2010-01-21 16:21:30 +0000
+++ src/point.cpp	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-/*
- * 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/point.h>
-
-CompPoint::CompPoint () :
-   mX (0),
-   mY (0)
-{
-}
-
-CompPoint::CompPoint (int x, int y) :
-   mX (x),
-   mY (y)
-{
-}
-
-void
-CompPoint::set (int x, int y)
-{
-    mX = x;
-    mY = y;
-}
-
-void
-CompPoint::setX (int x)
-{
-    mX = x;
-}
-
-void
-CompPoint::setY (int y)
-{
-    mY = y;
-}
-
-bool
-CompPoint::operator== (const CompPoint &point) const
-{
-    return (mX == point.mX) && (mY == point.mY);
-}
-
-bool
-CompPoint::operator!= (const CompPoint &point) const
-{
-    return !(*this == point);
-}
-
-CompPoint &
-CompPoint::operator+= (const CompPoint &point)
-{
-    mX += point.mX;
-    mY += point.mY;
-
-    return *this;
-}
-
-CompPoint
-CompPoint::operator+ (const CompPoint &rhs) const
-{
-    return CompPoint (mX + rhs.mX, mY + rhs.mY);
-}
-
-CompPoint &
-CompPoint::operator-= (const CompPoint &point)
-{
-    mX -= point.mX;
-    mY -= point.mY;
-
-    return *this;
-}
-
-CompPoint
-CompPoint::operator- (const CompPoint &rhs) const
-{
-    return CompPoint (mX - rhs.mX, mY - rhs.mY);
-}
-

=== added file 'src/point/CMakeLists.txt'
--- src/point/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/point/CMakeLists.txt	2012-01-11 08:48:40 +0000
@@ -0,0 +1,67 @@
+pkg_check_modules (
+  GLIBMM
+  REQUIRED
+  glibmm-2.4 glib-2.0
+)
+
+INCLUDE_DIRECTORIES (  
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/src
+
+  ${CMAKE_CURRENT_SOURCE_DIR}/point/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/point/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/point.h
+)
+
+SET ( 
+  PRIVATE_HEADERS 
+)
+
+SET( 
+  SRCS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/point.cpp
+)
+
+ADD_LIBRARY( 
+  compiz_point STATIC
+  
+  ${SRCS}
+  
+  ${PUBLIC_HEADERS}
+  ${PRIVATE_HEADERS}
+)
+
+ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
+
+SET_TARGET_PROPERTIES(
+  compiz_point PROPERTIES
+  PUBLIC_HEADER "${PUBLIC_HEADERS}"
+)
+
+INSTALL(
+  TARGETS                                 compiz_point
+  RUNTIME             DESTINATION         bin
+  LIBRARY             DESTINATION         lib
+  ARCHIVE             DESTINATION         lib
+  PUBLIC_HEADER       DESTINATION         include/compiz
+)
+
+
+
+TARGET_LINK_LIBRARIES( 
+  compiz_point
+  
+  ${GLIBMM_LIBRARIES}
+)

=== added directory 'src/point/include'
=== added directory 'src/point/include/core'
=== added file 'src/point/include/core/point.h'
--- src/point/include/core/point.h	1970-01-01 00:00:00 +0000
+++ src/point/include/core/point.h	2012-01-11 08:48:40 +0000
@@ -0,0 +1,110 @@
+/*
+ * 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]>
+ */
+
+#ifndef _COMPPOINT_H
+#define _COMPPOINT_H
+
+#include <vector>
+#include <list>
+
+/**
+ * A 2D coordinate (likely in screen space) that can only be mutated
+ * through set() methods, since it's data members are private.
+ */
+class CompPoint {
+
+    public:
+	CompPoint ();
+	CompPoint (int, int);
+	
+	/**
+	 * Get the x coordinate of this point
+	 */
+	int x () const;
+	
+	/**
+	 * Get the y coordinate of this point
+	 */
+	int y () const;
+	
+	/**
+	 * Set the x and y coordinate of this point
+	 */
+	void set (int, int);
+	
+	/**
+	 * Set the x coordinate of this point
+	 */
+	void setX (int);
+	
+	/**
+	 * Set the y coordinate of this point
+	 */
+	void setY (int);
+
+	bool operator== (const CompPoint &) const;
+	bool operator!= (const CompPoint &) const;
+	
+	/**
+	 * Takes from both co-ordinates
+	 */
+	CompPoint & operator-= (const CompPoint &);
+	/**
+	 * Adds to both co-ordinates
+	 */
+	CompPoint & operator+= (const CompPoint &);
+	
+	/**
+	 * Retuns an added point
+	 */
+	CompPoint operator+ (const CompPoint &) const;
+	/**
+	 * Returns a subtracted point
+	 */
+	CompPoint operator- (const CompPoint &) const;
+
+	typedef std::vector<CompPoint> vector;
+	typedef std::vector<CompPoint *> ptrVector;
+	typedef std::list<CompPoint> list;
+	typedef std::list<CompPoint *> ptrList;
+
+    private:
+	int mX, mY;
+};
+
+inline int
+CompPoint::x () const
+{
+    return mX;
+}
+
+inline int
+CompPoint::y () const
+{
+    return mY;
+}
+
+
+#endif

=== added directory 'src/point/src'
=== added file 'src/point/src/point.cpp'
--- src/point/src/point.cpp	1970-01-01 00:00:00 +0000
+++ src/point/src/point.cpp	2012-01-11 08:48:40 +0000
@@ -0,0 +1,100 @@
+/*
+ * 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/point.h>
+
+CompPoint::CompPoint () :
+   mX (0),
+   mY (0)
+{
+}
+
+CompPoint::CompPoint (int x, int y) :
+   mX (x),
+   mY (y)
+{
+}
+
+void
+CompPoint::set (int x, int y)
+{
+    mX = x;
+    mY = y;
+}
+
+void
+CompPoint::setX (int x)
+{
+    mX = x;
+}
+
+void
+CompPoint::setY (int y)
+{
+    mY = y;
+}
+
+bool
+CompPoint::operator== (const CompPoint &point) const
+{
+    return (mX == point.mX) && (mY == point.mY);
+}
+
+bool
+CompPoint::operator!= (const CompPoint &point) const
+{
+    return !(*this == point);
+}
+
+CompPoint &
+CompPoint::operator+= (const CompPoint &point)
+{
+    mX += point.mX;
+    mY += point.mY;
+
+    return *this;
+}
+
+CompPoint
+CompPoint::operator+ (const CompPoint &rhs) const
+{
+    return CompPoint (mX + rhs.mX, mY + rhs.mY);
+}
+
+CompPoint &
+CompPoint::operator-= (const CompPoint &point)
+{
+    mX -= point.mX;
+    mY -= point.mY;
+
+    return *this;
+}
+
+CompPoint
+CompPoint::operator- (const CompPoint &rhs) const
+{
+    return CompPoint (mX - rhs.mX, mY - rhs.mY);
+}
+

=== added directory 'src/point/tests'
=== added file 'src/point/tests/CMakeLists.txt'
--- src/point/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/point/tests/CMakeLists.txt	2012-01-11 08:48:40 +0000
@@ -0,0 +1,18 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library (compiz_point_test
+             ${CMAKE_CURRENT_SOURCE_DIR}/test-point.cpp)
+
+add_executable (compiz_test_point
+                ${CMAKE_CURRENT_SOURCE_DIR}/point/src/test-point.cpp)
+
+target_link_libraries (compiz_test_point
+                       compiz_point_test
+                       compiz_point 
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
+                       )
+
+add_test (compiz_point compiz_test_point)

=== added directory 'src/point/tests/point'
=== added directory 'src/point/tests/point/src'
=== added file 'src/point/tests/point/src/test-point.cpp'
--- src/point/tests/point/src/test-point.cpp	1970-01-01 00:00:00 +0000
+++ src/point/tests/point/src/test-point.cpp	2012-01-11 08:48:40 +0000
@@ -0,0 +1,71 @@
+/*
+ * 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-point.h"
+
+class CompPointTestPoint :
+    public CompWindowPointTest
+{
+    public:
+
+	CompPointTestPoint ();
+	~CompPointTestPoint ();
+
+    protected:
+
+	CompPoint p;
+};
+
+CompPointTestPoint::CompPointTestPoint () :
+    p (0, 0)
+{
+}
+
+CompPointTestPoint::~CompPointTestPoint ()
+{
+}
+
+TEST_F (CompPointTestPoint, TestPoint)
+{
+  p.setX (10);
+
+  EXPECT_EQ (p.x (), 10);
+
+  p.setY (10);
+
+  EXPECT_EQ (p.y (), 10);
+  EXPECT_EQ (p, CompPoint (10, 10));
+
+  EXPECT_TRUE (p == CompPoint (10, 10));
+  EXPECT_FALSE (p != CompPoint (10, 10));
+
+  p -= CompPoint (5, 5);
+
+  EXPECT_EQ (p, CompPoint (5, 5));
+
+  p += CompPoint (3, 3);
+
+  EXPECT_EQ (p, CompPoint (8, 8));
+}

=== added file 'src/point/tests/test-point.cpp'
--- src/point/tests/test-point.cpp	1970-01-01 00:00:00 +0000
+++ src/point/tests/test-point.cpp	2012-01-11 08:48:40 +0000
@@ -0,0 +1,34 @@
+/*
+ * 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-point.h"
+
+CompWindowPointTest::CompWindowPointTest ()
+{
+}
+
+CompWindowPointTest::~CompWindowPointTest ()
+{
+}

=== added file 'src/point/tests/test-point.h'
--- src/point/tests/test-point.h	1970-01-01 00:00:00 +0000
+++ src/point/tests/test-point.h	2012-01-11 08:48:40 +0000
@@ -0,0 +1,43 @@
+/*
+ * 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/point.h>
+#include <iostream>
+#include <boost/bind.hpp>
+
+class CompWindowPointTest : public ::testing::Test
+{
+public:
+
+    CompWindowPointTest ();
+    virtual ~CompWindowPointTest ();
+
+};
+
+#endif

=== modified file 'src/window.cpp'
--- src/window.cpp	2012-01-11 08:48:40 +0000
+++ src/window.cpp	2012-01-11 08:48:40 +0000
@@ -1834,7 +1834,6 @@
 	priv->height = ph;
 
 	/* Update the entire region again here */
-
 	if (priv->mapNum)
 	    priv->updateRegion ();
 
@@ -1852,6 +1851,17 @@
 	priv->geometry.setX (gm.x ());
 	priv->geometry.setY (gm.y ());
 
+	/* Non override redirect windows get their
+	 * region updated on position () time
+	 * but for override redirect windows we must
+	 * update the position here */
+
+	if (priv->attrib.override_redirect)
+	{
+	    priv->region.translate (dx, dy);
+	    priv->inputRegion.translate (dx, dy);
+	}
+
 	priv->invisible = WINDOW_INVISIBLE (priv);
 
 	window->moveNotify (dx, dy, true);
@@ -2165,17 +2175,7 @@
     {
 	gettimeofday (&priv->lastGeometryUpdate, NULL);
 
-	priv->geometry.setX (priv->geometry.x () + dx);
-	priv->geometry.setY (priv->geometry.y () + dy);
-	priv->frameGeometry.setX (priv->frameGeometry.x () + dx);
-	priv->frameGeometry.setY (priv->frameGeometry.y () + dy);
-
-	priv->region.translate (dx, dy);
-	priv->inputRegion.translate (dx, dy);
-	if (!priv->frameRegion.isEmpty ())
-	    priv->frameRegion.translate (dx, dy);
-
-	priv->invisible = WINDOW_INVISIBLE (priv);
+
 
 	window->moveNotify (dx, dy, immediate);
     }
@@ -2568,7 +2568,8 @@
 
 	/* Also translate regions but don't do a full update
 	 * since that involves round trips to get the shape
-	 * rectangles and is slow. */
+	 * rectangles and is slow. Do the full update
+	 * on the actual resize notification */
 
 	priv->region.translate  (dp);
 	priv->inputRegion.translate (dp);
@@ -6969,19 +6970,21 @@
     if (!i)
 	i = b;
 
-    if (priv->serverInput.left   != i->left ||
-	priv->serverInput.right  != i->right ||
-	priv->serverInput.top    != i->top ||
-	priv->serverInput.bottom != i->bottom ||
-	priv->border.left   != b->left ||
-	priv->border.right  != b->right ||
-	priv->border.top    != b->top ||
-	priv->border.bottom != b->bottom)
+    if (priv->serverInput != *i ||
+	priv->border 	  != *b)
     {
+	const CompPoint     &oldShift = compiz::window::extents::shift (priv->border, priv->sizeHints.win_gravity);
+	const CompPoint     &shift    = compiz::window::extents::shift (*b, priv->sizeHints.win_gravity);
+	compiz::window::Geometry ng;
+
+	priv->geometrySaver.get (ng);
+	ng.setPos (ng.pos () + (oldShift - shift));
+
 	priv->serverInput = *i;
 	priv->border = *b;
 
 	recalcActions ();
+	priv->geometrySaver.update (ng, CHANGE_X | CHANGE_Y);
 
 	priv->updateSize ();
 	priv->updateFrameWindow ();

=== modified file 'src/window/CMakeLists.txt'
--- src/window/CMakeLists.txt	2012-01-11 08:48:40 +0000
+++ src/window/CMakeLists.txt	2012-01-11 08:48:40 +0000
@@ -1,2 +1,3 @@
 add_subdirectory (geometry)
 add_subdirectory (geometry-saver)
+add_subdirectory (extents)

=== added directory 'src/window/extents'
=== added file 'src/window/extents/CMakeLists.txt'
--- src/window/extents/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/window/extents/CMakeLists.txt	2012-01-11 08:48:40 +0000
@@ -0,0 +1,67 @@
+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
+
+  ${compiz_SOURCE_DIR}/src/point/include
+    
+  ${Boost_INCLUDE_DIRS}
+  
+  ${GLIBMM_INCLUDE_DIRS}
+)
+
+LINK_DIRECTORIES (${GLIBMM_LIBRARY_DIRS}) 
+
+SET ( 
+  PUBLIC_HEADERS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/core/windowextents.h
+)
+
+SET ( 
+  PRIVATE_HEADERS 
+)
+
+SET( 
+  SRCS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/windowextents.cpp
+)
+
+ADD_LIBRARY( 
+  compiz_window_extents STATIC
+  
+  ${SRCS}
+  
+  ${PUBLIC_HEADERS}
+  ${PRIVATE_HEADERS}
+)
+
+ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
+
+SET_TARGET_PROPERTIES(
+  compiz_window_extents PROPERTIES
+  PUBLIC_HEADER "${PUBLIC_HEADERS}"
+)
+
+INSTALL(
+  TARGETS                                 compiz_window_extents
+  RUNTIME             DESTINATION         bin
+  LIBRARY             DESTINATION         lib
+  ARCHIVE             DESTINATION         lib
+  PUBLIC_HEADER       DESTINATION         include/compiz
+)
+
+
+
+TARGET_LINK_LIBRARIES( 
+  compiz_window_extents
+  compiz_point
+  
+  ${GLIBMM_LIBRARIES}
+)

=== added directory 'src/window/extents/include'
=== added directory 'src/window/extents/include/core'
=== added file 'src/window/extents/include/core/windowextents.h'
--- src/window/extents/include/core/windowextents.h	1970-01-01 00:00:00 +0000
+++ src/window/extents/include/core/windowextents.h	2012-01-11 08:48:40 +0000
@@ -0,0 +1,63 @@
+/*
+ * 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 _COMPWINDOWEXTENTS_H
+#define _COMPWINDOWEXTENTS_H
+
+#include <core/point.h>
+
+namespace compiz
+{
+namespace window
+{
+namespace extents
+{
+/**
+ * Specifies the left, right, top and bottom positions of a window's
+ * geometry
+ */
+struct Extents {
+    public:
+	int left;
+	int right;
+	int top;
+	int bottom;
+
+	bool operator== (const Extents &other);
+	bool operator!= (const Extents &other);
+};
+
+CompPoint shift (const Extents &extents,
+		 unsigned int  gravity = 0);
+}
+}
+}
+
+typedef compiz::window::extents::Extents CompWindowExtents;
+
+#endif

=== added directory 'src/window/extents/src'
=== added file 'src/window/extents/src/windowextents.cpp'
--- src/window/extents/src/windowextents.cpp	1970-01-01 00:00:00 +0000
+++ src/window/extents/src/windowextents.cpp	2012-01-11 08:48:40 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright © 2005 Novell, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Novell, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Novell, Inc. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: David Reveman <[e-mail]>
+ */
+
+#include <core/windowextents.h>
+#include <core/point.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+CompPoint
+compiz::window::extents::shift (const CompWindowExtents &extents,
+				unsigned int            gravity)
+{
+    CompPoint rv = CompPoint ();
+
+    switch (gravity) {
+	case NorthGravity:
+	case NorthWestGravity:
+	case NorthEastGravity:
+	    rv.setY (extents.top);
+	    break;
+	case SouthGravity:
+	case SouthWestGravity:
+	case SouthEastGravity:
+	    rv.setY (-extents.bottom);
+	    break;
+	default:
+	    break;
+    }
+
+    switch (gravity) {
+	case WestGravity:
+	case NorthWestGravity:
+	case SouthWestGravity:
+	    rv.setX (extents.left);
+	    break;
+	case EastGravity:
+	case NorthEastGravity:
+	case SouthEastGravity:
+	    rv.setX (-extents.right);
+	    break;
+    }
+
+    return rv;
+}
+
+bool
+compiz::window::extents::Extents::operator== (const Extents &other)
+{
+    return this->left == other.left &&
+	   this->right == other.right &&
+	   this->top == other.top &&
+	   this->bottom == other.bottom;
+}
+
+bool
+compiz::window::extents::Extents::operator!= (const Extents &other)
+{
+    return !(*this == other);
+}

=== added directory 'src/window/extents/tests'
=== added file 'src/window/extents/tests/CMakeLists.txt'
--- src/window/extents/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/window/extents/tests/CMakeLists.txt	2012-01-11 08:48:40 +0000
@@ -0,0 +1,18 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library (compiz_window_extents_test
+             ${CMAKE_CURRENT_SOURCE_DIR}/test-window-extents.cpp)
+
+add_executable (compiz_test_window_extents_shift
+                ${CMAKE_CURRENT_SOURCE_DIR}/shift/src/test-window-extents-shift.cpp)
+
+target_link_libraries (compiz_test_window_extents_shift
+                       compiz_window_extents_test
+                       compiz_window_extents 
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
+                       )
+
+add_test (compiz_window_extents_shift compiz_test_window_extents_shift)

=== added directory 'src/window/extents/tests/shift'
=== added directory 'src/window/extents/tests/shift/src'
=== added file 'src/window/extents/tests/shift/src/test-window-extents-shift.cpp'
--- src/window/extents/tests/shift/src/test-window-extents-shift.cpp	1970-01-01 00:00:00 +0000
+++ src/window/extents/tests/shift/src/test-window-extents-shift.cpp	2012-01-11 08:48:40 +0000
@@ -0,0 +1,91 @@
+/*
+ * 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-extents.h"
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+class CompWindowExtentsTestShift :
+    public CompWindowExtentsTest
+{
+public:
+
+    CompWindowExtentsTestShift ();
+    virtual ~CompWindowExtentsTestShift ();
+
+protected:
+
+    compiz::window::extents::Extents e;
+};
+
+CompWindowExtentsTestShift::CompWindowExtentsTestShift ()
+{
+}
+
+CompWindowExtentsTestShift::~CompWindowExtentsTestShift ()
+{
+}
+
+TEST_F (CompWindowExtentsTestShift, TestShift)
+{
+    CompPoint rp;
+    e.left = 5;
+    e.right = 7;
+    e.top = 10;
+    e.bottom = 7;
+
+    /* Check each gravity */
+    rp = compiz::window::extents::shift (e, NorthGravity);
+
+    EXPECT_EQ (rp, CompPoint (0, e.top));
+
+    rp = compiz::window::extents::shift (e, NorthWestGravity);
+
+    EXPECT_EQ (rp, CompPoint (e.left, e.top));
+
+    rp = compiz::window::extents::shift (e, NorthEastGravity);
+
+    EXPECT_EQ (rp, CompPoint (-e.right, e.top));
+
+    rp = compiz::window::extents::shift (e, EastGravity);
+
+    EXPECT_EQ (rp, CompPoint (-e.right, 0));
+
+    rp = compiz::window::extents::shift (e, WestGravity);
+
+    EXPECT_EQ (rp, CompPoint (e.left, 0));
+
+    rp = compiz::window::extents::shift (e, SouthGravity);
+
+    EXPECT_EQ (rp, CompPoint (0, -e.bottom));
+
+    rp = compiz::window::extents::shift (e, SouthWestGravity);
+
+    EXPECT_EQ (rp, CompPoint (e.left, -e.bottom));
+
+    rp = compiz::window::extents::shift (e, SouthEastGravity);
+
+    EXPECT_EQ (rp, CompPoint (-e.right, -e.bottom));
+}

=== added file 'src/window/extents/tests/test-window-extents.cpp'
--- src/window/extents/tests/test-window-extents.cpp	1970-01-01 00:00:00 +0000
+++ src/window/extents/tests/test-window-extents.cpp	2012-01-11 08:48:40 +0000
@@ -0,0 +1,34 @@
+/*
+ * 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-extents.h"
+
+CompWindowExtentsTest::CompWindowExtentsTest ()
+{
+}
+
+CompWindowExtentsTest::~CompWindowExtentsTest ()
+{
+}

=== added file 'src/window/extents/tests/test-window-extents.h'
--- src/window/extents/tests/test-window-extents.h	1970-01-01 00:00:00 +0000
+++ src/window/extents/tests/test-window-extents.h	2012-01-11 08:48:40 +0000
@@ -0,0 +1,42 @@
+/*
+ * 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_EXTENTS_H
+#define _COMPIZ_TEST_WINDOW_EXTENTS_H
+
+#include <gtest/gtest.h>
+#include <core/windowextents.h>
+#include <iostream>
+#include <boost/bind.hpp>
+
+class CompWindowExtentsTest : public ::testing::Test
+{
+public:
+
+    CompWindowExtentsTest ();
+    virtual ~CompWindowExtentsTest ();
+};
+
+#endif

=== modified file 'src/window/geometry-saver/CMakeLists.txt'
--- src/window/geometry-saver/CMakeLists.txt	2012-01-11 08:48:40 +0000
+++ src/window/geometry-saver/CMakeLists.txt	2012-01-11 08:48:40 +0000
@@ -15,6 +15,7 @@
   ${GLIBMM_INCLUDE_DIRS}
 
   ${compiz_SOURCE_DIR}/src/window/geometry/include
+  ${compiz_SOURCE_DIR}/src/point/include
 )
 
 LINK_DIRECTORIES (${GLIBMM_LIBRARY_DIRS}) 

=== added file 'src/window/geometry-saver/tests/CMakeLists.txt'
--- src/window/geometry-saver/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/window/geometry-saver/tests/CMakeLists.txt	2012-01-11 08:48:40 +0000
@@ -0,0 +1,18 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library (compiz_window_geometry_saver_test
+             ${CMAKE_CURRENT_SOURCE_DIR}/test-window-geometry-saver.cpp)
+
+add_executable (compiz_test_window_geometry_saver
+                ${CMAKE_CURRENT_SOURCE_DIR}/window-geometry-saver/src/test-window-geometry-saver.cpp)
+
+target_link_libraries (compiz_test_window_geometry_saver
+                       compiz_window_geometry_saver_test
+                       compiz_window_geometry_saver 
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
+                       )
+
+add_test (compiz_window_geometry_saver compiz_test_window_geometry_saver)

=== modified file 'src/window/geometry/CMakeLists.txt'
--- src/window/geometry/CMakeLists.txt	2012-01-11 08:48:40 +0000
+++ src/window/geometry/CMakeLists.txt	2012-01-11 08:48:40 +0000
@@ -9,7 +9,8 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/src
   
   ${compiz_SOURCE_DIR}/include
-    
+  ${compiz_SOURCE_DIR}/src/point/include
+
   ${Boost_INCLUDE_DIRS}
   
   ${GLIBMM_INCLUDE_DIRS}
@@ -60,6 +61,7 @@
 
 TARGET_LINK_LIBRARIES( 
   compiz_window_geometry
+  compiz_point
   
   ${GLIBMM_LIBRARIES}
 )

=== added file 'src/window/geometry/tests/CMakeLists.txt'
--- src/window/geometry/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/window/geometry/tests/CMakeLists.txt	2012-01-11 08:48:40 +0000
@@ -0,0 +1,18 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library (compiz_window_geometry_test
+             ${CMAKE_CURRENT_SOURCE_DIR}/test-window-geometry.cpp)
+
+add_executable (compiz_test_window_geometry
+                ${CMAKE_CURRENT_SOURCE_DIR}/window-geometry/src/test-window-geometry.cpp)
+
+target_link_libraries (compiz_test_window_geometry
+                       compiz_window_geometry_test
+                       compiz_window_geometry 
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
+                       )
+
+add_test (compiz_window_geometry compiz_test_window_geometry)