Merge lp:~compiz-team/compiz-core/fix_898465 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Added tests for clamping geometry to workarea (eg, within a rectangle) and also for handling screen size changes (eg, clamp to within new workarea, try to restore to last position before the clamping occurred when the resolution gets bigger.

Next pipe: lp:~compiz-team/compiz-core/fix_898469

[Sam Spilsbury (smspillaz)]

Added tests for clamping geometry to workarea (eg, within a rectangle) and also for handling screen size changes (eg, clamp to within new workarea, try to restore to last position before the clamping occurred when the resolution gets bigger.

Next pipe: lp:~compiz-team/compiz-core/fix_898469

[lp:~compiz-team/compiz-core/fix_898465]

2921. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2922. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2923. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2924. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2925. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

[Thomi Richards (thomir-deactivatedaccount)]

Looks good to me.

review: Approve

[lp:~compiz-team/compiz-core/fix_898465]

2926. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2927. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2928. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2929. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2930. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2931. By Sam Spilsbury on 2011-12-20

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2932. By Sam Spilsbury on 2011-12-20

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2933. By Sam Spilsbury on 2011-12-20

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2934. By Sam Spilsbury on 2011-12-23

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2935. By Sam Spilsbury on 2012-01-03

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2936. By Sam Spilsbury on 2012-01-03

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2937. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2938. By Sam Spilsbury on 2012-01-04

Ported the workarea constrainment test to Google Test

2939. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2940. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2941. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2942. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2943. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2944. By Sam Spilsbury on 2012-01-05

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2945. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2946. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2947. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2948. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2949. By Sam Spilsbury on 2012-01-10

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

[Alan Griffiths (alan-griffiths)]

After merging this change to my (up to date) working copy I get a build error:
...
Linking CXX shared library libplace.so
/usr/bin/ld: cannot find -lplace_constrain_to_workarea
collect2: ld returned 1 exit status
make[2]: *** [plugins/place/libplace.so] Error 1
make[1]: *** [plugins/place/CMakeFiles/place.dir/all] Error 2
make: *** [all] Error 2
.

[lp:~compiz-team/compiz-core/fix_898465]

2950. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2951. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2952. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2953. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2954. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

Unmerged revisions

2954. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2953. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2952. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2951. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2950. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2949. By Sam Spilsbury on 2012-01-10

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2948. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2947. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2946. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

2945. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_898038 into compiz-core.fix_898465.

=== modified file 'plugins/place/CMakeLists.txt'
--- plugins/place/CMakeLists.txt	2009-03-15 05:09:18 +0000
+++ plugins/place/CMakeLists.txt	2012-01-11 08:52:26 +0000
@@ -2,4 +2,10 @@
 
 include (CompizPlugin)
 
-compiz_plugin(place)
\ No newline at end of file
+# FIXME: Remove once MODULES support lands
+
+add_subdirectory (src/constrain-to-workarea)
+add_subdirectory (tests)
+
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/constrain-to-workarea/include/)
+compiz_plugin (place LIBRARIES place_constrain_to_workarea)

=== added directory 'plugins/place/src/constrain-to-workarea'
=== added file 'plugins/place/src/constrain-to-workarea/CMakeLists.txt'
--- plugins/place/src/constrain-to-workarea/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/place/src/constrain-to-workarea/CMakeLists.txt	2012-01-11 08:52:26 +0000
@@ -0,0 +1,74 @@
+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}/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/constrain-to-workarea.h
+)
+
+SET( 
+  SRCS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/constrain-to-workarea.cpp
+  ${compiz_SOURCE_DIR}/src/size.cpp
+)
+
+ADD_LIBRARY( 
+  compiz_place_constrain_to_workarea STATIC
+  
+  ${SRCS}
+  
+  ${PUBLIC_HEADERS}
+  ${PRIVATE_HEADERS}
+)
+
+ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
+
+SET_TARGET_PROPERTIES(
+  compiz_place_constrain_to_workarea PROPERTIES
+  PUBLIC_HEADER "${PUBLIC_HEADERS}"
+)
+
+INSTALL(
+  TARGETS                                 compiz_place_constrain_to_workarea
+  RUNTIME             DESTINATION         bin
+  LIBRARY             DESTINATION         lib
+  ARCHIVE             DESTINATION         lib
+  PUBLIC_HEADER       DESTINATION         include/compiz
+)
+
+
+
+TARGET_LINK_LIBRARIES(
+  compiz_place_constrain_to_workarea
+  compiz_rect
+  compiz_point
+  compiz_window_geometry
+  compiz_window_geometry_saver
+
+  ${GLIBMM_LIBRARIES}
+)

