Merge lp:~mc-return/compiz/compiz.merge-fix1101446-and-1101618-and-other-improvements into lp:compiz/0.9.11

[MC Return]

Grid:
Do not use xwc uninitialized (2x).
Declaration of variables outside of loops.
Initialization and assignment of variables in one line.
Improved GL_BLEND behaviour.
Merged if condition checks.
Removed redundant brackets.
Enhanced comments.
Indentation fixes.

(LP: #1101446, LP: #1101618)

Still WIP.

[lp:~mc-return/compiz/compiz.merge-fix1101446-and-1101618-and-other-improvements]

3775. By MC Return on 2013-07-24

Reduced the .diff
Minor additional fixes

3776. By MC Return on 2013-07-24

Merged latest lp:compiz

Unmerged revisions

3776. By MC Return on 2013-07-24

Merged latest lp:compiz

3775. By MC Return on 2013-07-24

Reduced the .diff
Minor additional fixes

3774. By MC Return on 2013-07-21

Just disable GL_BLEND if it was disabled before

3773. By MC Return on 2013-07-21

Grid: Multiple improvements (please see main commit message for details)

=== modified file 'plugins/grid/src/grabhandler/include/grabhandler.h'
--- plugins/grid/src/grabhandler/include/grabhandler.h	2012-09-25 08:28:11 +0000
+++ plugins/grid/src/grabhandler/include/grabhandler.h	2013-07-24 17:30:37 +0000
@@ -56,8 +56,8 @@
 
     private:
 
-	unsigned int         mMask;
-	GrabActiveFunc       mGrabActive;
+	unsigned int   mMask;
+	GrabActiveFunc mGrabActive;
 
 };
 }

=== 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-07-24 17:30:37 +0000
@@ -36,9 +36,9 @@
 static int const CURVE_ANIMATION = 35;
 
 void
-GridScreen::handleCompizEvent(const char           *plugin,
-			      const char           *event,
-			      CompOption::Vector&  o)
+GridScreen::handleCompizEvent(const char         *plugin,
+			      const char         *event,
+			      CompOption::Vector &o)
 {
     if (strcmp(event, "start_viewport_switch") == 0)
 	mSwitchingVp = true;
@@ -49,18 +49,18 @@
 }
 
 CompRect
-GridScreen::slotToRect (CompWindow      *w,
-			const CompRect& slot)
+GridScreen::slotToRect (CompWindow     *w,
+			const CompRect &slot)
 {
     return CompRect (slot.x () + w->border ().left,
 		     slot.y () + w->border ().top,
-		     slot.width () - (w->border ().left + w->border ().right),
-		     slot.height () - (w->border ().top + w->border ().bottom));
+		     slot.width ()  - (w->border ().left + w->border ().right),
+		     slot.height () - (w->border ().top  + w->border ().bottom));
 }
 
 CompRect
-GridScreen::constrainSize (CompWindow      *w,
-			   const CompRect& slot)
+GridScreen::constrainSize (CompWindow     *w,
+			   const CompRect &slot)
 {
     int      cw, ch;
     CompRect result = slotToRect (w, slot);
@@ -73,6 +73,7 @@
 
 	if (dx > 0)
 	    result.setX (result.x () - dx);
+
 	if (dy > 0)
 	    result.setY (result.y () - dy);
 
@@ -93,7 +94,9 @@
 }
 
 int
-applyProgress (int a, int b, float progress)
+applyProgress (int   a,
+	       int   b,
+	       float progress)
 {
     return a < b ?
 		b - (ABS (a - b) * progress) :
@@ -118,27 +121,26 @@
 }
 
 bool
