Merge lp:~townsend/compiz/fix-lp1251777 into lp:compiz/0.9.11

[Christopher Townsend]

* Add new Grid shortcuts for Ctrl-Super-Left/Right to left/right semi-maximize windows (removed from Unity).
* Patch Grid to use Ctrl-Super-Up to maximize a gridded window instead of using core. This helps in restoring a window back to it's original place before being gridded.
* Account for left and right borders when restoring a gridded window since the window would shrink and shift by this amount.

* Add new Grid shortcuts for Ctrl-Super-Left/Right to left/right semi-maximize windows (removed from Unity in another MP).
* Patch Grid to use Ctrl-Super-Up to maximize a gridded window instead of using core. This helps in restoring a window back to it's original place before being gridded.
* Account for left and right borders when restoring a gridded window since the window would shrink and shift by this amount.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/14/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

=== modified file 'debian/patches/ubuntu-config.patch'
--- debian/patches/ubuntu-config.patch	2013-11-11 20:07:16 +0000
+++ debian/patches/ubuntu-config.patch	2013-12-04 20:00:45 +0000
@@ -699,13 +699,14 @@
  bool Advance (Display *d, bool r)
 Index: compiz/plugins/grid/grid.xml.in
 ===================================================================
---- compiz.orig/plugins/grid/grid.xml.in	2013-10-08 17:00:56.932757923 +0200
-+++ compiz/plugins/grid/grid.xml.in	2013-10-08 17:01:05.104735978 +0200
-@@ -68,12 +68,11 @@
+--- compiz.orig/plugins/grid/grid.xml.in	2013-12-04 12:23:44.021963832 -0500
++++ compiz/plugins/grid/grid.xml.in	2013-12-04 12:24:43.885963254 -0500
+@@ -68,12 +68,12 @@
  		<option name="put_maximize_key" type="key">
  		    <_short>Maximize Key</_short>
  		    <_long>Maximize window.</_long>
 -		    <default>&lt;Control&gt;&lt;Alt&gt;KP_0</default>
++		    <default>&lt;Control&gt;&lt;Super&gt;Up</default>
  		</option>
  		<option name="put_restore_key" type="key">
  		    <_short>Restore</_short>
@@ -713,8 +714,8 @@
 -		    <default>&lt;Alt&gt;F5</default>
 +		    <default>&lt;Control&gt;&lt;Super&gt;Down</default>
  		</option>
- 	    </group>
- 	    <group>
+ 		<option name="left_maximize" type="key">
+ 		    <_short>Left Maximize</_short>
 Index: compiz/plugins/ezoom/ezoom.xml.in
 ===================================================================
 --- compiz.orig/plugins/ezoom/ezoom.xml.in	2013-10-08 17:00:56.932757923 +0200
 
=== modified file 'plugins/grid/grid.xml.in'
--- plugins/grid/grid.xml.in	2013-05-11 08:04:34 +0000
+++ plugins/grid/grid.xml.in	2013-12-04 20:00:45 +0000
@@ -75,6 +75,16 @@
 		    <_long>Restore window to it's original size. Note: Use the same shortcut you are using to unmaximize a window to be able to restore grid-maximized windows.</_long>
 		    <default>&lt;Alt&gt;F5</default>
 		</option>
+		<option name="left_maximize" type="key">
+		    <_short>Left Maximize</_short>
+		    <_long>Left vertically maximize window.</_long>
+		    <default>&lt;Control&gt;&lt;Super&gt;Left</default>
+		</option>
+		<option name="right_maximize" type="key">
+		    <_short>Right Maximize</_short>
+		    <_long>Right vertically maximize window.</_long>
+		    <default>&lt;Control&gt;&lt;Super&gt;Right</default>
+ 		</option>
 	    </group>
 	    <group>
 		<_short>Corners / Edges</_short>
 
=== modified file 'plugins/grid/src/grid.cpp'
--- plugins/grid/src/grid.cpp	2013-11-15 22:58:47 +0000
+++ plugins/grid/src/grid.cpp	2013-12-04 20:00:45 +0000
@@ -1020,8 +1020,8 @@
 	else if (isGridVertMaximized)
 	{
   	    window->saveMask ()     |= CWX | CWWidth;
-  	    window->saveWc ().x     = originalSize.x ();
-  	    window->saveWc ().width = originalSize.width ();
+  	    window->saveWc ().x     = originalSize.x () - window->border ().left;
+  	    window->saveWc ().width = originalSize.width () + window->border ().left + window->border ().right;
 	}
 
 	if ((isGridHorzMaximized &&
@@ -1314,6 +1314,9 @@
     GRIDSET (PutBottomrightKey, GridWindowType::GridBottomRight, true, true);
     GRIDSET (PutMaximizeKey, GridWindowType::GridMaximize, true, true);
 
+    GRIDSET (RightMaximize, GridWindowType::GridRight, true, true);
+    GRIDSET (LeftMaximize, GridWindowType::GridLeft, true, true);
+
 #undef GRIDSET
 
     optionSetPutRestoreKeyInitiate (boost::bind (&GridScreen::