=== added directory 'plugins/place/src/constrain-to-workarea/include'
=== added file 'plugins/place/src/constrain-to-workarea/include/constrain-to-workarea.h'
--- plugins/place/src/constrain-to-workarea/include/constrain-to-workarea.h	1970-01-01 00:00:00 +0000
+++ plugins/place/src/constrain-to-workarea/include/constrain-to-workarea.h	2012-01-11 08:52:26 +0000
@@ -0,0 +1,47 @@
+/*
+ * 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_CLAMP_TO_WORKAREA_H
+#define _COMPIZ_PLACE_CLAMP_TO_WORKAREA_H
+
+#include <core/rect.h>
+#include <core/windowgeometry.h>
+#include <core/windowextents.h>
+#include <core/size.h>
+#include <core/point.h>
+
+namespace compiz
+{
+namespace place
+{
+static unsigned int clampGeometrySizeOnly = (1 << 0);
+static unsigned int clampGeometryToViewport = (1 << 1);
+
+void clampGeometryToWorkArea (compiz::window::Geometry &g,
+			      const CompRect &workArea,
+			      const CompWindowExtents &border,
+			      unsigned int flags,
+			      const CompSize &screenSize);
+}
+}
+
+#endif

=== added directory 'plugins/place/src/constrain-to-workarea/src'
=== added file 'plugins/place/src/constrain-to-workarea/src/constrain-to-workarea.cpp'
--- plugins/place/src/constrain-to-workarea/src/constrain-to-workarea.cpp	1970-01-01 00:00:00 +0000
+++ plugins/place/src/constrain-to-workarea/src/constrain-to-workarea.cpp	2012-01-11 08:52:26 +0000
@@ -0,0 +1,129 @@
+/*
+ * 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 "constrain-to-workarea.h"
+
+void
+compiz::place::clampGeometryToWorkArea (compiz::window::Geometry &g,
+					const CompRect           &workArea,
+					const CompWindowExtents  &border,
+					unsigned int             flags,
+					const CompSize           &screenSize)
+{
+    int	     x, y, left, right, bottom, top;
+
+    if (flags & clampGeometryToViewport)
+    {
+	/* left, right, top, bottom target coordinates, clamed to viewport
+	 * sizes as we don't need to validate movements to other viewports;
+	 * we are only interested in inner-viewport movements */
+
+	x = g.x () % screenSize.width ();
+	if ((x + g.width ()) < 0)
+	    x += screenSize.width ();
+
+	y = g.y () % screenSize.height ();
+	if ((y + g.height ()) < 0)
+	    y += screenSize.height ();
+    }
+    else
+    {
+	x = g.x ();
+	y = g.y ();
+    }
+
+    left   = x - border.left;
+    right  = left + g.width () +  (border.left +
+				   border.right +
+				   2 * g.border ());
+    top    = y - border.top;
+    bottom = top + g.height () + (border.top +
+				  border.bottom +
+				  2 * g.border ());
+
+    if ((right - left) > workArea.width ())
+    {
+	left  = workArea.left ();
+	right = workArea.right ();
+    }
+    else
+    {
+	if (left < workArea.left ())
+	{
+	    right += workArea.left () - left;
+	    left  = workArea.left ();
+	}
+
+	if (right > workArea.right ())
+	{
+	    left -= right - workArea.right ();
+	    right = workArea.right ();
+	}
+    }
+
+    if ((bottom - top) > workArea.height ())
+    {
+	top    = workArea.top ();
+	bottom = workArea.bottom ();
+    }
+    else
+    {
+	if (top < workArea.top ())
+	{
+	    bottom += workArea.top () - top;
+	    top    = workArea.top ();
+	}
+
+	if (bottom > workArea.bottom ())
+	{
+	    top   -= bottom - workArea.bottom ();
+	    bottom = workArea.bottom ();
+	}
+    }
+
+    /* bring left/right/top/bottom to actual window coordinates */
+    left   += border.left;
+    right  -= border.right + 2 * g.border ();
+    top    += border.top;
+    bottom -= border.bottom + 2 * g.border ();
+
+    if ((right - left) != g.width ())
+    {
+	g.setWidth (right - left);
+	flags &= ~clampGeometrySizeOnly;
+    }
+
+    if ((bottom - top) != g.height ())
+    {
+	g.setHeight (bottom - top);
+	flags &= ~clampGeometrySizeOnly;
+    }
+
+    if (!(flags & clampGeometrySizeOnly))
+    {
+	if (left != x)
+	    g.setX (g.x () + left - x);
+
+	if (top != y)
+	    g.setY (g.y () + top - y);
+    }
+}