-GridScreen::initiateCommon (CompAction          *action,
-			    CompAction::State   state,
-			    CompOption::Vector  &option,
-			    unsigned int        where,
-			    bool                resize,
-			    bool                key)
+GridScreen::initiateCommon (CompAction         *action,
+			    CompAction::State  state,
+			    CompOption::Vector &option,
+			    unsigned int       where,
+			    bool               resize,
+			    bool               key)
 {
-    CompWindow *cw = 0;
-
-    Window xid = CompOption::getIntOptionNamed (option, "window");
-    cw  = screen->findWindow (xid);
+    Window     xid  = CompOption::getIntOptionNamed (option, "window");
+    CompWindow *cw  = screen->findWindow (xid);
 
     if (cw)
     {
-	XWindowChanges xwc;
-	bool maximizeH = where & (GridBottom | GridTop | GridMaximize);
-	bool maximizeV = where & (GridLeft | GridRight | GridMaximize);
-
-	bool horzMaximizedGridPosition = where & (GridTop | GridBottom);
+	XWindowChanges xwc = XWINDOWCHANGES_INIT;
+
+	bool maximizeH = where & (GridBottom | GridTop   | GridMaximize);
+	bool maximizeV = where & (GridLeft   | GridRight | GridMaximize);
+
+	bool horzMaximizedGridPosition = where & (GridTop  | GridBottom);
 	bool vertMaximizedGridPosition = where & (GridLeft | GridRight);
-	bool  anyMaximizedGridPosition = horzMaximizedGridPosition ||
+	bool anyMaximizedGridPosition  = horzMaximizedGridPosition ||
 					 vertMaximizedGridPosition ||
 					 where & GridMaximize;
 
@@ -187,7 +189,7 @@
 	     * have to worry about them. Don't mark the window as a
 	     * gridded one.
 	     */
-	    gw->isGridResized = false;
+	    gw->isGridResized       = false;
 	    gw->isGridHorzMaximized = false;
 	    gw->isGridVertMaximized = false;
 
@@ -251,7 +253,7 @@
 	    gw->lastTarget & where)
 	{
 	    int slotWidth25  = workarea.width () / 4;
-	    int slotWidth33  = (workarea.width () / 3) + cw->border ().left;
+	    int slotWidth33  = workarea.width () / 3 + cw->border ().left;
 	    int slotWidth17  = slotWidth33 - slotWidth25;
 	    int slotWidth66  = workarea.width () - slotWidth33;
 	    int slotWidth75  = workarea.width () - slotWidth25;
@@ -388,29 +390,29 @@
 		    /* First restore the window to its original size */
 		    XWindowChanges rwc;
 
-		    rwc.x = gw->originalSize.x ();
-		    rwc.y = gw->originalSize.y ();
+		    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);
 
-		    /* GridLeft || GridRight */
+		    /* GridLeft || GridRight == isGridVertMaximized */
 		    if (vertMaximizedGridPosition)
 		    {
 			gw->isGridVertMaximized = true;
 			gw->isGridHorzMaximized = false;
-			gw->isGridResized = false;
+			gw->isGridResized       = false;
 
 			/* Semi-maximize the window vertically */
 			cw->maximize (CompWindowStateMaximizedVertMask);
 		    }
-		    /* GridTop || GridBottom */
+		    /* GridTop || GridBottom == isGridHorzMaximized */
 		    else /* (horzMaximizedGridPosition) */
 		    {
 			gw->isGridHorzMaximized = true;
 			gw->isGridVertMaximized = false;
-			gw->isGridResized = false;
+			gw->isGridResized       = false;
 
 			/* Semi-maximize the window horizontally */
 			cw->maximize (CompWindowStateMaximizedHorzMask);
@@ -425,14 +427,14 @@
 		}
 		else /* GridCorners || GridCenter */
 		{
-		    gw->isGridResized = true;
+		    gw->isGridResized       = true;
 		    gw->isGridHorzMaximized = false;
 		    gw->isGridVertMaximized = false;
 		}
 	    }
 	    else /* if (optionGetCycleSizes ()) */
 	    {
-		gw->isGridResized = true;
+		gw->isGridResized       = true;
 		gw->isGridHorzMaximized = false;
 		gw->isGridVertMaximized = false;
 	    }
@@ -445,7 +447,7 @@
 		     (gw->window->border ().top +
 		      gw->window->border ().bottom);
 
-	    xwc.width += dw;
+	    xwc.width  += dw;
 	    xwc.height += dh;
 
 	    /* Make window the size that we want */
