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

[Sam Spilsbury]

Made the cube and rotate plugins work with paint offsets.

In order to implement this properly, we had to move from immediately updating the 2D display matrix of the window on position offset change to applying a 4x4 transformation matrix to the window before it is painted, like how global paint offsets work, which means that a lot of code was consolidated.

In terms of other plugins, the wobbly plugin needed to be updated to move its model entirely by the paint offset, since that is going to be the global display model for the window.

Added a test for points outside of rectangles to wrap-around a rectangle within it.

Moved some of the utility functions related to viewports into their own namespace.

Made CompScreen::moveViewport wrapable so that plugins can know when a viewport was just changed (eg, causing window movement to happen) rather than guessing.

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

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

2907. By Sam Spilsbury on 2011-12-02

Merged compiz-core.fix_891591

2908. By Sam Spilsbury on 2011-12-02

Fix typo

2909. By Sam Spilsbury on 2011-12-02

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2910. By Sam Spilsbury on 2011-12-02

Merged compiz-core.fix_891591

2911. By Sam Spilsbury on 2011-12-02

Include point.cpp in the build files

2912. By Sam Spilsbury on 2011-12-02

Added missing files

2913. By Sam Spilsbury on 2011-12-02

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2914. By Sam Spilsbury on 2011-12-03

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2915. By Sam Spilsbury on 2011-12-03

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2916. By Sam Spilsbury on 2011-12-03

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2917. By Sam Spilsbury on 2011-12-05

Merged fix_891591

2918. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2919. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2920. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2921. By Sam Spilsbury on 2011-12-05

Cleanup, fix hardcoded debugging value

[Thomi Richards (thomir-deactivatedaccount)]

ln 1204: Why the static cast? It looks to me like you're being given a CompRectTest* already...

Otherwise, looks good to me.

review: Approve

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

2922. By Sam Spilsbury on 2011-12-08

Merge

2923. By Sam Spilsbury on 2011-12-08

Merge

2924. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2925. By Sam Spilsbury on 2011-12-08

Merge

[Tim Penhey (thumper)]

> CompPoint remainingVp = CompPoint (screen->vpSize ().width () - wvp.x (),
> screen->vpSize ().height () - wvp.y ());

This is an inefficient way to write:

CompPoint remainingVp (screen->vpSize ().width () - wvp.x (),
                       screen->vpSize ().height () - wvp.y ());

The first way calls the constructor, then the copy constructor, then the destructor just to initialize remainingVp.

Please just use a constructor call. Please fix declarations in compiz::viewports::wraparoundOffsetForPoint.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

> > CompPoint remainingVp = CompPoint (screen->vpSize ().width () - wvp.x (),
> > screen->vpSize ().height () - wvp.y ());
>
> This is an inefficient way to write:
>
>
> CompPoint remainingVp (screen->vpSize ().width () - wvp.x (),
> screen->vpSize ().height () - wvp.y ());
>
> The first way calls the constructor, then the copy constructor, then the
> destructor just to initialize remainingVp.

I'm suprised the compiler doesn't optimize that out.

>
> Please just use a constructor call. Please fix declarations in
> compiz::viewports::wraparoundOffsetForPoint.

ack

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

2926. By Sam Spilsbury on 2011-12-20

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2927. By Sam Spilsbury on 2011-12-20

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2928. By Sam Spilsbury on 2011-12-20

Don't read compiz pkg config file and cleanup

2929. By Sam Spilsbury on 2011-12-23

Merge

2930. By Sam Spilsbury on 2012-01-03

Merge

2931. By Sam Spilsbury on 2012-01-03

Merge

2932. By Sam Spilsbury on 2012-01-03

Added CompRect to testing and moved the wraparound point test to Google Test

2933. By Sam Spilsbury on 2012-01-04

Fix tests to make sure that width and height are relative and that the
intersection test reflects intersection and not union

2934. By Sam Spilsbury on 2012-01-04

Added a few FIXME notes

2935. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2936. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2937. By Sam Spilsbury on 2012-01-04

Expose rect in the plugins lists

2938. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2939. By Sam Spilsbury on 2012-01-04

Merge

2940. By Sam Spilsbury on 2012-01-04

Fix typo

2941. By Sam Spilsbury on 2012-01-05

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2942. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2943. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2944. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2945. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

[Alan Griffiths (alan-griffiths)]

> > This is an inefficient way to write:
> >
> > CompPoint remainingVp (screen->vpSize ().width () - wvp.x (),
> > screen->vpSize ().height () - wvp.y ());
> >
> > The first way calls the constructor, then the copy constructor, then the
> > destructor just to initialize remainingVp.
>
> I'm suprised the compiler doesn't optimize that out.

It is allowed to, but not required to - so the intent is explicit with the suggested syntax. (What actually happens varies with compiler/version and context.)

The same construct exists elsewhere. Vis:

357 + CompPoint gp = CompPoint (g.pos ().x () % (screen->vpSize ().width () * screen->width ()),
358 + g.pos ().y () % (screen->vpSize ().height () * screen->height ()));
359 + CompPoint dp = gp - window->serverGeometry ().pos ();
360 CompSize dsize = CompSize (g.width () - window->serverGeometry ().width (),
361 g.height () - window->serverGeometry ().height ());
...
2242 + compiz::window::Geometry ng = w->serverGeometry ();
...
2398 + CompPoint remainingVp = CompPoint (screen->vpSize ().width () - wvp.x (),
2399 + screen->vpSize ().height () - wvp.y ());
2400 + CompPoint maxOffset = CompPoint ((remainingVp.x () * screen->width ()) -
2401 + wp.x (),
2402 + (remainingVp.y () * screen->height ()) -
2403 + wp.y ());
2404 + CompPoint minOffset = CompPoint (-((screen->vpSize ().width () * screen->width ()) - maxOffset.x ()),
2405 + -((screen->vpSize ().height () * screen->height ()) - maxOffset.y ()));
2406 + CompRect constrain = CompRect (minOffset.x (), minOffset.y (),
2407 + maxOffset.x () - minOffset.x (),
2408 + maxOffset.y () - minOffset.y ());

> > Please just use a constructor call.

+1

review: Needs Fixing

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

2946. By Sam Spilsbury on 2012-01-10

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2947. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2948. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2949. By Sam Spilsbury on 2012-01-11

Don't translate the 2D texture matrix or regions

2950. By Sam Spilsbury on 2012-01-11

Merge

2951. By Sam Spilsbury on 2012-01-11

Remove files no longer installed in this point

2952. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

Unmerged revisions

2952. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2951. By Sam Spilsbury on 2012-01-11

Remove files no longer installed in this point

2950. By Sam Spilsbury on 2012-01-11

Merge

2949. By Sam Spilsbury on 2012-01-11

Don't translate the 2D texture matrix or regions

2948. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2947. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2946. By Sam Spilsbury on 2012-01-10

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2945. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2944. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

2943. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_891591 into compiz-core.fix_896586_rotate_plugin.

=== modified file 'include/core/CMakeLists.txt'
--- include/core/CMakeLists.txt	2011-10-31 13:51:00 +0000
+++ include/core/CMakeLists.txt	2012-01-11 08:50:29 +0000
@@ -9,10 +9,8 @@
     option.h
     output.h
     plugin.h
-    point.h
     propertywriter.h
     privateunion.h
-    rect.h
     region.h
     screen.h
     serialization.h

=== removed file 'include/core/rect.h'
--- include/core/rect.h	2012-01-11 08:50:29 +0000
+++ include/core/rect.h	1970-01-01 00:00:00 +0000
@@ -1,236 +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 _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.
- */
-class CompRect {
-
-    public:
-	CompRect ();
-	CompRect (int x, int y, int width, int height);
-	CompRect (const CompRect&);
-	CompRect (const XRectangle);
-
-	int x () const;
-	int y () const;
-	CompPoint pos () const;
-
-	int width () const;
-	int height () const;
-
-	int x1 () const;
-	int y1 () const;
-	int x2 () const;
-	int y2 () const;
-
-	int left   () const;
-	int right  () const;
-	int top    () const;
-	int bottom () const;
-
-	int centerX () const;
-	int centerY () const;
-	CompPoint center () const;
-
-	int area () const;
-	
-	/**
-	 * Returns an X region handle for the CompRect
-	 */
-	Region region () const;
-
-	void setGeometry (int x, int y,
-			  int width, int height);
-
-	void setX      (int);
-	void setY      (int);
-	void setWidth  (int);
-	void setHeight (int);
-
-	void setPos (const CompPoint&);
-	void setSize (const CompSize&);
-
-	/** 
-	 * Sets the left edge position
-	 *
-	 * Setting an edge past it's opposite edge will result in both edges
-	 * being set to the new value
-	 */
-	void setLeft    (int);
-	/**
-	 * Sets the top edge position
-	 *
-	 * Setting an edge past it's opposite edge will result in both edges
-	 * being set to the new value
-	 */
-	void setTop     (int);
-	/** 
-	 * Sets the right edge position
-	 *
-	 * Setting an edge past it's opposite edge will result in both edges
-	 * being set to the new value
-	 */
-	void setRight   (int);
-	/** 
-	 * Sets the bottom edge position
-	 *
-	 * Setting an edge past it's opposite edge will result in both edges
-	 * being set to the new value
-	 */
-	void setBottom  (int);
-
-	bool contains (const CompPoint &) const;
-	bool contains (const CompRect &) const;
-	bool intersects (const CompRect &) const;
-	bool isEmpty () const;
-
-	bool operator== (const CompRect &) const;
-	bool operator!= (const CompRect &) const;
-
-	CompRect operator& (const CompRect &) const;
-	CompRect& operator&= (const CompRect &);
-	CompRect& operator= (const CompRect &);
-
-	typedef std::vector<CompRect> vector;
-	typedef std::vector<CompRect *> ptrVector;
-	typedef std::list<CompRect *> ptrList;
-
-    private:
-	REGION       mRegion;
-};
-
-
-inline int
-CompRect::x () const
-{
-    return mRegion.extents.x1;
-}
-
-inline int
-CompRect::y () const
-{
-    return mRegion.extents.y1;
-}
-
-inline CompPoint
-CompRect::pos () const
-{
-    return CompPoint (x (), y ());
-}
-
-inline int
-CompRect::width () const
-{
-    return mRegion.extents.x2 - mRegion.extents.x1;
-}
-
-inline int
-CompRect::height () const
-{
-    return mRegion.extents.y2 - mRegion.extents.y1;
-}
-
-inline int
-CompRect::x1 () const
-{
-    return mRegion.extents.x1;
-}
-
-inline int
-CompRect::y1 () const
-{
-    return mRegion.extents.y1;
-}
-
-inline int
-CompRect::x2 () const
-{
-    return mRegion.extents.x2;
-}
-
-inline int
-CompRect::y2 () const
-{
-    return mRegion.extents.y2;
-}
-
-inline int
-CompRect::left () const
-{
-    return mRegion.extents.x1;
-}
-
-inline int
-CompRect::right () const
-{
-    return mRegion.extents.x2;
-}
-
-inline int
-CompRect::top () const
-{
-    return mRegion.extents.y1;
-}
-
-
-inline int
-CompRect::bottom () const
-{
-    return mRegion.extents.y2;
-}
-
-inline int
-CompRect::centerX () const
-{
-    return x () + width () / 2;
-}
-
-inline int
-CompRect::centerY () const
-{
-    return y () + height () / 2;
-}
-
-inline CompPoint
-CompRect::center () const
-{
-    return CompPoint (centerX (), centerY ());
-}
-
-#endif

