Merge lp:~smspillaz/compiz-core/compiz-core.place-screen-size-change-tests into lp:compiz-core/0.9.5

[Sam Spilsbury]

Refactored and cleaned up a lot of the place plugin's screen size change handling code.

 * Moved the screen size change handling code into its own worker class which PlaceWindow derives from which automatically handles the save/restore of geometry on screen size changes.
 * Moved screen size change handling code into its own nameespace
 * Removed the two-pass semantics from the function - strut window collection is always done separately and we either wait until all of the external application which provide strut windows (eg, docks, panels) update their struts, or if they don't do it, time out after about 4 seconds and move windows on-screen anyways.
 * Position save now happens at the same time as the geometry is updated.
 * Added testcases for screen size change handling, in test-place-screen-size-change

Only exists as a testing module for now.

[lp:~smspillaz/compiz-core/compiz-core.place-screen-size-change-tests]

2926. By Sam Spilsbury on 2012-01-20

Merged compiz-core.place-constrainment-tests into compiz-core.place-screen-size-change-tests.

[Alan Griffiths (alan-griffiths)]

"Moved screen size change handling code into its own nameespace" - why?

review: Approve

=== modified file 'plugins/place/CMakeLists.txt'
--- plugins/place/CMakeLists.txt	2012-01-20 09:52:32 +0000
+++ plugins/place/CMakeLists.txt	2012-01-20 09:52:33 +0000
@@ -3,6 +3,8 @@
 include (CompizPlugin)
 
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/constrain-to-workarea/include/)
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/screen-size-change/include/)
+
 add_subdirectory (src/constrain-to-workarea)
-
-compiz_plugin (place LIBRARIES compiz_place_constrain_to_workarea)
+add_subdirectory (src/screen-size-change)
+compiz_plugin (place LIBRARIES compiz_place_constrain_to_workarea compiz_place_screen_size_change)

=== added directory 'plugins/place/src/screen-size-change'
=== added file 'plugins/place/src/screen-size-change/CMakeLists.txt'
--- plugins/place/src/screen-size-change/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/place/src/screen-size-change/CMakeLists.txt	2012-01-20 09:52:33 +0000
@@ -0,0 +1,76 @@
+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}/plugins/place/src/constrain-to-workarea/include
+  ${compiz_SOURCE_DIR}/src/point/include
+  ${compiz_SOURCE_DIR}/src/rect/include
+  ${compiz_SOURCE_DIR}/src/window/geometry/include
+  ${compiz_SOURCE_DIR}/src/window/geometry-saver/include
+  ${compiz_SOURCE_DIR}/src/window/extents/include
+  ${compiz_SOURCE_DIR}/include
+    
+  ${Boost_INCLUDE_DIRS}
+  
+  ${GLIBMM_INCLUDE_DIRS}
+)
+
+LINK_DIRECTORIES (${GLIBMM_LIBRARY_DIRS}) 
+
+SET ( 
+  PUBLIC_HEADERS 
+)
+
+SET ( 
+  PRIVATE_HEADERS
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/screen-size-change.h
+)
+
+SET( 
+  SRCS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/screen-size-change.cpp
+)
+
+ADD_LIBRARY( 
+  compiz_place_screen_size_change STATIC
+  
+  ${SRCS}
+  
+  ${PUBLIC_HEADERS}
+  ${PRIVATE_HEADERS}
+)
+
+ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
+
+SET_TARGET_PROPERTIES(
+  compiz_place_screen_size_change PROPERTIES
+  PUBLIC_HEADER "${PUBLIC_HEADERS}"
+  COMPILE_FLAGS "-fPIC"
+)
+
+INSTALL(
+  TARGETS                                 compiz_place_screen_size_change
+  RUNTIME             DESTINATION         bin
+  LIBRARY             DESTINATION         lib
+  ARCHIVE             DESTINATION         lib
+  PUBLIC_HEADER       DESTINATION         include/compiz/core
+)
+
+
+
+TARGET_LINK_LIBRARIES(
+  compiz_place_screen_size_change
+  compiz_place_constrain_to_workarea
+  compiz_rect
+  compiz_point
+  compiz_window_geometry
+  compiz_window_geometry_saver
+
+  ${GLIBMM_LIBRARIES}
+)