@@ -482,14 +484,13 @@
 			      const GLMatrix            &transform,
 			      CompOutput                *output)
 {
-    CompRect        rect;
-    GLMatrix        sTransform (transform);
-    std::vector<Animation>::iterator iter;
-    GLVertexBuffer  *streamingBuffer = GLVertexBuffer::streamingBuffer ();
-    GLfloat         vertexData[12];
-    GLushort        colorData[4];
-    GLushort        *color;
-    GLboolean       isBlendingEnabled;
+    CompRect       rect;
+    GLMatrix       sTransform (transform);
+    GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
+    GLfloat        vertexData[12];
+    GLushort       colorData[4];
+    GLushort       *color;
+    float          curve, alpha;
 
     const float MaxUShortFloat = std::numeric_limits <unsigned short>::max ();
 
@@ -500,15 +501,18 @@
 
     sTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
 
-    glGetBooleanv (GL_BLEND, &isBlendingEnabled);
-    glEnable (GL_BLEND);
-
-    for (iter = animations.begin (); iter != animations.end () && animating; ++iter)
+    GLboolean glBlendEnabled = glIsEnabled (GL_BLEND);
+
+    if (!glBlendEnabled)
+	glEnable (GL_BLEND);
+
+    for (std::vector<Animation>::iterator iter = animations.begin ();
+	 iter != animations.end () && animating; ++iter)
     {
-	Animation& anim = *iter;
+	Animation &anim = *iter;
 
-	float curve = powf (CURVE_ANIMATION, -anim.progress);
-	float alpha = (optionGetFillColorAlpha () / MaxUShortFloat) * anim.opacity;
+	curve = powf (CURVE_ANIMATION, -anim.progress);
+	alpha = (optionGetFillColorAlpha () / MaxUShortFloat) * anim.opacity;
 	color = optionGetFillColor ();
 
 	colorData[0] = alpha * color[0];
@@ -542,7 +546,7 @@
 	/* Set outline rect smaller to avoid damage issues */
 	anim.currentRect.setGeometry (anim.currentRect.x () + 1,
 				      anim.currentRect.y () + 1,
-				      anim.currentRect.width () - 2,
+				      anim.currentRect.width ()  - 2,
 				      anim.currentRect.height () - 2);
 
 	/* draw outline */
@@ -610,7 +614,7 @@
 	/* Set outline rect smaller to avoid damage issues */
 	rect.setGeometry (rect.x () + 1,
 			  rect.y () + 1,
-			  rect.width () - 2,
+			  rect.width ()  - 2,
 			  rect.height () - 2);
 
 	/* draw outline */
@@ -641,7 +645,7 @@
 	streamingBuffer->render (sTransform);
     }
 
-    if (!isBlendingEnabled)
+    if (!glBlendEnabled)
 	glDisable (GL_BLEND);
 }
 
@@ -672,7 +676,7 @@
 	}
 
 	unsigned int mask;
-	int type;
+	int          type;
 };
 }
 
