Merge lp:~compiz-team/compiz/compiz.revert_3728 into lp:compiz/0.9.10

[Sam Spilsbury]

Revert revision 3278.

Revert revision 3278.

It isn't quite ready yet.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3735
http://jenkins.qa.ubuntu.com/job/compiz-ci/193/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/193/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Alright, reverting!

review: Approve

[MC Return (mc-return)]

What about Sam's "It isn't quite ready yet." comment ?

review: Needs Information

[MC Return (mc-return)]

Setting to "On Hold"/"WIP" until Sam has verified that this is ready...

[Brandon Schaefer (brandontschaefer)]

Hmm I thought he was talking about the branch that was r3278 was not ready, hence why he wanted to revert it?

[MC Return (mc-return)]

Ah yes, maybe you are right -> I am not sure though...

review: Abstain

[Brandon Schaefer (brandontschaefer)]

Haha, yeah now im not 100% sure either, soo ill just wait for Sam to come around and global approve it :)

[MC Return (mc-return)]

+1

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/compiz-autolanding/93/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-autolanding/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-autolanding/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-autolanding/5

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[MC Return (mc-return)]

Oh, the misunderstanding was on my side. Sorry... ;)

=== removed file '.bzrignore'
--- .bzrignore	2013-05-26 06:01:34 +0000
+++ .bzrignore	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-.bzr-repo
 
=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2013-05-20 15:26:11 +0000
+++ plugins/decor/src/decor.cpp	2013-06-07 06:12:28 +0000
@@ -1165,8 +1165,6 @@
 
     xwc.x += w->serverGeometry ().x ();
     xwc.y += w->serverGeometry ().y ();
-    xwc.width += w->serverGeometry ().width ();
-    xwc.height += w->serverGeometry ().height ();
 
     w->configureXWindow (mask, &xwc);
     screen->handleCompizEvent ("decor", "window_decorated", o);
@@ -1511,68 +1509,38 @@
 
 void
 DecorWindow::moveDecoratedWindowBy (const CompPoint &movement,
-				    const CompSize  &sizeDelta,
 				    bool            instant)
 {
-    /* movement and sizeDelta are the shift of the client window
-     * as a result of decoration from a theoretical neutral position,
-     * lastShift and lastSizeDelta are the last recorded shift 
-     * and size-change. The true difference between two decorations
-     * is movement - lastShift, sizeDelta - sizeDelta */
-
-    int dx = movement.x () - lastShift.x ();
-    int dy = movement.y () - lastShift.y ();
-    int dwidth = sizeDelta.width () - lastSizeDelta.height ();
-    int dheight = sizeDelta.height () - lastSizeDelta.height ();
-
-    /* We don't apply these rules to override-redirect windows
-     * and we need to check that both the position and of the window
-     * would change as a result of decoration in order to move it
-     * (this is usually the case because as a window is decorated
-     *  it will necessarily get bigger or smaller in order to fit
-     *  inside its decoration) */
-    if (!window->overrideRedirect () &&
-	((dx || dy) && (dwidth || dheight)))
+    /* Need to actually move the window */
+    if (window->placed () && !window->overrideRedirect () &&
+	(movement.x () || movement.y ()))
     {
 	XWindowChanges xwc;
-	unsigned int   mask = CWX | CWY | CWWidth | CWHeight;
+	unsigned int   mask = CWX | CWY;
 
 	memset (&xwc, 0, sizeof (XWindowChanges));
 
 	/* Grab the geometry last sent to server at configureXWindow
 	 * time and not here since serverGeometry may be updated by
 	 * the time that we do call configureXWindow */
-	xwc.x = dx;
-	xwc.y = dy;
-	xwc.width = dwidth;
-	xwc.height = dheight;
+	xwc.x = movement.x ();
+	xwc.y = movement.y ();
 
 	/* Except if it's fullscreen, maximized or such */
 	if (window->state () & CompWindowStateFullscreenMask)
-	    mask &= ~(CWX | CWY | CWWidth | CWHeight);
+	    mask &= ~(CWX | CWY);
 
 	if (window->state () & CompWindowStateMaximizedHorzMask)
-	    mask &= ~(CWX | CWWidth);
+	    mask &= ~CWX;
 
 	if (window->state () & CompWindowStateMaximizedVertMask)
-	    mask &= ~(CWY | CWHeight);
+	    mask &= ~CWY;
 
 	if (window->saveMask () & CWX)
-	    window->saveWc ().x += xwc.x;
+	    window->saveWc ().x += movement.x ();
 
 	if (window->saveMask () & CWY)
-	    window->saveWc ().y += xwc.y;
-
-	if (window->saveMask () & CWWidth)
-	    window->saveWc ().width += xwc.width;
-
-	if (window->saveMask () & CWHeight)
-	    window->saveWc ().height += xwc.height;
-
-	/* If the window has not been placed, do not move it this time
-	 * but record what we would have moved it by */
-	if (!window->placed ())
-	    mask = 0;
+	    window->saveWc ().y += movement.y ();
 
 	if (mask)
 	{
@@ -1590,15 +1558,6 @@
 	    else
 		moveUpdate.start (boost::bind (decorOffsetMove, window, xwc, mask), 0);
 	}
-
-	/* Even if the window has not yet been placed, we still
-	 * need to store what we would have moved it by in order
-	 * to put it in the right position. The place plugin will
-	 * set a position that makes the most sense, but we need
-	 * to know how much to move back by should the window
-	 * become undecorated again */
-	lastShift = movement;
-	lastSizeDelta = sizeDelta;
     }
 }
 
