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

[Sam Spilsbury]

    Added a simple server->stack->container->object model for handling window
    geometry and stacking (not yet functional).

    A server can be either synchronous or asynchronous in operation, as can an
    object that is being displayed onscreen. Asynchronous objects own a write
    connection object to the server and have events written to them by the read
    connection object that the server owns.

    Each window is part of an object tree, with parent and children objects. The
    root object is specified as part of the server and its children are traversible.

    Stack positions are kept for each container object, which is also an on-screen
    object and geometry and stacking positions are done relative to the container.

    Implementations should derive from the Synchronous* or Asynchronous* classes.

    Typically Synchronous* implementations would be used for testing purposes.

Next Pipe: lp:~smspillaz/compiz-core/merge_894639

[Sam Spilsbury (smspillaz)]

    Added a simple server->stack->container->object model for handling window
    geometry and stacking (not yet functional).

    A server can be either synchronous or asynchronous in operation, as can an
    object that is being displayed onscreen. Asynchronous objects own a write
    connection object to the server and have events written to them by the read
    connection object that the server owns.

    Each window is part of an object tree, with parent and children objects. The
    root object is specified as part of the server and its children are traversible.

    Stack positions are kept for each container object, which is also an on-screen
    object and geometry and stacking positions are done relative to the container.

    Implementations should derive from the Synchronous* or Asynchronous* classes.

    Typically Synchronous* implementations would be used for testing purposes.

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

2939. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2940. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2941. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2942. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2943. By Sam Spilsbury on 2011-12-05

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2944. By Sam Spilsbury on 2011-12-06

Added implementations for server read/write handles

2945. By Sam Spilsbury on 2011-12-06

Switched to an NVI type pattern in ObjectIdentifier, hooked up the
server connections to the Server and AsynchronousObjects

2946. By Sam Spilsbury on 2011-12-08

Merge

2947. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2948. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2949. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2950. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2951. By Sam Spilsbury on 2011-12-08

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2952. By Sam Spilsbury on 2011-12-20

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2953. By Sam Spilsbury on 2011-12-20

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2954. By Sam Spilsbury on 2011-12-20

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2955. By Sam Spilsbury on 2011-12-23

Merge

2956. By Sam Spilsbury on 2011-12-23

Remove conflict

2957. By Sam Spilsbury on 2012-01-03

Merge

2958. By Sam Spilsbury on 2012-01-03

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2959. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2960. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2961. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2962. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2963. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2964. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2965. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2966. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2967. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2968. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2969. By Sam Spilsbury on 2012-01-04

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2970. By Sam Spilsbury on 2012-01-05

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2971. By Sam Spilsbury on 2012-01-05

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2972. By Sam Spilsbury on 2012-01-05

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2973. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2974. By Sam Spilsbury on 2012-01-09

Remove empty boilerplate

2975. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2976. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2977. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2978. By Sam Spilsbury on 2012-01-10

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2979. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2980. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2981. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2982. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2983. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

Unmerged revisions

2983. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2982. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2981. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2980. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2979. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2978. By Sam Spilsbury on 2012-01-10

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2977. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2976. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2975. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_898949 into compiz-core.fix_899557.

2974. By Sam Spilsbury on 2012-01-09

Remove empty boilerplate

=== modified file 'include/core/CMakeLists.txt'
--- include/core/CMakeLists.txt	2012-01-11 08:52:32 +0000
+++ include/core/CMakeLists.txt	2012-01-11 08:52:33 +0000
@@ -1,11 +1,17 @@
 set (_headers
     action.h
+    asynchronous-container.h
+    asynchronous-object.h
+    asynchronous-server.h
+    asynchronous-stack.h
     atoms.h
+    container.h
     core.h
     countedlist.h
     icon.h
     match.h
     modifierhandler.h
+    object.h
     option.h
     output.h
     plugin.h
@@ -14,8 +20,14 @@
     region.h
     screen.h
     serialization.h
+    server.h
+    server-read.h
+    server-write.h
     session.h
     size.h
+    stack.h
+    stackposition.h
+    valueholder.h
     window.h
     wrapsystem.h
 )

=== added file 'include/core/asynchronous-container.h'
--- include/core/asynchronous-container.h	1970-01-01 00:00:00 +0000
+++ include/core/asynchronous-container.h	2012-01-11 08:52:33 +0000
@@ -0,0 +1,93 @@
+/*
+ * 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
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ *          David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPIZ_ASYNCHRONOUS_CONTAINER_H
+#define _COMPIZ_ASYNCHRONOUS_CONTAINER_H
+
+#include <boost/shared_ptr.hpp>
+#include <core/windowgeometry.h>
+#include <core/stackposition.h>
+#include <core/asynchronous-object.h>
+#include <core/container.h>
+
+namespace compiz
+{
+namespace window
+{
+
+class WriteServerConnection;
+class ReadServerConnection;
+
+class AsynchronousContainer :
+    public AsynchronousObject,
+    public Container
+{
+    public:
+
+	typedef boost::shared_ptr <AsynchronousContainer> Ptr;
+
+	AsynchronousContainer (const compiz::window::ObjectIdentifier::Ptr &,
+			       const boost::shared_ptr <WriteServerConnection>            &);
+	AsynchronousContainer (const compiz::window::ObjectIdentifier::Ptr &,
+			       const compiz::window::Geometry              &,
+			       const boost::shared_ptr <WriteServerConnection>            &);
+	AsynchronousContainer (const compiz::window::ObjectIdentifier::Ptr &,
+			       const compiz::window::Geometry              &,
+			       const compiz::window::StackPosition         &,
+			       const boost::shared_ptr <WriteServerConnection>            &);
+	AsynchronousContainer (const compiz::window::ObjectIdentifier::Ptr &,
+			       const compiz::window::Geometry              &,
+			       const compiz::window::StackPosition         &,
+			       const boost::shared_ptr <Container>         &,
+			       const boost::shared_ptr <WriteServerConnection>            &);
+
+	virtual ~AsynchronousContainer ();
+
+	Container::Children sentChildren ();
+
+	void        sendInsertion (const Object::Ptr &);
+	Object::Ptr sendRemoval   (const Object::Ptr &);
+
+    protected:
+
+	void receiveInsertion (const Object::Ptr &);
+	void receiveRemoval   (const Object::Ptr &);
+
+	void        addSentInsertion (const Object::Ptr &);
+	Object::Ptr addSentRemoval   (const Object::Ptr &);
+
+	friend class ReadServerConnection;
+
+    private:
+
+	Children				  mSentChildren;
+	boost::shared_ptr <WriteServerConnection> mWriteConnection;
+};
+
+}
+}
+
+#endif

=== added file 'include/core/asynchronous-object.h'
--- include/core/asynchronous-object.h	1970-01-01 00:00:00 +0000
+++ include/core/asynchronous-object.h	2012-01-11 08:52:33 +0000
@@ -0,0 +1,94 @@
+/*
+ * 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
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ *          David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPIZ_ASYNCHRONOUS_OBJECT_H
+#define _COMPIZ_ASYNCHRONOUS_OBJECT_H
+
+#include <boost/shared_ptr.hpp>
+#include <core/windowgeometry.h>
+#include <core/stackposition.h>
+#include <core/object.h>
+
+
+namespace compiz
+{
+namespace window
+{
+
+class WriteServerConnection;
+
+class AsynchronousObject :
+    virtual public Object
+{
+    public:
+
+	typedef boost::shared_ptr <AsynchronousObject> Ptr;
+
+	AsynchronousObject (const ObjectIdentifier::Ptr      &,
+			    const boost::shared_ptr <WriteServerConnection> &);
+	AsynchronousObject (const ObjectIdentifier::Ptr      &,
+			    const compiz::window::Geometry   &,
+			    const boost::shared_ptr <WriteServerConnection> &);
+	AsynchronousObject (const ObjectIdentifier::Ptr         &,
+			    const compiz::window::Geometry      &,
+			    const compiz::window::StackPosition &,
+			    const boost::shared_ptr <WriteServerConnection>    &);
+	AsynchronousObject (const ObjectIdentifier::Ptr         &,
+			    const compiz::window::Geometry      &,
+			    const compiz::window::StackPosition &,
+			    const boost::shared_ptr <Container> &,
+			    const boost::shared_ptr <WriteServerConnection>    &);
+	virtual ~AsynchronousObject ();
+
+	/* Most recent sent positions */
+	const compiz::window::Geometry      &sentGeometry () const;
+	const compiz::window::StackPosition &sentStackPosition () const;
+
+	void sendGeometry      (const compiz::window::Geometry &);
+	void sendStackPosition (const compiz::window::StackPosition &);
+
+    protected:
+
+	void receiveGeometry      (const compiz::window::Geometry &);
+	void receiveStackPosition (const compiz::window::StackPosition &);
+	//void receiveMap ();
+
+	void addSentGeometry      (const compiz::window::Geometry &);
+	void addSentStackPosition (const compiz::window::StackPosition &);
+
+	boost::shared_ptr <WriteServerConnection> mWriteConnection;
+
+	friend class ReadServerConnection;
+
+    private:
+
+	compiz::window::Geometry	           mSentGeometry;
+	compiz::window::StackPosition	           mSentStackPosition;
+};
+}
+}
+
+#endif