=== added directory 'plugins/place/src/screen-size-change/include'
=== added file 'plugins/place/src/screen-size-change/include/screen-size-change.h'
--- plugins/place/src/screen-size-change/include/screen-size-change.h	1970-01-01 00:00:00 +0000
+++ plugins/place/src/screen-size-change/include/screen-size-change.h	2012-01-20 09:52:33 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2001 Havoc Pennington
+ * Copyright (C) 2002, 2003 Red Hat, Inc.
+ * Copyright (C) 2003 Rob Adams
+ * Copyright (C) 2005 Novell, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef _COMPIZ_PLACE_SCREEN_SIZE_CHANGE_H
+#define _COMPIZ_PLACE_SCREEN_SIZE_CHANGE_H
+
+#include <core/rect.h>
+#include <core/windowgeometry.h>
+#include <core/windowgeometrysaver.h>
+#include <core/windowextents.h>
+#include <core/size.h>
+#include <core/point.h>
+
+#include "constrain-to-workarea.h"
+
+namespace compiz
+{
+namespace place
+{
+
+class ScreenSizeChangeObject
+{
+    public:
+
+	ScreenSizeChangeObject (const compiz::window::Geometry &g);
+	virtual ~ScreenSizeChangeObject ();
+
+	virtual const compiz::window::Geometry & getGeometry () const = 0;
+	virtual void applyGeometry (compiz::window::Geometry &ng,
+				    compiz::window::Geometry &og) = 0;
+	virtual const CompPoint & getViewport () const = 0;
+	virtual const CompRect & getWorkarea (const compiz::window::Geometry &g) const = 0;
+	virtual const compiz::window::extents::Extents & getExtents () const = 0;
+
+	compiz::window::Geometry adjustForSize (const CompSize &oldSize,
+						const CompSize &newSize);
+
+	void unset ();
+
+    private:
+
+	compiz::window::GeometrySaver mSaver;
+};
+
+}
+}
+
+#endif

