Merge lp:~townsend/compiz/fix-lp1092323-0.9.10 into lp:compiz/0.9.10

[Christopher Townsend]

Alt-Tabbing or Launcher selecting a window that is over 50% in a different viewport should not switch the viewport nor change the placement of the window. The fix is to add an option to turn this behavior on or off. By default, the option is on, but Ubuntu is patched to turn it off to fix this bug.

Ayatana Design has requested that when Alt-Tabbing to a window that is more than 50% contained in a different viewport, that:
1. The viewport does not switch and;
2. The window's position stays where it currently is.

This fix adds an option to either enable of disable this behavior. By default, the behavior is enabled, meaning nothing changes from current behavior. An Ubuntu patch is included to disable this behavior to match what Design wants.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3779
http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-i386-ci/8

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Setting this a WIP to make this an option instead of just ripping out the code. Then patch Ubuntu to disable the code path so the viewport switch/window move will not occur.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3781
http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-i386-ci/10

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM, waiting for trunk to be merged before global approval.

review: Approve

[Christopher Townsend (townsend)]

I'm globally approving since the MP for trunk merged.

=== modified file 'debian/patches/ubuntu-config.patch'
--- debian/patches/ubuntu-config.patch	2013-08-19 14:35:46 +0000
+++ debian/patches/ubuntu-config.patch	2013-08-28 12:08:38 +0000
@@ -653,7 +653,16 @@
  						</default>
  					</option>
  				</subgroup>
-@@ -351,7 +351,7 @@
+@@ -201,7 +201,7 @@
+ 				<option name="auto_switch_vp_and_window" type="bool">
+ 					<_short>Auto Switch Vp And Window</_short>
+ 					<_long>Auto switch the viewport and move window when Alt-Tab to window that is more than half contained in another viewport</_long>
+-					<default>true</default>
++					<default>false</default>
+ 				</option>
+ 			</group>
+ 			<group>
+@@ -356,7 +356,7 @@
  				<option name="edgeflip_move" type="bool">
  					<_short>Edge Flip Move</_short>
  					<_long>Flip viewport when moving a window to a screen edge</_long>
 
=== modified file 'plugins/wall/src/wall.cpp'
--- plugins/wall/src/wall.cpp	2013-05-15 10:38:49 +0000
+++ plugins/wall/src/wall.cpp	2013-08-28 12:08:38 +0000
@@ -553,7 +553,7 @@
 {
     WALL_SCREEN (screen);
 
-    if (window->placed () && !screen->otherGrabExist ("wall", "switcher", 0))
+    if (ws->optionGetAutoSwitchVpAndWindow () && window->placed () && !screen->otherGrabExist ("wall", "switcher", 0))
     {
 	int       dx, dy;
 	CompPoint viewport;
 
=== modified file 'plugins/wall/wall.xml.in'
--- plugins/wall/wall.xml.in	2013-04-27 03:18:27 +0000
+++ plugins/wall/wall.xml.in	2013-08-28 12:08:38 +0000
@@ -198,6 +198,11 @@
 					<_long>Windows that should not slide during the slide animation</_long>
 					<default>type=Dock | type=Desktop | state=Sticky</default>
 				</option>
+				<option name="auto_switch_vp_and_window" type="bool">
+					<_short>Auto Switch Vp And Window</_short>
+					<_long>Auto switch the viewport and move window when Alt-Tab to window that is more than half contained in another viewport</_long>
+					<default>true</default>
+				</option>
 			</group>
 			<group>
 				<_short>Bindings</_short>