=== modified file 'include/core/screen.h'
--- include/core/screen.h	2012-01-11 08:50:29 +0000
+++ include/core/screen.h	2012-01-11 08:50:29 +0000
@@ -135,6 +135,8 @@
 	virtual void enterShowDesktopMode ();
 	virtual void leaveShowDesktopMode (CompWindow *window);
 
+	virtual void moveViewport (int tx, int ty);
+
 	virtual void outputChangeNotify ();
 	virtual void addSupportedAtoms (std::vector<Atom>& atoms);
 };
@@ -145,7 +147,7 @@
  */
 class CompScreen :
     public CompSize,
-    public WrapableHandler<ScreenInterface, 18>,
+    public WrapableHandler<ScreenInterface, 19>,
     public PluginClassStorage,
     public CompOption::Class
 {
@@ -314,8 +316,6 @@
 
 	void runCommand (CompString command);
 
-	void moveViewport (int tx, int ty, bool sync);
-
 	void sendWindowActivationRequest (Window id);
 
 	int outputDeviceForPoint (int x, int y);
@@ -405,6 +405,9 @@
 	WRAPABLE_HND (17, ScreenInterface, void, addSupportedAtoms,
 		      std::vector<Atom>& atoms);
 
+	WRAPABLE_HND (18, ScreenInterface, void, moveViewport, int tx,
+		      int ty);
+
 	friend class CompTimer;
 	friend class CompWindow;
 	friend class PrivateWindow;

=== modified file 'include/core/window.h'
--- include/core/window.h	2012-01-11 08:50:29 +0000
+++ include/core/window.h	2012-01-11 08:50:29 +0000
@@ -288,6 +288,21 @@
 #define CHANGE_HEIGHT  1 << 3
 #define CHANGE_BORDER  1 << 4
 
+namespace compiz
+{
+    namespace viewports
+    {
+	CompRect borderRectForViewportPosition (const CompRect &,
+						const CompPoint &,
+						unsigned int,
+						unsigned int);
+
+	CompPoint wraparoundOffsetForPoint (const CompPoint &,
+					    const CompPoint &,
+					    const CompPoint &);
+    }
+}
+
 /**
  * An Window object that wraps an X window. This handles snychronization of
  * window state, geometry, etc. between Compiz and the X server.
@@ -393,8 +408,6 @@
 
 	XWindowChanges & saveWc ();
 
-	void moveToViewportPosition (int x, int y, bool sync);
-
 	char * startupId ();
 
 	unsigned int desktop ();

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2012-01-11 08:50:29 +0000
+++ plugins/CMakeLists.txt	2012-01-11 08:50:29 +0000
@@ -19,6 +19,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/window/geometry-saver/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/window/extents/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/point/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/../src/rect/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:50:29 +0000
+++ plugins/decor/src/decor.cpp	2012-01-11 08:50:29 +0000
@@ -1056,9 +1056,6 @@
 	/* Translate by x and y points of this window */
 	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 ();
@@ -2097,7 +2094,7 @@
 DecorWindow::updateWindowRegions ()
 {
     CompRect input (window->serverInputRect ());
-    input.setPos (input.pos () + cWindow->paintOffset ());
+    input.setPos (input.pos ());
 
     if (regions.size () != gWindow->textures ().size ())
 	regions.resize (gWindow->textures ().size ());
@@ -2670,7 +2667,9 @@
 		       unsigned int             source,
 		       unsigned int             constrainment)
 {
-    CompPoint dp = g.pos () - window->serverGeometry ().pos ();
+    CompPoint gp = CompPoint (g.pos ().x () % (screen->vpSize ().width () * screen->width ()),
+			      g.pos ().y () % (screen->vpSize ().height () * screen->height ()));
+    CompPoint dp = gp - window->serverGeometry ().pos ();
     CompSize  dsize = CompSize (g.width () - window->serverGeometry ().width (),
 				g.height () - window->serverGeometry ().height ());
 
@@ -2707,14 +2706,6 @@
 void
 DecorWindow::applyOffset (const CompPoint &dOff)
 {
-    if (wd)
-    {
-	wd->translate (dOff);
-	setDecorationMatrices ();
-    }
-
-    updateReg = true;
-
     cWindow->applyOffset (dOff);
 
     if (dScreen->cmActive)

=== modified file 'plugins/move/src/move.cpp'
--- plugins/move/src/move.cpp	2012-01-11 08:50:29 +0000
+++ plugins/move/src/move.cpp	2012-01-11 08:50:29 +0000
@@ -146,18 +146,19 @@
 		s->warpPointer (xRoot - pointerX, yRoot - pointerY);
 	    }
 
-	    if (ms->moveOpacity != OPAQUE)
-	    {
-		if (mw->cWindow)
-		    mw->cWindow->addDamage ();
-		if (mw->gWindow)
-		    mw->gWindow->glPaintSetEnabled (mw, true);
-	    }
-
 	    if (ms->hasCompositing && mw->cWindow)
 	    {
 		mw->cWindow->addDamage ();
-	    }
+		mw->cWindow->applyOffsetSetEnabled (mw ,true);
+	    }
+
+	    if (ms->moveOpacity != OPAQUE && mw->gWindow)
+	    {
+		mw->gWindow->glPaintSetEnabled (mw, true);
+	    }
+
+	    ms->w->positionSetEnabled (mw, true);
+	    screen->moveViewportSetEnabled (ms, true);
 	}
     }
 
@@ -183,11 +184,15 @@
 
 	if (state & CompAction::StateCancel)
 	    ng.setPos (CompPoint (ms->savedX, ms->savedY));
-	else
+	else if (mw->cWindow)
 	    ng.setPos (ng.pos () + mw->cWindow->paintOffset ());
 