=== added file 'include/core/asynchronous-server.h'
--- include/core/asynchronous-server.h	1970-01-01 00:00:00 +0000
+++ include/core/asynchronous-server.h	2012-01-11 08:52:33 +0000
@@ -0,0 +1,79 @@
+/*
+ * 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
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ *          David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPIZ_ASYNCHRONOUS_SERVER_H
+#define _COMPIZ_ASYNCHRONOUS_SERVER_H
+
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/noncopyable.hpp>
+#include <core/server.h>
+#include <core/server-read.h>
+#include <core/windowgeometry.h>
+#include <core/stackposition.h>
+#include <core/object.h>
+#include <glibmm/main.h>
+
+namespace compiz
+{
+namespace window
+{
+
+class WriteServerConnection;
+
+class AsynchronousServer :
+    public Server,
+    public boost::enable_shared_from_this <AsynchronousServer>
+{
+    public:
+
+	typedef boost::shared_ptr <AsynchronousServer> Ptr;
+
+	virtual ~AsynchronousServer ();
+
+	boost::shared_ptr <WriteServerConnection> connect ();
+
+    protected:
+
+	AsynchronousServer ();
+
+	virtual void sendGeometry (const ObjectIdentifier::Ptr    &,
+				   const compiz::window::Geometry &) = 0;
+	virtual void sendStackPosition (const ObjectIdentifier::Ptr    &,
+					const compiz::window::StackPosition &) = 0;
+	virtual void sendParent (const ObjectIdentifier::Ptr &,
+				 const ObjectIdentifier::Ptr &) = 0;
+
+	compiz::window::ReadServerConnection::Ptr   mReadConnection;
+	Glib::RefPtr <Glib::Source>		    mEventSource;
+
+	friend class WriteServerConnection;
+};
+
+}
+}
+
+#endif

=== added file 'include/core/asynchronous-stack.h'
--- include/core/asynchronous-stack.h	1970-01-01 00:00:00 +0000
+++ include/core/asynchronous-stack.h	2012-01-11 08:52:33 +0000
@@ -0,0 +1,76 @@
+/*
+ * 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
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ *          David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPIZ_ASYNCHRONOUS_STACK_H
+#define _COMPIZ_ASYNCHRONOUS_STACK_H
+
+#include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
+#include <core/object.h>
+#include <core/stack.h>
+#include <core/object.h>
+#include <glibmm/main.h>
+
+namespace compiz
+{
+namespace window
+{
+
+class AsynchronousServer;
+class WriteServerConnection;
+
+class AsynchronousStack :
+    public compiz::window::Stack
+{
+    public:
+
+	typedef boost::shared_ptr <AsynchronousStack> Ptr;
+	virtual ~AsynchronousStack ();
+
+	const std::vector <Object::Ptr> & sentObjects () const;
+
+	void sendStack (const std::vector <Object::Ptr> &objects);
+	void sendRestackObject (const compiz::window::Object::Ptr   &id,
+				const compiz::window::StackPosition &sp);
+
+    protected:
+
+	AsynchronousStack (const boost::shared_ptr <AsynchronousServer> &);
+
+	void receiveRestackObject (const compiz::window::Object::Ptr   &o,
+				   const compiz::window::StackPosition &sp);
+
+    private:
+
+	/* Bottom to top */
+	std::vector <Object::Ptr>				  mSentObjects;
+	boost::shared_ptr <compiz::window::WriteServerConnection> mWriteConnection;
+};
+
+}
+}
+
+#endif

