Merge lp:~compiz-team/compiz-grid-plugin/compiz-grid-plugin.fix_860257 into lp:compiz-grid-plugin

[Sam Spilsbury]

Fixes Bug 860257

With the new core changes attempting to move a window that is maximizing will result in a race condition resulting in a deadlock.

[lp:~compiz-team/compiz-grid-plugin/compiz-grid-plugin.fix_860257]

99. By Sam Spilsbury on 2011-09-27

Move the window back to the desired size, explicitly moving it back by whatever we moved
it to will end up with us fighting ourselves in case core was configuring that window
while it was being moved, because we will get the moveNotify a little while after
we moved the window.

100. By Sam Spilsbury on 2011-09-27

Detect viewport changes and don't move windows back then.

101. By Sam Spilsbury on 2011-09-27

Merge trunk

[Jason Smith (jassmith)]

review: Approve

Unmerged revisions

=== modified file 'src/grid.cpp'
--- src/grid.cpp	2011-09-24 06:59:55 +0000
+++ src/grid.cpp	2011-09-27 16:03:25 +0000
@@ -43,6 +43,23 @@
     {0,0, 1,1},
 };
 
+void
+GridScreen::handleCompizEvent(const char*    plugin,
+			      const char*    event,
+			      CompOption::Vector&  o)
+{
+    if (strcmp(event, "start_viewport_switch") == 0)
+    {
+	mSwitchingVp = true;
+    }
+    else if (strcmp(event, "end_viewport_switch") == 0)
+    {
+	mSwitchingVp = false;
+    }
+
+  screen->handleCompizEvent(plugin, event, o);
+}
+
 CompRect
 GridScreen::slotToRect (CompWindow      *w,
 			const CompRect& slot)
@@ -328,6 +345,7 @@
 		for (unsigned int i = 0; i < animations.size (); i++)
 			animations.at (i).fadingOut = true;
 	    gw->lastTarget = where;
+	    gw->currentSize = CompRect (wc.x, wc.y, wc.width, wc.height);
 	}
 
 	/* This centers a window if it could not be resized to the desired
@@ -695,17 +713,20 @@
 {
     window->moveNotify (dx, dy, immediate);
 
-    if (isGridResized)
+    if (isGridResized && !isGridMaximized && !GridScreen::get (screen)->mSwitchingVp)
     {
-	pointerBufDx += dx;
-	pointerBufDy += dy;
+	if (window->grabbed ())
+	{
+	    pointerBufDx += dx;
+	    pointerBufDy += dy;
+	}
 
 	/* Do not allow the window to be moved while it
 	 * is resized */
+	dx = currentSize.x () - window->geometry ().x ();
+	dy = currentSize.y () - window->geometry ().y ();
 
-	window->moveNotifySetEnabled (this, false);
-	window->move (-dx, -dy);
-	window->moveNotifySetEnabled (this, true);
+	window->move (dx, dy);
     }
 }
 
@@ -755,6 +776,7 @@
 	xwc.width  = gw->originalSize.width ();
 	xwc.height = gw->originalSize.height ();
 	cw->maximize (0);
+	gw->currentSize = CompRect ();
 	cw->configureXWindow (CWX | CWY | CWWidth | CWHeight, &xwc);
 	gw->pointerBufDx = 0;
 	gw->pointerBufDy = 0;
@@ -860,11 +882,13 @@
     glScreen (GLScreen::get (screen)),
     centerCheck (false),
     mGrabWindow (NULL),
-    animating (false)
+    animating (false),
+    mSwitchingVp (false)
 {
     o.push_back (CompOption ("window", CompOption::TypeInt));
 
     ScreenInterface::setHandler (screen, false);
+    screen->handleCompizEventSetEnabled (this, true);
     CompositeScreenInterface::setHandler (cScreen, false);
     GLScreenInterface::setHandler (glScreen, false);
 

=== modified file 'src/grid.h'
--- src/grid.h	2011-09-24 06:59:55 +0000
+++ src/grid.h	2011-09-27 16:03:25 +0000
@@ -106,6 +106,7 @@
 	bool centerCheck;
 	CompWindow *mGrabWindow;
 	bool animating;
+	bool mSwitchingVp;
 
 	void getPaintRectangle (CompRect&);
 	void setCurrentRect (Animation&);
@@ -128,6 +129,7 @@
 	GridType edgeToGridType ();
 
 	void handleEvent (XEvent *event);
+	void handleCompizEvent (const char *plugin, const char *event, CompOption::Vector &options);
 
 	bool restoreWindow (CompAction*,
 			    CompAction::State,
@@ -161,6 +163,7 @@
 	int pointerBufDx;
 	int pointerBufDy;
 	int resizeCount;
+	CompRect currentSize;
 	CompRect originalSize;
 	GridType lastTarget;