-	ms->w->position (ng);
-	mw->cWindow->addDamage ();
+	ms->w->positionSetEnabled (mw, false);
+	ms->w->position (ng, 0, 0);
+	ms->w->positionSetEnabled (mw, true);
+
+	if (mw->cWindow)
+	    mw->cWindow->addDamage ();
 
 	/* update window attributes as window constraints may have
 	   changed - needed e.g. if a maximized window was moved
@@ -200,13 +205,19 @@
 	    ms->grab = NULL;
 	}
 
-	if (ms->moveOpacity != OPAQUE)
-	{
-	    if (mw->cWindow)
-		mw->cWindow->addDamage ();
-	    if (mw->gWindow)
-		mw->gWindow->glPaintSetEnabled (mw, false);
-	}
+	if (ms->hasCompositing && mw->cWindow)
+	{
+	    mw->cWindow->addDamage ();
+	    mw->cWindow->applyOffsetSetEnabled (mw, false);
+	}
+
+	if (ms->moveOpacity != OPAQUE && mw->gWindow)
+	{
+	    mw->gWindow->glPaintSetEnabled (mw, false);
+	}
+
+	ms->w->positionSetEnabled (mw, false);
+	screen->moveViewportSetEnabled (ms, false);
 
 	ms->w             = 0;
 	ms->releaseButton = 0;
@@ -499,7 +510,9 @@
 
 		ng.setPos (ng.pos () + d);
 
+		ms->w->positionSetEnabled (mw, false);
 		ms->w->position (ng);
+		ms->w->positionSetEnabled (mw, true);
 	    }
 
 	    ms->x -= dx;
@@ -647,6 +660,50 @@
 }
 
 bool
+MoveWindow::position (compiz::window::Geometry &g,
+		      unsigned int             source,
+		      unsigned int             constrainment)
+{
+    /* Normally on position updates during window movement
+     * we should warp the pointer by the difference in
+     * geometry (eg, -(CompWindow::serverGeometry +
+     * CompositeWindow::poisitionOffset)) so that it will
+     * start moving again from that position, but in
+     * the case of a viewport switch while a window
+     * is still grabbed we need to keep the paint offset
+     * and cursor position where they are */
+    if (!MoveScreen::get (screen)->mSwitchVp)
+    {
+	CompPoint dp = window->serverGeometry ().pos () -
+		       g.pos ();
+
+	dp -= cWindow->paintOffset ();
+
+	screen->warpPointer (dp.x (), dp.y ());
+    }
+
+    return window->position (g, source, constrainment);
+}
+
+void
+MoveWindow::applyOffset (const CompPoint &dOffset)
+{
+    /* See above */
+    if (MoveScreen::get (screen)->mSwitchVp)
+	cWindow->applyOffset (CompPoint (0, 0));
+    else
+	cWindow->applyOffset (dOffset);
+}
+
+void
+MoveScreen::moveViewport (int tx, int ty)
+{
+    mSwitchVp = true;
+    screen->moveViewport (tx, ty);
+    mSwitchVp = false;
+}
+
+bool
 MoveWindow::glPaint (const GLWindowPaintAttrib &attrib,
 		     const GLMatrix            &transform,
 		     const CompRegion          &region,
@@ -700,7 +757,8 @@
     releaseButton (0),
     grab (NULL),
     hasCompositing (false),
-    yConstrained (false)
+    yConstrained (false),
+    mSwitchVp (false)
 {
     updateOpacity ();
 
@@ -725,6 +783,7 @@
     optionSetInitiateKeyTerminate (moveTerminate);
 
     ScreenInterface::setHandler (screen);
+    screen->moveViewportSetEnabled (this, false);
 }
 
 MoveScreen::~MoveScreen ()

=== modified file 'plugins/move/src/move.h'
--- plugins/move/src/move.h	2012-01-11 08:50:29 +0000
+++ plugins/move/src/move.h	2012-01-11 08:50:29 +0000
@@ -65,6 +65,8 @@
 
 	void handleEvent (XEvent *);
 
+	void moveViewport (int tx, int ty);
+
 	bool registerPaintHandler (compiz::composite::PaintHandler *pHnd);
 	void unregisterPaintHandler ();
 
@@ -93,11 +95,14 @@
 	bool hasCompositing;
 
 	bool yConstrained;
+
+	bool mSwitchVp;
 };
 
 class MoveWindow :
+    public WindowInterface,
+    public CompositeWindowInterface,
     public GLWindowInterface,
-    public CompositeWindowInterface,
     public PluginClassHandler<MoveWindow,CompWindow>
 {
     public:
@@ -107,13 +112,21 @@
 	    gWindow (GLWindow::get (window)),
 	    cWindow (CompositeWindow::get (window))
 	{
+	    if (cWindow)
+		CompositeWindowInterface::setHandler (cWindow, true);
+
 	    if (gWindow)
 		GLWindowInterface::setHandler (gWindow, false);
 
-	    if (cWindow)
-		CompositeWindowInterface::setHandler (cWindow);
+	    WindowInterface::setHandler (window, false);
 	};
 
+	bool position (compiz::window::Geometry &g,
+		       unsigned int source,
+		       unsigned int constrainment);
+
+	void applyOffset (const CompPoint &dOffset);
+
 	bool glPaint (const GLWindowPaintAttrib &, const GLMatrix &,
 		      const CompRegion &, unsigned int);
 

=== modified file 'plugins/opengl/include/opengl/opengl.h'
--- plugins/opengl/include/opengl/opengl.h	2012-01-11 07:16:32 +0000
+++ plugins/opengl/include/opengl/opengl.h	2012-01-11 08:50:29 +0000
@@ -35,7 +35,7 @@
 #include <opengl/texture.h>
 #include <opengl/fragment.h>
 
-#define COMPIZ_OPENGL_ABI 4
+#define COMPIZ_OPENGL_ABI 5
 
 #include <core/pluginclasshandler.h>
 
@@ -479,10 +479,16 @@
 	virtual void glDrawTexture (GLTexture *texture, GLFragment::Attrib &,
 				    unsigned int);
 	virtual void glDrawGeometry ();
+
+	/**
+	 * Specify an absolute paint offset for this window, the default
+	 * is to use the value from the composite plugin
+	 */
+	virtual CompPoint glPaintOffset ();
 };
 
 class GLWindow :
-    public WrapableHandler<GLWindowInterface, 5>,
+    public WrapableHandler<GLWindowInterface, 6>,
     public PluginClassHandler<GLWindow, CompWindow, COMPIZ_OPENGL_ABI>
 {
     public:
@@ -581,6 +587,7 @@
 	WRAPABLE_HND (3, GLWindowInterface, void, glDrawTexture,
 		      GLTexture *texture, GLFragment::Attrib &, unsigned int);
 	WRAPABLE_HND (4, GLWindowInterface, void, glDrawGeometry);
+	WRAPABLE_HND (5, GLWindowInterface, CompPoint, glPaintOffset);
 
 	friend class GLScreen;
 	friend class PrivateGLScreen;

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2012-01-11 08:50:29 +0000
+++ plugins/opengl/src/paint.cpp	2012-01-11 08:50:29 +0000
@@ -207,7 +207,7 @@
     bool          status, unredirectFS;
     bool          withOffset = false;
     GLMatrix      vTransform;
-    CompPoint     offXY;
+    CompPoint     offXY, offset;
 
     CompWindowList                   pl;
     CompWindowList::reverse_iterator rit;
@@ -239,6 +239,13 @@
 	    if (w->destroyed ())
 		continue;
 
+	    odMask = PAINT_WINDOW_OCCLUSION_DETECTION_MASK;
+
+	    offset = w->onAllViewports () ? CompPoint () : cScreen->windowPaintOffset ();
+	    offset += gw->glPaintOffset ();
+
+	    offXY = w->getMovementForOffset (offset);
+
 	    if (!w->shaded ())
 	    {
 		/* Non-damaged windows don't have valid pixmap
@@ -247,6 +254,7 @@
 		if (!gw->priv->cWindow->damaged ())
 		{
 		    gw->priv->clip = region;
+		    gw->priv->clip.translate (offset);
 		    continue;
 		}
 		if (!w->isViewable ())
@@ -256,19 +264,11 @@
 	    /* copy region */
 	    gw->priv->clip = tmpRegion;
 
-	    odMask = PAINT_WINDOW_OCCLUSION_DETECTION_MASK;
-
-	    const CompPoint &offset =
-		    cScreen->windowPaintOffset ();
-
 	    if ((offset.x () != 0 ||
-		 offset.y () != 0) &&
-		!w->onAllViewports ())
+		 offset.y () != 0))
 	    {
 		withOffset = true;
 
-		offXY = w->getMovementForOffset (offset);
-
 		vTransform = transform;
 		vTransform.translate (offXY.x (), offXY.y (), 0);
 
@@ -292,8 +292,6 @@
 		if (withOffset)
 		    pr.translate (offXY);
 
-		pr.translate (gw->priv->cWindow->paintOffset ());
-
 		tmpRegion -= pr;
 
 		/* unredirect top most fullscreen windows. */
@@ -326,6 +324,8 @@
     /* paint all windows from bottom to top */
     foreach (w, pl)
     {
+	gw = GLWindow::get (w);
+
 	if (w->destroyed ())
 	    continue;
 
@@ -338,23 +338,21 @@
 		continue;
 	}
 
-	gw = GLWindow::get (w);
+	offset = w->onAllViewports () ? CompPoint () : cScreen->windowPaintOffset ();
+	offset += gw->glPaintOffset ();
+
+	offXY = w->getMovementForOffset (offset);
 
 	const CompRegion &clip =
 	    (!(mask & PAINT_SCREEN_NO_OCCLUSION_DETECTION_MASK)) ?
-	    gw->clip () : region.translated (gw->priv->cWindow->paintOffset ());
-
-	CompPoint offset =
-		cScreen->windowPaintOffset ();
+	    gw->clip () : region.translated (offXY);
 
 	if ((offset.x () != 0 ||
-	     offset.y () != 0) &&
-	    !w->onAllViewports ())
+	     offset.y () != 0))
 	{
-	    offXY = w->getMovementForOffset (offset);
-
 	    vTransform = transform;
 	    vTransform.translate (offXY.x (), offXY.y (), 0);
+
 	    gw->glPaint (gw->paintAttrib (), vTransform, clip,
 		         windowMask | PAINT_WINDOW_WITH_OFFSET_MASK);
 	}
@@ -639,6 +637,14 @@
     }
 }
 