@@ -1609,9 +1568,9 @@
                       bool       shadowOnly,
                       bool       isSwitcher)
 {
-    const bool frameOrUnmapReference = (w->frame () ||
+    const bool visible = (w->frame () ||
 		          w->hasUnmapReference ());
-    const bool realDecoration = frameOrUnmapReference && !shadowOnly;
+    const bool realDecoration = visible && !shadowOnly;
     const bool forceDecoration = isSwitcher;
 
     return realDecoration || forceDecoration;
@@ -1657,8 +1616,7 @@
 DecorWindow::update (bool allowDecoration)
 {
     Decoration::Ptr  old, decoration;
-    CompPoint        movement;
-    CompSize         sizeDelta;
+    CompPoint        oldShift, movement;
 
     if (wd)
 	old = wd->decor;
@@ -1692,9 +1650,13 @@
     if (decoration == old)
 	return false;
 
-    /* Destroy the old WindowDecoration */
+    /* Determine how much we moved the window for the old
+     * decoration and save that, also destroy the old
+     * WindowDecoration */
     if (old)
     {
+	oldShift = cwe::shift (window->border (), window->sizeHints ().win_gravity);
+
 	WindowDecoration::destroy (wd);
 	wd = NULL;
     }
@@ -1716,6 +1678,7 @@
 	else if (!window->hasUnmapReference ())
 	    window->setWindowFrameExtents (&decoration->border,
 					   &decoration->input);
+
 	/* This window actually needs its decoration contents updated
 	 * as it was actually visible */
 	if (decorate ||
@@ -1732,11 +1695,7 @@
 	    }
 
 	    movement = cwe::shift (window->border (), window->sizeHints ().win_gravity);
-
-	    sizeDelta = CompSize (-(window->border ().left +
-				    window->border ().right),
-				  -(window->border ().top +
-				    window->border ().bottom));
+	    movement -= oldShift;
 
 	    window->updateWindowOutputExtents ();
 
@@ -1765,6 +1724,8 @@
 	memset (&emptyExtents, 0, sizeof (CompWindowExtents));
 
 	window->setWindowFrameExtents (&emptyExtents, &emptyExtents);
+
+	movement -= oldShift;
     }
 
     /* We need to damage the current output extents
@@ -1778,7 +1739,6 @@
     }
 
     moveDecoratedWindowBy (movement,
-			   sizeDelta,
 			   !allowDecoration);
 
     return true;
@@ -2320,20 +2280,6 @@
 }
 
 /*
- * DecorWindow::place
- *
- * Update any windows just before placement
- * so that placement algorithms will have the
- * border size at place-time
- */
-bool
-DecorWindow::place (CompPoint &pos)
-{
-    update (true);
-    return window->place (pos);
-}
-
-/*
  * DecorWindow::windowNotify
  *
  * Window event notification handler. On various
@@ -3011,6 +2957,9 @@
 {
     if (wd && wd->decor)
     {
+	CompPoint oldShift = compiz::window::extents::shift (window->border (), window->sizeHints ().win_gravity);
+	
+
 	if ((window->state () & MAXIMIZE_STATE))
 	    window->setWindowFrameExtents (&wd->decor->maxBorder,
 					   &wd->decor->maxInput);
@@ -3018,7 +2967,18 @@
 	    window->setWindowFrameExtents (&wd->decor->border,
 					   &wd->decor->input);
 
-	/* The shift will occurr in decorOffsetMove */
+	/* Since we immediately update the frame extents, we must
+	 * also update the stored saved window geometry in order
+	 * to prevent the window from shifting back too far once
+	 * unmaximized */
+
+	CompPoint movement = compiz::window::extents::shift (window->border (), window->sizeHints ().win_gravity) - oldShift;
+
+	if (window->saveMask () & CWX)
+	    window->saveWc ().x += movement.x ();
+
+	if (window->saveMask () & CWY)
+	    window->saveWc ().y += movement.y ();
 
 	updateFrame ();
     }
 
=== modified file 'plugins/decor/src/decor.h'
--- plugins/decor/src/decor.h	2013-04-17 23:41:09 +0000
+++ plugins/decor/src/decor.h	2013-06-07 06:12:28 +0000
@@ -293,8 +293,6 @@
 
 	bool damageRect (bool, const CompRect &);
 
-	bool place (CompPoint &pos);
-
 	bool glDraw (const GLMatrix &, const GLWindowPaintAttrib &,
 		     const CompRegion &, unsigned int);
 	void glDecorate (const GLMatrix &, const GLWindowPaintAttrib &,
@@ -382,16 +380,12 @@
 
 	X11DecorPixmapRequestor   mRequestor;
 
-	CompPoint               lastShift;
-	CompSize                lastSizeDelta;
-
     private:
 
 	bool            bareDecorationOnly ();
 	Decoration::Ptr findRealDecoration ();
 	Decoration::Ptr findBareDecoration ();
 	void            moveDecoratedWindowBy (const CompPoint &movement,
-					       const CompSize &sizeDelta,
 					       bool instant);
 };
 
 
=== modified file 'plugins/place/src/constrain-to-workarea/include/constrain-to-workarea.h'
--- plugins/place/src/constrain-to-workarea/include/constrain-to-workarea.h	2013-04-17 23:41:09 +0000
+++ plugins/place/src/constrain-to-workarea/include/constrain-to-workarea.h	2013-06-07 06:12:28 +0000
@@ -45,7 +45,8 @@
 CompPoint & constrainPositionToWorkArea (CompPoint                      &pos,
 				         const compiz::window::Geometry &serverGeometry,
                                          const CompWindowExtents        &border,
-					 const CompRect                 &workArea);
+                                         const CompRect                 &workArea,
+                                         bool                           staticGravity);
 
 
 CompPoint getViewportRelativeCoordinates (const compiz::window::Geometry &geom,
@@ -53,7 +54,8 @@
 
 CompWindowExtents getWindowEdgePositions (const CompPoint                &position,
 					  const compiz::window::Geometry &geom,
-					  const CompWindowExtents        &border);
+					  const CompWindowExtents        &border,
+					  unsigned int                   gravity);
 
 void clampHorizontalEdgePositionsToWorkArea (CompWindowExtents &edgePositions,
 					    const CompRect    &workArea);