=== added file 'include/core/container.h'
--- include/core/container.h	1970-01-01 00:00:00 +0000
+++ include/core/container.h	2012-01-11 08:52:33 +0000
@@ -0,0 +1,103 @@
+/*
+ * 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
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ *          David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPIZ_CONTAINER_H
+#define _COMPIZ_CONTAINER_H
+
+#include <boost/shared_ptr.hpp>
+#include <core/windowgeometry.h>
+#include <core/stackposition.h>
+#include <core/object.h>
+
+namespace compiz
+{
+namespace window
+{
+
+class Container :
+    virtual public Object
+{
+    public:
+
+	typedef boost::shared_ptr <Container> Ptr;
+	typedef std::vector <Object::Ptr> Children;
+
+	Container (const compiz::window::ObjectIdentifier::Ptr &);
+	Container (const compiz::window::ObjectIdentifier::Ptr &,
+		   const compiz::window::Geometry &);
+	Container (const compiz::window::ObjectIdentifier::Ptr &,
+		   const compiz::window::Geometry &,
+		   const compiz::window::StackPosition &);
+	Container (const compiz::window::ObjectIdentifier::Ptr &,
+		   const compiz::window::Geometry &,
+		   const compiz::window::StackPosition &,
+		   const boost::shared_ptr <Container> &);
+
+	virtual ~Container ();
+
+	Children children ();
+
+    protected:
+
+	bool insert (const Object::Ptr &);
+	Object::Ptr remove (const compiz::window::ObjectIdentifier::Ptr &);
+	Object::Ptr remove (const Object::Ptr &);
+
+    private:
+
+	Children mChildren;
+};
+
+class SynchronousContainer :
+    public SynchronousObject,
+    public Container
+{
+    public:
+
+	typedef boost::shared_ptr <SynchronousContainer> Ptr;
+
+	SynchronousContainer (const compiz::window::ObjectIdentifier::Ptr &);
+	SynchronousContainer (const compiz::window::ObjectIdentifier::Ptr &,
+		   	      const compiz::window::Geometry &);
+	SynchronousContainer (const compiz::window::ObjectIdentifier::Ptr &,
+		   	      const compiz::window::Geometry &,
+		   	      const compiz::window::StackPosition &);
+	SynchronousContainer (const compiz::window::ObjectIdentifier::Ptr &,
+			      const compiz::window::Geometry &,
+			      const compiz::window::StackPosition &,
+			      const boost::shared_ptr <Container> &);
+
+	virtual ~SynchronousContainer ();
+
+	bool insert (const Object::Ptr &);
+	Object::Ptr remove (const compiz::window::ObjectIdentifier::Ptr &);
+	Object::Ptr remove (const Object::Ptr &);
+};
+
+}
+}
+
+#endif

=== added file 'include/core/object.h'
--- include/core/object.h	1970-01-01 00:00:00 +0000
+++ include/core/object.h	2012-01-11 08:52:33 +0000
@@ -0,0 +1,154 @@
+/*
+ * 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
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ *          David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPIZ_OBJECT_H
+#define _COMPIZ_OBJECT_H
+
+#include <boost/shared_ptr.hpp>
+#include <core/windowgeometry.h>
+#include <core/stackposition.h>
+#include <boost/enable_shared_from_this.hpp>
+
+namespace compiz
+{
+namespace window
+{
+
+class Container;
+class Object;
+class ObjectIdentifier;
+class Server;
+
+bool objectIdentifierEq (const boost::shared_ptr <Object> &o,
+			 const boost::shared_ptr <ObjectIdentifier>      &i);
+
+class ObjectIdentifier :
+    public boost::enable_shared_from_this <ObjectIdentifier>
+{
+    public:
+
+	/* Available identifier types
+	 * supported by this system */
+	typedef enum
+	{
+	    MockWire = 0,
+	    X11 = 1
+	} ObjectType;
+
+	typedef boost::shared_ptr <ObjectIdentifier> Ptr;
+
+	virtual ~ObjectIdentifier ();
+
+	bool operator== (const ObjectIdentifier::Ptr &) const;
+	bool operator!= (const ObjectIdentifier::Ptr &) const;
+
+	bool equal (const ObjectIdentifier::Ptr &) const;
+
+	const boost::shared_ptr <Object> & operator() ();
+	const boost::shared_ptr <Object> & operator() () const;
+
+    protected:
+
+	virtual bool compare (const ObjectIdentifier::Ptr &) const = 0;
+	virtual ObjectType getType () const = 0;
+	virtual const boost::shared_ptr <Object> & lookup () const = 0;
+
+	/* Either fully resolved or looked up
+	 * at runtime in the repository */
+	boost::shared_ptr <Object> mObj;
+
+	friend class Server;
+};
+
+class Object
+{
+    public:
+
+	typedef boost::shared_ptr <Object> Ptr;
+
+	Object (const ObjectIdentifier::Ptr &);
+	Object (const ObjectIdentifier::Ptr &,
+		const compiz::window::Geometry &);
+	Object (const ObjectIdentifier::Ptr &,
+		const compiz::window::Geometry &,
+		const compiz::window::StackPosition &);
+	Object (const ObjectIdentifier::Ptr &,
+		const compiz::window::Geometry &,
+		const compiz::window::StackPosition &,
+		const boost::shared_ptr <Container> &);
+	virtual ~Object ();
+
+	const boost::shared_ptr <Container> & container () const;
+
+	const ObjectIdentifier::Ptr & id () const;
+	const compiz::window::Geometry & geometry () const;
+	const compiz::window::StackPosition & stackPosition () const;
+
+	bool operator== (const Object &) const;
+	bool operator!= (const Object &) const;
+
+    protected:
+
+	bool setStackPosition (const StackPosition &);
+	bool setGeometry (const Geometry &);
+	//virtual bool show () = 0;
+	//virtual bool hide () = 0;
+
+    private:
+
+	ObjectIdentifier::Ptr			      mId;
+	compiz::window::Geometry		      mGeometry;
+	compiz::window::StackPosition		      mStackPosition;
+	boost::shared_ptr <Container>		      mContainer;
+};
+
+class SynchronousObject :
+    virtual public Object
+{
+    public:
+
+	typedef boost::shared_ptr <SynchronousObject> Ptr;
+
+	SynchronousObject (const ObjectIdentifier::Ptr &);
+	SynchronousObject (const ObjectIdentifier::Ptr &,
+			   const compiz::window::Geometry &);
+	SynchronousObject (const ObjectIdentifier::Ptr &,
+			   const compiz::window::Geometry &,
+			   const compiz::window::StackPosition &);
+	SynchronousObject (const ObjectIdentifier::Ptr &,
+			   const compiz::window::Geometry &,
+			   const compiz::window::StackPosition &,
+			   const boost::shared_ptr <Container> &);
+	virtual ~SynchronousObject ();
+
+	bool setStackPosition (const StackPosition &);
+	bool setGeometry (const Geometry &);
+};
+
+}
+}
+
+#endif

=== added file 'include/core/server-read.h'
--- include/core/server-read.h	1970-01-01 00:00:00 +0000
+++ include/core/server-read.h	2012-01-11 08:52:33 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ *          David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPIZ_ASYNCHRONOUS_SERVER_READ_CONNECTION_H
+#define _COMPIZ_ASYNCHRONOUS_SERVER_READ_CONNECTION_H
+
+#include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
+#include <core/windowgeometry.h>
+#include <core/stackposition.h>
+#include <core/object.h>
+#include <core/asynchronous-object.h>
+#include <core/asynchronous-container.h>
+
+namespace compiz
+{
+namespace window
+{
+
+class AsynchronousServer;
+
+class ReadServerConnection :
+    public boost::noncopyable
+{
+    public:
+
+	typedef boost::shared_ptr <ReadServerConnection> Ptr;
+	virtual ~ReadServerConnection ();
+
+	void receiveGeometry (const AsynchronousObject::Ptr  &,
+			      const compiz::window::Geometry &);
+
+	void receiveStackPosition (const AsynchronousObject::Ptr       &,
+				   const compiz::window::StackPosition &);
+
+	void receiveParent (const AsynchronousObject::Ptr    &,
+			    const AsynchronousContainer::Ptr &);
+    protected:
+
+	ReadServerConnection ();
+
+	friend class AsynchronousServer;
+};
+
+}
+}
+
+#endif

=== added file 'include/core/server-write.h'
--- include/core/server-write.h	1970-01-01 00:00:00 +0000
+++ include/core/server-write.h	2012-01-11 08:52:33 +0000
@@ -0,0 +1,70 @@
+/*
+ * 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
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ *          David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPIZ_ASYNCHRONOUS_SERVER_WRITE_CONNECTION_H
+#define _COMPIZ_ASYNCHRONOUS_SERVER_WRITE_CONNECTION_H
+
+#include <core/asynchronous-server.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
+#include <core/windowgeometry.h>
+#include <core/stackposition.h>
+#include <core/object.h>
+
+namespace compiz
+{
+namespace window
+{
+
+class WriteServerConnection :
+    public boost::noncopyable
+{
+    public:
+
+	typedef boost::shared_ptr <WriteServerConnection> Ptr;
+	virtual ~WriteServerConnection ();
+
+	void sendGeometry (const ObjectIdentifier::Ptr    &id,
+			   const compiz::window::Geometry &g);
+
+	void sendStackPosition (const ObjectIdentifier::Ptr         &id,
+				const compiz::window::StackPosition &sp);
+
+	void sendParent (const ObjectIdentifier::Ptr  &id,
+			 const ObjectIdentifier::Ptr  &parent);
+    private:
+
+	WriteServerConnection (const compiz::window::AsynchronousServer::Ptr &);
+
+	compiz::window::AsynchronousServer::Ptr mServer;
+
+	friend class AsynchronousServer;
+};
+
+}
+}
+
+#endif

=== added file 'include/core/server.h'
--- include/core/server.h	1970-01-01 00:00:00 +0000
+++ include/core/server.h	2012-01-11 08:52:33 +0000
@@ -0,0 +1,65 @@
+/*
+ * 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
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ *          David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPIZ_SERVER_H
+#define _COMPIZ_SERVER_H
+
+#include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
+#include <core/object.h>
+
+namespace compiz
+{
+namespace window
+{
+
+class Server :
+    public boost::noncopyable
+{
+    public:
+
+	typedef boost::shared_ptr <Server> Ptr;
+	virtual ~Server ();
+
+	const Object::Ptr & root ();
+	virtual const Object::Ptr & lookup (const boost::shared_ptr <const ObjectIdentifier> &id) = 0;
+
+	static Server::Ptr Default ();
+
+    protected:
+
+	Server ();
+
+    private:
+
+	Object::Ptr        mRoot;
+	static Server::Ptr mDefault;
+};
+
+}
+}
+
+#endif

=== added file 'include/core/stack.h'
--- include/core/stack.h	1970-01-01 00:00:00 +0000
+++ include/core/stack.h	2012-01-11 08:52:33 +0000
@@ -0,0 +1,87 @@
+/*
+ * 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
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ *          David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPIZ_STACK_H
+#define _COMPIZ_STACK_H
+
+#include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
+#include <core/asynchronous-object.h>
+#include <core/object.h>
+#include <glibmm/main.h>
+
+namespace compiz
+{
+namespace window
+{
+
+class Stack :
+    public boost::noncopyable
+{
+    public:
+
+	typedef boost::shared_ptr <Stack> Ptr;
+	const std::vector <compiz::window::Object::Ptr> & objects () const;
+	virtual ~Stack ();
+
+    protected:
+
+	Stack ();
+
+	/* Rewrites entire window stack, throws
+	 * if there are missing entities from
+	 * mToplevelObjects to toplevelObjects */
+	void setStack (const std::vector <Object::Ptr> &toplevelObjects);
+
+	/* Inserts a window at a StackPosition specified */
+	void restackObject (const compiz::window::Object::Ptr &,
+			    const compiz::window::StackPosition &);
+
+	/* Bottom to top */
+	std::vector <Object::Ptr> mObjects;
+};
+
+class SynchronousStack :
+    public compiz::window::Stack
+{
+    public:
+
+	typedef boost::shared_ptr <SynchronousStack> Ptr;
+	virtual ~SynchronousStack ();
+
+	void setStack (const std::vector <Object::Ptr> &toplevelObjects);
+	void restackObject (const compiz::window::Object::Ptr &,
+			    const compiz::window::StackPosition &);
+
+    protected:
+
+	SynchronousStack ();
+};
+
+}
+}
+
+#endif

