Merge lp:~smspillaz/compiz-grid-plugin/oneiric.fix_750316 into lp:compiz-grid-plugin

[Sam Spilsbury]

Fix bug 750316

[Jason Smith (jassmith)]

review: Approve

=== modified file 'grid.xml.in'
--- grid.xml.in	2010-09-28 22:30:57 +0000
+++ grid.xml.in	2011-09-28 14:48:22 +0000
@@ -84,7 +84,7 @@
 			<option name="top_left_corner_action" type="int">
 			    <_short>Upper Left Corner</_short>
 			    <_long>Action to be performed when window is dropped on the top left corner</_long>
-			    <default>7</default>
+			    <default>4</default>
 			    <min>0</min>
 			    <max>10</max>
 			    <desc>
@@ -186,7 +186,7 @@
 			<option name="top_right_corner_action" type="int">
 			    <_short>Upper Right Corner</_short>
 			    <_long>Action to be performed when window is dropped on the top right corner</_long>
-			    <default>9</default>
+			    <default>6</default>
 			    <min>0</min>
 			    <max>10</max>
 			    <desc>
@@ -339,7 +339,7 @@
 			<option name="bottom_left_corner_action" type="int">
 			    <_short>Bottom Left Corner</_short>
 			    <_long>Action to be performed when window is dropped on the bottom left corner</_long>
-			    <default>1</default>
+			    <default>4</default>
 			    <min>0</min>
 			    <max>10</max>
 			    <desc>
@@ -390,7 +390,7 @@
 			<option name="bottom_edge_action" type="int">
 			    <_short>Bottom Edge</_short>
 			    <_long>Action to be performed when window is dropped on the bottom edge</_long>
-			    <default>2</default>
+			    <default>0</default>
 			    <min>0</min>
 			    <max>10</max>
 			    <desc>
@@ -441,7 +441,7 @@
 			<option name="bottom_right_corner_action" type="int">
 			    <_short>Bottom Right Corner</_short>
 			    <_long>Action to be performed when window is dropped on the bottom right corner</_long>
-			    <default>3</default>
+			    <default>6</default>
 			    <min>0</min>
 			    <max>10</max>
 			    <desc>
@@ -505,21 +505,21 @@
 			<option name="left_edge_threshold" type="int">
 				<_short>Left Edge</_short>
 				<_long>Maximum number of pixels from the left edge a window can be dropped</_long>
-				<default>5</default>
+				<default>15</default>
 				<min>0</min>
 				<max>500</max>
 			</option>
 			<option name="right_edge_threshold" type="int">
 				<_short>Right Edge</_short>
 				<_long>Maximum number of pixels from the right edge a window can be dropped</_long>
-				<default>5</default>
+				<default>15</default>
 				<min>0</min>
 				<max>500</max>
 			</option>
 			<option name="top_edge_threshold" type="int">
 				<_short>Top Edge</_short>
 				<_long>Maximum number of pixels from the top edge a window can be dropped</_long>
-				<default>5</default>
+				<default>20</default>
 				<min>0</min>
 				<max>500</max>
 			</option>
@@ -543,9 +543,9 @@
 			<_short>Outline Color</_short>
 			<_long>Color of the resize indicator outline</_long>
 			<default>
-			    <red>0x2f2f</red>
-			    <green>0x2f2f</green>
-			    <blue>0x4f4f</blue>
+			    <red>0xfbfb</red>
+			    <green>0x8b8b</green>
+			    <blue>0x0</blue>
 			    <alpha>0x9f9f</alpha>
 			</default>
 		</option>
@@ -553,9 +553,9 @@
 			<_short>Fill Color</_short>
 			<_long>Fill color of the resize indicator</_long>
 			<default>
-			    <red>0x2f2f</red>
-			    <green>0x2f2f</green>
-			    <blue>0x4f4f</blue>
+			    <red>0xfbfb</red>
+			    <green>0x8b8b</green>
+			    <blue>0x0</blue>
 			    <alpha>0x4f4f</alpha>
 			</default>
 		</option>

=== modified file 'src/grid.cpp'
--- src/grid.cpp	2011-09-24 06:59:55 +0000
+++ src/grid.cpp	2011-09-28 14:48:22 +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)
@@ -128,13 +145,13 @@
     xid = CompOption::getIntOptionNamed (option, "window");
     cw  = screen->findWindow (xid);
 