=== added directory 'plugins/place/src/screen-size-change/src'
=== added file 'plugins/place/src/screen-size-change/src/screen-size-change.cpp'
--- plugins/place/src/screen-size-change/src/screen-size-change.cpp	1970-01-01 00:00:00 +0000
+++ plugins/place/src/screen-size-change/src/screen-size-change.cpp	2012-01-20 09:52:33 +0000
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2001 Havoc Pennington
+ * Copyright (C) 2002, 2003 Red Hat, Inc.
+ * Copyright (C) 2003 Rob Adams
+ * Copyright (C) 2005 Novell, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "screen-size-change.h"
+
+
+compiz::place::ScreenSizeChangeObject::ScreenSizeChangeObject (const compiz::window::Geometry &g) :
+    mSaver (g)
+{
+}
+
+compiz::place::ScreenSizeChangeObject::~ScreenSizeChangeObject ()
+{
+}
+
+compiz::window::Geometry
+compiz::place::ScreenSizeChangeObject::adjustForSize (const CompSize &oldSize,
+						      const CompSize &newSize)
+{
+    int            vpX, vpY, shiftX, shiftY;
+    compiz::window::Geometry g, vpRelRect;
+    int		   pivotX, pivotY;
+    int		   curVpOffsetX = getViewport ().x () * newSize.width ();
+    int		   curVpOffsetY = getViewport ().y () * newSize.height ();
+
+    g = getGeometry ();
+
+    pivotX = g.x ();
+    pivotY = g.y ();
+
+    /* FIXME: Should use saved geometry for maximized / fullscreen windows */
+
+    /* calculate target vp x, y index for window's pivot point */
+    vpX = pivotX / oldSize.width ();
+    if (pivotX < 0)
+	vpX -= 1;
+    vpY = pivotY / oldSize.height ();
+    if (pivotY < 0)
+	vpY -= 1;
+
+    /* if window's target vp is to the left of the leftmost viewport on that
+       row, assign its target vp column as 0 (-s->x rel. to current vp) */
+    if (getViewport ().x () + vpX < 0)
+	vpX = -getViewport ().x ();
+
+    /* if window's target vp is above the topmost viewport on that column,
+       assign its target vp row as 0 (-s->y rel. to current vp) */
+    if (getViewport ().y () + vpY < 0)
+	vpY = -getViewport ().y ();
+
+    unsigned int mask = mSaver.pop (vpRelRect, CHANGE_X | CHANGE_Y |
+					       CHANGE_WIDTH | CHANGE_HEIGHT);
+
+    if (mask)
+    {
+	/* set position/size to saved original rectangle */
+	g.applyChange (compiz::window::Geometry (vpRelRect.x () + vpX * newSize.width (),
+						 vpRelRect.y () + vpY * newSize.height (),
+						 vpRelRect.width (),
+						 vpRelRect.height (),
+						 vpRelRect.border ()), mask);
+    }
+    else
+    {
+	/* set position/size to window's current rectangle
+	   (with position relative to target viewport) */
+	vpRelRect.setX (g.x () - vpX * oldSize.width ());
+	vpRelRect.setY (g.y () - vpY * oldSize.height ());
+	vpRelRect.setWidth (g.width ());
+	vpRelRect.setHeight (g.height ());
+
+	g.setPos (g.pos ());
+
+	shiftX = vpX * (newSize.width () - oldSize.width ());
+	shiftY = vpY * (newSize.width () - oldSize.height ());
+
+	/* if coords. relative to viewport are outside new viewport area,
+	   shift window left/up so that it falls inside */
+	if (vpRelRect.x () >= newSize.width ())
+	    shiftX -= vpRelRect.x () - (newSize.width () - 1);
+	if (vpRelRect.y () >= newSize.height ())
+	    shiftY -= vpRelRect.y () - (newSize.height () - 1);
+
+	if (shiftX)
+	    g.setX (g.x () + shiftX);
+
+	if (shiftY)
+	    g.setY (g.y () + shiftY);
+
+	g.setWidth (vpRelRect.width ());
+	g.setHeight (vpRelRect.height ());
+    }
+
+    /* Handle non-(0,0) current viewport by shifting by curVpOffsetX,Y,
+       and bring window to (0,0) by shifting by minus its vp offset */
+
+    g.setX (g.x () + curVpOffsetX - (getViewport ().x () + vpX) * newSize.width ());
+    g.setY (g.y () + curVpOffsetY - (getViewport ().y () + vpY) * newSize.height ());
+
+    unsigned int flags = 0;
+
+    compiz::window::Geometry og (g);
+    const CompRect &workArea = getWorkarea (g);
+
+    compiz::place::clampGeometryToWorkArea (g, workArea, getExtents (), flags, newSize);
+
+    g.setX (g.x () - curVpOffsetX + (getViewport ().x () + vpX) * newSize.width ());
+    g.setY (g.y () - curVpOffsetY + (getViewport ().y () + vpY) * newSize.height ());
+
+    if (!mask)
+    {
+	/* save window geometry (relative to viewport) so that it
+	can be restored later */
+	mask = getGeometry ().changeMask (g);
+	mSaver.push (vpRelRect, mask);
+    }
+    else
+    {
+	compiz::window::Geometry rg (vpRelRect.x () + vpX * newSize.width (),
+				     vpRelRect.y () + vpY * newSize.height (),
+				     vpRelRect.width (),
+				     vpRelRect.height (), vpRelRect.border ());
+
+	/* Don't care about any bits not restored */
+	rg.applyChange (g, ~mask);
+
+	/* Push any bits back on the saver
+	 * that don't match the requested window geometry
+	 * since we will need to restore to them later */
+
+	unsigned int remaining = g.changeMask (rg);
+	mSaver.push (vpRelRect, remaining);
+    }
+
+    /* for maximized/fullscreen windows, update saved pos/size XXX,
+     * also pull in the old code to handle maximized windows which
+     * currently can't be implemented yet */
+
+    /* actually move/resize window in directions given by mask */
+    applyGeometry (g, og);
+
+    return g;
+}
+
+void
+compiz::place::ScreenSizeChangeObject::unset ()
+{
+    compiz::window::Geometry g;
+    mSaver.pop (g, !0);
+}