=== added file 'include/core/stackposition.h'
--- include/core/stackposition.h	1970-01-01 00:00:00 +0000
+++ include/core/stackposition.h	2012-01-11 08: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
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ *          David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPIZ_STACKPOSITION_H
+#define _COMPIZ_STACKPOSITION_H
+
+
+namespace compiz
+{
+namespace window
+{
+
+class StackPosition
+{
+    public:
+
+	typedef boost::shared_ptr <StackPosition> Ptr;
+};
+
+}
+}
+
+#endif

=== modified file 'include/core/window.h'
--- include/core/window.h	2012-01-11 08:52:32 +0000
+++ include/core/window.h	2012-01-11 08:52:33 +0000
@@ -29,6 +29,7 @@
 #define _COMPWINDOW_H
 
 #include <boost/function.hpp>
+#include <boost/shared_ptr.hpp>
 
 #include <X11/Xlib-xcb.h>
 #include <X11/Xutil.h>
@@ -42,9 +43,11 @@
 #include <core/point.h>
 #include <core/region.h>
 #include <core/windowgeometry.h>
+#include <core/windowconstrainment.h>
 #include <core/windowgeometrysaver.h>
 #include <core/windowextents.h>
-#include <core/windowconstrainment.h>
+#include <core/asynchronous-container.h>
+#include <core/asynchronous-object.h>
 
 #include <core/wrapsystem.h>
 
@@ -246,7 +249,6 @@
 }
 }
 
-
 /**
  * Wrappable core window functions. Derive from this class
  * and overload these functions in order to have your function called

=== modified 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	2012-01-11 08:52:32 +0000
+++ plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea/src/test-place-constrain-to-workarea.cpp	2012-01-11 08:52:33 +0000
@@ -32,20 +32,8 @@
 class CompPlaceTestConstrainToWorkarea :
     public CompPlaceTest
 {
-public:
-
-    CompPlaceTestConstrainToWorkarea ();
-    ~CompPlaceTestConstrainToWorkarea ();
 };
 
-CompPlaceTestConstrainToWorkarea::CompPlaceTestConstrainToWorkarea ()
-{
-}
-
-CompPlaceTestConstrainToWorkarea::~CompPlaceTestConstrainToWorkarea ()
-{
-}
-
 TEST_F (CompPlaceTestConstrainToWorkarea, TestConstrainToWorkarea)
 {
     CompSize screensize (1000, 2000);

=== modified 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	2012-01-11 08:52:32 +0000
+++ plugins/place/src/constrain-to-workarea/tests/test-constrain-to-workarea.cpp	2012-01-11 08:52:33 +0000
@@ -24,11 +24,3 @@
  */
 
 #include "test-constrain-to-workarea.h"
-
-CompPlaceTest::CompPlaceTest ()
-{
-}
-
-CompPlaceTest::~CompPlaceTest ()
-{
-}

=== modified 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	2012-01-11 08:52:32 +0000
+++ plugins/place/src/constrain-to-workarea/tests/test-constrain-to-workarea.h	2012-01-11 08:52:33 +0000
@@ -39,10 +39,6 @@
 
 class CompPlaceTest : public ::testing::Test
 {
-public:
-
-    CompPlaceTest ();
-    virtual ~CompPlaceTest ();
 };
 
 #endif

=== modified 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	2012-01-11 08:52:32 +0000
+++ plugins/place/src/screen-size-change/tests/screen-size-change/src/test-place-screen-size-change.cpp	2012-01-11 08:52:33 +0000
@@ -32,20 +32,8 @@
 class CompPlaceScreenSizeChangeTestScreenSizeChange :
     public CompPlaceScreenSizeChangeTest
 {
-public:
-
-    CompPlaceScreenSizeChangeTestScreenSizeChange ();
-    ~CompPlaceScreenSizeChangeTestScreenSizeChange ();
 };
 
-CompPlaceScreenSizeChangeTestScreenSizeChange::CompPlaceScreenSizeChangeTestScreenSizeChange ()
-{
-}
-
-CompPlaceScreenSizeChangeTestScreenSizeChange::~CompPlaceScreenSizeChangeTestScreenSizeChange ()
-{
-}
-
 class MockScreenSizeChangeObject :
     public compiz::place::ScreenSizeChangeObject
 {

=== modified 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	2012-01-11 08:52:32 +0000
+++ plugins/place/src/screen-size-change/tests/test-screen-size-change.cpp	2012-01-11 08:52:33 +0000
@@ -24,11 +24,3 @@
  */
 
 #include "test-screen-size-change.h"
-
-CompPlaceScreenSizeChangeTest::CompPlaceScreenSizeChangeTest ()
-{
-}
-
-CompPlaceScreenSizeChangeTest::~CompPlaceScreenSizeChangeTest ()
-{
-}

=== modified 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	2012-01-11 08:52:32 +0000
+++ plugins/place/src/screen-size-change/tests/test-screen-size-change.h	2012-01-11 08:52:33 +0000
@@ -41,9 +41,6 @@
     public ::testing::Test
 {
 public:
-
-    CompPlaceScreenSizeChangeTest ();
-    virtual ~CompPlaceScreenSizeChangeTest ();
 };
 
 #endif

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-01-11 08:52:32 +0000
+++ src/CMakeLists.txt	2012-01-11 08:52:33 +0000
@@ -98,6 +98,17 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/propertywriter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/eventsource.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/stackdebugger.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/object.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/container.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/asynchronous-object.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/asynchronous-container.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/asynchronous-server.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/stackposition.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/server.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/server-read.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/server-write.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/stack.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/asynchronous-stack.cpp
     ${_bcop_sources}
 )
 