+CompPoint
+GLWindow::glPaintOffset ()
+{
+    WRAPABLE_HND_FUNC_RETURN (5, CompPoint, glPaintOffset);
+
+    return priv->cWindow->paintOffset ();
+}
+
 static inline void
 addSingleQuad (GLfloat      *&d,
 	       const        GLTexture::MatrixList &matrix,
@@ -1211,7 +1217,6 @@
 	 * too */
 
 	CompRegion pr = priv->window->region ();
-	pr.translate (priv->cWindow->paintOffset ());
 
 	ml[0] = priv->matrices[0];
 	priv->geometry.reset ();

=== modified file 'plugins/opengl/src/window.cpp'
--- plugins/opengl/src/window.cpp	2012-01-11 08:50:29 +0000
+++ plugins/opengl/src/window.cpp	2012-01-11 08:50:29 +0000
@@ -78,8 +78,6 @@
 {
     CompRect input (window->serverInputRect ());
 
-    input.setPos (input.pos () + cWindow->paintOffset ());
-
     if (textures.size () != matrices.size ())
 	matrices.resize (textures.size ());
 
@@ -159,6 +157,10 @@
 GLWindowInterface::glDrawGeometry ()
     WRAPABLE_DEF (glDrawGeometry)
 
+CompPoint
+GLWindowInterface::glPaintOffset ()
+    WRAPABLE_DEF (glPaintOffset)
+
 const CompRegion &
 GLWindow::clip () const
 {
@@ -385,8 +387,6 @@
 {
     CompRect input (window->serverInputRect ());
 
-    input.setPos (input.pos () + cWindow->paintOffset ());
-
     if (regions.size () != textures.size ())
 	regions.resize (textures.size ());
     for (unsigned int i = 0; i < textures.size (); i++)

=== modified file 'plugins/rotate/src/rotate.cpp'
--- plugins/rotate/src/rotate.cpp	2012-01-11 08:50:29 +0000
+++ plugins/rotate/src/rotate.cpp	2012-01-11 08:50:29 +0000
@@ -114,6 +114,16 @@
 void
 RotateScreen::releaseMoveWindow ()
 {
+    CompWindow *w = screen->findWindow (mMoveWindow);
+
+    if (w)
+    {
+	compiz::window::Geometry g = w->serverGeometry ();
+	g.setPos (g.pos () + CompositeWindow::get (w)->paintOffset ());
+
+	w->position (g, 0, 0);
+    }
+
     mMoveWindow = None;
 }
 
@@ -205,7 +215,7 @@
 		    /* flag end of rotation */
 		    cubeScreen->rotationState (CubeScreen::RotationNone);
 
-		    screen->moveViewport (tx, 0, true);
+		    screen->moveViewport (tx, 0);
 
 		    mXrot = 0.0f;
 		    mYrot = 0.0f;
@@ -229,7 +239,8 @@
 
 			    ng.setX (mMoveWindowX);
 
-			    w->position (ng);
+			    /* Don't care about constrainments */
+			    w->position (ng, 0, 0);
 			}
 		    }
 		    /* only focus default window if switcher isn't active */
@@ -251,9 +262,13 @@
 	    w = screen->findWindow (mMoveWindow);
 	    if (w)
 	    {
+		CompositeWindow *cw = CompositeWindow::get (w);
+
 		float xrot = (screen->vpSize ().width () * (mBaseXrot + mXrot)) / 360.0f;
-		w->moveToViewportPosition (mMoveWindowX - xrot * screen->width (),
-					   w->y (), false);
+		CompPoint lastOffset = cw->paintOffset ();
+		CompPoint offset     = CompPoint (-xrot * screen->width (), 0);
+
+		cw->applyOffset (offset - lastOffset);
 	    }
 	}
     }
@@ -376,7 +391,7 @@
 
 	mask &= ~PAINT_SCREEN_REGION_MASK;
 	mask |= PAINT_SCREEN_TRANSFORMED_MASK;
-	
+
 	return gScreen->glPaintOutput (sAttrib, sTransform, region, output, mask);
     }
 

=== modified file 'plugins/wobbly/src/wobbly.cpp'
--- plugins/wobbly/src/wobbly.cpp	2012-01-11 08:50:29 +0000
+++ plugins/wobbly/src/wobbly.cpp	2012-01-11 08:50:29 +0000
@@ -1478,7 +1478,7 @@
 						  w->output ().top));
 
 			    w->positionSetEnabled (ww, false);
-			    w->position (ng);
+			    w->position (ng, 0, 0);
 			    w->positionSetEnabled (ww, true);
 			}
 
@@ -1509,8 +1509,8 @@
 
 			const CompPoint &offset = ww->cWindow->paintOffset ();
 
-			int wx = w->geometry ().x () + offset.x ();
-			int wy = w->geometry ().y () + offset.y ();
+			int wx = w->serverGeometry ().x () + offset.x ();
+			int wy = w->serverGeometry ().y () + offset.y ();
 			int borderWidth = w->geometry ().border ();
 
 			// Damage a box that's 1-pixel larger on each side
@@ -1607,6 +1607,14 @@
     }
 }
 
+CompPoint
+WobblyWindow::glPaintOffset ()
+{
+    /* Offsets are already done by
+     * the model here */
+    return CompPoint ();
+}
+
 void
 WobblyWindow::glAddGeometry (const GLTexture::MatrixList &matrix,
 			     const CompRegion            &region,
@@ -1865,6 +1873,36 @@
     window->windowNotify (n);
 }
 