=== added directory 'plugins/place/src/constrain-to-workarea/tests'
=== added file 'plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt'
--- plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt	2012-01-11 08:52:26 +0000
@@ -0,0 +1,18 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library (compiz_place_constrain_to_workarea_test
+             ${CMAKE_CURRENT_SOURCE_DIR}/test-constrain-to-workarea.cpp)
+
+add_executable (compiz_test_place_constrain_to_workarea
+                ${CMAKE_CURRENT_SOURCE_DIR}/constrain-to-workarea/src/test-place-constrain-to-workarea.cpp)
+
+target_link_libraries (compiz_test_place_constrain_to_workarea
+                       compiz_place_constrain_to_workarea_test
+                       compiz_place_constrain_to_workarea
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
+                       )
+
+add_test (compiz_place_constrain_to_workarea compiz_test_place_constrain_to_workarea)

=== added directory 'plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea'
=== added directory 'plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea/src'
=== added file 'plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea/src/CMakeLists.txt'
--- plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea/src/CMakeLists.txt	2012-01-11 08:52:26 +0000
@@ -0,0 +1,25 @@
+link_directories (${COMPIZ_TEST_PLACE_LINK_DIRS})
+
+include_directories (${COMPIZ_TEST_PLACE_INCLUDE_DIRS}
+		     ${compiz_SOURCE_DIR}/include
+		     ${compiz_BINARY_DIR}
+		     ${compiz_BINARY_DIR}/generated
+		     ${compiz_SOURCE_DIR}/src
+		     ${compiz_SOURCE_DIR}/plugins/place/src
+		     ${COMPIZ_PLACE_TEST_BASE_DIR})
+
+add_executable (test-place-clamp-to-workarea
+		test-place-constrain-to-workarea.cpp
+		../test-place.cpp 
+		${compiz_SOURCE_DIR}/plugins/place/src/constrain-to-workarea.cpp
+		${compiz_SOURCE_DIR}/src/windowextents.cpp
+		${compiz_SOURCE_DIR}/src/windowgeometry.cpp
+		${compiz_SOURCE_DIR}/src/rect.cpp
+		${compiz_SOURCE_DIR}/src/point.cpp
+		${compiz_SOURCE_DIR}/src/size.cpp)
+
+target_link_libraries (test-place-clamp-to-workarea
+		       ${COMPIZ_TEST_PLACE_LIBRARIES})
+
+add_test (test-place-clamp-to-workarea
+	  ${CMAKE_CURRENT_BINARY_DIR}/test-place-clamp-to-workarea)

=== added file 'plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea/src/test-place-constrain-to-workarea.cpp'
--- plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea/src/test-place-constrain-to-workarea.cpp	1970-01-01 00:00:00 +0000
+++ plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea/src/test-place-constrain-to-workarea.cpp	2012-01-11 08:52:26 +0000
@@ -0,0 +1,63 @@
+/*
+ * 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-constrain-to-workarea.h>
+#include <constrain-to-workarea.h>
+#include <iostream>
+#include <stdlib.h>
+#include <cstring>
+
+class CompPlaceTestConstrainToWorkarea :
+    public CompPlaceTest
+{
+public:
+
+    CompPlaceTestConstrainToWorkarea ();
+    ~CompPlaceTestConstrainToWorkarea ();
+};
+
+CompPlaceTestConstrainToWorkarea::CompPlaceTestConstrainToWorkarea ()
+{
+}
+
+CompPlaceTestConstrainToWorkarea::~CompPlaceTestConstrainToWorkarea ()
+{
+}
+
+TEST_F (CompPlaceTestConstrainToWorkarea, TestConstrainToWorkarea)
+{
+    CompSize screensize (1000, 2000);
+    CompRect workArea (50, 50, 900, 1900);
+    compiz::window::Geometry g (100, 100, 200, 200, 0);
+    compiz::window::extents::Extents extents;
+    unsigned int flags = 0;
+
+    memset (&extents, 0, sizeof (compiz::window::extents::Extents));
+
+    /* Do nothing */
+    compiz::place::clampGeometryToWorkArea (g, workArea, extents, flags, screensize);
+
+    EXPECT_EQ (g, compiz::window::Geometry (100, 100, 200, 200, 0));
+}