=== added file 'src/asynchronous-container.cpp'
--- src/asynchronous-container.cpp	1970-01-01 00:00:00 +0000
+++ src/asynchronous-container.cpp	2012-01-11 08:52:33 +0000
@@ -0,0 +1,126 @@
+/*
+ * Copyright © 2010 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 <core/asynchronous-container.h>
+#include <core/server-write.h>
+#include <core/server.h>
+
+compiz::window::AsynchronousContainer::AsynchronousContainer (const compiz::window::ObjectIdentifier::Ptr      &id,
+							      const compiz::window::WriteServerConnection::Ptr &writer) :
+    Object::Object (id),
+    AsynchronousObject::AsynchronousObject (id, writer),
+    Container::Container (id)
+{
+}
+
+compiz::window::AsynchronousContainer::AsynchronousContainer (const compiz::window::ObjectIdentifier::Ptr      &id,
+							      const compiz::window::Geometry                   &g,
+							      const compiz::window::WriteServerConnection::Ptr &writer) :
+    Object::Object (id, g),
+    AsynchronousObject::AsynchronousObject (id, g, writer),
+    Container::Container (id, g)
+{
+}
+
+compiz::window::AsynchronousContainer::AsynchronousContainer (const compiz::window::ObjectIdentifier::Ptr      &id,
+							      const compiz::window::Geometry                   &g,
+							      const compiz::window::StackPosition              &sp,
+							      const compiz::window::WriteServerConnection::Ptr &writer) :
+    Object::Object (id, g, sp),
+    AsynchronousObject::AsynchronousObject (id, g, sp, writer),
+    Container::Container (id, g, sp)
+{
+}
+
+compiz::window::AsynchronousContainer::AsynchronousContainer (const compiz::window::ObjectIdentifier::Ptr      &id,
+							      const compiz::window::Geometry                   &g,
+							      const compiz::window::StackPosition              &sp,
+							      const boost::shared_ptr <Container>              &c,
+							      const compiz::window::WriteServerConnection::Ptr &writer) :
+    Object::Object (id, g, sp, c),
+    AsynchronousObject::AsynchronousObject (id, g, sp , c, writer),
+    Container::Container (id, g, sp, c)
+{
+}
+
+compiz::window::AsynchronousContainer::~AsynchronousContainer ()
+{
+}
+
+void
+compiz::window::AsynchronousContainer::sendInsertion (const Object::Ptr &o)
+{
+    mWriteConnection->sendParent (o->id (), id ());
+
+    addSentInsertion (o);
+}
+
+compiz::window::Object::Ptr
+compiz::window::AsynchronousContainer::sendRemoval (const Object::Ptr &o)
+{
+    Object::Ptr p = addSentRemoval (o);
+
+    mWriteConnection->sendParent (o->id (), Server::Default ()->root ()->id ());
+
+    return p;
+}
+
+void
+compiz::window::AsynchronousContainer::receiveInsertion (const Object::Ptr &o)
+{
+    Container::insert (o);
+}
+
+void
+compiz::window::AsynchronousContainer::receiveRemoval (const Object::Ptr &o)
+{
+    Container::remove (o);
+}
+
+void
+compiz::window::AsynchronousContainer::addSentInsertion (const Object::Ptr &o)
+{
+    mSentChildren.push_back (o);
+}
+
+compiz::window::Object::Ptr
+compiz::window::AsynchronousContainer::addSentRemoval (const Object::Ptr &o)
+{
+    Children::iterator it = std::find (mSentChildren.begin (),
+				       mSentChildren.end (),
+				       o);
+
+    if (it != mSentChildren.end ())
+    {
+	Object::Ptr p = *it;
+	mSentChildren.erase (it);
+
+	return p;
+    }
+
+    return Object::Ptr ();
+}
+
+

=== added file 'src/asynchronous-object.cpp'
--- src/asynchronous-object.cpp	1970-01-01 00:00:00 +0000
+++ src/asynchronous-object.cpp	2012-01-11 08:52:33 +0000
@@ -0,0 +1,117 @@
+/*
+ * Copyright © 2010 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 <core/asynchronous-object.h>
+#include <core/server-write.h>
+
+compiz::window::AsynchronousObject::AsynchronousObject (const compiz::window::ObjectIdentifier::Ptr      &id,
+							const compiz::window::WriteServerConnection::Ptr &writer) :
+    Object::Object (id),
+    mWriteConnection (writer)
+{
+}
+
+compiz::window::AsynchronousObject::AsynchronousObject (const compiz::window::ObjectIdentifier::Ptr      &id,
+							const compiz::window::Geometry                   &g,
+							const compiz::window::WriteServerConnection::Ptr &writer) :
+    Object::Object (id, g),
+    mWriteConnection (writer)
+{
+}
+
+compiz::window::AsynchronousObject::AsynchronousObject (const compiz::window::ObjectIdentifier::Ptr      &id,
+							const compiz::window::Geometry                   &g,
+							const compiz::window::StackPosition              &sp,
+							const compiz::window::WriteServerConnection::Ptr &writer) :
+    Object::Object (id, g, sp),
+    mWriteConnection (writer)
+{
+}
+
+compiz::window::AsynchronousObject::AsynchronousObject (const compiz::window::ObjectIdentifier::Ptr      &id,
+							const compiz::window::Geometry                   &g,
+							const compiz::window::StackPosition              &sp,
+							const boost::shared_ptr <Container>              &c,
+							const compiz::window::WriteServerConnection::Ptr &writer) :
+    Object::Object (id, g, sp, c),
+    mWriteConnection (writer)
+{
+}
+
+compiz::window::AsynchronousObject::~AsynchronousObject ()
+{
+}
+
+const compiz::window::Geometry &
+compiz::window::AsynchronousObject::sentGeometry () const
+{
+    return mSentGeometry;
+}
+
+const compiz::window::StackPosition &
+compiz::window::AsynchronousObject::sentStackPosition () const
+{
+    return mSentStackPosition;
+}
+
+void
+compiz::window::AsynchronousObject::sendGeometry (const compiz::window::Geometry &g)
+{
+    mWriteConnection->sendGeometry (id (), g);
+
+    addSentGeometry (g);
+}
+
+void
+compiz::window::AsynchronousObject::sendStackPosition (const compiz::window::StackPosition &sp)
+{
+    mWriteConnection->sendStackPosition (id (), sp);
+
+    addSentStackPosition (sp);
+}
+
+void
+compiz::window::AsynchronousObject::receiveGeometry (const compiz::window::Geometry &g)
+{
+    Object::setGeometry (g);
+}
+
+void
+compiz::window::AsynchronousObject::receiveStackPosition (const compiz::window::StackPosition &sp)
+{
+    Object::setStackPosition (sp);
+}
+
+void
+compiz::window::AsynchronousObject::addSentGeometry (const compiz::window::Geometry &g)
+{
+    mSentGeometry = g;
+}
+
+void
+compiz::window::AsynchronousObject::addSentStackPosition (const compiz::window::StackPosition &sp)
+{
+    mSentStackPosition = sp;
+}

=== added file 'src/asynchronous-server.cpp'
--- src/asynchronous-server.cpp	1970-01-01 00:00:00 +0000
+++ src/asynchronous-server.cpp	2012-01-11 08:52:33 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2010 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 <core/asynchronous-server.h>
+#include <core/server-write.h>
+
+compiz::window::AsynchronousServer::AsynchronousServer () :
+    Server::Server (),
+    mReadConnection (new compiz::window::ReadServerConnection)
+{
+}
+
+compiz::window::AsynchronousServer::~AsynchronousServer ()
+{
+}
+
+compiz::window::WriteServerConnection::Ptr
+compiz::window::AsynchronousServer::connect ()
+{
+    compiz::window::AsynchronousServer::Ptr t = shared_from_this ();
+    return compiz::window::WriteServerConnection::Ptr (new compiz::window::WriteServerConnection (t));
+}
+

=== added file 'src/asynchronous-stack.cpp'
--- src/asynchronous-stack.cpp	1970-01-01 00:00:00 +0000
+++ src/asynchronous-stack.cpp	2012-01-11 08:52:33 +0000
@@ -0,0 +1,99 @@
+/*
+ * Copyright © 2010 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 <core/asynchronous-stack.h>
+#include <core/asynchronous-server.h>
+#include <core/asynchronous-object.h>
+#include <core/object.h>
+#include <core/server-write.h>
+
+compiz::window::AsynchronousStack::AsynchronousStack (const compiz::window::AsynchronousServer::Ptr &server) :
+    mWriteConnection (server->connect ())
+{
+}
+
+compiz::window::AsynchronousStack::~AsynchronousStack ()
+{
+}
+
+const std::vector <compiz::window::Object::Ptr> &
+compiz::window::AsynchronousStack::sentObjects () const
+{
+    return mSentObjects;
+}
+
+
+
+void
+compiz::window::AsynchronousStack::sendStack (const std::vector <Object::Ptr> &objects)
+{
+    /* Must be the same size as the last sent objects
+     * and no point restacking if there is only one object */
+    if (objects.size () == mSentObjects.size () &&
+	objects.size () > 1)
+    {
+	std::vector <Object::Ptr>::const_iterator oit (objects.begin ());
+	std::vector <Object::Ptr>::const_iterator sit (mSentObjects.begin ());
+
+	std::advance (oit, 1);
+	std::advance (sit, 1);
+
+	for (; oit != objects.end () && sit != mSentObjects.end (); ++oit, ++sit)
+	{
+	    std::vector <Object::Ptr>::const_iterator poit = (oit - 1);
+	    std::vector <Object::Ptr>::const_iterator psit = (sit - 1);
+
+	    /* Need a heuristic that detects if the old sibling is
+	     * different and if not, if that old sibling was restacked
+	     * already, so we can stack above it anyways */
+	    if (poit != psit)
+	    {
+		const Object::Ptr &prev = (*psit);
+		const Object::Ptr &current = (*oit);
+		sendRestackObject (current, prev->stackPosition ());
+	    }
+	}
+    }
+}
+
+void
+compiz::window::AsynchronousStack::sendRestackObject (const compiz::window::Object::Ptr   &o,
+						      const compiz::window::StackPosition &sp)
+{
+    mWriteConnection->sendStackPosition (o->id (), sp);
+
+    /* Update stack last sent to server */
+}
+
+void
+compiz::window::AsynchronousStack::receiveRestackObject (const compiz::window::Object::Ptr   &o,
+							 const compiz::window::StackPosition &sp)
+{
+    Stack::restackObject (o, sp);
+}
+
+
+
+