+/* Ignore movement due to viewport changes */
+void
+WobblyScreen::moveViewport (int tx, int ty)
+{
+    foreach (CompWindow *w, screen->windows ())
+    {
+	WobblyWindow *ww = WobblyWindow::get (w);
+
+	ww->cWindow->applyOffsetSetEnabled (ww, false);
+	ww->window->positionSetEnabled (ww, false);
+    }
+
+    screen->moveViewport (tx, ty);
+
+    foreach (CompWindow *w, screen->windows ())
+    {
+	WobblyWindow *ww = WobblyWindow::get (w);
+
+	ww->cWindow->applyOffsetSetEnabled (ww, true);
+	ww->window->positionSetEnabled (ww, true);
+
+	/* Move all models back by viewport switch amount */
+	if (ww->model && ww->grabbed)
+	{
+	    ww->model->move ((static_cast <float> (tx)) * screen->width (),
+			     (static_cast <float> (ty)) * screen->height ());
+	}
+    }
+}
+
 void
 WobblyScreen::handleEvent (XEvent *event)
 {
@@ -1986,6 +2024,7 @@
 WobblyWindow::enableWobbling (bool enabling)
 {
     gWindow->glPaintSetEnabled (this, enabling);
+    gWindow->glPaintOffsetSetEnabled (this, enabling);
     gWindow->glAddGeometrySetEnabled (this, enabling);
     gWindow->glDrawGeometrySetEnabled (this, enabling);
     cWindow->damageRectSetEnabled (this, enabling);

=== modified file 'plugins/wobbly/src/wobbly.h'
--- plugins/wobbly/src/wobbly.h	2012-01-11 08:50:29 +0000
+++ plugins/wobbly/src/wobbly.h	2012-01-11 08:50:29 +0000
@@ -247,6 +247,7 @@
 
     // ScreenInterface methods
     void handleEvent (XEvent *event);
+    void moveViewport (int tx, int ty);
 
     // CompositeScreenInterface methods
     void preparePaint (int);
@@ -328,6 +329,7 @@
 			const CompRegion &, const CompRegion &,
 			unsigned int = MAXSHORT, unsigned int = MAXSHORT);
     void glDrawGeometry ();
+    CompPoint glPaintOffset ();
 
     WobblyScreen     *wScreen;
     CompWindow       *window;

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-01-11 08:50:29 +0000
+++ src/CMakeLists.txt	2012-01-11 08:50:29 +0000
@@ -7,6 +7,7 @@
 add_subdirectory( pluginclasshandler )
 add_subdirectory( window )
 add_subdirectory( point )
+add_subdirectory( rect )
 
 compiz_add_bcop_targets (
     core
@@ -42,6 +43,9 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/point/include
     ${CMAKE_CURRENT_SOURCE_DIR}/point/src
 
+    ${CMAKE_CURRENT_SOURCE_DIR}/rect/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/rect/src
+
     ${CMAKE_CURRENT_SOURCE_DIR}/pluginclasshandler/include
     ${CMAKE_CURRENT_SOURCE_DIR}/pluginclasshandler/src
 
@@ -111,6 +115,7 @@
     compiz_string
     compiz_timer
     compiz_point
+    compiz_rect
     compiz_logmessage
     compiz_pluginclasshandler
     compiz_window_geometry

=== added directory 'src/rect'
=== removed file 'src/rect.cpp'
--- src/rect.cpp	2012-01-11 08:50:29 +0000
+++ src/rect.cpp	1970-01-01 00:00:00 +0000
@@ -1,286 +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 <X11/Xlib.h>
-#include <X11/Xregion.h>
-#include <core/rect.h>
-
-CompRect::CompRect ()
-{
-    mRegion.rects = &mRegion.extents;
-    mRegion.numRects = 1;
-    mRegion.extents.x1 = 0;
-    mRegion.extents.x2 = 0;
-    mRegion.extents.y1 = 0;
-    mRegion.extents.y2 = 0;
-}
-
-CompRect::CompRect (int x, int y, int width, int height)
-{
-    mRegion.rects = &mRegion.extents;
-    mRegion.numRects = 1;
-    mRegion.extents.x1 = x;
-    mRegion.extents.y1 = y;
-    mRegion.extents.x2 = x + width;
-    mRegion.extents.y2 = y + height;
-}
-
-CompRect::CompRect (const CompRect& r)
-{
-    mRegion = r.mRegion;
-    mRegion.rects = &mRegion.extents;
-}
-
-CompRect::CompRect (const XRectangle xr)
-{
-    mRegion.rects = &mRegion.extents;
-    mRegion.numRects = 1;
-    mRegion.extents.x1 = xr.x;
-    mRegion.extents.y1 = xr.y;
-    mRegion.extents.x2 = xr.x + xr.width;
-    mRegion.extents.y2 = xr.y + xr.height;
-}
-
-Region
-CompRect::region () const
-{
-    return const_cast<const Region> (&mRegion);
-}
-
-void
-CompRect::setGeometry (int x,
-		       int y,
-		       int width,
-		       int height)
-{
-    mRegion.extents.x1 = x;
-    mRegion.extents.y1 = y;
-    mRegion.extents.x2 = x + width;
-    mRegion.extents.y2 = y + height;
-}
-
-void
-CompRect::setX (int x)
-{
-    int width = mRegion.extents.x2 - mRegion.extents.x1;
-
-    mRegion.extents.x1 = x;
-    mRegion.extents.x2 = x + width;
-}
-
-void
-CompRect::setY (int y)
-{
-    int height = mRegion.extents.y2 - mRegion.extents.y1;
-
-    mRegion.extents.y1 = y;
-    mRegion.extents.y2 = y + height;
-}
-
-void
-CompRect::setPos (const CompPoint& pos)
-{
-    setX (pos.x ());
-    setY (pos.y ());
-}
-
-void
-CompRect::setWidth (int width)
-{
-    mRegion.extents.x2 = mRegion.extents.x1 + width;
-}
-
-void
-CompRect::setHeight (int height)
-{
-    mRegion.extents.y2 = mRegion.extents.y1 + height;
-}
-
-void
-CompRect::setSize (const CompSize& size)
-{
-    mRegion.extents.x2 = mRegion.extents.x1 + size.width ();
-    mRegion.extents.y2 = mRegion.extents.y1 + size.height ();
-}
-
-void
-CompRect::setLeft (int x1)
-{
-    mRegion.extents.x1 = x1;
-    if (mRegion.extents.x2 < x1)
-	mRegion.extents.x2 = x1;
-}
-
-void
-CompRect::setTop (int y1)
-{
-    mRegion.extents.y1 = y1;
-    if (mRegion.extents.y2 < y1)
-	mRegion.extents.y2 = y1;
-}
-
-void
-CompRect::setRight (int x2)
-{
-    mRegion.extents.x2 = x2;
-    if (mRegion.extents.x1 > x2)
-	mRegion.extents.x1 = x2;
-}
-
-void
-CompRect::setBottom (int y2)
-{
-    mRegion.extents.y2 = y2;
-    if (mRegion.extents.y1 > y2)
-	mRegion.extents.y1 = y2;
-}
-
-bool
-CompRect::contains (const CompPoint& point) const
-{
-    if (point.x () < x1 ())
-	return false;
-    if (point.x () > x2 ())
-	return false;
-    if (point.y () < y1 ())
-	return false;
-    if (point.y () > y2 ())
-	return false;
-
-    return true;
-}
-
-bool
-CompRect::contains (const CompRect& rect) const
-{
-    if (rect.x1 () < x1 ())
-	return false;
-    if (rect.x2 () > x2 ())
-	return false;
-    if (rect.y1 () < y1 ())
-	return false;
-    if (rect.y2 () > y2 ())
-	return false;
-
-    return true;
-}
-
-bool
-CompRect::intersects (const CompRect& rect) const
-{
-    int l, r, t, b;
-
-    /* extents of overlapping rectangle */
-    l = MAX (left (), rect.left ());
-    r = MIN (right (), rect.right ());
-    t = MAX (top (), rect.top ());
-    b = MIN (bottom (), rect.bottom ());
-
-    return (l < r) && (t < b);
-}
-
-bool
-CompRect::isEmpty () const
-{
-    if (mRegion.extents.x1 != mRegion.extents.x2)
-	return false;
-    if (mRegion.extents.y1 != mRegion.extents.y2)
-	return false;
-
-    return true;
-}
-
-int
-CompRect::area () const
-{
-    if (mRegion.extents.x2 < mRegion.extents.x1)
-	return 0;
-    if (mRegion.extents.y2 < mRegion.extents.y1)
-	return 0;
-
-    return (mRegion.extents.x2 - mRegion.extents.x1) *
-	   (mRegion.extents.y2 - mRegion.extents.y1);
-}
-
-bool
-CompRect::operator== (const CompRect &rect) const
-{
-    if (mRegion.extents.x1 != rect.mRegion.extents.x1)
-	return false;
-    if (mRegion.extents.y1 != rect.mRegion.extents.y1)
-	return false;
-    if (mRegion.extents.x2 != rect.mRegion.extents.x2)
-	return false;
-    if (mRegion.extents.y2 != rect.mRegion.extents.y2)
-	return false;
-
-    return true;
-}
-
-bool
-CompRect::operator!= (const CompRect &rect) const
-{
-    return !(*this == rect);
-}
-
-CompRect
-CompRect::operator& (const CompRect &rect) const
-{
-    CompRect result (*this);
-
-    result &= rect;
-    return result;
-}
-
-CompRect&
-CompRect::operator&= (const CompRect &rect)
-{
-    int l, r, t, b;
-
-    /* extents of overlapping rectangle */
-    l = MAX (left (), rect.left ());
-    r = MIN (right (), rect.right ());
-    t = MAX (top (), rect.top ());
-    b = MIN (bottom (), rect.bottom ());
-
-    mRegion.extents.x1 = l;
-    mRegion.extents.x2 = r;
-    mRegion.extents.y1 = t;
-    mRegion.extents.y2 = b;
-
-    return *this;
-}
-
-CompRect &
-CompRect::operator= (const CompRect &rect)
-{
-    mRegion.extents.x1 = rect.mRegion.extents.x1;
-    mRegion.extents.y1 = rect.mRegion.extents.y1;
-    mRegion.extents.x2 = rect.mRegion.extents.x2;
-    mRegion.extents.y2 = rect.mRegion.extents.y2;
-
-    return *this;
-}
-

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

=== added directory 'src/rect/include'
=== added directory 'src/rect/include/core'
=== added file 'src/rect/include/core/rect.h'
--- src/rect/include/core/rect.h	1970-01-01 00:00:00 +0000
+++ src/rect/include/core/rect.h	2012-01-11 08:50:29 +0000
@@ -0,0 +1,246 @@
+/*
+ * 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 _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.
+ */
+class CompRect {
+
+    public:
+	CompRect ();
+	CompRect (int x, int y, int width, int height);
+	CompRect (const CompRect&);
+	CompRect (const XRectangle);
+
+	int x () const;
+	int y () const;
+	CompPoint pos () const;
+
+	int width () const;
+	int height () const;
+
+	int x1 () const;
+	int y1 () const;
+	int x2 () const;
+	int y2 () const;
+
+	int left   () const;
+	int right  () const;
+	int top    () const;
+	int bottom () const;
+
+	int centerX () const;
+	int centerY () const;
+	CompPoint center () const;
+
+	int area () const;
+	
+	/**
+	 * Returns an X region handle for the CompRect
+	 */
+	Region region () const;
+
+	void setGeometry (int x, int y,
+			  int width, int height);
+
+	void setX      (int);
+	void setY      (int);
+	void setWidth  (int);
+	void setHeight (int);
+
+	void setPos (const CompPoint&);
+	void setSize (const CompSize&);
+
+	/** 
+	 * Sets the left edge position
+	 *
+	 * Setting an edge past it's opposite edge will result in both edges
+	 * being set to the new value
+	 */
+	void setLeft    (int);
+	/**
+	 * Sets the top edge position
+	 *
+	 * Setting an edge past it's opposite edge will result in both edges
+	 * being set to the new value
+	 */
+	void setTop     (int);
+	/** 
+	 * Sets the right edge position
+	 *
+	 * Setting an edge past it's opposite edge will result in both edges
+	 * being set to the new value
+	 */
+	void setRight   (int);
+	/** 
+	 * Sets the bottom edge position
+	 *
+	 * Setting an edge past it's opposite edge will result in both edges
+	 * being set to the new value
+	 */
+	void setBottom  (int);
+
+	bool contains (const CompPoint &) const;
+	bool contains (const CompRect &) const;
+	bool intersects (const CompRect &) const;
+	bool isEmpty () const;
+
+	bool operator== (const CompRect &) const;
+	bool operator!= (const CompRect &) const;
+
+	/* FIXME: Implement operator|= */
+
+	CompRect operator& (const CompRect &) const;
+	CompRect& operator&= (const CompRect &);
+	CompRect& operator= (const CompRect &);
+
+	typedef std::vector<CompRect> vector;
+	typedef std::vector<CompRect *> ptrVector;
+	typedef std::list<CompRect *> ptrList;
+
+    private:
+	REGION       mRegion;
+};
+
+namespace compiz
+{
+    namespace rect
+    {
+	CompPoint wraparoundPoint (const CompRect &bounds,
+				   const CompPoint &p);
+    }
+}
+
+
+inline int
+CompRect::x () const
+{
+    return mRegion.extents.x1;
+}
+
+inline int
+CompRect::y () const
+{
+    return mRegion.extents.y1;
+}
+
+inline CompPoint
+CompRect::pos () const
+{
+    return CompPoint (x (), y ());
+}
+
+inline int
+CompRect::width () const
+{
+    return mRegion.extents.x2 - mRegion.extents.x1;
+}
+
+inline int
+CompRect::height () const
+{
+    return mRegion.extents.y2 - mRegion.extents.y1;
+}
+
+inline int
+CompRect::x1 () const
+{
+    return mRegion.extents.x1;
+}
+
+inline int
+CompRect::y1 () const
+{
+    return mRegion.extents.y1;
+}
+
+inline int
+CompRect::x2 () const
+{
+    return mRegion.extents.x2;
+}
+
+inline int
+CompRect::y2 () const
+{
+    return mRegion.extents.y2;
+}
+
+inline int
+CompRect::left () const
+{
+    return mRegion.extents.x1;
+}
+
+inline int
+CompRect::right () const
+{
+    return mRegion.extents.x2;
+}
+
+inline int
+CompRect::top () const
+{
+    return mRegion.extents.y1;
+}
+
+
+inline int
+CompRect::bottom () const
+{
+    return mRegion.extents.y2;
+}
+
+inline int
+CompRect::centerX () const
+{
+    return x () + width () / 2;
+}
+
+inline int
+CompRect::centerY () const
+{
+    return y () + height () / 2;
+}
+
+inline CompPoint
+CompRect::center () const
+{
+    return CompPoint (centerX (), centerY ());
+}
+
+#endif

=== added directory 'src/rect/src'
=== added file 'src/rect/src/rect.cpp'
--- src/rect/src/rect.cpp	1970-01-01 00:00:00 +0000
+++ src/rect/src/rect.cpp	2012-01-11 08:50:29 +0000
@@ -0,0 +1,306 @@
+/*
+ * 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 <X11/Xlib.h>
+#include <X11/Xregion.h>
+#include <core/rect.h>
+#include <math.h>
+#include <stdlib.h>
+
+
+CompRect::CompRect ()
+{
+    mRegion.rects = &mRegion.extents;
+    mRegion.numRects = 1;
+    mRegion.extents.x1 = 0;
+    mRegion.extents.x2 = 0;
+    mRegion.extents.y1 = 0;
+    mRegion.extents.y2 = 0;
+}
+
+CompRect::CompRect (int x, int y, int width, int height)
+{
+    mRegion.rects = &mRegion.extents;
+    mRegion.numRects = 1;
+    mRegion.extents.x1 = x;
+    mRegion.extents.y1 = y;
+    mRegion.extents.x2 = x + width;
+    mRegion.extents.y2 = y + height;
+}
+
+CompRect::CompRect (const CompRect& r)
+{
+    mRegion = r.mRegion;
+    mRegion.rects = &mRegion.extents;
+}
+
+CompRect::CompRect (const XRectangle xr)
+{
+    mRegion.rects = &mRegion.extents;
+    mRegion.numRects = 1;
+    mRegion.extents.x1 = xr.x;
+    mRegion.extents.y1 = xr.y;
+    mRegion.extents.x2 = xr.x + xr.width;
+    mRegion.extents.y2 = xr.y + xr.height;
+}
+
+CompPoint
+compiz::rect::wraparoundPoint (const CompRect &bounds, const CompPoint &p)
+{
+    CompPoint r (p);
+
+    if (p.x () > bounds.x2 ())
+	r.setX ((p.x () % bounds.width ()) + bounds.x1 ());
+    else if (p.x () < bounds.x1 ())
+	r.setX (bounds.width () - (abs (p.x ()) % bounds.width ()));
+
+    if (p.y () > bounds.y2 ())
+	r.setY ((p.y () % bounds.height ()) + bounds.y1 ());
+    else if (p.y () < bounds.y1 ())
+	r.setY (bounds.height () - (abs (p.y ()) % bounds.height ()));
+
+    return r;
+}
+
+Region
+CompRect::region () const
+{
+    return const_cast<const Region> (&mRegion);
+}
+
+void
+CompRect::setGeometry (int x,
+		       int y,
+		       int width,
+		       int height)
+{
+    mRegion.extents.x1 = x;
+    mRegion.extents.y1 = y;
+    mRegion.extents.x2 = x + width;
+    mRegion.extents.y2 = y + height;
+}
+
+void
+CompRect::setX (int x)
+{
+    int width = mRegion.extents.x2 - mRegion.extents.x1;
+
+    mRegion.extents.x1 = x;
+    mRegion.extents.x2 = x + width;
+}
+
+void
+CompRect::setY (int y)
+{
+    int height = mRegion.extents.y2 - mRegion.extents.y1;
+
+    mRegion.extents.y1 = y;
+    mRegion.extents.y2 = y + height;
+}
+
+void
+CompRect::setPos (const CompPoint& pos)
+{
+    setX (pos.x ());
+    setY (pos.y ());
+}
+
+void
+CompRect::setWidth (int width)
+{
+    mRegion.extents.x2 = mRegion.extents.x1 + width;
+}
+
+void
+CompRect::setHeight (int height)
+{
+    mRegion.extents.y2 = mRegion.extents.y1 + height;
+}
+
+void
+CompRect::setSize (const CompSize& size)
+{
+    mRegion.extents.x2 = mRegion.extents.x1 + size.width ();
+    mRegion.extents.y2 = mRegion.extents.y1 + size.height ();
+}
+
+void
+CompRect::setLeft (int x1)
+{
+    mRegion.extents.x1 = x1;
+    if (mRegion.extents.x2 < x1)
+	mRegion.extents.x2 = x1;
+}
+
+void
+CompRect::setTop (int y1)
+{
+    mRegion.extents.y1 = y1;
+    if (mRegion.extents.y2 < y1)
+	mRegion.extents.y2 = y1;
+}
+
+void
+CompRect::setRight (int x2)
+{
+    mRegion.extents.x2 = x2;
+    if (mRegion.extents.x1 > x2)
+	mRegion.extents.x1 = x2;
+}
+
+void
+CompRect::setBottom (int y2)
+{
+    mRegion.extents.y2 = y2;
+    if (mRegion.extents.y1 > y2)
+	mRegion.extents.y1 = y2;
+}
+
+bool
+CompRect::contains (const CompPoint& point) const
+{
+    if (point.x () < x1 ())
+	return false;
+    if (point.x () > x2 ())
+	return false;
+    if (point.y () < y1 ())
+	return false;
+    if (point.y () > y2 ())
+	return false;
+
+    return true;
+}
+
+bool
+CompRect::contains (const CompRect& rect) const
+{
+    if (rect.x1 () < x1 ())
+	return false;
+    if (rect.x2 () > x2 ())
+	return false;
+    if (rect.y1 () < y1 ())
+	return false;
+    if (rect.y2 () > y2 ())
+	return false;
+
+    return true;
+}
+
+bool
+CompRect::intersects (const CompRect& rect) const
+{
+    int l, r, t, b;
+
+    /* extents of overlapping rectangle */
+    l = MAX (left (), rect.left ());
+    r = MIN (right (), rect.right ());
+    t = MAX (top (), rect.top ());
+    b = MIN (bottom (), rect.bottom ());
+
+    return (l < r) && (t < b);
+}
+
+bool
+CompRect::isEmpty () const
+{
+    return mRegion.extents.x1 == mRegion.extents.x2 ||
+	   mRegion.extents.y1 == mRegion.extents.y2;
+}
+
+int
+CompRect::area () const
+{
+    if (mRegion.extents.x2 < mRegion.extents.x1)
+	return 0;
+    if (mRegion.extents.y2 < mRegion.extents.y1)
+	return 0;
+
+    return (mRegion.extents.x2 - mRegion.extents.x1) *
+	   (mRegion.extents.y2 - mRegion.extents.y1);
+}
+
+bool
+CompRect::operator== (const CompRect &rect) const
+{
+    if (mRegion.extents.x1 != rect.mRegion.extents.x1)
+	return false;
+    if (mRegion.extents.y1 != rect.mRegion.extents.y1)
+	return false;
+    if (mRegion.extents.x2 != rect.mRegion.extents.x2)
+	return false;
+    if (mRegion.extents.y2 != rect.mRegion.extents.y2)
+	return false;
+
+    return true;
+}
+
+bool
+CompRect::operator!= (const CompRect &rect) const
+{
+    return !(*this == rect);
+}
+
+CompRect
+CompRect::operator& (const CompRect &rect) const
+{
+    CompRect result (*this);
+
+    result &= rect;
+    return result;
+}
+
+CompRect&
+CompRect::operator&= (const CompRect &rect)
+{
+    int l, r, t, b;
+
+    /* extents of overlapping rectangle */
+    l = MAX (left (), rect.left ());
+    r = MIN (right (), rect.right ());
+    t = MAX (top (), rect.top ());
+    b = MIN (bottom (), rect.bottom ());
+
+    mRegion.extents.x1 = l;
+    mRegion.extents.x2 = r;
+    mRegion.extents.y1 = t;
+    mRegion.extents.y2 = b;
+
+    /* FIXME: This can result in negative widths
+     * and heights, which makes no sense */
+
+    return *this;
+}
+
+CompRect &
+CompRect::operator= (const CompRect &rect)
+{
+    mRegion.extents.x1 = rect.mRegion.extents.x1;
+    mRegion.extents.y1 = rect.mRegion.extents.y1;
+    mRegion.extents.x2 = rect.mRegion.extents.x2;
+    mRegion.extents.y2 = rect.mRegion.extents.y2;
+
+    return *this;
+}
+

=== added directory 'src/rect/tests'
=== added file 'src/rect/tests/CMakeLists.txt'
--- src/rect/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/rect/tests/CMakeLists.txt	2012-01-11 08:50:29 +0000
@@ -0,0 +1,31 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library (compiz_rect_test
+             ${CMAKE_CURRENT_SOURCE_DIR}/test-rect.cpp)
+
+add_executable (compiz_test_rect
+                ${CMAKE_CURRENT_SOURCE_DIR}/rect/src/test-rect.cpp)
+
+add_executable (compiz_test_rect_wraparound_point
+                ${CMAKE_CURRENT_SOURCE_DIR}/wraparound_point/src/test-rect-wraparound-point.cpp)
+
+target_link_libraries (compiz_test_rect
+                       compiz_rect_test
+                       compiz_rect 
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
+                       )
+
+target_link_libraries (compiz_test_rect_wraparound_point
+                       compiz_rect_test
+                       compiz_rect 
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
+                       )
+
+add_test (compiz_rect compiz_test_rect)
+add_test (compiz_rect_wraparound_point compiz_test_rect_wraparound_point)

=== added directory 'src/rect/tests/rect'
=== added directory 'src/rect/tests/rect/src'
=== added file 'src/rect/tests/rect/src/test-rect.cpp'
--- src/rect/tests/rect/src/test-rect.cpp	1970-01-01 00:00:00 +0000
+++ src/rect/tests/rect/src/test-rect.cpp	2012-01-11 08:50:29 +0000
@@ -0,0 +1,106 @@
+/*
+ * 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-rect.h>
+#include <iostream>
+#include <stdlib.h>
+
+class CompRectTestRect :
+    public CompRectTest
+{
+public:
+
+    CompRectTestRect ();
+    ~CompRectTestRect ();
+};
+
+
+CompRectTestRect::CompRectTestRect ()
+{
+}
+
+CompRectTestRect::~CompRectTestRect ()
+{
+}
+
+TEST_F (CompRectTestRect, TestRect)
+{
+    ASSERT_EQ (mRect, CompRect (0, 0, 0, 0));
+
+    mRect = CompRect (100, 100, 400, 300);
+
+    EXPECT_EQ (mRect.x (), 100);
+    EXPECT_EQ (mRect.y (), 100);
+    EXPECT_EQ (mRect.width (), 400);
+    EXPECT_EQ (mRect.height (), 300);
+    EXPECT_EQ (mRect.x2 (), 500);
+    EXPECT_EQ (mRect.y2 (), 400);
+    EXPECT_EQ (mRect.left (), 100);
+    EXPECT_EQ (mRect.right (), 500);
+    EXPECT_EQ (mRect.top (), 100);
+    EXPECT_EQ (mRect.bottom (), 400);
+
+    EXPECT_EQ (mRect.centerX (), 300);
+    EXPECT_EQ (mRect.centerY (), 250);
+
+    EXPECT_EQ (mRect.center (), CompPoint (300, 250));
+    EXPECT_EQ (mRect.pos (), CompPoint (100, 100));
+
+    EXPECT_EQ (mRect.area (), 120000);
+
+    mRect.setWidth (-1);
+    mRect.setHeight (-1);
+
+    EXPECT_EQ (mRect.area (), 0);
+
+    mRect = CompRect (0, 0, 0, 0);
+
+    EXPECT_TRUE (mRect.isEmpty ());
+
+    mRect.setRight (500);
+    mRect.setLeft (100);
+    mRect.setTop (50);
+    mRect.setBottom (450);
+
+    EXPECT_EQ (mRect, CompRect (100, 50, 400, 400));
+
+    mRect.setLeft (600);
+
+    EXPECT_TRUE (mRect.isEmpty ());
+    EXPECT_EQ (mRect.right (), 600);
+
+    mRect.setRight (1000);
+
+    EXPECT_TRUE (mRect.contains (CompPoint (601, 100)));
+    EXPECT_TRUE (mRect.contains (CompRect (601, 51, 300, 350)));
+    EXPECT_FALSE (mRect.contains (CompRect (601, 41, 900, 500)));
+    EXPECT_TRUE (mRect.intersects (CompRect (601, 41, 300, 400)));
+
+    /* Intersection */
+    mRect &= CompRect (700, 100, 400, 100);
+
+    EXPECT_EQ (mRect, CompRect (700, 100, 300, 100));
+}
+