@@ -62,7 +64,8 @@
 
 void subtractBordersFromEdgePositions (CompWindowExtents       &edgePositions,
 				       const CompWindowExtents &border,
-				       unsigned int            legacyBorder);
+				       unsigned int            legacyBorder,
+				       unsigned int            gravity);
 
 bool onlySizeChanged (unsigned int mask);
 bool applyWidthChange (const CompWindowExtents &edgePositions,
 
=== modified file 'plugins/place/src/constrain-to-workarea/src/constrain-to-workarea.cpp'
--- plugins/place/src/constrain-to-workarea/src/constrain-to-workarea.cpp	2013-04-17 23:41:09 +0000
+++ plugins/place/src/constrain-to-workarea/src/constrain-to-workarea.cpp	2013-06-07 06:12:28 +0000
@@ -140,21 +140,35 @@
 
 CompPoint &
 cp::constrainPositionToWorkArea (CompPoint               &pos,
-				 const cw::Geometry      &serverGeometry,
-				 const CompWindowExtents &border,
-				 const CompRect          &workArea)
+			         const cw::Geometry      &serverGeometry,
+			         const CompWindowExtents &border,
+			         const CompRect          &workArea,
+			         bool                    staticGravity)
 {
     CompWindowExtents extents;
     int               delta;
 
-    extents.left   = pos.x () - border.left;
-    extents.top    = pos.y () - border.top;
+    CompWindowExtents effectiveBorders = border;
+
+    /* Ignore borders in the StaticGravity case for placement
+     * because the window intended to be placed as if it didn't
+     * have them */
+    if (staticGravity)
+    {
+	effectiveBorders.left = 0;
+	effectiveBorders.right = 0;
+	effectiveBorders.top = 0;
+	effectiveBorders.bottom = 0;
+    }
+
+    extents.left   = pos.x () - effectiveBorders.left;
+    extents.top    = pos.y () - effectiveBorders.top;
     extents.right  = extents.left + serverGeometry.widthIncBorders () +
-		     (border.left +
-		      border.right);
+		     (effectiveBorders.left +
+		      effectiveBorders.right);
     extents.bottom = extents.top + serverGeometry.heightIncBorders () +
-		     (border.top +
-		      border.bottom);
+		     (effectiveBorders.top +
+		      effectiveBorders.bottom);
 
     delta = workArea.right () - extents.right;
     if (delta < 0)
@@ -172,8 +186,8 @@
     if (delta > 0)
 	extents.top += delta;
 
-    pos.setX (extents.left + border.left);
-    pos.setY (extents.top  + border.top);
+    pos.setX (extents.left + effectiveBorders.left);
+    pos.setY (extents.top  + effectiveBorders.top);
 
     return pos;
 }