=== added file 'src/container.cpp'
--- src/container.cpp	1970-01-01 00:00:00 +0000
+++ src/container.cpp	2012-01-11 08:52:33 +0000
@@ -0,0 +1,182 @@
+/*
+ * Copyright © 2010 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 <core/container.h>
+#include <core/object.h>
+#include <boost/bind.hpp>
+
+compiz::window::Container::Container (const compiz::window::ObjectIdentifier::Ptr &id) :
+    Object::Object (id)
+{
+}
+
+compiz::window::Container::Container (const compiz::window::ObjectIdentifier::Ptr    &id,
+				      const compiz::window::Geometry &g) :
+    Object::Object (id, g)
+{
+}
+
+compiz::window::Container::Container (const compiz::window::ObjectIdentifier::Ptr         &id,
+				      const compiz::window::Geometry      &g,
+				      const compiz::window::StackPosition &sp) :
+    Object::Object (id, g, sp)
+{
+}
+
+compiz::window::Container::Container (const compiz::window::ObjectIdentifier::Ptr         &id,
+				      const compiz::window::Geometry      &g,
+				      const compiz::window::StackPosition &sp,
+				      const boost::shared_ptr <Container> &c) :
+    Object::Object (id, g, sp, c)
+{
+}
+
+compiz::window::Container::~Container ()
+{
+}
+
+compiz::window::Container::Children
+compiz::window::Container::children ()
+{
+    return mChildren;
+}
+
+bool
+compiz::window::objectIdentifierEq (const compiz::window::Object::Ptr           &o,
+				    const compiz::window::ObjectIdentifier::Ptr &i)
+{
+    return o->id () == i;
+}
+
+bool
+compiz::window::Container::insert (const compiz::window::Object::Ptr &o)
+{
+    Children::iterator it = std::find (mChildren.begin (), mChildren.end (), o);
+
+    if (it != mChildren.end ())
+	return false;
+    else
+	mChildren.insert (it, o);
+
+    return true;
+}
+
+compiz::window::Object::Ptr
+compiz::window::Container::remove (const compiz::window::ObjectIdentifier::Ptr &i)
+{
+    Children::iterator it = std::find_if (mChildren.begin (),
+					  mChildren.end (),
+					  boost::bind (objectIdentifierEq, _1, i));
+
+    if (it != mChildren.end ())
+    {
+	Object::Ptr o = *it;
+
+	mChildren.erase (it);
+	return o;
+    }
+    else
+    {
+	return Object::Ptr ();
+    }
+}
+
+compiz::window::Object::Ptr
+compiz::window::Container::remove (const Object::Ptr &o)
+{
+    Children::iterator it = std::find (mChildren.begin (),
+				       mChildren.end (),
+				       o);
+
+    if (it != mChildren.end ())
+    {
+	Object::Ptr o = *it;
+
+	mChildren.erase (it);
+	return o;
+    }
+    else
+    {
+	return Object::Ptr ();
+    }
+}
+
+compiz::window::SynchronousContainer::SynchronousContainer (const compiz::window::ObjectIdentifier::Ptr &id) :
+    Object::Object (id),
+    SynchronousObject::SynchronousObject (id),
+    Container::Container (id)
+{
+}
+
+compiz::window::SynchronousContainer::SynchronousContainer (const compiz::window::ObjectIdentifier::Ptr    &id,
+							    const compiz::window::Geometry &g) :
+    Object::Object (id, g),
+    SynchronousObject::SynchronousObject (id, g),
+    Container::Container (id, g)
+{
+}
+
+compiz::window::SynchronousContainer::SynchronousContainer (const compiz::window::ObjectIdentifier::Ptr         &id,
+							    const compiz::window::Geometry      &g,
+							    const compiz::window::StackPosition &sp) :
+    Object::Object (id, g, sp),
+    SynchronousObject::SynchronousObject (id, g, sp),
+    Container::Container (id, g, sp)
+{
+}
+
+compiz::window::SynchronousContainer::SynchronousContainer (const compiz::window::ObjectIdentifier::Ptr &id,
+							    const compiz::window::Geometry              &g,
+							    const compiz::window::StackPosition         &sp,
+							    const boost::shared_ptr <Container>         &c) :
+    Object::Object (id, g, sp, c),
+    SynchronousObject::SynchronousObject (id, g, sp, c),
+    Container::Container (id, g, sp, c)
+{
+}
+
+compiz::window::SynchronousContainer::~SynchronousContainer ()
+{
+}
+
+bool
+compiz::window::SynchronousContainer::insert (const compiz::window::Object::Ptr &o)
+{
+    return Container::insert (o);
+}
+
+compiz::window::Object::Ptr
+compiz::window::SynchronousContainer::remove (const compiz::window::ObjectIdentifier::Ptr &i)
+{
+    return Container::remove (i);
+}
+
+compiz::window::Object::Ptr
+compiz::window::SynchronousContainer::remove (const compiz::window::Object::Ptr &o)
+{
+    return Container::remove (o);
+}
+
+

=== added file 'src/object.cpp'
--- src/object.cpp	1970-01-01 00:00:00 +0000
+++ src/object.cpp	2012-01-11 08:52:33 +0000
@@ -0,0 +1,204 @@
+/*
+ * Copyright © 2010 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 <core/object.h>
+
+compiz::window::Object::Object (const compiz::window::ObjectIdentifier::Ptr &id) :
+    mId (id)
+{
+}
+
+compiz::window::Object::Object (const compiz::window::ObjectIdentifier::Ptr &id,
+				const compiz::window::Geometry &g) :
+    mId (id),
+    mGeometry (g)
+{
+}
+
+compiz::window::Object::Object (const compiz::window::ObjectIdentifier::Ptr &id,
+				const compiz::window::Geometry      &g,
+				const compiz::window::StackPosition &sp) :
+    mId (id),
+    mGeometry (g),
+    mStackPosition (sp)
+{
+}
+
+compiz::window::Object::Object (const compiz::window::ObjectIdentifier::Ptr &id,
+				const compiz::window::Geometry       &g,
+				const compiz::window::StackPosition  &sp,
+				const boost::shared_ptr <Container>  &c) :
+    mId (id),
+    mGeometry (g),
+    mStackPosition (sp),
+    mContainer (c)
+{
+}
+
+bool
+compiz::window::ObjectIdentifier::operator ==(const ObjectIdentifier::Ptr &other) const
+{
+    return equal (other);
+}
+
+bool
+compiz::window::ObjectIdentifier::operator !=(const ObjectIdentifier::Ptr &other) const
+{
+    return !(*this == other);
+}
+
+bool
+compiz::window::ObjectIdentifier::equal (const ObjectIdentifier::Ptr &other) const
+{
+    if (getType () == other->getType ())
+	return compare (other);
+
+    return false;
+}
+
+const boost::shared_ptr <compiz::window::Container> &
+compiz::window::Object::container () const
+{
+    return mContainer;
+}
+
+const compiz::window::Geometry &
+compiz::window::Object::geometry () const
+{
+    return mGeometry;
+}
+
+const compiz::window::StackPosition &
+compiz::window::Object::stackPosition () const
+{
+    return mStackPosition;
+}
+
+const compiz::window::ObjectIdentifier::Ptr &
+compiz::window::Object::id () const
+{
+    return mId;
+}
+
+bool
+compiz::window::Object::operator == (const Object &other) const
+{
+    return other.mId == mId;
+}
+
+bool
+compiz::window::Object::operator != (const Object &other) const
+{
+    return !(other == *this);
+}
+
+bool
+compiz::window::Object::setGeometry (const compiz::window::Geometry &g)
+{
+    unsigned int mask = mGeometry.changeMask (g);
+    mGeometry.applyChange (g, mask);
+
+    return mask != 0;
+}
+
+bool
+compiz::window::Object::setStackPosition (const StackPosition &sp)
+{
+    mStackPosition = sp;
+    return true;
+}
+
+compiz::window::Object::~Object ()
+{
+}
+
+compiz::window::SynchronousObject::SynchronousObject (const compiz::window::ObjectIdentifier::Ptr &id) :
+    Object::Object (id)
+{
+}
+
+compiz::window::SynchronousObject::SynchronousObject (const compiz::window::ObjectIdentifier::Ptr    &id,
+						      const compiz::window::Geometry &g) :
+    Object::Object (id, g)
+{
+}
+
+compiz::window::SynchronousObject::SynchronousObject (const compiz::window::ObjectIdentifier::Ptr         &id,
+						      const compiz::window::Geometry      &g,
+						      const compiz::window::StackPosition &sp) :
+    Object::Object (id, g, sp)
+{
+}
+
+compiz::window::SynchronousObject::SynchronousObject (const compiz::window::ObjectIdentifier::Ptr  &id,
+						      const compiz::window::Geometry               &g,
+						      const compiz::window::StackPosition          &sp,
+						      const boost::shared_ptr <Container>          &c) :
+    Object::Object (id, g, sp, c)
+{
+}
+
+compiz::window::SynchronousObject::~SynchronousObject ()
+{
+}
+
+bool
+compiz::window::SynchronousObject::setGeometry (const Geometry &g)
+{
+    return Object::setGeometry (g);
+}
+
+bool
+compiz::window::SynchronousObject::setStackPosition (const StackPosition &sp)
+{
+    return Object::setStackPosition (sp);
+}
+
+const boost::shared_ptr <compiz::window::Object> &
+compiz::window::ObjectIdentifier::operator() ()
+{
+    if (mObj)
+	return mObj;
+    else
+    {
+	mObj = lookup ();
+	return mObj;
+    }
+}
+
+const boost::shared_ptr <compiz::window::Object> &
+compiz::window::ObjectIdentifier::operator() () const
+{
+    if (mObj)
+	return mObj;
+    else
+    {
+	return lookup ();
+    }
+}
+
+compiz::window::ObjectIdentifier::~ObjectIdentifier ()
+{
+}

=== modified file 'src/point/tests/point/src/test-point.cpp'
--- src/point/tests/point/src/test-point.cpp	2012-01-11 08:52:32 +0000
+++ src/point/tests/point/src/test-point.cpp	2012-01-11 08:52:33 +0000
@@ -31,7 +31,6 @@
     public:
 
 	CompPointTestPoint ();
-	~CompPointTestPoint ();
 
     protected:
 
@@ -43,10 +42,6 @@
 {
 }
 
-CompPointTestPoint::~CompPointTestPoint ()
-{
-}
-
 TEST_F (CompPointTestPoint, TestPoint)
 {
   p.setX (10);

=== modified file 'src/point/tests/test-point.cpp'
--- src/point/tests/test-point.cpp	2012-01-11 08:52:32 +0000
+++ src/point/tests/test-point.cpp	2012-01-11 08:52:33 +0000
@@ -24,11 +24,3 @@
  */
 
 #include "test-point.h"