=== added file 'plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea/test-place-constrain-to-workarea.cpp'
--- plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea/test-place-constrain-to-workarea.cpp	1970-01-01 00:00:00 +0000
+++ plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea/test-place-constrain-to-workarea.cpp	2012-01-11 08:52:26 +0000
@@ -0,0 +1,63 @@
+/*
+ * 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-constrain-to-workarea.h>
+#include <constrain-to-workarea.h>
+#include <iostream>
+#include <stdlib.h>
+#include <cstring>
+
+class CompPlaceTestConstrainToWorkarea :
+    public CompPlaceTest
+{
+public:
+
+    CompPlaceTestConstrainToWorkarea ();
+    ~CompPlaceTestConstrainToWorkarea ();
+};
+
+CompPlaceTestConstrainToWorkarea::CompPlaceTestConstrainToWorkarea ()
+{
+}
+
+CompPlaceTestConstrainToWorkarea::~CompPlaceTestConstrainToWorkarea ()
+{
+}
+
+TEST_F (CompPlaceTestConstrainToWorkarea, TestConstrainToWorkarea)
+{
+    CompSize screensize (1000, 2000);
+    CompRect workArea (50, 50, 900, 1900);
+    compiz::window::Geometry g (100, 100, 200, 200, 0);
+    compiz::window::extents::Extents extents;
+    unsigned int flags = 0;
+
+    memset (&extents, 0, sizeof (compiz::window::extents::Extents));
+
+    /* Do nothing */
+    compiz::place::clampGeometryToWorkArea (g, workArea, extents, flags, screensize);
+
+    EXPECT_EQ (g, compiz::window::Geometry (100, 100, 200, 200, 0));
+}

=== added file 'plugins/place/src/constrain-to-workarea/tests/test-constrain-to-workarea.cpp'
--- plugins/place/src/constrain-to-workarea/tests/test-constrain-to-workarea.cpp	1970-01-01 00:00:00 +0000
+++ plugins/place/src/constrain-to-workarea/tests/test-constrain-to-workarea.cpp	2012-01-11 08:52:26 +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-constrain-to-workarea.h"
+
+CompPlaceTest::CompPlaceTest ()
+{
+}
+
+CompPlaceTest::~CompPlaceTest ()
+{
+}