@@ -199,18 +213,23 @@
 
 CompWindowExtents cp::getWindowEdgePositions (const CompPoint         &position,
 					      const cw::Geometry      &geom,
-					      const CompWindowExtents &border)
+					      const CompWindowExtents &border,
+					      unsigned int            gravity)
 {
     CompWindowExtents edgePositions;
-
-    edgePositions.left   = position.x () - border.left;
+    CompWindowExtents effectiveBorder (border);
+
+    if (gravity & StaticGravity)
+	effectiveBorder = CompWindowExtents (0, 0, 0, 0);
+
+    edgePositions.left   = position.x () - effectiveBorder.left;
     edgePositions.right  = edgePositions.left +
-			   geom.widthIncBorders () +  (border.left +
-						       border.right);
-    edgePositions.top    = position.y () - border.top;
+			   geom.widthIncBorders () +  (effectiveBorder.left +
+						       effectiveBorder.right);
+    edgePositions.top    = position.y () - effectiveBorder.top;
     edgePositions.bottom = edgePositions.top +
-			   geom.heightIncBorders () + (border.top +
-						       border.bottom);
+			   geom.heightIncBorders () + (effectiveBorder.top +
+						       effectiveBorder.bottom);
 
     return edgePositions;
 }
@@ -266,14 +285,19 @@
 
 void cp::subtractBordersFromEdgePositions (CompWindowExtents       &edgePositions,
 					   const CompWindowExtents &border,
-					   unsigned int            legacyBorder)
+					   unsigned int            legacyBorder,
+					   unsigned int            gravity)
 {
     const unsigned int doubleBorder = 2 * legacyBorder;
-
-    edgePositions.left   += border.left;
-    edgePositions.right  -= border.right + doubleBorder;
-    edgePositions.top    += border.top;
-    edgePositions.bottom -= border.bottom + doubleBorder;
+    CompWindowExtents  effectiveBorder = border;
+
+    if (gravity & StaticGravity)
+	effectiveBorder = CompWindowExtents (0, 0, 0, 0);
+
+    edgePositions.left   += effectiveBorder.left;
+    edgePositions.right  -= effectiveBorder.right + doubleBorder;
+    edgePositions.top    += effectiveBorder.top;
+    edgePositions.bottom -= effectiveBorder.bottom + doubleBorder;
 }
 
 bool cp::onlySizeChanged (unsigned int mask)
 