@@ -754,8 +758,6 @@
 void
 GridScreen::handleEvent (XEvent *event)
 {
-    CompWindow *w;
-
     screen->handleEvent (event);
 
     if (event->type != MotionNotify || !mGrabWindow)
@@ -828,9 +830,8 @@
 
     if (lastEdge != edge)
     {
-	bool check = false;
+	lastSlot = desiredSlot;
 	unsigned int target = typeToMask (edgeToGridType ());
-	lastSlot = desiredSlot;
 
 	if (edge == NoEdge || target == GridUnknown)
 	    desiredSlot.setGeometry (0, 0, 0, 0);
@@ -838,7 +839,7 @@
 	if (cScreen)
 	    cScreen->damageRegion (desiredSlot);
 
-	check = initiateCommon (NULL, 0, o, target, false, false);
+	bool check = initiateCommon (NULL, 0, o, target, false, false);
 
 	if (cScreen)
 	    cScreen->damageRegion (desiredSlot);
@@ -856,13 +857,13 @@
 		if (cw)
 		{
 		    animations.push_back (Animation ());
-		    int current = animations.size () - 1;
-		    animations.at (current).fromRect	= cw->serverBorderRect ();
-		    animations.at (current).currentRect	= cw->serverBorderRect ();
-		    animations.at (current).duration = optionGetAnimationDuration ();
-		    animations.at (current).timer = animations.at (current).duration;
-		    animations.at (current).targetRect = desiredSlot;
-		    animations.at (current).window = cw->id();
+		    int current                         = animations.size () - 1;
+		    animations.at (current).fromRect    = cw->serverBorderRect ();
+		    animations.at (current).currentRect = cw->serverBorderRect ();
+		    animations.at (current).duration    = optionGetAnimationDuration ();
+		    animations.at (current).timer       = animations.at (current).duration;
+		    animations.at (current).targetRect  = desiredSlot;
+		    animations.at (current).window      = cw->id();
 
 		    if (lastEdge == NoEdge || !animating)
 		    {
@@ -879,7 +880,7 @@
 	lastEdge = edge;
     }
 
-    w = screen->findWindow (CompOption::getIntOptionNamed (o, "window"));
+    CompWindow *w = screen->findWindow (CompOption::getIntOptionNamed (o, "window"));
 
     if (w)
     {
@@ -898,18 +899,18 @@
 }
 
 void
-GridWindow::validateResizeRequest (unsigned int &xwcm,
+GridWindow::validateResizeRequest (unsigned int   &xwcm,
 				   XWindowChanges *xwc,
-				   unsigned int source)
+				   unsigned int   source)
 {
     window->validateResizeRequest (xwcm, xwc, source);
 
     /* Don't allow non-pagers to change
      * the size of the window, the user
      * specified this size */
-    if (isGridHorzMaximized || isGridVertMaximized)
-	if (source != ClientTypePager)
-	    xwcm = 0;
+    if ((isGridHorzMaximized || isGridVertMaximized) &&
+	source != ClientTypePager)
+	xwcm = 0;
 }
 
 void
@@ -963,13 +964,15 @@
     }
 
     gScreen->lastResizeEdge = gScreen->edge;
-    gScreen->edge = NoEdge;
+    gScreen->edge           = NoEdge;
 
     window->ungrabNotify ();
 }
 
 void
-GridWindow::moveNotify (int dx, int dy, bool immediate)
+GridWindow::moveNotify (int  dx,
+			int  dy,
+			bool immediate)
 {
     window->moveNotify (dx, dy, immediate);
 
@@ -1015,15 +1018,15 @@
 	{
 	    if (isGridHorzMaximized)
 	    {
- 		window->saveMask ()      |= CWY | CWHeight;
-  		window->saveWc ().y      = originalSize.y ();
-  		window->saveWc ().height = originalSize.height ();
+		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 ();
+		window->saveMask ()    |= CWX | CWWidth;
+		window->saveWc ().x     = originalSize.x ();
+		window->saveWc ().width = originalSize.width ();
 	    }
 	}
 
@@ -1055,8 +1058,6 @@
 			   CompAction::State  state,
 			   CompOption::Vector &option)
 {
-    XWindowChanges xwc;
-    int            xwcm = 0;
     CompWindow     *cw = screen->findWindow (screen->activeWindow ());
 
     if (!cw)
@@ -1064,6 +1065,9 @@
 
     GRID_WINDOW (cw);
 
+    XWindowChanges xwc = XWINDOWCHANGES_INIT;
+    int            xwcm = 0;
+
     /* We have nothing to do here */
     if (!gw->isGridResized		&&
 	!gw->isGridVertMaximized	&&
@@ -1109,11 +1113,16 @@
     {
 	/* The windows x-center is different in this case. */
 	if (optionGetSnapbackWindows ())
-	    xwc.x = pointerX - (gw->originalSize.width () / 2);
+	{
+	    xwc.x = pointerX - gw->originalSize.width () / 2;
+	    xwc.y = pointerY + cw->border ().top / 2;
+	}
 	else /* the user does not want the original size back */
-	    xwc.x = pointerX - gw->currentSize.width () / 2;
-
-	xwc.y = pointerY + cw->border ().top / 2;
+	{
+	     /* this one is quite tricky to get right */
+	    xwc.x = pointerX - gw->pointerBufDx - gw->currentSize.width () / 2;
+	    xwc.y = pointerY - gw->pointerBufDy + cw->border ().top / 2;
+	}
     }
     else if (cw->grabbed () && screen->grabExist ("expo"))
     {
@@ -1158,9 +1167,9 @@
 
     cw->configureXWindow (xwcm, &xwc);
 
-    gw->currentSize         = CompRect ();
-    gw->pointerBufDx        = 0;
-    gw->pointerBufDy        = 0;
+    gw->currentSize  = CompRect ();
+    gw->pointerBufDx = 0;
+    gw->pointerBufDy = 0;
 
     if (cw->state () & MAXIMIZE_STATE)
 	cw->maximize(0);
@@ -1174,9 +1183,8 @@
 void
 GridScreen::preparePaint (int msSinceLastPaint)
 {
-    std::vector<Animation>::iterator iter;
-
-    for (iter = animations.begin (); iter != animations.end (); ++iter)
+    for (std::vector<Animation>::iterator iter = animations.begin ();
+	 iter != animations.end (); ++iter)
     {
 	Animation& anim = *iter;
 	anim.timer -= msSinceLastPaint;
@@ -1216,9 +1224,8 @@
 void
 GridScreen::donePaint ()
 {
-    std::vector<Animation>::iterator iter;
-
-    for (iter = animations.begin (); iter != animations.end ();)
+    for (std::vector<Animation>::iterator iter = animations.begin ();
+	 iter != animations.end ();)
     {
 	Animation& anim = *iter;
 
@@ -1255,16 +1262,16 @@
 
 Animation::Animation ()
 {
-    progress = 0.0f;
-    fromRect = CompRect (0, 0, 0, 0);
-    targetRect = CompRect (0, 0, 0, 0);
+    progress    = 0.0f;
+    fromRect    = CompRect (0, 0, 0, 0);
+    targetRect  = CompRect (0, 0, 0, 0);
     currentRect = CompRect (0, 0, 0, 0);
-    opacity = 0.0f;
-    timer = 0.0f;
-    duration = 0;
-    complete = false;
-    fadingOut = false;
-    window = 0;
+    opacity     = 0.0f;
+    timer       = 0.0f;
+    duration    = 0;
+    complete    = false;
+    fadingOut   = false;
+    window      = 0;
 }
 
 GridScreen::GridScreen (CompScreen *screen) :
@@ -1353,23 +1360,23 @@
 }
 
 bool
-GridWindow::glPaint (const GLWindowPaintAttrib& attrib, const GLMatrix& matrix,
-		     const CompRegion& region, const unsigned int mask)
+GridWindow::glPaint (const GLWindowPaintAttrib &attrib,
+		     const GLMatrix            &matrix,
+		     const CompRegion          &region,
+		     const unsigned int        mask)
 {
     bool status = gWindow->glPaint (attrib, matrix, region, mask);
 
-    std::vector<Animation>::iterator iter;
-
-    for (iter = gScreen->animations.begin ();
+    for (std::vector<Animation>::iterator iter = gScreen->animations.begin ();
 	 iter != gScreen->animations.end () && gScreen->animating; ++iter)
     {
-	Animation& anim = *iter;
+	Animation &anim = *iter;
 
 	if (anim.timer > 0.0f && anim.window == window->id())
 	{
-	    GLWindowPaintAttrib wAttrib(attrib);
-	    GLMatrix wTransform (matrix);
-	    unsigned int wMask(mask);
+	    GLWindowPaintAttrib wAttrib (attrib);
+	    GLMatrix            wTransform (matrix);
+	    unsigned int        wMask (mask);
 
 	    float curve = powf (CURVE_ANIMATION, -anim.progress);
 	    wAttrib.opacity *= curve;
@@ -1408,8 +1415,8 @@
 bool
 GridPluginVTable::init ()
 {
-    if (CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI)   &&
-	CompPlugin::checkPluginABI ("core", CORE_ABIVERSION)		 &&
+    if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION)		&&
+	CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI)	&&
 	CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
 	return true;
 

=== modified file 'plugins/grid/src/grid.h'
--- plugins/grid/src/grid.h	2013-04-30 00:18:41 +0000
+++ plugins/grid/src/grid.h	2013-07-24 17:30:37 +0000
@@ -30,6 +30,8 @@
 
 #include "grid_options.h"
 
+#define XWINDOWCHANGES_INIT {0, 0, 0, 0, 0, None, 0}
+
 namespace GridWindowType
 {
     static const unsigned int GridUnknown     = (1 << 0);
@@ -224,11 +226,16 @@
 		      const CompRegion          &,
 		      unsigned int                );
 
-	void grabNotify (int, int, unsigned int, unsigned int);
+	void grabNotify (int           ,
+			 int           ,
+			 unsigned int  ,
+			 unsigned int   );
 
 	void ungrabNotify ();
 
-	void moveNotify (int, int, bool);
+	void moveNotify (int  ,
+			 int  ,
+			 bool  );
 
 	void stateChangeNotify (unsigned int);