=== added file 'plugins/place/src/constrain-to-workarea/tests/test-constrain-to-workarea.h'
--- plugins/place/src/constrain-to-workarea/tests/test-constrain-to-workarea.h	1970-01-01 00:00:00 +0000
+++ plugins/place/src/constrain-to-workarea/tests/test-constrain-to-workarea.h	2012-01-11 08:52:26 +0000
@@ -0,0 +1,47 @@
+/*
+ * 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>
+#include <core/windowgeometry.h>
+#include <core/windowextents.h>
+#include <core/size.h>
+#include <core/point.h>
+#include <string>
+#include <iostream>
+#include <stdlib.h>
+
+class CompPlaceTest : public ::testing::Test
+{
+public:
+
+    CompPlaceTest ();
+    virtual ~CompPlaceTest ();
+};
+
+#endif

=== modified file 'plugins/place/src/place.cpp'
--- plugins/place/src/place.cpp	2012-01-11 08:52:26 +0000
+++ plugins/place/src/place.cpp	2012-01-11 08:52:26 +0000
@@ -186,7 +186,7 @@
 	CompRect workArea = screen->getWorkareaForOutput (
 				screen->outputDeviceForGeometry (g));
 
-	compiz::place::clampGeometryToWorkArea (g, workArea, w->border (), flags);
+	compiz::place::clampGeometryToWorkArea (g, workArea, w->border (), flags, *screen);
 
 	g.setX (g.x () - curVpOffsetX - (screen->vp ().x () + vpX) * newWidth);
 	g.setY (g.y () - curVpOffsetY - (screen->vp ().y () + vpY) * newHeight);
@@ -470,111 +470,6 @@
     return true;
 }
 
-void
-compiz::place::clampGeometryToWorkArea (compiz::window::Geometry &g,
-					const CompRect           &workArea,
-					const CompWindowExtents  &border,
-					unsigned int             flags)
-{
-    int	     x, y, left, right, bottom, top;
-
-    if (flags & clampGeometryToViewport)
-    {
-	/* left, right, top, bottom target coordinates, clamed to viewport
-	 * sizes as we don't need to validate movements to other viewports;
-	 * we are only interested in inner-viewport movements */
-
-	x = g.x () % screen->width ();
-	if ((x + g.width ()) < 0)
-	    x += screen->width ();
-
-	y = g.y () % screen->height ();
-	if ((y + g.height ()) < 0)
-	    y += screen->height ();
-    }
-    else
-    {
-	x = g.x ();
-	y = g.y ();
-    }
-
-    left   = x - border.left;
-    right  = left + g.width () +  (border.left +
-				   border.right +
-				   2 * g.border ());
-    top    = y - border.top;
-    bottom = top + g.height () + (border.top +
-				  border.bottom +
-				  2 * g.border ());
-
-    if ((right - left) > workArea.width ())
-    {
-	left  = workArea.left ();
-	right = workArea.right ();
-    }
-    else
-    {
-	if (left < workArea.left ())
-	{
-	    right += workArea.left () - left;
-	    left  = workArea.left ();
-	}
-
-	if (right > workArea.right ())
-	{
-	    left -= right - workArea.right ();
-	    right = workArea.right ();
-	}
-    }
-
-    if ((bottom - top) > workArea.height ())
-    {
-	top    = workArea.top ();
-	bottom = workArea.bottom ();
-    }
-    else
-    {
-	if (top < workArea.top ())
-	{
-	    bottom += workArea.top () - top;
-	    top    = workArea.top ();
-	}
-
-	if (bottom > workArea.bottom ())
-	{
-	    top   -= bottom - workArea.bottom ();
-	    bottom = workArea.bottom ();
-	}
-    }
-
-    /* bring left/right/top/bottom to actual window coordinates */
-    left   += border.left;
-    right  -= border.right + 2 * g.border ();
-    top    += border.top;
-    bottom -= border.bottom + 2 * g.border ();
-
-    if ((right - left) != g.width ())
-    {
-	g.setWidth (right - left);
-	flags &= ~clampGeometrySizeOnly;
-    }
-
-    if ((bottom - top) != g.height ())
-    {
-	g.setHeight (bottom - top);
-	flags &= ~clampGeometrySizeOnly;
-    }
-
-    if (!(flags & clampGeometrySizeOnly))
-    {
-	if (left != x)
-	    g.setX (g.x () + left - x);
-
-	if (top != y)
-	    g.setY (g.y () + top - y);
-    }
-}
-
 bool
 PlaceWindow::position (compiz::window::Geometry &g, unsigned int source, unsigned int constrainment)
 {
@@ -623,7 +518,7 @@
     CompRect workArea = screen->getWorkareaForOutput (
 			    screen->outputDeviceForGeometry (g));
 
-    compiz::place::clampGeometryToWorkArea (g, workArea, window->border (), flags);
+    compiz::place::clampGeometryToWorkArea (g, workArea, window->border (), flags, *screen);
 
     bool rv =  window->position (g, source, constrainment);
 

=== modified file 'plugins/place/src/place.h'
--- plugins/place/src/place.h	2012-01-11 08:52:26 +0000
+++ plugins/place/src/place.h	2012-01-11 08:52:26 +0000
@@ -30,20 +30,7 @@
 #include <core/pluginclasshandler.h>
 
 #include "place_options.h"
-
-namespace compiz
-{
-namespace place
-{
-static unsigned int clampGeometrySizeOnly = (1 << 0);
-static unsigned int clampGeometryToViewport = (1 << 1);
-
-void clampGeometryToWorkArea (compiz::window::Geometry &,
-			      const CompRect &,
-			      const CompWindowExtents &,
-			      unsigned int flags);
-}
-}
+#include "constrain-to-workarea.h"
 
 class PlaceScreen :
     public PluginClassHandler<PlaceScreen, CompScreen>,

=== added directory 'plugins/place/tests'
=== added file 'plugins/place/tests/CMakeLists.txt'
=== added directory 'plugins/place/tests/place'
=== modified file 'src/privatewindow.h'
--- src/privatewindow.h	2012-01-11 08:52:26 +0000
+++ src/privatewindow.h	2012-01-11 08:52:26 +0000
@@ -233,8 +233,6 @@
 
 	void readIconHint ();
 
-	bool checkClear ();
-
     public:
 
 	PrivateWindow *priv;
@@ -266,9 +264,6 @@
 	XSizeHints	     sizeHints;
 	XWMHints             *hints;
 
-	struct timeval       lastGeometryUpdate;
-	struct timeval       lastConfigureRequest;
-
 	bool       inputHint;
 	bool       alpha;
 	int        width;
@@ -315,8 +310,6 @@
 	typedef std::pair <XWindowChanges, unsigned int> XWCValueMask;
 
 	compiz::X11::PendingEventQueue pendingConfigures;
-	CompTimer                     mClearCheckTimeout;
-	bool pendingPositionUpdates;
 
 	char *startupId;
 	char *resName;

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-01-11 08:52:26 +0000
+++ src/screen.cpp	2012-01-11 08:52:26 +0000
@@ -4662,9 +4662,6 @@
     priv->vpSize.setWidth (priv->optionGetHsize ());
     priv->vpSize.setHeight (priv->optionGetVsize ());
 
-    /* Start initializing windows here */
-    priv->initialized = true;
-
     for (unsigned int i = 0; i < nchildren; i++)
     {
 	XWindowAttributes attrib;
@@ -4721,6 +4718,9 @@
 	    focusDefaultWindow ();
     }
 
+    /* Start initializing windows here */
+    priv->initialized = true;
+
     /* 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
@@ -4729,8 +4729,9 @@
      * screens from option changes */
     assert (CompPlugin::screenInitPlugins (this));
 
-    /* The active plugins list might have been changed - load any
-     * new plugins */
+    /* Now init window plugins */
+    foreach (CompWindow *w, screen->windows ())
+	CompPlugin::windowInitPlugins (w);
 
     priv->vpSize.setWidth (priv->optionGetHsize ());
     priv->vpSize.setHeight (priv->optionGetVsize ());

=== modified file 'src/window.cpp'
--- src/window.cpp	2012-01-11 08:52:26 +0000
+++ src/window.cpp	2012-01-11 08:52:26 +0000
@@ -893,10 +893,6 @@
 										  screen->dpy (), serverFrame, valueMask, &xwc)));
 
 	    pendingConfigures.add (pc);