=== added file 'src/rect/tests/test-rect.cpp'
--- src/rect/tests/test-rect.cpp	1970-01-01 00:00:00 +0000
+++ src/rect/tests/test-rect.cpp	2012-01-11 08:50:29 +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-rect.h"
+
+CompRectTest::CompRectTest ()
+{
+}
+
+CompRectTest::~CompRectTest ()
+{
+}

=== added file 'src/rect/tests/test-rect.h'
--- src/rect/tests/test-rect.h	1970-01-01 00:00:00 +0000
+++ src/rect/tests/test-rect.h	2012-01-11 08:50:29 +0000
@@ -0,0 +1,44 @@
+/*
+ * 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_TIMER_H
+#define _COMPIZ_TEST_TIMER_H
+
+#include <gtest/gtest.h>
+#include <core/rect.h>
+
+class CompRectTest : public ::testing::Test
+{
+public:
+
+    CompRectTest ();
+    virtual ~CompRectTest ();
+
+protected:
+
+    CompRect mRect;
+};
+
+#endif

=== added directory 'src/rect/tests/wraparound_point'
=== added directory 'src/rect/tests/wraparound_point/src'
=== added file 'src/rect/tests/wraparound_point/src/test-rect-wraparound-point.cpp'
--- src/rect/tests/wraparound_point/src/test-rect-wraparound-point.cpp	1970-01-01 00:00:00 +0000
+++ src/rect/tests/wraparound_point/src/test-rect-wraparound-point.cpp	2012-01-11 08:50:29 +0000
@@ -0,0 +1,78 @@
+/*
+ * 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-rect.h>
+#include <iostream>
+#include <stdlib.h>
+
+class CompRectTestWraparound :
+    public CompRectTest
+{
+public:
+
+    CompRectTestWraparound ();
+    ~CompRectTestWraparound ();
+};
+
+
+CompRectTestWraparound::CompRectTestWraparound ()
+{
+    /* x1: -500
+     * x2:  750
+     * y1: -400
+     * y2:  800
+     */
+    mRect = CompRect (-500, -400, 1250, 1200);
+}
+
+CompRectTestWraparound::~CompRectTestWraparound ()
+{
+}
+
+TEST_F (CompRectTestWraparound, TestWraparound)
+{
+    CompPoint outsider = CompPoint (2501, 2401);
+    CompPoint inside = CompPoint ();
+
+    inside = compiz::rect::wraparoundPoint (mRect, outsider);
+
+    RecordProperty ("Outside point x: ", outsider.x ());
+    RecordProperty ("Outside point y: ", outsider.y ());
+    RecordProperty ("Inside point x: ", inside.x ());
+    RecordProperty ("Inside point y: ", inside.y ());
+
+    EXPECT_EQ (inside, CompPoint (-499, -399));
+
+    outsider = CompPoint (-1751, -1601);
+
+    inside = compiz::rect::wraparoundPoint (mRect, outsider);
+
+    RecordProperty ("Outside point x: ", outsider.x ());
+    RecordProperty ("Outside point y: ", outsider.y ());
+    RecordProperty ("Inside point x: ", inside.x ());
+    RecordProperty ("Inside point y: ", inside.y ());
+
+    EXPECT_EQ (inside, CompPoint (749, 799));
+}

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-01-11 08:50:29 +0000
+++ src/screen.cpp	2012-01-11 08:50:29 +0000
@@ -1710,7 +1710,7 @@
 	    ty = screen->vp ().y () - (newv - 1);
 
 	if (tx != 0 || ty != 0)
