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

[Christopher Townsend]

When saving window geometry when going into maximized/semi-maximized, also save for grabbed windows as well. This fixes a desktop hang condition. This is a backport from lp:compiz revno. 3803.

= Issue =
A reasonable corner case where a window that is snapped to the panel and the bottom of screen that is then dragged to the left or right to vertically semi-maximize it and then dragged to the top will cause the desktop to hang.

= Fix =
A check to only save window geometry when a window was not grabbed needed to be removed. It should save this regardless if the window is grabbed or not when the state changes from a maximized state to non-maximized.

= Test =
1. Open a window.
2. Snap it to the top panel and bottom of the screen.
3. Drag the window to the left or right to semi-maximize it.
4. Drag the window to the top to maximize it.

This should cause the desktop hang. This fix should allow the window to become maximized.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'plugins/grid/src/grid.cpp'
--- plugins/grid/src/grid.cpp	2013-07-12 19:04:03 +0000
+++ plugins/grid/src/grid.cpp	2013-11-20 18:51:49 +0000
@@ -1011,20 +1011,17 @@
     {
 	lastTarget = GridUnknown;
 
-	if (!window->grabbed ())
-	{
-	    if (isGridHorzMaximized)
-	    {
- 		window->saveMask ()      |= CWY | CWHeight;
-  		window->saveWc ().y      = originalSize.y ();
-  		window->saveWc ().height = originalSize.height ();
-	    }
-	    else if (isGridVertMaximized)
-	    {
-  		window->saveMask ()     |= CWX | CWWidth;
-  		window->saveWc ().x     = originalSize.x ();
-  		window->saveWc ().width = originalSize.width ();
-	    }
+	if (isGridHorzMaximized)
+	{
+ 	    window->saveMask ()      |= CWY | CWHeight;
+  	    window->saveWc ().y      = originalSize.y ();
+  	    window->saveWc ().height = originalSize.height ();
+	}
+	else if (isGridVertMaximized)
+	{
+  	    window->saveMask ()     |= CWX | CWWidth;
+  	    window->saveWc ().x     = originalSize.x ();
+  	    window->saveWc ().width = originalSize.width ();
 	}
 
 	if ((isGridHorzMaximized &&