-	    if (priv->mClearCheckTimeout.active ())
-		priv->mClearCheckTimeout.stop ();
-	    priv->mClearCheckTimeout.start (boost::bind (&PrivateWindow::checkClear, priv),
-					    2000, 2500);
 
 	    XSendEvent (screen->dpy (), screen->root (), false,
 			SubstructureNotifyMask, (XEvent *) &xev);
@@ -912,10 +908,6 @@
 										  screen->dpy (), serverFrame, valueMask, &xwc)));
 
 	    pendingConfigures.add (pc);
-	    if (priv->mClearCheckTimeout.active ())
-		priv->mClearCheckTimeout.stop ();
-	    priv->mClearCheckTimeout.start (boost::bind (&PrivateWindow::checkClear, priv),
-					    2000, 2500);
 	    XConfigureWindow (screen->dpy (), serverFrame, valueMask, &xwc);
 	}
 
@@ -1031,10 +1023,6 @@
 										  screen->dpy (), serverFrame, valueMask, &xwc)));
 
 	    pendingConfigures.add (pc);
-	    if (priv->mClearCheckTimeout.active ())
-		priv->mClearCheckTimeout.stop ();
-	    priv->mClearCheckTimeout.start (boost::bind (&PrivateWindow::checkClear, priv),
-					    2000, 2500);
 
 	    XSendEvent (screen->dpy (), screen->root (), false,
 			SubstructureNotifyMask, (XEvent *) &xev);