-	    screen->moveViewport (tx, ty, TRUE);
+	    screen->moveViewport (tx, ty);
 
 	/* Move windows that were in one of the deleted viewports into the
 	   closest viewport */
@@ -3497,8 +3497,10 @@
 }
 
 void
-CompScreen::moveViewport (int tx, int ty, bool sync)
+CompScreen::moveViewport (int tx, int ty)
 {
+    WRAPABLE_HND_FUNC (18, moveViewport, tx, ty);
+    CompWindow *w;
     CompPoint pnt;
 
     tx = priv->vp.x () - tx;
@@ -3520,9 +3522,8 @@
 
     foreach (CompWindow *w, priv->windows)
     {
-	unsigned int valueMask = CWX | CWY;
-	XWindowChanges xwc;
 	compiz::window::Geometry saved;
+	compiz::window::Geometry ng = w->serverGeometry ();
 
 	if (w->onAllViewports ())
 	    continue;
@@ -3533,35 +3534,27 @@
 								      CHANGE_Y);
 
 	saved.setPos (saved.pos () + pnt);
+	ng.setPos (ng.pos () + pnt);
 
 	w->priv->geometrySaver.update (saved, saveMask);
-
-	xwc.x = w->serverGeometry ().x () + pnt.x ();
-	xwc.y = w->serverGeometry ().y () + pnt.y ();
-
-	w->priv->configureXWindow (valueMask, &xwc);
+	w->position (ng, 0, 0);
     }
 
-    if (sync)
+    priv->setDesktopHints ();
+
+    priv->setCurrentActiveWindowHistory (priv->vp.x (), priv->vp.y ());
+
+    w = findWindow (priv->activeWindow);
+    if (w)
     {
-	CompWindow *w;
-
-	priv->setDesktopHints ();
-
-	priv->setCurrentActiveWindowHistory (priv->vp.x (), priv->vp.y ());
-
-	w = findWindow (priv->activeWindow);
-	if (w)
-	{
-	    CompPoint dvp;
-
-	    dvp = w->defaultViewport ();
-
-	    /* add window to current history if it's default viewport is
-	       still the current one. */
-	    if (priv->vp.x () == dvp.x () && priv->vp.y () == dvp.y ())
-		priv->addToCurrentActiveWindowHistory (w->id ());
-	}
+	CompPoint dvp;
+
+	dvp = w->defaultViewport ();
+
+	/* add window to current history if it's default viewport is
+	   still the current one. */
+	if (priv->vp.x () == dvp.x () && priv->vp.y () == dvp.y ())
+	    priv->addToCurrentActiveWindowHistory (w->id ());
     }
 }
 
@@ -4006,6 +3999,10 @@
     WRAPABLE_DEF (leaveShowDesktopMode, window)
 
 void