-    if (where == GridUnknown || screen->otherGrabExist ("move", NULL))
-	return false;
-
     if (cw)
     {
 	XWindowChanges xwc;
 
+	if (where == GridUnknown)
+	    return false;
+
 	GRID_WINDOW (cw);
 
 	if (gw->lastTarget != where)
@@ -322,12 +339,42 @@
 	/* TODO: animate move+resize */
 	if (resize)
 	{
-	    cw->configureXWindow (CWX | CWY | CWWidth | CWHeight, &xwc);
-	    gw->isGridResized = true;
-	    gw->isGridMaximized = false;
-		for (unsigned int i = 0; i < animations.size (); i++)
-			animations.at (i).fadingOut = true;
+	    unsigned int valueMask = CWX | CWY | CWWidth | CWHeight;
 	    gw->lastTarget = where;
+	    gw->currentSize = CompRect (wc.x, wc.y, wc.width, wc.height);
+
+	    /* Special case for left and right, actually vertically maximize
+	     * the window */
+	    if (where == GridLeft || where == GridRight)
+	    {
+		/* First restore the window to its original size */
+		XWindowChanges rwc;
+
+		rwc.x = gw->originalSize.x ();
+		rwc.y = gw->originalSize.y ();
+		rwc.width = gw->originalSize.width ();
+		rwc.height = gw->originalSize.height ();
+
+		cw->configureXWindow (CWX | CWY | CWWidth | CWHeight, &rwc);
+
+		gw->isGridMaximized = true;
+		gw->isGridResized = false;
+
+		gw->lastBorder = cw->border ();
+		/* Maximize the window */
+		cw->maximize (CompWindowStateMaximizedVertMask);
+	    }
+	    else
+	    {
+	        gw->isGridResized = true;
+	        gw->isGridMaximized = false;
+	    }
+
+	    /* Make window the size that we want */
+	    cw->configureXWindow (valueMask, &xwc);
+
+	    for (unsigned int i = 0; i < animations.size (); i++)
+		animations.at (i).fadingOut = true;
 	}
 
 	/* This centers a window if it could not be resized to the desired
@@ -646,21 +693,22 @@
 			unsigned int state,
 			unsigned int mask)
 {
-    if (screen->grabExist ("move"))
+    if (mask & (CompWindowGrabMoveMask | CompWindowGrabButtonMask))
     {
 	gScreen->o[0].value ().set ((int) window->id ());
 
 	screen->handleEventSetEnabled (gScreen, true);
 	gScreen->mGrabWindow = window;
 	pointerBufDx = pointerBufDy = 0;
+	grabMask = mask;
 
-	if (!isGridResized && gScreen->optionGetSnapbackWindows ())
+	if (!isGridResized && !isGridMaximized && gScreen->optionGetSnapbackWindows ())
 	    /* Store size not including borders when grabbing with cursor */
 	    originalSize = gScreen->slotToRect(window,
 						    window->serverBorderRect ());
     }
 
-    if (screen->grabExist ("resize"))
+    if (mask & CompWindowGrabResizeMask)
     {
 	isGridResized = false;
 	resizeCount = 0;
@@ -679,6 +727,7 @@
 			 gScreen->edge != gScreen->lastResizeEdge);
 
 	screen->handleEventSetEnabled (gScreen, false);
+	grabMask = 0;
 	gScreen->mGrabWindow = NULL;
 	gScreen->o[0].value ().set (0);
 	gScreen->cScreen->damageRegion (gScreen->desiredSlot);
@@ -695,17 +744,20 @@
 {
     window->moveNotify (dx, dy, immediate);
 
-    if (isGridResized)
+    if (isGridResized && !isGridMaximized && !GridScreen::get (screen)->mSwitchingVp)
     {
-	pointerBufDx += dx;
-	pointerBufDy += dy;
+	if (window->grabbed () && (grabMask & CompWindowGrabMoveMask))
+	{
+	    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);
     }
 }
 
@@ -717,11 +769,49 @@
 	lastTarget = GridUnknown;
     else if (!(lastState & MAXIMIZE_STATE) &&
 	     window->state () & MAXIMIZE_STATE)
+    {
 	lastTarget = GridMaximize;
+	if (window->grabbed ())
+	{
+	    originalSize = gScreen->slotToRect (window,
+					        window->serverBorderRect ());
+	}
+    }
 
     window->stateChangeNotify (lastState);
-} 
-
+}
+
+void
+GridWindow::windowNotify (CompWindowNotify n)
+{
+    if (n == CompWindowNotifyFrameUpdate)
+    {
+	if (isGridMaximized && !((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE))
+	{
+	    unsigned int valueMask = 0;
+	    XWindowChanges xwc;
+
+	    int dw = (lastBorder.left + lastBorder.right) - 
+		      (window->border ().left + window->border ().right);
+			
+	    int dh = (lastBorder.top + lastBorder.bottom) - 
+			(window->border ().top + window->border ().bottom);
+
+	    if (dw != 0)
+		valueMask |= CWWidth;
+	    if (dh != 0)
+		valueMask |= CWHeight;
+	    xwc.width = window->serverGeometry ().width () + dw;
+	    xwc.height = window->serverGeometry ().height () + dh;
+
+	    window->configureXWindow (valueMask, &xwc);
+	}
+
+	lastBorder = window->border ();
+    }
+
+    window->windowNotify (n);
+}
 bool
 GridScreen::restoreWindow (CompAction         *action,
 			   CompAction::State  state,
@@ -755,6 +845,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 +951,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);
 
@@ -903,6 +996,7 @@
     PluginClassHandler <GridWindow, CompWindow> (window),
     window (window),
     gScreen (GridScreen::get (screen)),
+    grabMask (0),
     isGridResized (false),
     isGridMaximized (false),
     pointerBufDx (0),

=== modified file 'src/grid.h'
--- src/grid.h	2011-09-24 06:59:55 +0000
+++ src/grid.h	2011-09-28 14:48:22 +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,
@@ -158,10 +160,13 @@
 
 	bool isGridResized;
 	bool isGridMaximized;
+	unsigned int grabMask;
 	int pointerBufDx;
 	int pointerBufDy;
 	int resizeCount;
+	CompRect currentSize;
 	CompRect originalSize;
+	CompWindowExtents lastBorder;
 	GridType lastTarget;
 
 	void grabNotify (int, int, unsigned int, unsigned int);
@@ -171,6 +176,8 @@
 	void moveNotify (int, int, bool);
 
 	void stateChangeNotify (unsigned int);
+
+	void windowNotify (CompWindowNotify n);
 };
 
 #define GRID_WINDOW(w) \