=== added directory 'plugins/place/src/screen-size-change/tests'
=== added file 'plugins/place/src/screen-size-change/tests/CMakeLists.txt'
--- plugins/place/src/screen-size-change/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/place/src/screen-size-change/tests/CMakeLists.txt	2012-01-20 09:52:33 +0000
@@ -0,0 +1,18 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library (compiz_place_screen_size_change_test
+             ${CMAKE_CURRENT_SOURCE_DIR}/test-screen-size-change.cpp)
+
+add_executable (compiz_test_place_screen_size_change
+                ${CMAKE_CURRENT_SOURCE_DIR}/screen-size-change/src/test-place-screen-size-change.cpp)
+
+target_link_libraries (compiz_test_place_screen_size_change
+                       compiz_place_screen_size_change_test
+                       compiz_place_screen_size_change
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
+                       )
+
+add_test (compiz_place_screen_size_change compiz_test_place_screen_size_change)

=== added directory 'plugins/place/src/screen-size-change/tests/screen-size-change'
=== added directory 'plugins/place/src/screen-size-change/tests/screen-size-change/src'
=== added file 'plugins/place/src/screen-size-change/tests/screen-size-change/src/test-place-screen-size-change.cpp'
--- plugins/place/src/screen-size-change/tests/screen-size-change/src/test-place-screen-size-change.cpp	1970-01-01 00:00:00 +0000
+++ plugins/place/src/screen-size-change/tests/screen-size-change/src/test-place-screen-size-change.cpp	2012-01-20 09:52:33 +0000
@@ -0,0 +1,312 @@
+/*
+ * 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-screen-size-change.h>
+#include <screen-size-change.h>
+#include <iostream>
+#include <stdlib.h>
+#include <cstring>
+
+class CompPlaceScreenSizeChangeTestScreenSizeChange :
+    public CompPlaceScreenSizeChangeTest
+{
+};
+
+class MockScreenSizeChangeObject :
+    public compiz::place::ScreenSizeChangeObject
+{
+    public:
+
+	MockScreenSizeChangeObject (const compiz::window::Geometry &);
+	~MockScreenSizeChangeObject ();
+
+	const compiz::window::Geometry & getGeometry () const;
+	void applyGeometry (compiz::window::Geometry &n,
+			    compiz::window::Geometry &o);
+	const CompPoint & getViewport () const;
+	const CompRect &  getWorkarea (const compiz::window::Geometry &g) const;
+	const compiz::window::extents::Extents & getExtents () const;
+
+	void setVp (const CompPoint &);
+	void setWorkArea (const CompRect &);
+	void setExtents (unsigned int left,
+			 unsigned int right,
+			 unsigned int top,
+			 unsigned int bottom);
+
+	void setGeometry (const compiz::window::Geometry &g);
+
+    private:
+
+	CompPoint			 mCurrentVp;
+	CompRect			 mCurrentWorkArea;
+	compiz::window::extents::Extents mCurrentExtents;
+	compiz::window::Geometry         mCurrentGeometry;
+};
+
+MockScreenSizeChangeObject::MockScreenSizeChangeObject (const compiz::window::Geometry &g) :
+    ScreenSizeChangeObject (g),
+    mCurrentVp (0, 0),
+    mCurrentWorkArea (50, 50, 1000, 1000),
+    mCurrentGeometry (g)
+{
+    memset (&mCurrentExtents, 0, sizeof (compiz::window::extents::Extents));
+}
+
+MockScreenSizeChangeObject::~MockScreenSizeChangeObject ()
+{
+}
+
+const compiz::window::Geometry &
+MockScreenSizeChangeObject::getGeometry () const
+{
+    return mCurrentGeometry;
+}
+
+void
+MockScreenSizeChangeObject::applyGeometry (compiz::window::Geometry &n,
+					   compiz::window::Geometry &o)
+{
+    std::cout << "DEBUG: new geometry : " << n.x () << " "
+					  << n.y () << " "
+					  << n.width () << " "
+					  << n.height () << " "
+					  << n.border () << std::endl;
+
+    std::cout << "DEBUG: old geometry : " << o.x () << " "
+					  << o.y () << " "
+					  << o.width () << " "
+					  << o.height () << " "
+					  << o.border () << std::endl;
+
+    mCurrentGeometry = n;
+}
+
+const CompPoint &
+MockScreenSizeChangeObject::getViewport () const
+{
+    return mCurrentVp;
+}
+
+const CompRect &
+MockScreenSizeChangeObject::getWorkarea (const compiz::window::Geometry &g) const
+{
+    return mCurrentWorkArea;
+}
+
+const compiz::window::extents::Extents &
+MockScreenSizeChangeObject::getExtents () const
+{
+    return mCurrentExtents;
+}
+
+void
+MockScreenSizeChangeObject::setVp (const CompPoint &p)
+{
+    mCurrentVp = p;
+}
+
+void
+MockScreenSizeChangeObject::setWorkArea (const CompRect &wa)
+{
+    mCurrentWorkArea = wa;
+}
+
+void
+MockScreenSizeChangeObject::setExtents (unsigned int left,
+				        unsigned int right,
+					unsigned int top,
+					unsigned int bottom)
+{
+    mCurrentExtents.left = left;
+    mCurrentExtents.right = right;
+    mCurrentExtents.top = top;
+    mCurrentExtents.bottom = bottom;
+}
+
+void
+MockScreenSizeChangeObject::setGeometry (const compiz::window::Geometry &g)
+{
+    mCurrentGeometry = g;
+}
+
+void
+reserveStruts (CompRect &workArea)
+{
+    workArea.setLeft (workArea.left () + 24);
+    workArea.setTop (workArea.top () + 24);
+    workArea.setBottom (workArea.bottom () - 24);
+}
+
+TEST_F (CompPlaceScreenSizeChangeTestScreenSizeChange, TestScreenSizeChange)
+{
+    CompSize		     current, old;
+    compiz::window::Geometry g (200, 250, 300, 400, 0);
+
+    MockScreenSizeChangeObject *ms = new MockScreenSizeChangeObject (g);
+
+    current = CompSize (1280, 800);
+
+    /* Reserve top, bottom and left parts of the screen for
+     * fake "24px" panels */
+    CompRect workArea = CompRect (0, 0, current.width (), current.height ());
+    reserveStruts (workArea);
+
+    ms->setWorkArea (workArea);
+
+    /* First test that changing the screen size
+     * to something smaller here doesn't cause our
+     * (small) window to be moved */
+
+    old = current;
+    current = CompSize (1024, 768);
+
+    workArea = CompRect (0, 0, current.width (), current.height ());
+    reserveStruts (workArea);
+
+    ms->setWorkArea (workArea);
+
+    g = ms->adjustForSize (old, current);
+
+    EXPECT_EQ (g, compiz::window::Geometry (200, 250, 300, 400, 0));
+
+    /* Making the screen size bigger with no
+     * saved geometry should cause the window not to move */
+
+    old = current;
+    current = CompSize (2048, 768);
+
+    workArea = CompRect (0, 0, current.width (), current.height ());
+    reserveStruts (workArea);
+
+    ms->setWorkArea (workArea);
+
+    g = ms->adjustForSize (old, current);
+
+    EXPECT_EQ (g, compiz::window::Geometry (200, 250, 300, 400, 0));
+
+    /* Move the window to the other "monitor" */
+
+    ms->setGeometry (compiz::window::Geometry (1025, 250, 300, 400, 0));
+
+    old = current;
+
+    /* Unplug a "monitor" */
+    current = CompSize (1024, 768);
+
+    workArea = CompRect (0, 0, current.width (), current.height ());
+    reserveStruts (workArea);
+
+    ms->setWorkArea (workArea);
+
+    g = ms->adjustForSize (old, current);
+
+    EXPECT_EQ (g, compiz::window::Geometry (724, 250, 300, 400, 0));
+
+    old = current;
+
+    /* Re-plug the monitor - window should go back
+     * to the same position */
+    current = CompSize (2048, 768);
+
+    workArea = CompRect (0, 0, current.width (), current.height ());
+    reserveStruts (workArea);
+
+    ms->setWorkArea (workArea);
+
+    g = ms->adjustForSize (old, current);
+
+    EXPECT_EQ (g, compiz::window::Geometry (1025, 250, 300, 400, 0));
+
+    old = current;
+
+    /* Plug 2 monitors downwards, no change */
+    current = CompSize (2048, 1536);
+
+    workArea = CompRect (0, 0, current.width (), current.height ());
+    reserveStruts (workArea);
+
+    ms->setWorkArea (workArea);
+
+    g = ms->adjustForSize (old, current);
+
+    EXPECT_EQ (g, compiz::window::Geometry (1025, 250, 300, 400, 0));
+
+    /* Move the window to the bottom "monitor" */
+
+    ms->setGeometry (compiz::window::Geometry (1025, 791, 300, 400, 0));
+
+    old = current;
+
+    /* Unplug bottom "monitor" */
+    current = CompSize (2048, 768);
+
+    workArea = CompRect (0, 0, current.width (), current.height ());
+    reserveStruts (workArea);
+
+    ms->setWorkArea (workArea);
+
+    g = ms->adjustForSize (old, current);
+
+    EXPECT_EQ (g, compiz::window::Geometry (1025, 344, 300, 400, 0));
+
+    old = current;
+
+    /* Re-plug bottom "monitor" */
+    current = CompSize (2048, 1356);
+
+    workArea = CompRect (0, 0, current.width (), current.height ());
+    reserveStruts (workArea);
+
+    ms->setWorkArea (workArea);
+
+    g = ms->adjustForSize (old, current);
+
+    EXPECT_EQ (g, compiz::window::Geometry (1025, 791, 300, 400, 0));
+
+    /* Move the entire window right a viewport */
+
+    g.setPos (g.pos () + CompPoint (current.width (), 0));
+
+    ms->setGeometry (g);
+
+    /* Now change the screen resolution again - the window should
+     * move to be within the constrained size of its current
+     * viewport */
+
+    /* Unplug a "monitor" */
+    old = current;
+    current = CompSize (1024, 1356);
+
+    workArea = CompRect (0, 0, current.width (), current.height ());
+    reserveStruts (workArea);
+
+    ms->setWorkArea (workArea);
+
+    g = ms->adjustForSize (old, current);
+
+    EXPECT_EQ (g, compiz::window::Geometry (current.width () + 724, 791, 300, 400, 0));
+}
+