@@ -1050,10 +1038,6 @@
 										  screen->dpy (), serverFrame, valueMask, &xwc)));
 
 	    pendingConfigures.add (pc);
-	    if (priv->mClearCheckTimeout.active ())
-		priv->mClearCheckTimeout.stop ();
-	    priv->mClearCheckTimeout.start (boost::bind (&PrivateWindow::checkClear, priv),
-					    2000, 2500);
 
 	    XConfigureWindow (screen->dpy (), serverFrame, valueMask, &xwc);
 	}
@@ -2173,10 +2157,6 @@
 {
     if (dx || dy)
     {
-	gettimeofday (&priv->lastGeometryUpdate, NULL);
-
-
-
 	window->moveNotify (dx, dy, immediate);
     }
 }
@@ -2187,22 +2167,6 @@
     return !mEvents.empty ();
 }
 
-bool
-PrivateWindow::checkClear ()
-{
-    if (pendingConfigures.pending ())
-    {
-	/* FIXME: This is a hack to avoid performance regressions
-	 * and must be removed in 0.9.6 */
-	compLogMessage ("core", CompLogLevelWarn, "failed to receive ConfigureNotify event on 0x%x\n",
-			id);
-	pendingConfigures.dump ();
-	pendingConfigures.clear ();
-    }
-
-    return false;
-}
-
 void
 compiz::X11::PendingEventQueue::add (PendingEvent::Ptr p)
 {
@@ -2274,12 +2238,6 @@
 
 compiz::X11::PendingEventQueue::PendingEventQueue (Display *d)
 {
-    /* mClearCheckTimeout.setTimes (0, 0)
-     *
-     * XXX: For whatever reason, calling setTimes (0, 0) here causes
-     * the destructor of the timer object to be called twice later on
-     * in execution and the stack gets smashed. This could be a
-     * compiler bug, but requires further investigation */
 }
 
 compiz::X11::PendingEventQueue::~PendingEventQueue ()
@@ -3530,8 +3488,6 @@
 
     if (serverFrame)
     {
-	gettimeofday (&lastConfigureRequest, NULL);
-
 	if (frameValueMask)
 	{
 	    XWindowChanges wc = *xwc;
@@ -3547,11 +3503,6 @@
 										  screen->dpy (), priv->serverFrame, frameValueMask, &wc)));
 
 	    pendingConfigures.add (pc);
-	    if (priv->mClearCheckTimeout.active ())
-		priv->mClearCheckTimeout.stop ();
-	    priv->mClearCheckTimeout.start (boost::bind (&PrivateWindow::checkClear, priv),
-					    2000, 2500);
-
 	    XConfigureWindow (screen->dpy (), serverFrame, frameValueMask, &wc);
 	}
 	valueMask &= ~(CWSibling | CWStackMode);
@@ -4343,10 +4294,6 @@
 											  screen->dpy (), serverFrame, valueMask, &lxwc)));
 
 		    pendingConfigures.add (pc);
-		    if (priv->mClearCheckTimeout.active ())
-			priv->mClearCheckTimeout.stop ();
-		    priv->mClearCheckTimeout.start (boost::bind (&PrivateWindow::checkClear, priv),
-						    2000, 2500);
 		}
 
 		/* Below with no sibling puts the window at the bottom
@@ -6619,8 +6566,9 @@
 	}
     }
 
-    /* TODO: bailout properly when objectInitPlugins fails */
-    assert (CompPlugin::windowInitPlugins (this));
+    if (screen->priv->initialized)
+	/* TODO: bailout properly when objectInitPlugins fails */
+	assert (CompPlugin::windowInitPlugins (this));
 
     recalcActions ();
     priv->updateIconGeometry ();
@@ -6790,7 +6738,6 @@
     pendingUnmaps (0),
     pendingMaps (0),
     pendingConfigures (screen->dpy ()),
-    pendingPositionUpdates (false),
 
     startupId (0),
     resName (0),