-
-CompWindowPointTest::CompWindowPointTest ()
-{
-}
-
-CompWindowPointTest::~CompWindowPointTest ()
-{
-}

=== modified file 'src/point/tests/test-point.h'
--- src/point/tests/test-point.h	2012-01-11 08:52:32 +0000
+++ src/point/tests/test-point.h	2012-01-11 08:52:33 +0000
@@ -33,11 +33,6 @@
 
 class CompWindowPointTest : public ::testing::Test
 {
-public:
-
-    CompWindowPointTest ();
-    virtual ~CompWindowPointTest ();
-
 };
 
 #endif

=== modified file 'src/privatewindow.h'
--- src/privatewindow.h	2012-01-11 08:52:32 +0000
+++ src/privatewindow.h	2012-01-11 08:52:33 +0000
@@ -43,7 +43,8 @@
 
 typedef CompWindowExtents CompFullscreenMonitorSet;
 
-class PrivateWindow {
+class PrivateWindow
+{
 
     public:
 	PrivateWindow ();
@@ -53,8 +54,6 @@
 
 	void updateFrameWindow ();
 
-	void setWindowMatrix ();
-
 	bool restack (Window aboveId);
 
 	bool initializeSyncCounter ();

=== modified file 'src/rect/tests/rect/src/test-rect.cpp'
--- src/rect/tests/rect/src/test-rect.cpp	2012-01-11 08:52:32 +0000
+++ src/rect/tests/rect/src/test-rect.cpp	2012-01-11 08:52:33 +0000
@@ -30,21 +30,8 @@
 class CompRectTestRect :
     public CompRectTest
 {
-public:
-
-    CompRectTestRect ();
-    ~CompRectTestRect ();
 };
 
-
-CompRectTestRect::CompRectTestRect ()
-{
-}
-
-CompRectTestRect::~CompRectTestRect ()
-{
-}
-
 TEST_F (CompRectTestRect, TestRect)
 {
     ASSERT_EQ (mRect, CompRect (0, 0, 0, 0));

=== added file 'src/server-read.cpp'
--- src/server-read.cpp	1970-01-01 00:00:00 +0000
+++ src/server-read.cpp	2012-01-11 08:52:33 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2010 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 <core/server-read.h>
+#include <core/asynchronous-object.h>
+#include <core/asynchronous-container.h>
+
+compiz::window::ReadServerConnection::ReadServerConnection ()
+{
+}
+
+compiz::window::ReadServerConnection::~ReadServerConnection ()
+{
+}
+
+void
+compiz::window::ReadServerConnection::receiveGeometry (const compiz::window::AsynchronousObject::Ptr &ao,
+						       const compiz::window::Geometry                &g)
+{
+    ao->receiveGeometry (g);
+}
+
+void
+compiz::window::ReadServerConnection::receiveStackPosition (const compiz::window::AsynchronousObject::Ptr &ao,
+							    const compiz::window::StackPosition           &sp)
+{
+    /* Write new stack position to parent window stack XXX */
+    ao->receiveStackPosition (sp);
+}
+
+void
+compiz::window::ReadServerConnection::receiveParent (const compiz::window::AsynchronousObject::Ptr    &child,
+						     const compiz::window::AsynchronousContainer::Ptr &parent)
+{
+    compiz::window::AsynchronousContainer::Ptr lastParent = boost::shared_static_cast <compiz::window::AsynchronousContainer> (child->container ());
+    lastParent->receiveRemoval (boost::shared_static_cast <compiz::window::Object> (child));
+    parent->receiveInsertion (boost::shared_static_cast <compiz::window::Object> (child));
+}

=== added file 'src/server-write.cpp'
--- src/server-write.cpp	1970-01-01 00:00:00 +0000
+++ src/server-write.cpp	2012-01-11 08:52:33 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2010 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 <core/server-write.h>
+
+compiz::window::WriteServerConnection::WriteServerConnection (const AsynchronousServer::Ptr &server) :
+    mServer (server)
+{
+}
+
+compiz::window::WriteServerConnection::~WriteServerConnection ()
+{
+}
+
+void
+compiz::window::WriteServerConnection::sendGeometry (const ObjectIdentifier::Ptr    &id,
+						     const compiz::window::Geometry &g)
+{
+    mServer->sendGeometry (id, g);
+}
+
+void
+compiz::window::WriteServerConnection::sendStackPosition (const ObjectIdentifier::Ptr         &id,
+							  const compiz::window::StackPosition &sp)
+{
+    mServer->sendStackPosition (id, sp);
+}
+
+void
+compiz::window::WriteServerConnection::sendParent (const ObjectIdentifier::Ptr    &id,
+						   const ObjectIdentifier::Ptr    &pid)
+{
+    mServer->sendParent (id, pid);
+}
+
+
+

=== added file 'src/server.cpp'
--- src/server.cpp	1970-01-01 00:00:00 +0000
+++ src/server.cpp	2012-01-11 08:52:33 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2010 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 <core/server.h>
+
+compiz::window::Server::Ptr compiz::window::Server::mDefault = compiz::window::Server::Ptr ();
+
+compiz::window::Server::Server ()
+{
+}
+
+compiz::window::Server::~Server ()
+{
+}
+
+compiz::window::Server::Ptr compiz::window::Server::Default()
+{
+    return mDefault;
+}
+
+const compiz::window::Object::Ptr &
+compiz::window::Server::root ()
+{
+    return mRoot;
+}

=== added file 'src/stack.cpp'
--- src/stack.cpp	1970-01-01 00:00:00 +0000
+++ src/stack.cpp	2012-01-11 08:52:33 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2010 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 <core/stack.h>
+
+compiz::window::Stack::Stack ()
+{
+}
+
+compiz::window::Stack::~Stack ()
+{
+}
+
+void
+compiz::window::Stack::setStack (const std::vector <Object::Ptr> &toplevelObjects)
+{
+    mObjects = toplevelObjects;
+}
+
+void
+compiz::window::Stack::restackObject (const compiz::window::Object::Ptr   &o,
+				      const compiz::window::StackPosition &sp)
+{
+    /* Lookup position, insert object into stack */
+}
+
+compiz::window::SynchronousStack::SynchronousStack () :
+    Stack::Stack ()
+{
+}
+
+compiz::window::SynchronousStack::~SynchronousStack ()
+{
+}
+
+void
+compiz::window::SynchronousStack::setStack (const std::vector <Object::Ptr> &toplevelObjects)
+{
+    Stack::setStack (toplevelObjects);
+}
+
+void
+compiz::window::SynchronousStack::restackObject (const compiz::window::Object::Ptr   &o,
+						 const compiz::window::StackPosition &sp)
+{
+    Stack::restackObject (o, sp);
+}
+
+

=== added file 'src/stackposition.cpp'
--- src/stackposition.cpp	1970-01-01 00:00:00 +0000
+++ src/stackposition.cpp	2012-01-11 08:52:33 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright © 2010 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]>
+ */

=== modified file 'src/window/constrainment/tests/test-window-constrainment.cpp'
--- src/window/constrainment/tests/test-window-constrainment.cpp	2012-01-11 08:52:32 +0000
+++ src/window/constrainment/tests/test-window-constrainment.cpp	2012-01-11 08:52:33 +0000
@@ -24,11 +24,3 @@
  */
 
 #include "test-window-constrainment.h"
-
-CompWindowConstrainmentTest::CompWindowConstrainmentTest ()
-{
-}
-
-CompWindowConstrainmentTest::~CompWindowConstrainmentTest ()
-{
-}

=== modified file 'src/window/constrainment/tests/test-window-constrainment.h'
--- src/window/constrainment/tests/test-window-constrainment.h	2012-01-11 08:52:32 +0000
+++ src/window/constrainment/tests/test-window-constrainment.h	2012-01-11 08:52:33 +0000
@@ -34,10 +34,6 @@
 
 class CompWindowConstrainmentTest : public ::testing::Test
 {
-public:
-
-    CompWindowConstrainmentTest ();
-    virtual ~CompWindowConstrainmentTest ();
 };
 
 #endif

=== modified file 'src/window/constrainment/tests/to-hints/src/test-window-constrainment-to-hints.cpp'
--- src/window/constrainment/tests/to-hints/src/test-window-constrainment-to-hints.cpp	2012-01-11 08:52:32 +0000
+++ src/window/constrainment/tests/to-hints/src/test-window-constrainment-to-hints.cpp	2012-01-11 08:52:33 +0000
@@ -29,20 +29,8 @@
 class CompWindowConstrainmentTestToHints :
     public CompWindowConstrainmentTest
 {
-public:
-
-    CompWindowConstrainmentTestToHints ();
-    virtual ~CompWindowConstrainmentTestToHints ();
 };
 
-CompWindowConstrainmentTestToHints::CompWindowConstrainmentTestToHints ()
-{
-}
-
-CompWindowConstrainmentTestToHints::~CompWindowConstrainmentTestToHints ()
-{
-}
-
 TEST_F (CompWindowConstrainmentTestToHints, ToHints)
 {
     /* No hints, size is the same */

=== modified file 'src/window/extents/tests/shift/src/test-window-extents-shift.cpp'
--- src/window/extents/tests/shift/src/test-window-extents-shift.cpp	2012-01-11 08:52:32 +0000
+++ src/window/extents/tests/shift/src/test-window-extents-shift.cpp	2012-01-11 08:52:33 +0000
@@ -30,24 +30,11 @@
 class CompWindowExtentsTestShift :
     public CompWindowExtentsTest
 {
-public:
-
-    CompWindowExtentsTestShift ();
-    virtual ~CompWindowExtentsTestShift ();
-
 protected:
 
     compiz::window::extents::Extents e;
 };
 
-CompWindowExtentsTestShift::CompWindowExtentsTestShift ()
-{
-}
-
-CompWindowExtentsTestShift::~CompWindowExtentsTestShift ()
-{
-}
-
 TEST_F (CompWindowExtentsTestShift, TestShift)
 {
     CompPoint rp;

=== modified file 'src/window/extents/tests/test-window-extents.cpp'
--- src/window/extents/tests/test-window-extents.cpp	2012-01-11 08:52:32 +0000
+++ src/window/extents/tests/test-window-extents.cpp	2012-01-11 08:52:33 +0000
@@ -24,11 +24,3 @@
  */
 
 #include "test-window-extents.h"
-
-CompWindowExtentsTest::CompWindowExtentsTest ()
-{
-}
-
-CompWindowExtentsTest::~CompWindowExtentsTest ()
-{
-}

=== modified file 'src/window/extents/tests/test-window-extents.h'
--- src/window/extents/tests/test-window-extents.h	2012-01-11 08:52:32 +0000
+++ src/window/extents/tests/test-window-extents.h	2012-01-11 08:52:33 +0000
@@ -33,10 +33,6 @@
 
 class CompWindowExtentsTest : public ::testing::Test
 {
-public:
-
-    CompWindowExtentsTest ();
-    virtual ~CompWindowExtentsTest ();
 };
 
 #endif