+ScreenInterface::moveViewport (int tx, int ty)
+    WRAPABLE_DEF (moveViewport, tx, ty)
+
+void
 ScreenInterface::outputChangeNotify ()
     WRAPABLE_DEF (outputChangeNotify)
 
@@ -4658,6 +4655,13 @@
     XUngrabServer (dpy);
     XSync (dpy, FALSE);
 
+    /* Need to set a default here so that the value isn't uninitialized
+     * when loading plugins FIXME: Should find a way to initialize options
+     * first and then set this value, or better yet, tie this value directly
+     * to the option */
+    priv->vpSize.setWidth (priv->optionGetHsize ());
+    priv->vpSize.setHeight (priv->optionGetVsize ());
+
     /* Start initializing windows here */
     priv->initialized = true;
 
@@ -4717,13 +4721,6 @@
 	    focusDefaultWindow ();
     }
 
-    /* Need to set a default here so that the value isn't uninitialized
-     * when loading plugins FIXME: Should find a way to initialize options
-     * first and then set this value, or better yet, tie this value directly
-     * to the option */
-    priv->vpSize.setWidth (priv->optionGetHsize ());
-    priv->vpSize.setHeight (priv->optionGetVsize ());
-
     /* TODO: Bailout properly when screenInitPlugins fails
      * TODO: It would be nicer if this line could mean
      * "init all the screens", but unfortunately it only inits

=== modified file 'src/window.cpp'
--- src/window.cpp	2012-01-11 08:50:29 +0000
+++ src/window.cpp	2012-01-11 08:50:29 +0000
@@ -2488,6 +2488,9 @@
 {
     WRAPABLE_HND_FUNC_RETURN (5, bool, position, g, source, constrainment)
 
+    /* Enforce wrap-around viewports */
+    g.setPos (CompPoint (g.pos ().x () % (screen->vpSize ().width () * screen->width ()),
+			 g.pos ().y () % (screen->vpSize ().height () * screen->height ())));
     unsigned int changeMask = priv->serverGeometry.changeMask (g);
 
     if (!(priv->type & (CompWindowTypeDockMask    |
@@ -2556,6 +2559,9 @@
 	XWindowChanges xwc;
 	CompPoint      dp = g.pos () - priv->serverGeometry.pos ();
 
+	/* Check viewport position */
+	CompPoint lastVp = defaultViewport ();
+
 	memset (&xwc, sizeof (XWindowChanges), 0);
 
 	xwc.x = g.x ();
@@ -2576,6 +2582,21 @@
 	if (!priv->frameRegion.isEmpty ())
 	    priv->frameRegion.translate (dp);
 
+	if (defaultViewport () != lastVp)
+	{
+	    compiz::window::Geometry update;
+	    unsigned int	     saveMask  = (priv->geometrySaver.get (update) &
+						    (CHANGE_X |
+						     CHANGE_Y));
+	    /* Not perfect, but the cases where we are changing
+	     * viewports with a window with saved geometry are
+	     * going to be cases where the window moves
+	     * but CompScreen::width or CompScreen::height */
+	    update.setPos (update.pos () + dp);
+
+	    priv->geometrySaver.update (update, saveMask);
+	}
+
 	return true;
     }
 
@@ -6134,14 +6155,37 @@
     return priv->struts;
 }
 
-void
-CompWindow::moveToViewportPosition (int  x,
-				    int  y,
-				    bool sync)
-{
-    int tx, ty;
+CompPoint
+compiz::viewports::wraparoundOffsetForPoint (const CompPoint &p,
+					     const CompPoint &wp,
+					     const CompPoint &wvp)
+{
+    CompPoint remainingVp = CompPoint (screen->vpSize ().width () - wvp.x (),
+				       screen->vpSize ().height () - wvp.y ());
+    CompPoint maxOffset = CompPoint ((remainingVp.x () * screen->width ()) -
+					wp.x (),
+				     (remainingVp.y () * screen->height ()) -
+					wp.y ());
+    CompPoint minOffset = CompPoint (-((screen->vpSize ().width () * screen->width ()) - maxOffset.x ()),
+				     -((screen->vpSize ().height () * screen->height ()) - maxOffset.y ()));
+    CompRect constrain = CompRect (minOffset.x (), minOffset.y (),
+				   maxOffset.x () - minOffset.x (),
+				   maxOffset.y () - minOffset.y ());
+
+    return compiz::rect::wraparoundPoint (constrain, p);
+}
+
+CompRect
+compiz::viewports::borderRectForViewportPosition (const CompRect                 &borderRect,
+						  const CompPoint		 &vp,
+						  unsigned int                   type,
+						  unsigned int                   state)
+{
+    int x = vp.x () * screen->width () + borderRect.x ();
+    int y = vp.y () * screen->height () + borderRect.y ();
     int vWidth  = screen->width () * screen->vpSize ().width ();
     int vHeight = screen->height () * screen->vpSize ().height ();
+    int tx, ty;
 
     if (screen->vpSize ().width () != 1)
     {
@@ -6157,61 +6201,51 @@
 	y -= screen->vp ().y () * screen->height ();
     }
 
-    tx = x - priv->geometry.x ();
-    ty = y - priv->geometry.y ();
+    tx = x - borderRect.x ();
+    ty = y - borderRect.y ();
 
     if (tx || ty)
     {
-	unsigned int   valueMask = CWX | CWY;
-	XWindowChanges xwc;
 	int m, wx, wy;
 
-	if (!priv->managed)
-	    return;
-
-	if (priv->type & (CompWindowTypeDesktopMask | CompWindowTypeDockMask))
-	    return;
-
-	if (priv->state & CompWindowStateStickyMask)
-	    return;
+	if (type & (CompWindowTypeDesktopMask | CompWindowTypeDockMask))
+	    return borderRect;
+
+	if (state & CompWindowStateStickyMask)
+	    return borderRect;
 
 	wx = tx;
 	wy = ty;
 
 	if (screen->vpSize ().width ()!= 1)
 	{
-	    m = priv->geometry.x () + tx;
+	    m = borderRect.x () + tx;
 
-	    if (m - priv->output.left < (int) screen->width () - vWidth)
+	    if (m < (int) screen->width () - vWidth)
 		wx = tx + vWidth;
-	    else if (m + priv->width + priv->output.right > vWidth)
+	    else if (m + borderRect.width () > vWidth)
 		wx = tx - vWidth;
 	}
 
 	if (screen->vpSize ().height () != 1)
 	{
-	    m = priv->geometry.y () + ty;
+	    m = borderRect.y () + ty;
 
-	    if (m - priv->output.top < (int) screen->height () - vHeight)
+	    if (m < (int) screen->height () - vHeight)
 		wy = ty + vHeight;
-	    else if (m + priv->height + priv->output.bottom > vHeight)
+	    else if (m + borderRect.height () > vHeight)
 		wy = ty - vHeight;
 	}
 
-	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;
-
-	priv->configureXWindow (valueMask, &xwc);
+	CompPoint np (wx, wy);
+	CompRect  nbr (borderRect);
+
+	nbr.setPos (nbr.pos () + np);
+
+	return nbr;
     }
+
+    return borderRect;
 }
 
 char *
@@ -6335,8 +6369,6 @@
     {
 	Time       timestamp = 0;
 	CompPoint  vp, svp;
-	CompSize   size;
-	int        x, y;
 
 	initialTimestampSet = false;
 	screen->priv->applyStartupProperties (window);
@@ -6350,11 +6382,26 @@
 
 	vp   = window->defaultViewport ();
 	svp  = screen->vp ();
-	size = *screen;
-
-	x = window->geometry ().x () + (svp.x () - vp.x ()) * size.width ();
-	y = window->geometry ().y () + (svp.y () - vp.y ()) * size.height ();
-	window->moveToViewportPosition (x, y, true);
+
+	CompRect br = compiz::viewports::borderRectForViewportPosition (window->serverBorderRect (),
+									svp - vp,
+									window->state (),
+									window->actions ());
+	br.setPos (br.pos () + CompPoint (window->border ().left,
+					  window->border ().top));
+	br.setWidth (br.width () - window->border ().left - window->border ().right);
+	br.setHeight (br.height () - window->border ().bottom - window->border ().top);
+
+	compiz::window::Geometry g = window->serverGeometry ();
+
+	g.applyChange (compiz::window::Geometry (br.x (),
+						 br.y (),
+						 br.width (),
+						 br.height (), 0), CHANGE_X |
+								   CHANGE_Y |
+								   CHANGE_WIDTH |
+								   CHANGE_HEIGHT);
+	window->position (g, 0, 0);
 
 	if (allowWindowFocus (0, timestamp))
 	    window->activate ();

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

=== modified file 'src/window/geometry/CMakeLists.txt'
--- src/window/geometry/CMakeLists.txt	2012-01-11 08:50:29 +0000
+++ src/window/geometry/CMakeLists.txt	2012-01-11 08:50:29 +0000
@@ -10,6 +10,7 @@
   
   ${compiz_SOURCE_DIR}/include
   ${compiz_SOURCE_DIR}/src/point/include
+  ${compiz_SOURCE_DIR}/src/rect/include
 
   ${Boost_INCLUDE_DIRS}
   
@@ -30,7 +31,6 @@
 SET( 
   SRCS 
   ${CMAKE_CURRENT_SOURCE_DIR}/src/windowgeometry.cpp
-  ${compiz_SOURCE_DIR}/src/rect.cpp
 )
 
 ADD_LIBRARY( 
@@ -62,6 +62,7 @@
 TARGET_LINK_LIBRARIES( 
   compiz_window_geometry
   compiz_point
+  compiz_rect
   
   ${GLIBMM_LIBRARIES}
 )