=== 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	2013-04-17 23:41:09 +0000
+++ plugins/place/src/constrain-to-workarea/tests/constrain-to-workarea/src/test-place-constrain-to-workarea.cpp	2013-06-07 06:12:28 +0000
@@ -226,7 +226,7 @@
     extents = WindowExtents (GetParam ());
 
     CompPoint pos = InitialPosition (GetParam ());
-    pos = cp::constrainPositionToWorkArea (pos, g, extents, WArea);
+    pos = cp::constrainPositionToWorkArea (pos, g, extents, WArea, false);
 
     const CompPoint expectedAfterExtentsAdjustment = ExpectedPosition +
 						     CompPoint (extents.left,
@@ -235,6 +235,19 @@
     EXPECT_EQ (expectedAfterExtentsAdjustment, pos);
 }
 
+TEST_P (PlaceConstrainPositionToWorkArea, PositionConstrainedStaticGravity)
+{
+    g = WindowGeometry (GetParam ());
+    extents = WindowExtents (GetParam ());
+
+    CompPoint pos = InitialPosition (GetParam ());
+    pos = cp::constrainPositionToWorkArea (pos, g, extents, WArea, true);
+
+    /* Do not adjust residual position for extents with windows
+     * that have a static gravity */
+    EXPECT_EQ (ExpectedPosition, pos);
+}
+
 namespace
 {
 cwe::Extents PossibleExtents[] =
@@ -284,7 +297,7 @@
 	CompPoint    pos;
 };
 
-TEST_F (PlaceGetEdgePositions, GetEdgePositions)
+TEST_F (PlaceGetEdgePositions, GetEdgePositionsNWGravity)
 {
     int left = geom.x () - border.left;
     int right = left + (geom.widthIncBorders ()) +
@@ -296,7 +309,25 @@
     const cwe::Extents ExpectedExtents (left, right, top, bottom);
     cwe::Extents actualExtents (cp::getWindowEdgePositions (pos,
 							    geom,
-							    border));
+							    border,
+							    NorthWestGravity));
+
+    EXPECT_EQ (ExpectedExtents, actualExtents);
+}
+
+TEST_F (PlaceGetEdgePositions, GetEdgePositionsStaticGravity)
+{
+    /* Don't count borders in validation */
+    int left = geom.x ();
+    int right = left + (geom.widthIncBorders ());
+    int top = geom.y ();
+    int bottom = top + (geom.heightIncBorders ());
+
+    const cwe::Extents ExpectedExtents (left, right, top, bottom);
+    cwe::Extents actualExtents (cp::getWindowEdgePositions (pos,
+							    geom,
+							    border,
+							    StaticGravity));
 
     EXPECT_EQ (ExpectedExtents, actualExtents);
 }
@@ -496,7 +527,29 @@
 
     cp::subtractBordersFromEdgePositions (modifiedEdgePositions,
 					  borders,
-					  legacyBorder);
+					  legacyBorder,
+					  NorthWestGravity);
+
+    EXPECT_EQ (expectedEdgePositions, modifiedEdgePositions);
+}
+
+TEST (PlaceSubtractBordersFromEdgePositions, StaticGravityDefinition)
+{
+    const CompWindowExtents borders (1, 2, 3, 4);
+    const CompWindowExtents edgePositions (100, 200, 100, 200);
+    const unsigned int      legacyBorder = 1;
+
+    CompWindowExtents       expectedEdgePositions (edgePositions.left,
+						   edgePositions.right - (2 * legacyBorder),
+						   edgePositions.top,
+						   edgePositions.bottom - (2 * legacyBorder));
+
+    CompWindowExtents       modifiedEdgePositions (edgePositions);
+
+    cp::subtractBordersFromEdgePositions (modifiedEdgePositions,
+					  borders,
+					  legacyBorder,
+					  StaticGravity);
 
     EXPECT_EQ (expectedEdgePositions, modifiedEdgePositions);
 }
 