=== added file 'plugins/place/src/screen-size-change/tests/test-screen-size-change.cpp'
--- plugins/place/src/screen-size-change/tests/test-screen-size-change.cpp	1970-01-01 00:00:00 +0000
+++ plugins/place/src/screen-size-change/tests/test-screen-size-change.cpp	2012-01-20 09:52:33 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Canonical Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL CANONICAL, LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#include "test-screen-size-change.h"

=== added file 'plugins/place/src/screen-size-change/tests/test-screen-size-change.h'
--- plugins/place/src/screen-size-change/tests/test-screen-size-change.h	1970-01-01 00:00:00 +0000
+++ plugins/place/src/screen-size-change/tests/test-screen-size-change.h	2012-01-20 09:52:33 +0000
@@ -0,0 +1,46 @@
+/*
+ * 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_PLACE_SCREEN_SIZE_CHANGE_H
+#define _COMPIZ_TEST_PLACE_SCREEN_SIZE_CHANGE_H
+
+#include <gtest/gtest.h>
+#include <core/rect.h>
+#include <core/windowgeometry.h>
+#include <core/windowgeometrysaver.h>
+#include <core/windowextents.h>
+#include <core/size.h>
+#include <core/point.h>
+#include <string>
+#include <iostream>
+#include <stdlib.h>
+
+class CompPlaceScreenSizeChangeTest :
+    public ::testing::Test
+{
+public:
+};
+
+#endif