Merge lp:~townsend/compiz/fix-workspace-switch into lp:compiz/0.9.11

[Christopher Townsend]

Second part of the fix to keep the workspace from automatically switching when more than half of the window is contained in another workspace.

= Issue =
The issue was that if a window was contained more than 50% into a different workspace, then the workspace would switch and the window would completely move to the workspace. I already have a fix in Compiz for the automatic window movement, but the automatic workspace switch would still occur.

= Fix =
This addresses the automatic workspace switch. Care had to be taken to still allow the workspace switch if the window is completely contained in another workspace, such as clicking on the icon in the Launcher. So, if any part of the window is contained in the current workspace, then the workspace will not switch automatically.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3799
http://jenkins.qa.ubuntu.com/job/compiz-ci/302/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/115

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/compiz-ci/302/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3799
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/4

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/compiz-0.9.11-ci/4/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-autolanding/181/
Executed test runs:

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Jenkins is configured to run two jobs for lp:compiz. As a result, I had to abort one of them and re-approve so that the correct job is allowed to finish.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/wall/src/wall.cpp'
--- plugins/wall/src/wall.cpp	2013-09-24 20:24:20 +0000
+++ plugins/wall/src/wall.cpp	2013-10-30 19:12:44 +0000
@@ -556,9 +556,11 @@
     if (window->placed () && !screen->otherGrabExist ("wall", "switcher", 0))
     {
 	int       dx, dy;
-	CompPoint viewport;
-
-	screen->viewportForGeometry (window->geometry (), viewport);
+	CompPoint viewport = screen->vp ();
+
+	if (ws->optionGetAutoSwitchVpAndWindow () || window->defaultViewport () != viewport)
+	    screen->viewportForGeometry (window->geometry (), viewport);
+
 	dx       = viewport.x ();
 	dy       = viewport.y ();