=== modified file 'plugins/place/src/place.cpp'
--- plugins/place/src/place.cpp	2013-05-20 15:26:11 +0000
+++ plugins/place/src/place.cpp	2013-06-07 06:12:28 +0000
@@ -362,7 +362,8 @@
 
     CompWindowExtents edgePositions = cp::getWindowEdgePositions (pos,
 								  geom,
-								  window->border ());
+								  window->border (),
+								  window->sizeHints ().win_gravity);
 
     int      output   = screen->outputDeviceForGeometry (geom);
     CompRect workArea = screen->getWorkareaForOutput (output);
@@ -385,7 +386,8 @@
     /* bring left/right/top/bottom to actual window coordinates */
     cp::subtractBordersFromEdgePositions (edgePositions,
 					  window->border (),
-					  geom.border ());
+					  geom.border (),
+					  window->sizeHints ().win_gravity);
 
     /* always validate position if the application changed only its size,
      * as it might become partially offscreen because of that */
@@ -1141,10 +1143,13 @@
 PlaceWindow::constrainToWorkarea (const CompRect &workArea,
 				  CompPoint      &pos)
 {
+    bool staticGravity = window->sizeHints ().win_gravity & StaticGravity;
+
     pos = cp::constrainPositionToWorkArea (pos,
                                            window->serverGeometry (),
                                            window->border (),
-                                           workArea);
+                                           workArea,
+                                           staticGravity);
 
 }
 
 
=== modified file 'src/window/extents/src/windowextents.cpp'
--- src/window/extents/src/windowextents.cpp	2013-04-17 23:41:09 +0000
+++ src/window/extents/src/windowextents.cpp	2013-06-07 06:12:28 +0000
@@ -35,11 +35,6 @@
     CompPoint rv = CompPoint ();
 
     switch (gravity) {
-	/* We treat StaticGravity like NorthWestGravity here
-	 * as when decorating / undecorating the window we
-	 * really do need to move it in order to handle
-	 * any cases where it goes offscreen */
-	case StaticGravity:
 	case NorthGravity:
 	case NorthWestGravity:
 	case NorthEastGravity:
@@ -55,11 +50,6 @@
     }
 
     switch (gravity) {
-	/* We treat StaticGravity like NorthWestGravity here
-	 * as when decorating / undecorating the window we
-	 * really do need to move it in order to handle
-	 * any cases where it goes offscreen */
-	case StaticGravity:
 	case WestGravity:
 	case NorthWestGravity:
 	case SouthWestGravity:
 
=== removed file 'tests/manual/README.txt'
--- tests/manual/README.txt	2013-04-18 03:02:14 +0000
+++ tests/manual/README.txt	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-Compiz Manual Tests
-===================
-
-Avoid writing manual tests if you can. Acceptance tests that can be run
-on an automatic basis are always preferred.
-
-If getting some part of the code would be too difficult or invasive, then
-write a manual test in here so that we can remind ourselves to deploy test
-frameworks for the code in quesiton.
 
=== removed file 'tests/manual/plugins/decor.txt'
--- tests/manual/plugins/decor.txt	2013-05-20 15:26:11 +0000
+++ tests/manual/plugins/decor.txt	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-COMPIZ DECOR PLUGIN
-===================
-Sam Spilsbury <[e-mail]>
-
-Static Gravity Handling - no decorations
-----------------------------------------
-Setup:
-# Install guake
-
-Actions:
-# Start and launch guake
-
-Expected Result:
-  Guake should sit flush with the panels and work area
-
-Static Gravity Handling - decorations
--------------------------------------
-Setup:
-# Install friends-app
-
-Actions:
-# Start and launch friends-app
-
-Expected Result:
-  The QML window should have its decorations visible and
-  be contained in the top left hand corner of the work area
-
-_NET_REQUEST_FRAME_EXTENTS handling
------------------------------------
-Setup:
-# Install any sun-awt application - examples:
-  1. netbeans
-  2. ecplise
-
-Actions:
-# Run the application
-
-Expected Result:
-  The application should not have its contents offset
-  by its decoration size