Merge lp:~compiz-team/compiz-wall-plugin/compiz-wall-plugin.fix_762335 into lp:compiz-wall-plugin

[Sam Spilsbury]

Fix bug 762335

[Jason Smith (jassmith)]

+1

review: Approve

=== modified file 'src/wall.cpp'
--- src/wall.cpp	2011-03-14 16:07:54 +0000
+++ src/wall.cpp	2011-10-11 13:45:27 +0000
@@ -608,7 +608,7 @@
 	int       dx, dy;
 	CompPoint viewport;
 
-	viewport = window->defaultViewport ();
+	screen->viewportForGeometry (window->geometry (), viewport);
 	dx       = viewport.x ();
 	dy       = viewport.y ();
 
@@ -617,8 +617,55 @@
 
 	if (dx || dy)
 	{
-	    ws->moveViewport (-dx, -dy, None);
+	    XWindowChanges xwc;
+	    unsigned int   mask = 0;
+
+	    ws->moveViewport (-dx, -dy, false);
 	    ws->focusDefault = false;
+
+	    CompWindow::Geometry sbr (window->serverBorderRect ().x (),
+				      window->serverBorderRect ().y (),
+				      window->serverBorderRect ().width (),
+				      window->serverBorderRect ().height (),
+				      0);
+	    CompRegion sbrRegion (sbr);
+	    int        output = screen->outputDeviceForGeometry (sbr);
+	    CompRegion outputRegion (screen->outputDevs ()[output].workArea ());
+
+	    /* If the window would be partially offscreen
+	     * after it was moved then we should move it back
+	     * so that it is completely onscreen, since we moved
+	     * from mostly offscreen on B to mostly onscreen on A,
+	     * the user should be able to see their selected window */
+	    CompRegion inter = sbrRegion.intersected (outputRegion);
+	    CompRegion rem = sbrRegion - outputRegion;
+
+	    foreach (const CompRect &r, rem.rects ())
+	    {
+		if (r.x1 () >= inter.boundingRect ().x2 ())
+		{
+		    xwc.x = window->serverGeometry ().x () - r.width ();
+		    mask |= CWX;
+		}
+		else if (r.x2 () <= inter.boundingRect ().x1 ())
+		{
+		    xwc.x = window->serverGeometry ().x () + r.width ();
+		    mask |= CWX;
+		}
+
+		if (r.y1 () >= inter.boundingRect ().y2 ())
+		{
+		    xwc.y = window->serverGeometry ().y () - r.height ();
+		    mask |= CWY;
+		}
+		else if (r.y2 () <= inter.boundingRect ().y1 ())
+		{
+		    xwc.y = window->serverGeometry ().y () + r.height ();
+		    mask |= CWY;
+		}
+	    }
+
+	    window->configureXWindow (mask, &xwc);
 	}
     }