Merge lp:~mc-return/compiz/compiz.merge-animation-code-cleanup into lp:compiz/0.9.11

[MC Return]

Animation code cleanup:

Return ASAP, do not calculate stuff you might not need.
Declare CompWindow *w, AnimWindow *animWin, PrivateAnimWindow *aw
and Animation *curAnim outside the for loop.
grid.cpp: Declare float x, y, topiyFloat outside the for loop.
options.cpp: Declare unsigned int nOptions outside the foreach loop.
Use pre- instead of postfix de- and increments.
Declaration and assignment of variables in one line.
Merged if condition checks.
Added and removed brackets.
Added and removed newlines.
Fixed indentation.
Also initialize the non-static class members "mGridWidth" and
"mGridHeight" in the GridAnim::GridAnim ctor. (LP: #1101618)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3725
http://jenkins.qa.ubuntu.com/job/compiz-ci/276/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/89

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/276/rebuild

review: Approve (continuous-integration)

[lp:~mc-return/compiz/compiz.merge-animation-code-cleanup]

3726. By MC Return on 2013-07-24

Fixed bug #1101618 UNINIT_CTOR

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3726
http://jenkins.qa.ubuntu.com/job/compiz-ci/280/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/93

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/280/rebuild

review: Approve (continuous-integration)

[Sami Jaktholm (sjakthol)]

review: Approve

[MC Return (mc-return)]

Thanks, Sami.

I am already working on a follow-up to this one ;)

[MC Return (mc-return)]

(Bug #1204807)

=== modified file 'plugins/animation/src/animation.cpp'
--- plugins/animation/src/animation.cpp	2013-05-26 06:15:47 +0000
+++ plugins/animation/src/animation.cpp	2013-07-24 17:39:26 +0000
@@ -97,17 +97,16 @@
     public CompPlugin::VTableForScreenAndWindow<AnimScreen, AnimWindow, ANIMATION_ABI>
 {
 public:
+
     bool init ();
     void fini ();
 };
 
 COMPIZ_PLUGIN_20090315 (animation, AnimPluginVTable);
 
-static const unsigned short FAKE_ICON_SIZE = 4;
-
-const unsigned short LAST_ANIM_DIRECTION = 5;
-
-const unsigned short NUM_EFFECTS = 16;
+static const unsigned short FAKE_ICON_SIZE      = 4;
+const unsigned short        LAST_ANIM_DIRECTION = 5;
+const unsigned short        NUM_EFFECTS         = 16;
 
 const char *eventNames[AnimEventNum] =
 {"Open", "Close", "Minimize", "Unminimize", "Shade", "Focus"};
@@ -167,11 +166,12 @@
 // provided by a plugin, otherwise set it to None.
 void
 PrivateAnimScreen::updateEventEffects (AnimEvent e,
-				       bool forRandom,
-				       bool callPost)
+				       bool      forRandom,
+				       bool      callPost)
 {
     CompOption::Value::Vector *listVal;
     EffectSet *effectSet;
+
     if (forRandom)
     {
 	listVal = &getOptions ()[(unsigned)randomEffectOptionIds[e]].value ().
@@ -184,6 +184,7 @@
 	    list ();
 	effectSet = &mEventEffects[e];
     }
+
     unsigned int n = listVal->size ();
 
     effectSet->effects.clear ();
@@ -191,7 +192,7 @@
 
     AnimEffectVector &eventEffectsAllowed = mEventEffectsAllowed[e];
 
-    for (unsigned int r = 0; r < n; r++) // for each row
+    for (unsigned int r = 0; r < n; ++r) // for each row
     {
 	const CompString &animName = (*listVal)[r].s ();
 
@@ -208,7 +209,7 @@
 
     if (callPost)
     {
-    	foreach (ExtensionPluginInfo *extPlugin, mExtensionPlugins)
+	foreach (ExtensionPluginInfo *extPlugin, mExtensionPlugins)
 	    extPlugin->postUpdateEventEffects (e, forRandom);
     }
 }
@@ -227,20 +228,22 @@
 
 bool
 PrivateAnimScreen::isAnimEffectInList (AnimEffect theEffect,
-				       EffectSet &effectList)
+				       EffectSet  &effectList)
 {
     for (unsigned int i = 0; i < effectList.effects.size (); ++i)
 	if (effectList.effects[i] == theEffect)
 	    return true;
+
     return false;
 }
 
 bool
 PrivateAnimScreen::isAnimEffectPossibleForEvent (AnimEffect theEffect,
-						 AnimEvent event)
+						 AnimEvent  event)
 {
     // Check all rows to see if the effect is chosen there
     unsigned int nRows = mEventEffects[event].effects.size ();
+
     for (unsigned int i = 0; i < nRows; ++i)
     {
 	AnimEffect chosenEffect = mEventEffects[event].effects[i];
@@ -253,6 +256,7 @@
 	    isAnimEffectInList (theEffect, mRandomEffects[event]))
 	    return true;
     }
+
     return false;
 }
 
@@ -262,6 +266,7 @@
     for (int e = 0; e < AnimEventNum; ++e)
 	if (isAnimEffectPossibleForEvent (theEffect, (AnimEvent)e))
 	    return true;
+
     return false;
 }
 
@@ -275,9 +280,11 @@
     {
 	AnimEffect chosenEffect = mEventEffects[(unsigned)AnimEventFocus].
 	    effects[i];
+
 	if (chosenEffect->isRestackAnim)
 	    return true;
     }
+
     return false;
 }
 
@@ -297,7 +304,7 @@
 
 void
 PrivateAnimScreen::addExtension (ExtensionPluginInfo *extensionPluginInfo,
-				 bool shouldInitPersistentData)
+				 bool                shouldInitPersistentData)
 {
     mExtensionPlugins.push_back (extensionPluginInfo);
 
@@ -324,20 +331,24 @@
     }
 
     for (int e = 0; e < AnimEventNum; ++e)
+    {
 	if (eventEffectsNeedUpdate[e])
 	{
 	    updateEventEffects ((AnimEvent)e, false, false);
+
 	    if (e != AnimEventFocus)
 		updateEventEffects ((AnimEvent)e, true, false);
 	}
+    }
 
     if (shouldInitPersistentData)
     {
 	const CompWindowList &pl = pushLockedPaintList ();
+	AnimWindow           *aw;
 	// Initialize persistent window data for the extension plugin
 	foreach (CompWindow *w, pl)
 	{
-	    AnimWindow *aw = AnimWindow::get (w);
+	    aw = AnimWindow::get (w);
 	    extensionPluginInfo->initPersistentData (aw);
 	}
 
@@ -357,9 +368,12 @@
     // Stop all ongoing animations
     const CompWindowList &pl = pushLockedPaintList ();
 
+    PrivateAnimWindow *aw;
+
     foreach (CompWindow *w, pl)
     {
-	PrivateAnimWindow *aw = AnimWindow::get (w)->priv;
+	aw = AnimWindow::get (w)->priv;
+
 	if (aw->curAnimation ())
 	    aw->postAnimationCleanUp ();
     }
@@ -380,7 +394,6 @@
     if (extensionPluginInfo->nEffects == 0)
 	return; // no animation effects -> we're done here
 
-
     // Also delete the "allowed effect" entries for that plugin
 
     for (int e = 0; e < AnimEventNum; ++e)
@@ -409,6 +422,7 @@
 
 	// Update event effects to complete removal
 	updateEventEffects ((AnimEvent)e, false);
+
 	if (e != AnimEventFocus)
 	    updateEventEffects ((AnimEvent)e, true);
     }
@@ -425,11 +439,11 @@
     popLockedPaintList ();
 }
 
-ExtensionPluginInfo::ExtensionPluginInfo (const CompString &name,
-					  unsigned int nEffects,
-					  AnimEffect *effects,
+ExtensionPluginInfo::ExtensionPluginInfo (const CompString   &name,
+					  unsigned int       nEffects,
+					  AnimEffect         *effects,
 					  CompOption::Vector *effectOptions,
-					  unsigned int firstEffectOptionIndex) :
+					  unsigned int       firstEffectOptionIndex) :
     name (name),
     nEffects (nEffects),
     effects (effects),
@@ -440,11 +454,11 @@
 
 // End of extension functions
 
-Animation::Animation (CompWindow *w,
-		      WindowEvent curWindowEvent,
-		      float duration,
+Animation::Animation (CompWindow       *w,
+		      WindowEvent      curWindowEvent,
+		      float            duration,
 		      const AnimEffect info,
-		      const CompRect &icon) :
+		      const CompRect   &icon) :
     mWindow (w),
     mAWindow (AnimWindow::get (w)),
     mTotalTime (duration),
@@ -461,11 +475,11 @@
     if (curWindowEvent == WindowEventShade ||
 	curWindowEvent == WindowEventUnshade)
     {
-	mDecorTopHeight = w->output ().top;
+	mDecorTopHeight    = w->output ().top;
 	mDecorBottomHeight = w->output ().bottom;
     }
 
-    texturesCache = new GLTexture::List (GLWindow::get (w)->textures ());
+    texturesCache         = new GLTexture::List (GLWindow::get (w)->textures ());
     PrivateAnimScreen *as = mAWindow->priv->paScreen ();
 
     mTimestep = as->optionGetTimeStep ();
@@ -494,26 +508,32 @@
 
     switch (mCurWindowEvent) // the old event
     {
-    case WindowEventOpen:
-	mCurWindowEvent = WindowEventClose;
-	break;
-    case WindowEventClose:
-	mCurWindowEvent = WindowEventOpen;
-	break;
-    case WindowEventMinimize:
-	mCurWindowEvent = WindowEventUnminimize;
-	break;
-    case WindowEventUnminimize:
-	mCurWindowEvent = WindowEventMinimize;
-	break;
-    case WindowEventShade:
-	mCurWindowEvent = WindowEventUnshade;
-	break;
-    case WindowEventUnshade:
-	mCurWindowEvent = WindowEventShade;
-	break;
-    default:
-	break;
+	case WindowEventOpen:
+	    mCurWindowEvent = WindowEventClose;
+	    break;
+
+	case WindowEventClose:
+	    mCurWindowEvent = WindowEventOpen;
+	    break;
+
+	case WindowEventMinimize:
+	    mCurWindowEvent = WindowEventUnminimize;
+	    break;
+
+	case WindowEventUnminimize:
+	    mCurWindowEvent = WindowEventMinimize;
+	    break;
+
+	case WindowEventShade:
+	    mCurWindowEvent = WindowEventUnshade;
+	    break;
+
+	case WindowEventUnshade:
+	    mCurWindowEvent = WindowEventShade;
+	    break;
+
+	default:
+	    break;
     }
 
     // 1: forward, 2: backward  (3 - progressDir is opposite direction)
@@ -521,13 +541,14 @@
 
     switch (mCurWindowEvent) // the new event
     {
-    case WindowEventClose:
-    case WindowEventMinimize:
-    case WindowEventShade:
-	progressDir = 2;
-	break;
-    default:
-	break;
+	case WindowEventClose:
+	case WindowEventMinimize:
+	case WindowEventShade:
+	    progressDir = 2;
+	    break;
+
+	default:
+	    break;
     }
 
     if (mOverrideProgressDir == 0)
@@ -536,11 +557,11 @@
 	mOverrideProgressDir = 0; // disable override
 }
 
-PartialWindowAnim::PartialWindowAnim (CompWindow *w,
-				      WindowEvent curWindowEvent,
-				      float duration,
+PartialWindowAnim::PartialWindowAnim (CompWindow       *w,
+				      WindowEvent      curWindowEvent,
+				      float            duration,
 				      const AnimEffect info,
-				      const CompRect &icon) :
+				      const CompRect   &icon) :
     Animation::Animation (w, curWindowEvent, duration, info, icon),
     mUseDrawRegion (false),
     mDrawRegion ()
@@ -574,8 +595,9 @@
 	getOptions ()[(unsigned)customOptionOptionIds[e]].value ();
 
     unsigned int nRows = valMatch.list ().size ();
-    if (nRows != eventEffects->effects.size () ||
-	nRows != valDuration.list ().size () ||
+
+    if (nRows != eventEffects->effects.size ()	||
+	nRows != valDuration.list ().size ()	||
 	nRows != valCustomOptions.list ().size ())
     {
 	compLogMessage ("animation", CompLogLevelError,
@@ -605,15 +627,16 @@
 
 AnimEffect
 PrivateAnimScreen::getActualEffect (AnimEffect effect,
-				    AnimEvent animEvent)
+				    AnimEvent  animEvent)
 {
-    bool allRandom = optionGetAllRandom ();
+    bool             allRandom      = optionGetAllRandom ();
     AnimEffectVector *randomEffects = &mRandomEffects[animEvent].effects;
-    unsigned int nRandomEffects = randomEffects->size ();
+    unsigned int     nRandomEffects = randomEffects->size ();
 
     if ((effect == AnimEffectRandom) || allRandom)
     {
 	unsigned int nFirstRandomEffect = 0;
+
 	if (nRandomEffects == 0) // no random animation selected, assume "all"
 	{
 	    randomEffects = &mEventEffectsAllowed[animEvent];
@@ -622,8 +645,10 @@
 	    nFirstRandomEffect = 2;
 	    nRandomEffects = randomEffects->size () - 2;
 	}
+
 	unsigned int index = nFirstRandomEffect +
 	    (unsigned int)(nRandomEffects * (double)rand () / RAND_MAX);
+
 	return (*randomEffects)[index];
     }
     else
@@ -634,12 +659,10 @@
 /// to an actual direction (up, down, left, or right).
 AnimDirection
 Animation::getActualAnimDirection (AnimDirection dir,
-				   bool openDir)
+				   bool          openDir)
 {
     if (dir == AnimDirectionRandom)
-    {
 	dir = (AnimDirection)(rand () % 4);
-    }
     else if (dir == AnimDirectionAuto)
     {
 	CompRect outRect (mAWindow->savedRectsValid () ?
@@ -647,8 +670,8 @@
 			  mWindow->outputRect ());
 
 	// away from icon
-	int centerX = outRect.x () + outRect.width () / 2 ;
-	int centerY = outRect.y () + outRect.height () / 2 ;
+	int   centerX  = outRect.centerX ();
+	int   centerY  = outRect.centerY ();
 	float relDiffX = ((float)centerX - mIcon.x ()) / outRect.width ();
 	float relDiffY = ((float)centerY - mIcon.y ()) / outRect.height ();
 
@@ -683,14 +706,13 @@
 float
 Animation::progressLinear ()
 {
-    float forwardProgress =
-	1 - mRemainingTime / (mTotalTime - mTimestep);
-    forwardProgress = MIN (forwardProgress, 1);
-    forwardProgress = MAX (forwardProgress, 0);
+    float forwardProgress = 1 - mRemainingTime / (mTotalTime - mTimestep);
+    forwardProgress       = MIN (forwardProgress, 1);
+    forwardProgress       = MAX (forwardProgress, 0);
 
-    if (mCurWindowEvent == WindowEventOpen ||
-	mCurWindowEvent == WindowEventUnminimize ||
-	mCurWindowEvent == WindowEventUnshade ||
+    if (mCurWindowEvent == WindowEventOpen	    ||
+	mCurWindowEvent == WindowEventUnminimize    ||
+	mCurWindowEvent == WindowEventUnshade	    ||
 	mCurWindowEvent == WindowEventFocus)
 	forwardProgress = 1 - forwardProgress;
 
@@ -700,19 +722,17 @@
 float
 Animation::progressEaseInEaseOut ()
 {
-    float forwardProgress =
-	1 - mRemainingTime / (mTotalTime - mTimestep);
-    forwardProgress = MIN (forwardProgress, 1);
-    forwardProgress = MAX (forwardProgress, 0);
+    float forwardProgress = 1 - mRemainingTime / (mTotalTime - mTimestep);
+    forwardProgress       = MIN (forwardProgress, 1);
+    forwardProgress       = MAX (forwardProgress, 0);
 
     // Apply sigmoid and normalize
-    forwardProgress =
-	(sigmoid (forwardProgress) - sigmoid (0)) /
-	(sigmoid (1) - sigmoid (0));
+    forwardProgress = (sigmoid (forwardProgress) - sigmoid (0)) /
+		      (sigmoid (1) - sigmoid (0));
 
-    if (mCurWindowEvent == WindowEventOpen ||
-	mCurWindowEvent == WindowEventUnminimize ||
-	mCurWindowEvent == WindowEventUnshade ||
+    if (mCurWindowEvent == WindowEventOpen	    ||
+	mCurWindowEvent == WindowEventUnminimize    ||
+	mCurWindowEvent == WindowEventUnshade	    ||
 	mCurWindowEvent == WindowEventFocus)
 	forwardProgress = 1 - forwardProgress;
 
@@ -725,7 +745,9 @@
 /// where minx and maxx are the
 /// starting and ending points on the sigmoid.
 float
-Animation::progressDecelerateCustom (float progress, float minx, float maxx)
+Animation::progressDecelerateCustom (float progress,
+				     float minx,
+				     float maxx)
 {
     float x = 1 - progress;
     float s = 8;
@@ -770,16 +792,20 @@
 
     if (source.x1 < target.x1)
 	target.x1 = source.x1;
+
     if (source.x2 > target.x2)
 	target.x2 = source.x2;
+
     if (source.y1 < target.y1)
 	target.y1 = source.y1;
+
     if (source.y2 > target.y2)
 	target.y2 = source.y2;
 }
 
 void
-AnimWindow::expandBBWithPoint (float fx, float fy)
+AnimWindow::expandBBWithPoint (float fx,
+			       float fy)
 {
     Box &target = priv->BB ();
 
@@ -794,6 +820,7 @@
 	target.y2 = y + 1;
 	return;
     }
+
     if (x < target.x1)
 	target.x1 = x;
     else if (x > target.x2)
@@ -817,14 +844,19 @@
 }
 
 static bool
-project (float objx, float objy, float objz, 
-         const float modelview[16], const float projection[16],
-         const GLint viewport[4],
-         float *winx, float *winy, float *winz)
+project (float       objx,
+	 float       objy,
+	 float       objz,
+	 const float modelview[16],
+	 const float projection[16],
+	 const GLint viewport[4],
+	 float       *winx,
+	 float       *winy,
+	 float       *winz)
 {
     unsigned int i;
-    float in[4];
-    float out[4];
+    float        in[4];
+    float        out[4];
 
     in[0] = objx;
     in[1] = objy;
@@ -870,11 +902,11 @@
 
 /// Either points or objects should be non-0.
 bool
-AnimWindow::expandBBWithPoints3DTransform (CompOutput     &output,
-					   GLMatrix       &transform,
-					   const float    *points,
+AnimWindow::expandBBWithPoints3DTransform (CompOutput                      &output,
+					   GLMatrix                        &transform,
+					   const float                     *points,
 					   GridAnim::GridModel::GridObject *objects,
-					   unsigned int   nPoints)
+					   unsigned int                    nPoints)
 {
     GLfloat x, y, z;
     GLint viewport[4] =
@@ -884,16 +916,16 @@
 	 output.height ()};
 
     const float *projection =
-        GLScreen::get (::screen)->projectionMatrix ()->getMatrix ();
+	GLScreen::get (::screen)->projectionMatrix ()->getMatrix ();
 
     if (points) // use points
     {
-	for (; nPoints; nPoints--, points += 3)
+	for (; nPoints; --nPoints, points += 3)
 	{
 	    if (!project (points[0], points[1], points[2],
-	                  transform.getMatrix (), projection,
-	                  viewport,
-	                  &x, &y, &z))
+			  transform.getMatrix (), projection,
+			  viewport,
+			  &x, &y, &z))
 		return false;
 
 	    expandBBWithPoint (x + 0.5, (::screen->height () - y) + 0.5);
@@ -902,14 +934,15 @@
     else // use grid model objects
     {
 	GridAnim::GridModel::GridObject *object = objects;
+
 	for (; nPoints; --nPoints, ++object)
 	{
 	    if (!project (object->position ().x (),
-	                  object->position ().y (),
-	                  object->position ().z (),
-	                  transform.getMatrix (), projection,
-	                  viewport,
-	                  &x, &y, &z))
+			  object->position ().y (),
+			  object->position ().z (),
+			  transform.getMatrix (), projection,
+			  viewport,
+			  &x, &y, &z))
 		return false;
 
 	    expandBBWithPoint (x + 0.5, (::screen->height () - y) + 0.5);
@@ -924,7 +957,8 @@
     CompRect outRect (savedRectsValid () ?
 		      savedOutRect () :
 		      mWindow->outputRect ());
-    Box windowBox = {
+    Box windowBox =
+    {
 	static_cast <short int> (outRect.x ()), static_cast <short int> (outRect.x () + outRect.width ()),
 	static_cast <short int> (outRect.y ()), static_cast <short int> (outRect.y () + outRect.height ())
     };
@@ -941,8 +975,8 @@
 
 void
 Animation::prepareTransform (CompOutput &output,
-			     GLMatrix &resultTransform,
-			     GLMatrix &transform)
+			     GLMatrix   &resultTransform,
+			     GLMatrix   &transform)
 {
     GLMatrix sTransform;
     sTransform.toScreenSpace (&output, -DEFAULT_Z_CAMERA);
@@ -954,9 +988,9 @@
 {
     // Have a 1 pixel margin to prevent occasional 1 pixel line artifact
     CompRegion region (priv->mBB.x1 - 1,
-    		       priv->mBB.y1 - 1,
-    		       priv->mBB.x2 - priv->mBB.x1 + 2,
-    		       priv->mBB.y2 - priv->mBB.y1 + 2);
+		       priv->mBB.y1 - 1,
+		       priv->mBB.x2 - priv->mBB.x1 + 2,
+		       priv->mBB.y2 - priv->mBB.y1 + 2);
     priv->mStepRegion = region;
 }
 
@@ -978,7 +1012,8 @@
 }
 
 bool
-AnimScreen::getMousePointerXY (short *x, short *y)
+AnimScreen::getMousePointerXY (short *x,
+			       short *y)
 {
     Window w1, w2;
     int xp, yp, xj, yj;
@@ -998,21 +1033,21 @@
 PrivateAnimWindow::getState ()
 {
     Atom actual;
-    int result, format;
+    int format;
     unsigned long n, left;
     unsigned char *data;
     unsigned int retval = WithdrawnState;
 
-    result = XGetWindowProperty (::screen->dpy (), mWindow->id (),
-				 Atoms::wmState, 0L,
-				 1L, false,
-				 Atoms::wmState,
-				 &actual, &format, &n, &left, &data);
+    int result = XGetWindowProperty (::screen->dpy (), mWindow->id (),
+				     Atoms::wmState, 0L,
+				     1L, false,
+				     Atoms::wmState,
+				     &actual, &format, &n, &left, &data);
 
     if (result == Success && data)
     {
 	if (n)
-    	    memcpy (&retval, data, sizeof (int));
+	    memcpy (&retval, data, sizeof (int));
 
 	XFree ((void *)data);
     }
@@ -1039,6 +1074,7 @@
 {
     if (mExtensionPlugins.empty ())
 	initAnimationList ();
+
     foreach (CompOption::Value &val, opt->value ().list ())
 	val.match ().update ();
 }
@@ -1049,6 +1085,7 @@
 {
     if (mExtensionPlugins.empty ())
 	initAnimationList ();
+
     updateOptionSets (getCorrespondingAnimEvent (num));
 }
 
@@ -1058,6 +1095,7 @@
 {
     if (mExtensionPlugins.empty ())
 	initAnimationList ();
+
     updateEventEffects (getCorrespondingAnimEvent (num), false);
 }
 
@@ -1067,6 +1105,7 @@
 {
     if (mExtensionPlugins.empty ())
 	initAnimationList ();
+
     updateEventEffects (getCorrespondingAnimEvent (num), true);
 }
 
@@ -1076,22 +1115,21 @@
 					       bool clearMatchingRow)
 {
     bool shouldDamageWindow = false;
-    
+
     notifyAnimation (false);
 
-    if (mCurAnimation)
-    {
-	if (mCurAnimation->shouldDamageWindowOnEnd ())
-	    shouldDamageWindow = true;
-    }
+    if (mCurAnimation &&
+	mCurAnimation->shouldDamageWindowOnEnd ())
+	shouldDamageWindow = true;
+
     enablePainting (false);
 
     if (shouldDamageWindow)
 	mAWindow->expandBBWithWindow ();
 
     if (shouldDamageWindow ||
-	(mCurAnimation &&
-	 !mCurAnimation->stepRegionUsed () &&
+	(mCurAnimation			    &&
+	 !mCurAnimation->stepRegionUsed ()  &&
 	 mAWindow->BB ()->x1 != MAXSHORT)) // BB intialized
 	mAWindow->resetStepRegionWithBB ();
 
@@ -1113,16 +1151,20 @@
 	mCurAnimSelectionRow = -1;
 
     mFinishingAnim = true;
+
     if (!destructing)
     {
 	mIgnoreDamage = true;
+
 	while (mUnmapCnt > 0)
 	{
 	    mWindow->unmap ();
 	    --mUnmapCnt;
 	}
+
 	if (mUnmapCnt < 0)
 	    mUnmapCnt = 0;
+
 	mIgnoreDamage = false;
     }
 
@@ -1131,6 +1173,7 @@
 	mWindow->destroy ();
 	--mDestroyCnt;
     }
+
     mFinishingAnim = false;
 
     foreach (ExtensionPluginInfo *extPlugin, mPAScreen->mExtensionPlugins)
@@ -1175,12 +1218,10 @@
 	    return;
     }
     else
-    {
 	// Animations have finished for all windows
 	// (Keep preparePaint enabled)
-
 	aScreen->enableCustomPaintList (false);
-    }
+
     cScreen->donePaintSetEnabled (this, activating);
     gScreen->glPaintOutputSetEnabled (this, activating);
 
@@ -1200,49 +1241,56 @@
 void
 PrivateAnimWindow::notifyAnimation (bool activation)
 {
-    CompOption::Vector o (0);
-    
     if (!mCurAnimation)
 	return;
-    
+
+    CompOption::Vector o (0);
+
     o.push_back (CompOption ("root", CompOption::TypeInt));
     o.push_back (CompOption ("window", CompOption::TypeInt));
     o.push_back (CompOption ("type", CompOption::TypeString));
     o.push_back (CompOption ("active", CompOption::TypeBool));
-    
+
     o[0].value ().set ((int) ::screen->root ());
     o[1].value ().set ((int) mWindow->id ());
-        
+
     switch (mCurAnimation->curWindowEvent ())
     {
 	case WindowEventOpen:
 	    o[2].value ().set ("open");
 	    break;
+
 	case WindowEventClose:
 	    o[2].value ().set ("close");
 	    break;
+
 	case WindowEventMinimize:
 	    o[2].value ().set ("minimize");
 	    break;
+
 	case WindowEventUnminimize:
 	    o[2].value ().set ("unminimize");
 	    break;
+
 	case WindowEventShade:
 	    o[2].value ().set ("shade");
 	    break;
+
 	case WindowEventUnshade:
 	    o[2].value ().set ("unshade");
 	    break;
+
 	case WindowEventFocus:
 	    o[2].value ().set ("focus");
 	    break;
+
 	case WindowEventNum:
 	case WindowEventNone:
 	default:
 	    o[2].value ().set ("none");
 	    break;
     }
-    
+
     o[3].value ().set (activation);
 
     screen->handleCompizEvent ("animation", "window_animation", o);
@@ -1254,6 +1302,7 @@
     for (int i = 0; i < WatchedScreenPluginNum; ++i)
 	if (mPluginActive[i])
 	    return true;
+
     return false;
 }
 
@@ -1261,6 +1310,7 @@
 Animation::shouldSkipFrame (int msSinceLastPaintActual)
 {
     mTimeElapsedWithinTimeStep += msSinceLastPaintActual;
+
     if (mTimeElapsedWithinTimeStep < mTimestep) // if timestep not yet completed
 	return true;
 
@@ -1304,7 +1354,7 @@
 	extPlugin->prePreparePaintGeneral ();
 
     if (mAnimInProgress)
-    {	
+    {
 	int msSinceLastPaintActual;
 	const CompWindowList &pl = pushLockedPaintList ();
 	CompWindowList       windowsFinishedAnimations;
@@ -1325,14 +1375,19 @@
 	mLastRedrawTime = curTime; // Store current time for next time
 	mLastRedrawTimeFresh = true;
 
+	CompWindow        *w;
+	AnimWindow        *animWin;
+	PrivateAnimWindow *aw;
+	Animation         *curAnim;
+
 	/* Paint list includes destroyed windows */
 	for (CompWindowList::const_reverse_iterator rit = pl.rbegin ();
 	     rit != pl.rend (); ++rit)
 	{
-	    CompWindow *w = (*rit);
-	    AnimWindow *animWin = AnimWindow::get (w);
-	    PrivateAnimWindow *aw = animWin->priv;
-	    Animation *curAnim = aw->curAnimation ();
+	    w       = (*rit);
+	    animWin = AnimWindow::get (w);
+	    aw      = animWin->priv;
+	    curAnim = aw->curAnimation ();
 
 	    if (curAnim)
 	    {		
@@ -1393,6 +1448,7 @@
 			    // so reset step region here with BB.
 			    animWin->resetStepRegionWithBB ();
 			}
+
 			if (!(cScreen->damageMask () &
 			      COMPOSITE_SCREEN_DAMAGE_ALL_MASK))
 			    aw->damageThisAndLastStepRegion ();
@@ -1400,6 +1456,7 @@
 		}
 
 		bool finished = (curAnim->remainingTime () <= 0);
+
 		if (finished) // Animation is done
 		    windowsFinishedAnimations.push_back (w);
 	    }
@@ -1408,6 +1465,7 @@
 	foreach (CompWindow *w, pl)
 	{
 	    PrivateAnimWindow *aw = AnimWindow::get (w)->priv;
+
 	    if (aw->curAnimation ())
 		aw->curAnimation ()->postPreparePaint ();
 	}
@@ -1423,6 +1481,7 @@
     if (mStartCountdown)
     {
 	--mStartCountdown;
+
 	if (!mStartCountdown)
 	{
 	    foreach (ExtensionPluginInfo *extPlugin, mExtensionPlugins)
@@ -1440,19 +1499,24 @@
     CompWindowList       windowsFinishedAnimations;
 
     bool animStillInProgress = false;
+    CompWindow        *w;
+    AnimWindow        *animWin;
+    PrivateAnimWindow *aw;
+    Animation         *curAnim;
 
     /* Paint list includes destroyed windows */
     for (CompWindowList::const_reverse_iterator rit = pl.rbegin ();
 	 rit != pl.rend (); ++rit)
     {
-	CompWindow *w = (*rit);
-	AnimWindow *animWin = AnimWindow::get (w);
-	PrivateAnimWindow *aw = animWin->priv;
-	Animation *curAnim = aw->curAnimation ();
+	w       = (*rit);
+	animWin = AnimWindow::get (w);
+	aw      = animWin->priv;
+	curAnim = aw->curAnimation ();
 
 	if (curAnim)
 	{
 	    bool finished = (curAnim->remainingTime () <= 0);
+
 	    if (finished) // Animation is done
 		windowsFinishedAnimations.push_back (w);
 	    else
@@ -1518,16 +1582,16 @@
 bool
 Animation::shouldDamageWindowOnStart ()
 {
-    return (mCurWindowEvent == WindowEventClose ||
-	    mCurWindowEvent == WindowEventMinimize ||
+    return (mCurWindowEvent == WindowEventClose	    ||
+	    mCurWindowEvent == WindowEventMinimize  ||
 	    mCurWindowEvent == WindowEventShade);
 }
 
 bool
 Animation::shouldDamageWindowOnEnd ()
 {
-    return (mCurWindowEvent == WindowEventOpen ||
-	    mCurWindowEvent == WindowEventUnminimize ||
+    return (mCurWindowEvent == WindowEventOpen		||
+	    mCurWindowEvent == WindowEventUnminimize	||
 	    mCurWindowEvent == WindowEventUnshade);
 }
 
@@ -1563,15 +1627,13 @@
 }
 
 void
-PrivateAnimWindow::glDrawTexture (GLTexture          *texture,
-                                  const GLMatrix     &transform,
-                                  const GLWindowPaintAttrib &attrib,
-				  unsigned int       mask)
+PrivateAnimWindow::glDrawTexture (GLTexture                 *texture,
+				  const GLMatrix            &transform,
+				  const GLWindowPaintAttrib &attrib,
+				  unsigned int              mask)
 {
     if (mCurAnimation)
-    {
 	mCurAnimation->setCurPaintAttrib (attrib);
-    }
 
     gWindow->glDrawTexture (texture, transform, attrib, mask);
 }
@@ -1586,16 +1648,14 @@
 	    mCurAnimation->drawGeometry ();
     }
     else
-    {
 	gWindow->glDrawGeometry ();
-    }
 }
 #endif
 
 void
-Animation::drawTexture (GLTexture          *texture,
-                        const GLWindowPaintAttrib &attrib,
-			unsigned int       mask)
+Animation::drawTexture (GLTexture                 *texture,
+			const GLWindowPaintAttrib &attrib,
+			unsigned int              mask)
 {
     mCurPaintAttrib = attrib;
 }
@@ -1610,8 +1670,9 @@
 
 bool
 PrivateAnimWindow::glPaint (const GLWindowPaintAttrib &attrib,
-			    const GLMatrix &transform,
-			    const CompRegion &region, unsigned int mask)
+			    const GLMatrix            &transform,
+			    const CompRegion          &region,
+			    unsigned int              mask)
 {
     bool status;
 
@@ -1694,7 +1755,7 @@
 {
     if (!mLockedPaintListCnt)
     {
-    	const CompWindowList &pl = cScreen->getWindowPaintList ();
+	const CompWindowList &pl = cScreen->getWindowPaintList ();
 	mLockedPaintList = &pl;
 
 	if (!mGetWindowPaintListEnableCnt)
@@ -1705,6 +1766,7 @@
     }
 
     ++mLockedPaintListCnt;
+
     return *mLockedPaintList;
 }
 
@@ -1734,6 +1796,7 @@
 
     ExtensionPluginAnimation *extPlugin =
 	static_cast<ExtensionPluginAnimation *> (mExtensionPlugins[0]);
+
     return extPlugin->getWindowPaintList ();
 }
 
@@ -1803,6 +1866,7 @@
     ::screen->handleCompizEvent (pluginName, eventName, options);
 
     for (int i = 0; i < WatchedScreenPluginNum; ++i)
+    {
 	if (strcmp (pluginName, watchedScreenPlugins[i].pluginName) == 0)
 	{
 	    if (strcmp (eventName, 
@@ -1813,17 +1877,18 @@
 
 		if (!mPluginActive[i] &&
 		    (i == WatchedPluginSwitcher ||
-		     i == WatchedPluginRing ||
-		     i == WatchedPluginShift ||
+		     i == WatchedPluginRing	||
+		     i == WatchedPluginShift	||
 		     i == WatchedPluginScale))
-		{
 		    mSwitcherPostWait = 1;
-		}
 	    }
+
 	    break;
 	}
+    }
 
     for (int i = 0; i < WatchedWindowPluginNum; ++i)
+    {
 	if (strcmp (pluginName,
 		    watchedWindowPlugins[i].pluginName) == 0)
 	{
@@ -1845,14 +1910,17 @@
 								    false);
 		}
 	    }
+
 	    break;
 	}
+    }
 }
 
 /// Returns true for windows that don't have a pixmap or certain properties,
 /// like the dimming layer of gksudo and x-session-manager.
 inline bool
-PrivateAnimScreen::shouldIgnoreWindowForAnim (CompWindow *w, bool checkPixmap)
+PrivateAnimScreen::shouldIgnoreWindowForAnim (CompWindow *w,
+					      bool       checkPixmap)
 {
     AnimWindow *aw = AnimWindow::get (w);
 
@@ -1889,6 +1957,7 @@
 
     if (shouldIgnoreWindowForAnim (w, true))
 	return;
+
     int duration = 200;
     AnimEffect chosenEffect =
 	getMatchingAnimSelection (w, AnimEventClose, &duration);
@@ -1921,9 +1990,7 @@
 		}
 	    }*/
 	    else
-	    {
 		aw->postAnimationCleanUpPrev (true, false);
-	    }
 	}
 
 	if (startingNew)
@@ -1989,35 +2056,35 @@
 
     // Make sure non-animated closing windows get a damage.
     if (!aw->curAnimation ())
-    {
 	aw->mAWindow->expandBBWithWindow ();
-    }
 }
 
 CompRect
-PrivateAnimScreen::getIcon (CompWindow *w, bool alwaysUseMouse)
+PrivateAnimScreen::getIcon (CompWindow *w,
+			    bool       alwaysUseMouse)
 {
     CompRect icon;
 
     if (!alwaysUseMouse)
-    {
 	icon = w->iconGeometry ();
-    }
+
     if (alwaysUseMouse ||
-	(icon.x () == 0 &&
-	 icon.y () == 0 &&
+	(icon.x () == 0	    &&
+	 icon.y () == 0	    &&
 	 icon.width () == 0 &&
 	 icon.height () == 0)) // that is, couldn't get icon from window
     {
 	// Minimize to mouse pointer if there is no
 	// window list or if the window skips taskbar
 	short x, y;
+
 	if (!aScreen->getMousePointerXY (&x, &y))
 	{
 	    // Use screen center if can't get mouse coords
 	    x = ::screen->width () / 2;
 	    y = ::screen->height () / 2;
 	}
+
 	icon.setX (x);
 	icon.setY (y);
 	icon.setWidth (FAKE_ICON_SIZE);
@@ -2053,7 +2120,7 @@
 
     if (chosenEffect != AnimEffectNone)
     {
-	bool startingNew = true;
+	bool        startingNew    = true;
 	WindowEvent curWindowEvent = WindowEventNone;
 
 	if (aw->curAnimation ())
@@ -2062,9 +2129,7 @@
 	if (curWindowEvent != WindowEventNone)
 	{
 	    if (curWindowEvent != WindowEventUnminimize)
-	    {
 		aw->postAnimationCleanUpPrev (false, false);
-	    }
 	    else
 	    {
 		startingNew = false;
@@ -2112,17 +2177,16 @@
 
     if (chosenEffect != AnimEffectNone)
     {
-	bool startingNew = true;
+	bool        startingNew    = true;
 	WindowEvent curWindowEvent = WindowEventNone;
+
 	if (aw->curAnimation ())
 	    curWindowEvent = aw->curAnimation ()->curWindowEvent ();
 
 	if (curWindowEvent != WindowEventNone)
 	{
 	    if (curWindowEvent != WindowEventUnshade)
-	    {
 		aw->postAnimationCleanUpPrev (false, false);
-	    }
 	    else
 	    {
 		startingNew = false;
@@ -2169,6 +2233,7 @@
 	extPlugin->preInitiateOpenAnim (aw->mAWindow);
 
     WindowEvent curWindowEvent = WindowEventNone;
+
     if (aw->curAnimation ())
 	curWindowEvent = aw->curAnimation ()->curWindowEvent ();
 
@@ -2185,9 +2250,7 @@
 	if (curWindowEvent != WindowEventNone)
 	{
 	    if (curWindowEvent != WindowEventClose)
-	    {
 		aw->postAnimationCleanUpPrev (false, false);
-	    }
 	    else
 	    {
 		startingNew = false;
@@ -2251,15 +2314,14 @@
 
 	// TODO Refactor the rest? (almost the same in other initiateX methods)
 	WindowEvent curWindowEvent = WindowEventNone;
+
 	if (aw->curAnimation ())
 	    curWindowEvent = aw->curAnimation ()->curWindowEvent ();
 
 	if (curWindowEvent != WindowEventNone)
 	{
 	    if (curWindowEvent != WindowEventMinimize)
-	    {
 		aw->postAnimationCleanUpPrev (false, false);
-	    }
 	    else
 	    {
 		startingNew = false;
@@ -2316,15 +2378,14 @@
 	bool playEffect = true;
 
 	WindowEvent curWindowEvent = WindowEventNone;
+
 	if (aw->curAnimation ())
 	    curWindowEvent = aw->curAnimation ()->curWindowEvent ();
 
 	if (curWindowEvent != WindowEventNone)
 	{
 	    if (curWindowEvent != WindowEventShade)
-	    {
 		aw->postAnimationCleanUpPrev (false, false);
-	    }
 	    else
 	    {
 		startingNew = false;
@@ -2363,8 +2424,8 @@
 bool
 PrivateAnimScreen::initiateFocusAnim (PrivateAnimWindow *aw)
 {
-    CompWindow *w = aw->mWindow;
-    int duration = 200;
+    CompWindow *w       = aw->mWindow;
+    int        duration = 200;
 
     if (aw->curAnimation () || otherPluginsActive () ||
 	// Check the "switcher post-wait" counter that effectively prevents
@@ -2407,19 +2468,19 @@
 	mUnshadePending = false;
 	mPAScreen->initiateUnshadeAnim (this);
     }
-    else if (mCurAnimation && mCurAnimation->inProgress () &&
+    else if (mCurAnimation && mCurAnimation->inProgress ()	&&
 	// Don't let transient window open anim be interrupted with a resize notify
-	!(mCurAnimation->curWindowEvent () == WindowEventOpen &&
+	!(mCurAnimation->curWindowEvent () == WindowEventOpen	&&
 	  (mWindow->wmType () &
-	   (CompWindowTypeDropdownMenuMask |
-	    CompWindowTypePopupMenuMask |
-       	    CompWindowTypeMenuMask |
-	    CompWindowTypeTooltipMask |
-	    CompWindowTypeNotificationMask |
-	    CompWindowTypeComboMask |
-	    CompWindowTypeDndMask))) &&
+	   (CompWindowTypeDropdownMenuMask  |
+	    CompWindowTypePopupMenuMask	    |
+	    CompWindowTypeMenuMask	    |
+	    CompWindowTypeTooltipMask	    |
+	    CompWindowTypeNotificationMask  |
+	    CompWindowTypeComboMask	    |
+	    CompWindowTypeDndMask)))				&&
 	// Ignore resize with dx=0, dy=0, dwidth=0, dheight=0
-	!(dx == 0 && dy == 0 && dwidth == 0 && dheight == 0) &&
+	!(dx == 0 && dy == 0 && dwidth == 0 && dheight == 0)	&&
 	!mCurAnimation->resizeUpdate (dx, dy, dwidth, dheight))
     {
 	postAnimationCleanUp ();
@@ -2445,9 +2506,7 @@
 	    break;
 	}
 	else
-	{
 	    aw->notifyAnimation (false);
-	}
     }
 
     popLockedPaintList ();
@@ -2462,11 +2521,11 @@
 			       bool immediate)
 {
     if (mCurAnimation && mCurAnimation->inProgress () &&
-    	(mGrabbed || !mCurAnimation->moveUpdate (dx, dy)))
+	(mGrabbed || !mCurAnimation->moveUpdate (dx, dy)))
     {
 	// Stop the animation
-    	postAnimationCleanUp ();
-    	mPAScreen->updateAnimStillInProgress ();
+	postAnimationCleanUp ();
+	mPAScreen->updateAnimStillInProgress ();
     }
 
     mWindow->moveNotify (dx, dy, immediate);
@@ -2496,7 +2555,7 @@
 				  const GLMatrix            &matrix,
 				  const CompRegion          &region,
 				  CompOutput                *output,
-				  unsigned int               mask)
+				  unsigned int              mask)
 {
     assert (mAnimInProgress);
 
@@ -2530,46 +2589,88 @@
 
 AnimEffectUsedFor& AnimEffectUsedFor::exclude (AnimEvent event)
 {
-  switch (event) {
-    case AnimEventOpen: open = false; break;
-    case AnimEventClose: close = false; break;
-    case AnimEventMinimize: minimize = false; break;
-    case AnimEventUnminimize: unminimize = false; break;
-    case AnimEventShade: shade = false; break;
-    case AnimEventFocus: focus = false; break;
-    default: break;
-  }
-  return *this;
+    switch (event)
+    {
+	case AnimEventOpen:
+	    open = false;
+	    break;
+
+	case AnimEventClose:
+	    close = false;
+	    break;
+
+	case AnimEventMinimize:
+	    minimize = false;
+	    break;
+
+	case AnimEventUnminimize:
+	    unminimize = false;
+	    break;
+
+	case AnimEventShade:
+	    shade = false;
+	    break;
+
+	case AnimEventFocus:
+	    focus = false;
+	    break;
+
+	default:
+	    break;
+    }
+
+    return *this;
 }
 
 AnimEffectUsedFor& AnimEffectUsedFor::include (AnimEvent event)
 {
-  switch (event) {
-    case AnimEventOpen: open = true; break;
-    case AnimEventClose: close = true; break;
-    case AnimEventMinimize: minimize = true; break;
-    case AnimEventUnminimize: unminimize = true; break;
-    case AnimEventShade: shade = true; break;
-    case AnimEventFocus: focus = true; break;
-    default: break;
-  }
+    switch (event)
+    {
+	case AnimEventOpen:
+	    open = true;
+	    break;
+
+	case AnimEventClose:
+	    close = true;
+	    break;
+
+	case AnimEventMinimize:
+	    minimize = true;
+	    break;
+
+	case AnimEventUnminimize:
+	    unminimize = true;
+	    break;
+
+	case AnimEventShade:
+	    shade = true;
+	    break;
+
+	case AnimEventFocus:
+	    focus = true;
+	    break;
+
+	default:
+	    break;
+    }
+
   return *this;
 }
 
-AnimEffectInfo::AnimEffectInfo (const char *name,
-                               AnimEffectUsedFor usedFor,
-				CreateAnimFunc create,
-				bool isRestackAnim) :
+AnimEffectInfo::AnimEffectInfo (const char        *name,
+				AnimEffectUsedFor usedFor,
+				CreateAnimFunc    create,
+				bool              isRestackAnim) :
     name (name),
     create (create),
     isRestackAnim (isRestackAnim)
 {
-    usedForEvents[AnimEventOpen] = usedFor.open;
-    usedForEvents[AnimEventClose] = usedFor.close;
-    usedForEvents[AnimEventMinimize] = usedFor.minimize;
+    usedForEvents[AnimEventOpen]       = usedFor.open;
+    usedForEvents[AnimEventClose]      = usedFor.close;
+    usedForEvents[AnimEventMinimize]   = usedFor.minimize;
     usedForEvents[AnimEventUnminimize] = usedFor.unminimize;
-    usedForEvents[AnimEventShade] = usedFor.shade;
-    usedForEvents[AnimEventFocus] = usedFor.focus;
+    usedForEvents[AnimEventShade]      = usedFor.shade;
+    usedForEvents[AnimEventFocus]      = usedFor.focus;
 }
 
 bool
@@ -2587,7 +2688,7 @@
 AnimEffect animEffects[NUM_EFFECTS];
 
 ExtensionPluginAnimation animExtensionPluginInfo (CompString ("animation"),
-                                                  NUM_EFFECTS, animEffects, 0,
+						  NUM_EFFECTS, animEffects, 0,
 						  NUM_NONEFFECT_OPTIONS);
 ExtensionPluginInfo *
 Animation::getExtensionPluginInfo ()
@@ -2695,86 +2796,86 @@
     int i = 0;
 
     animEffects[i++] = AnimEffectNone =
-	new AnimEffectInfo ("animation:None",
-                            AnimEffectUsedFor::all(),
-                            0);
+	    new AnimEffectInfo ("animation:None",
+				AnimEffectUsedFor::all(),
+				0);
 
     animEffects[i++] = AnimEffectRandom =
-	new AnimEffectInfo ("animation:Random",
-                           AnimEffectUsedFor::all().exclude(AnimEventFocus),
-                           0);
+	    new AnimEffectInfo ("animation:Random",
+				AnimEffectUsedFor::all().exclude(AnimEventFocus),
+				0);
 
     animEffects[i++] = AnimEffectCurvedFold =
-	new AnimEffectInfo ("animation:Curved Fold",
-                           AnimEffectUsedFor::all().exclude(AnimEventFocus),
-			    &createAnimation<CurvedFoldAnim>);
-        
+	    new AnimEffectInfo ("animation:Curved Fold",
+				AnimEffectUsedFor::all().exclude(AnimEventFocus),
+				&createAnimation<CurvedFoldAnim>);
+
     animEffects[i++] = AnimEffectDodge =
-	new AnimEffectInfo ("animation:Dodge", 
-                           AnimEffectUsedFor::none().include(AnimEventFocus),
-			    &createAnimation<DodgeAnim>,
-			    true);
-        
+	    new AnimEffectInfo ("animation:Dodge",
+				AnimEffectUsedFor::none().include(AnimEventFocus),
+				&createAnimation<DodgeAnim>,
+				true);
+
     animEffects[i++] = AnimEffectDream =
-	new AnimEffectInfo ("animation:Dream", 
-                           AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
-			    &createAnimation<DreamAnim>);
+	    new AnimEffectInfo ("animation:Dream",
+				AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
+				&createAnimation<DreamAnim>);
 
     animEffects[i++] = AnimEffectFade =
-	new AnimEffectInfo ("animation:Fade",
-                           AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
-			    &createAnimation<FadeAnim>);
-        
+	    new AnimEffectInfo ("animation:Fade",
+				AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
+				&createAnimation<FadeAnim>);
+
     animEffects[i++] = AnimEffectFocusFade =
-	new AnimEffectInfo ("animation:Focus Fade", 
-                           AnimEffectUsedFor::none().include(AnimEventFocus),
-			    &createAnimation<FocusFadeAnim>,
-			    true);
-        
+	    new AnimEffectInfo ("animation:Focus Fade",
+				AnimEffectUsedFor::none().include(AnimEventFocus),
+				&createAnimation<FocusFadeAnim>,
+				true);
+
     animEffects[i++] = AnimEffectGlide1 =
-	new AnimEffectInfo ("animation:Glide 1",
-                           AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
-			    &createAnimation<GlideAnim>);
-        
+	    new AnimEffectInfo ("animation:Glide 1",
+				AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
+				&createAnimation<GlideAnim>);
+
     animEffects[i++] = AnimEffectGlide2 =
-	new AnimEffectInfo ("animation:Glide 2",
-                           AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
-			    &createAnimation<Glide2Anim>);
-        
+	    new AnimEffectInfo ("animation:Glide 2",
+				AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
+				&createAnimation<Glide2Anim>);
+
     animEffects[i++] = AnimEffectHorizontalFolds =
-	new AnimEffectInfo ("animation:Horizontal Folds",
-                           AnimEffectUsedFor::all().exclude(AnimEventFocus),
-			    &createAnimation<HorizontalFoldsAnim>);
-        
+	    new AnimEffectInfo ("animation:Horizontal Folds",
+				AnimEffectUsedFor::all().exclude(AnimEventFocus),
+				&createAnimation<HorizontalFoldsAnim>);
+
     animEffects[i++] = AnimEffectMagicLamp =
-	new AnimEffectInfo ("animation:Magic Lamp",
-                           AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
-			    &createAnimation<MagicLampAnim>);
-        
+	    new AnimEffectInfo ("animation:Magic Lamp",
+				AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
+				&createAnimation<MagicLampAnim>);
+
     animEffects[i++] = AnimEffectMagicLampWavy =
-	new AnimEffectInfo ("animation:Magic Lamp Wavy",
-                           AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
-			    &createAnimation<MagicLampWavyAnim>);
-        
+	    new AnimEffectInfo ("animation:Magic Lamp Wavy",
+				AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
+				&createAnimation<MagicLampWavyAnim>);
+
     animEffects[i++] = AnimEffectRollUp =
-	new AnimEffectInfo ("animation:Roll Up",
-                           AnimEffectUsedFor::none().include(AnimEventShade),
-			    &createAnimation<RollUpAnim>);
-        
+	    new AnimEffectInfo ("animation:Roll Up",
+				AnimEffectUsedFor::none().include(AnimEventShade),
+				&createAnimation<RollUpAnim>);
+
     animEffects[i++] = AnimEffectSidekick =
-	new AnimEffectInfo ("animation:Sidekick",
-                           AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
-			    &createAnimation<SidekickAnim>);
-        
+	    new AnimEffectInfo ("animation:Sidekick",
+				AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
+				&createAnimation<SidekickAnim>);
+
     animEffects[i++] = AnimEffectWave =
-	new AnimEffectInfo ("animation:Wave",
-                           AnimEffectUsedFor::all().exclude(AnimEventShade),
-			    &createAnimation<WaveAnim>);
-    
+	    new AnimEffectInfo ("animation:Wave",
+				AnimEffectUsedFor::all().exclude(AnimEventShade),
+				&createAnimation<WaveAnim>);
+
     animEffects[i++] = AnimEffectZoom =
-	new AnimEffectInfo ("animation:Zoom", 
-                           AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
-			    &createAnimation<ZoomAnim>);
+	    new AnimEffectInfo ("animation:Zoom",
+				AnimEffectUsedFor::all().exclude(AnimEventFocus).exclude(AnimEventShade),
+				&createAnimation<ZoomAnim>);
 
     animExtensionPluginInfo.effectOptions = &getOptions ();
 
@@ -2813,18 +2914,14 @@
 	mPluginActive[i] = false;
 
     if (w->minimized ())
-    {
 	mState = mNewState = IconicState;
-    }
     else if (w->shaded ())
     {
 	mState = mNewState = NormalState;
 	mNowShaded = true;
     }
     else
-    {
 	mState = mNewState = getState ();
-    }
 
     WindowInterface::setHandler (mWindow, true);
     GLWindowInterface::setHandler (gWindow, false);
@@ -2846,27 +2943,34 @@
 	    mPAScreen->initiateMinimizeAnim (this);
 	    mEventNotOpenClose = true;
 	    break;
+
 	case CompWindowNotifyLeaveShowDesktopMode:
 	case CompWindowNotifyUnminimize:
 	    mPAScreen->initiateUnminimizeAnim (this);
 	    mEventNotOpenClose = true;
 	    break;
+
 	case CompWindowNotifyShade:
 	    mPAScreen->initiateShadeAnim (this);
 	    mEventNotOpenClose = true;
 	    break;
+
 	case CompWindowNotifyUnshade:
 	    if (mNowShaded &&
 		mCurAnimation &&
 		mCurAnimation->curWindowEvent () == WindowEventShade)
 		mPAScreen->initiateUnshadeAnim (this); // reverse the shade anim
+
 	    break;
+
 	case CompWindowNotifyClose:
 	    if (!(mCurAnimation &&
 		  (mCurAnimation->curWindowEvent () == WindowEventClose ||
 		   mCurAnimation->curWindowEvent () == WindowEventUnminimize)))
 		mPAScreen->initiateCloseAnim (this);
+
 	    break;
+
 	case CompWindowNotifyShow:
 	case CompWindowNotifyBeforeMap:
 	    // Prevent dialog disappearing when a dialog is reopened during
@@ -2877,7 +2981,9 @@
 		mPAScreen->initiateOpenAnim (this);
 		mEventNotOpenClose = false;
 	    }
+
 	    break;
+
 	case CompWindowNotifyMap:
 	    if (mNowShaded)
 		mUnshadePending = true;
@@ -2890,7 +2996,9 @@
 			mCurAnimation->curWindowEvent () == WindowEventOpen)))
 		mPAScreen->initiateOpenAnim (this);
 	    mEventNotOpenClose = false;
+
 	    break;
+
 	case CompWindowNotifyBeforeUnmap:
 	    if (mCurAnimation && mCurAnimation->curWindowEvent () == WindowEventMinimize)
 	    {
@@ -2898,28 +3006,29 @@
 		mWindow->incrementUnmapReference ();
 	    }
 	    break;
+
 	case CompWindowNotifyBeforeDestroy:
 	    if (!mFinishingAnim)
 	    {
-		if (mPAScreen->shouldIgnoreWindowForAnim (mWindow, true))
-		    break;
-
-		/* Don't increment the destroy reference count unless
-		 * the window is already animated */
-		if (!mCurAnimation)
+		if (mPAScreen->shouldIgnoreWindowForAnim (mWindow, true) ||
+		    /* Don't increment the destroy reference count unless
+		     * the window is already animated */
+		    !mCurAnimation)
 		    break;
 
 		++mDestroyCnt;
 		mWindow->incrementDestroyReference ();
 	    }
+
 	    break;
+
 	case CompWindowNotifyUnreparent:
-	    if (!mFinishingAnim)
-	    {
-		if (mPAScreen->shouldIgnoreWindowForAnim (mWindow, false))
-		    break;
-	    }
+	    if (!mFinishingAnim &&
+		mPAScreen->shouldIgnoreWindowForAnim (mWindow, false))
+		break;
+
 	    break;
+
 	case CompWindowNotifyFocusChange:
 	    if (!mPAScreen->mLastActiveWindow ||
 	    	mPAScreen->mLastActiveWindow != mWindow->id ())
@@ -2942,6 +3051,7 @@
 	    }
 
 	    break;
+
 	case CompWindowNotifyRestack:
 	{
 	    // Prevent menu disappearing when a menu is reopened during
@@ -2956,18 +3066,17 @@
 	    }
 
 	    // Handle CompWindowNotifyRestack only when necessary.
-	    if (!mPAScreen->isRestackAnimPossible ())
-		break;
-
-	    if (mPAScreen->mStartCountdown) // Don't animate at startup
+	    if (!mPAScreen->isRestackAnimPossible () ||
+		mPAScreen->mStartCountdown) // Don't animate at startup
 		break;
 
 	    foreach (ExtensionPluginInfo *extPlugin,
-	    	     mPAScreen->mExtensionPlugins)
+		     mPAScreen->mExtensionPlugins)
 		extPlugin->handleRestackNotify (mAWindow);
 
 	    break;
 	}
+
 	default:
 	    break;
     }
@@ -2983,8 +3092,8 @@
 
 AnimEffect
 AnimScreen::getMatchingAnimSelection (CompWindow *w,
-				      AnimEvent e,
-				      int *duration)
+				      AnimEvent  e,
+				      int        *duration)
 {
     return priv->getMatchingAnimSelection (w, e, duration);
 }
@@ -3009,7 +3118,8 @@
 
 /// If duration is 0, it should be set to a positive value later.
 void
-AnimWindow::createFocusAnimation (AnimEffect effect, int duration)
+AnimWindow::createFocusAnimation (AnimEffect effect,
+				  int        duration)
 {
     priv->createFocusAnimation (effect, duration);
 }
@@ -3017,8 +3127,8 @@
 void
 AnimWindow::deletePersistentData (const char *name)
 {
-    PersistentDataMap::iterator itData =
-	persistentData.find (name);
+    PersistentDataMap::iterator itData = persistentData.find (name);
+
     if (itData != persistentData.end ()) // if found
     {
 	delete itData->second;
@@ -3027,13 +3137,13 @@
 }
 
 void
-PrivateAnimWindow::createFocusAnimation (AnimEffect effect, int duration)
+PrivateAnimWindow::createFocusAnimation (AnimEffect effect,
+					 int        duration)
 {
-    mCurAnimation =
-	effect->create (mWindow, WindowEventFocus,
-			duration,
-			effect,
-			CompRect ());
+    mCurAnimation = effect->create (mWindow, WindowEventFocus,
+				    duration,
+				    effect,
+				    CompRect ());
     enablePainting (true);
 }
 
@@ -3069,6 +3179,7 @@
 
     // Destroy each persistent data object
     PersistentDataMap::iterator itData = persistentData.begin ();
+
     for (; itData != persistentData.end (); ++itData)
 	delete itData->second;
 

=== modified file 'plugins/animation/src/curvedfold.cpp'
--- plugins/animation/src/curvedfold.cpp	2013-04-25 11:07:54 +0000
+++ plugins/animation/src/curvedfold.cpp	2013-07-24 17:39:26 +0000
@@ -63,11 +63,11 @@
     return progressLinear ();
 }
 
-CurvedFoldAnim::CurvedFoldAnim (CompWindow *w,
-				WindowEvent curWindowEvent,
-				float duration,
+CurvedFoldAnim::CurvedFoldAnim (CompWindow       *w,
+				WindowEvent      curWindowEvent,
+				float            duration,
 				const AnimEffect info,
-				const CompRect &icon) :
+				const CompRect   &icon) :
     Animation::Animation (w, curWindowEvent, duration, info, icon),
     TransformAnim::TransformAnim (w, curWindowEvent, duration, info, icon),
     FoldAnim::FoldAnim (w, curWindowEvent, duration, info, icon)
@@ -83,10 +83,10 @@
 
 float
 CurvedFoldAnim::getObjectZ (GridAnim::GridModel *mModel,
-			    float forwardProgress,
-			    float sinForProg,
-			    float relDistToCenter,
-			    float curveMaxAmp)
+			    float               forwardProgress,
+			    float               sinForProg,
+			    float               relDistToCenter,
+			    float               curveMaxAmp)
 {
     return -(sinForProg *
 	     (1 - pow (pow (2 * relDistToCenter, 1.3), 2)) *
@@ -102,24 +102,20 @@
     float forwardProgress = getActualProgress ();
 
     CompRect winRect (mAWindow->savedRectsValid () ?
-		      mAWindow->saveWinRect () :
-		      mWindow->geometry ());
+		      mAWindow->saveWinRect () : mWindow->geometry ());
     CompRect inRect (mAWindow->savedRectsValid () ?
-		     mAWindow->savedInRect () :
-		     mWindow->borderRect ());
+		     mAWindow->savedInRect () : mWindow->borderRect ());
     CompRect outRect (mAWindow->savedRectsValid () ?
-		      mAWindow->savedOutRect () :
-		      mWindow->outputRect ());
+		      mAWindow->savedOutRect () : mWindow->outputRect ());
     CompWindowExtents outExtents (mAWindow->savedRectsValid () ?
-				  mAWindow->savedOutExtents () :
-				  mWindow->output ());
+				  mAWindow->savedOutExtents () : mWindow->output ());
 
-    int wx = winRect.x ();
-    int wy = winRect.y ();
+    int wx      = winRect.x ();
+    int wy      = winRect.y ();
     int wheight = winRect.height ();
 
-    int oy = outRect.y ();
-    int owidth = outRect.width ();
+    int oy      = outRect.y ();
+    int owidth  = outRect.width ();
     int oheight = outRect.height ();
 
     float curveMaxAmp = (0.4 * pow ((float)oheight /
@@ -130,6 +126,7 @@
 
     GridModel::GridObject *object = mModel->objects ();
     unsigned int n = mModel->numObjects ();
+
     for (unsigned int i = 0; i < n; ++i, ++object)
     {
 	Point3d &objPos = object->position ();
@@ -229,6 +226,7 @@
 
     GridModel::GridObject *objects = mModel->objects ();
     unsigned int n = mModel->numObjects ();
+
     for (unsigned int i = 0; i < n; ++i)
     {
 	Point3d &pos = objects[i].position ();

=== modified file 'plugins/animation/src/dodge.cpp'
--- plugins/animation/src/dodge.cpp	2013-04-25 11:07:54 +0000
+++ plugins/animation/src/dodge.cpp	2013-07-24 17:39:26 +0000
@@ -57,7 +57,8 @@
 }
 
 bool
-DodgeAnim::moveUpdate (int dx, int dy)
+DodgeAnim::moveUpdate (int dx,
+		       int dy)
 {
     if (mDodgeData->isDodgeSubject &&
     	mDodgeDirection == DodgeDirectionXY)
@@ -73,16 +74,19 @@
     // Update dodge amount for the dodgers of all subjects
     // in the restack chain
     RestackPersistentData *dataCur;
+
     for (CompWindow *wCur = wBottommost; wCur;
 	 wCur = dataCur->mMoreToBePaintedNext)
     {
 	AnimWindow *awCur = AnimWindow::get (wCur);
 	dataCur = static_cast<RestackPersistentData *>
 	    (awCur->persistentData["restack"]);
+
 	if (!dataCur)
 	    break;
 
 	Animation *curAnim = awCur->curAnimation ();
+
 	if (!curAnim || curAnim->info () != AnimEffectDodge)
 	    continue;
 
@@ -99,14 +103,13 @@
 
 	    DodgeAnim *animDodger =
 		dynamic_cast<DodgeAnim *> (adw->curAnimation ());
+
 	    if (!animDodger)
 		continue;
 
 	    if (animDodger->mDodgeSubjectWin &&
 		animDodger->mTransformProgress <= 0.5f)
-	    {
 		animDodger->updateDodgerDodgeAmount ();
-	    }
 	}
     }
 
@@ -132,15 +135,11 @@
     if (((mDodgeDirection == DodgeDirectionDown && newDodgeAmount > 0) ||
 	 (mDodgeDirection == DodgeDirectionUp && newDodgeAmount < 0)) &&
 	abs (newDodgeAmount) > abs (mDodgeMaxAmountY))
-    {
 	mDodgeMaxAmountY = newDodgeAmount;
-    }
     else if (((mDodgeDirection == DodgeDirectionRight && newDodgeAmount > 0) ||
 	      (mDodgeDirection == DodgeDirectionLeft && newDodgeAmount < 0)) &&
 	     abs (newDodgeAmount) > abs (mDodgeMaxAmountX))
-    {
 	mDodgeMaxAmountX = newDodgeAmount;
-    }
 }
 
 float
@@ -160,9 +159,10 @@
     mTransformProgress = 0;
 
     float forwardProgress = dodgeProgress ();
+
     if (forwardProgress > mTransformStartProgress)
     {
-    	// Compute transform progress and normalize
+	// Compute transform progress and normalize
 	mTransformProgress =
 	    (forwardProgress - mTransformStartProgress) /
 	    (1 - mTransformStartProgress);
@@ -182,31 +182,32 @@
 DodgeAnim::postPreparePaint ()
 {
     // Only dodge subjects (with dodger chains) should be processed here
-    if (!mDodgeData || !mDodgeData->isDodgeSubject ||
-    	!mDodgeData->dodgeChainStart)
-	return;
-
-    if (!mRestackData || !mRestackData->restackInfo ())
-	return;
-
-    if (mDodgeData->skipPostPrepareScreen)
+    if (!mDodgeData			||
+	!mDodgeData->isDodgeSubject	||
+	!mDodgeData->dodgeChainStart	||
+	!mRestackData			||
+	!mRestackData->restackInfo ()	||
+	mDodgeData->skipPostPrepareScreen)
 	return;
 
     // Find the bottommost subject in restack chain
     CompWindow *wBottommost = mWindow;
     RestackPersistentData *dataCur;
+
     for (CompWindow *wCur = mRestackData->mMoreToBePaintedPrev; wCur;
-    	 wCur = dataCur->mMoreToBePaintedPrev)
+	 wCur = dataCur->mMoreToBePaintedPrev)
     {
-    	wBottommost = wCur;
-    	dataCur = static_cast<RestackPersistentData *>
-    	    (AnimWindow::get (wCur)->persistentData["restack"]);
-    	if (!dataCur)
-    	    break;
+	wBottommost = wCur;
+	dataCur = static_cast<RestackPersistentData *>
+		  (AnimWindow::get (wCur)->persistentData["restack"]);
+
+	if (!dataCur)
+	    break;
     }
+
     AnimWindow *awBottommost = AnimWindow::get (wBottommost);
     RestackPersistentData *restackDataBottommost =
-    	static_cast<RestackPersistentData *>
+	static_cast<RestackPersistentData *>
 	(awBottommost->persistentData["restack"]);
 
     // Find the first dodging window that hasn't yet
@@ -215,11 +216,14 @@
     // if subject is being lowered).
     RestackPersistentData *restackDataDodger = NULL;
     DodgePersistentData *dodgeDataDodger = NULL;
+
     CompWindow *dw;
+
     for (dw = mDodgeData->dodgeChainStart; dw;
 	 dw = dodgeDataDodger->dodgeChainNext)
     {
 	AnimWindow *adw = AnimWindow::get (dw);
+
 	restackDataDodger = static_cast<RestackPersistentData *>
 	    (adw->persistentData["restack"]);
 	dodgeDataDodger = static_cast<DodgePersistentData *>
@@ -233,12 +237,13 @@
     }
 
     RestackInfo *bottommostRestackInfo = restackDataBottommost->restackInfo ();
+
     if (!bottommostRestackInfo)
     	return;
 
     if (bottommostRestackInfo->raised &&
 	// if mWindow's host should change
-    	dw != restackDataBottommost->mWinThisIsPaintedBefore)
+	dw != restackDataBottommost->mWinThisIsPaintedBefore)
     {
 	if (restackDataBottommost->mWinThisIsPaintedBefore)
 	{
@@ -252,13 +257,12 @@
 	}
 	// if a dodger win. is still at <0.5 progress
 	if (dw && restackDataDodger)
-	{
 	    // Put subject right behind new host
 	    restackDataDodger->mWinToBePaintedBeforeThis = wBottommost;
-	}
+
 	// otherwise all dodger win.s have passed 0.5 progress
-
 	CompWindow *wCur = wBottommost;
+
 	while (wCur)
 	{
 	    RestackPersistentData *dataCur =
@@ -281,14 +285,11 @@
 	if (dw && dodgeDataDodger)
 	{
 	    if (dodgeDataDodger->dodgeChainPrev)
-	    {
 	    	wDodgeChainAbove = dodgeDataDodger->dodgeChainPrev;
-	    }
 	    else
-	    {
 	    	// Use the wOldAbove of topmost subject
 		wDodgeChainAbove = mRestackData->restackInfo ()->wOldAbove;
-	    }
+
 	    if (!wDodgeChainAbove)
 		compLogMessage ("animation", CompLogLevelError,
 				"%s: error at line %d", __FILE__, __LINE__);
@@ -318,6 +319,7 @@
 	// otherwise all dodger win.s have passed 0.5 progress
 
 	CompWindow *wCur = wBottommost;
+
 	while (wCur)
 	{
 	    RestackPersistentData *dataCur =
@@ -335,7 +337,7 @@
 {
     // for dodging windows only, when subject is fixed
     return !(mDodgeMode == AnimationOptions::DodgeModeFixedClickedWindow &&
-    	     mDodgeData->isDodgeSubject);
+	     mDodgeData->isDodgeSubject);
 }
 
 void
@@ -344,11 +346,11 @@
     TransformAnim::updateBB (output);
 }
 
-DodgeAnim::DodgeAnim (CompWindow *w,
-		      WindowEvent curWindowEvent,
-		      float duration,
+DodgeAnim::DodgeAnim (CompWindow       *w,
+		      WindowEvent      curWindowEvent,
+		      float            duration,
 		      const AnimEffect info,
-		      const CompRect &icon) :
+		      const CompRect   &icon) :
     Animation::Animation (w, curWindowEvent, duration, info, icon),
     RestackAnim::RestackAnim (w, curWindowEvent, duration, info, icon),
     TransformAnim::TransformAnim (w, curWindowEvent, duration, info, icon),
@@ -369,7 +371,7 @@
     // Remove this window from its subject's dodger chain
     if (mDodgeSubjectWin)
     {
-    	CompWindow *w = mDodgeSubjectWin;
+	CompWindow *w = mDodgeSubjectWin;
 	AnimWindow *aw = AnimWindow::get (w);
 	Animation *curAnim = aw->curAnimation ();
 	DodgePersistentData *dodgeData = static_cast<DodgePersistentData *>
@@ -389,10 +391,12 @@
 		AnimWindow *adw = AnimWindow::get (dw);
 		dodgeDataDodger = static_cast<DodgePersistentData *>
 		    (adw->persistentData["dodge"]);
+
 		if (dw == mWindow)
 		{
 		    // Remove mWindow from the chain
 		    CompWindow *dwNext = dodgeDataDodger->dodgeChainNext;
+
 		    if (dwNext)
 		    {
 			AnimWindow *adwNext = AnimWindow::get (dwNext);
@@ -402,7 +406,9 @@
 			dodgeDataDodgerNext->dodgeChainPrev =
 			    dodgeDataDodger->dodgeChainPrev;
 		    }
+
 		    CompWindow *dwPrev = dodgeDataDodger->dodgeChainPrev;
+
 		    if (dwPrev)
 		    {
 			AnimWindow *adwPrev = AnimWindow::get (dwPrev);
@@ -412,9 +418,11 @@
 			dodgeDataDodgerPrev->dodgeChainNext =
 			    dodgeDataDodger->dodgeChainNext;
 		    }
+
 		    if (dodgeData->dodgeChainStart == mWindow)
 			dodgeData->dodgeChainStart =
 			    dodgeDataDodger->dodgeChainNext;
+
 		    dodgeDataDodger->dodgeChainPrev = 0;
 		    dodgeDataDodger->dodgeChainNext = 0;
 		}
@@ -431,12 +439,15 @@
 	    // Update this window's dodgers so that they no longer point
 	    // to this window as their subject
 	    DodgePersistentData *dodgeDataDodger;
+
 	    for (CompWindow *dw = dodgeData->dodgeChainStart; dw;
 		 dw = dodgeDataDodger->dodgeChainNext)
 	    {
 		AnimWindow *adw = AnimWindow::get (dw);
+
 		if (!adw)
 		    break;
+
 		dodgeDataDodger = static_cast<DodgePersistentData *>
 		    (adw->persistentData["dodge"]);
 
@@ -445,6 +456,7 @@
 		if (curAnim && curAnim->info () == AnimEffectDodge)
 		{
 		    DodgeAnim *animDodger = dynamic_cast<DodgeAnim *> (curAnim);
+
 		    if (animDodger->mDodgeSubjectWin == mWindow)
 			animDodger->mDodgeSubjectWin = NULL;
 		}
@@ -463,8 +475,8 @@
 }
 
 int
-DodgeAnim::getDodgeAmount (CompRect &rect,
-			   CompWindow *dw,
+DodgeAnim::getDodgeAmount (CompRect       &rect,
+			   CompWindow     *dw,
 			   DodgeDirection dir)
 {
     CompRect dRect (dw->borderRect ().x () +
@@ -477,23 +489,29 @@
 		     dw->outputRect ().height ()) / 2);
 
     int amount = 0;
+
     switch (dir)
     {
 	case DodgeDirectionUp:
 	    amount = (rect.y () - (dRect.y () + dRect.height ()));
 	    break;
+
 	case DodgeDirectionDown:
 	    amount = (rect.y () + rect.height () - dRect.y ());
 	    break;
+
 	case DodgeDirectionLeft:
 	    amount = (rect.x () - (dRect.x () + dRect.width ()));
 	    break;
+
 	case DodgeDirectionRight:
 	    amount = (rect.x () + rect.width () - dRect.x ());
 	    break;
+
 	default:
 	    break;
     }
+
     return amount;
 }
 
@@ -501,41 +519,45 @@
 DodgeAnim::processCandidate (CompWindow *candidateWin,
 			     CompWindow *subjectWin,
 			     CompRegion &candidateAndSubjectIntersection,
-			     int &numSelectedCandidates)
+			     int        &numSelectedCandidates)
 {
     AnimWindow *aCandidateWin = AnimWindow::get (candidateWin);
-    AnimScreen *as = AnimScreen::get (::screen);
+    AnimScreen *as            = AnimScreen::get (::screen);
 
     if ((!aCandidateWin->curAnimation () ||
 	 aCandidateWin->curAnimation ()->info () == AnimEffectDodge) &&
 	candidateWin != subjectWin) // don't let the subject dodge itself
     {
 	// Mark this window for dodge
-
 	bool nonMatching = false;
+
 	if (as->getMatchingAnimSelection (candidateWin, AnimEventFocus, 0) !=
 	    AnimEffectDodge)
 	    nonMatching = true;
 
 	++numSelectedCandidates;
+
 	DodgePersistentData *data = static_cast<DodgePersistentData *>
 	    (aCandidateWin->persistentData["dodge"]);
+
 	data->dodgeOrder = numSelectedCandidates;
+
 	if (nonMatching) // Use neg. values for non-matching windows
 	    data->dodgeOrder *= -1;
     }
 }
 
 void
-DodgeAnim::postInitiateRestackAnim (int numSelectedCandidates,
-				    int duration,
+DodgeAnim::postInitiateRestackAnim (int        numSelectedCandidates,
+				    int        duration,
 				    CompWindow *wStart,
 				    CompWindow *wEnd,
-				    bool raised)
+				    bool       raised)
 {
     DodgePersistentData *dataSubject = mDodgeData;
+
     if (!dataSubject)
-    	return;
+	return;
 
     dataSubject->isDodgeSubject = true;
     dataSubject->dodgeChainStart = 0;
@@ -564,11 +586,13 @@
 	// Initiate dodge for this window
 
 	bool stationaryDodger = false;
+
 	if (dataDodger->dodgeOrder < 0)
 	{
 	    dataDodger->dodgeOrder *= -1; // Make it positive again
 	    stationaryDodger = true;
 	}
+
 	if (!adw->curAnimation ())
 	{
 	    // Create dodge animation for dodger
@@ -579,8 +603,7 @@
 	    extPlugin->incrementCurRestackAnimCount ();
 	}
 
-	DodgeAnim *animDodger =
-	    dynamic_cast<DodgeAnim *> (adw->curAnimation ());
+	DodgeAnim *animDodger = dynamic_cast<DodgeAnim *> (adw->curAnimation ());
 
 	animDodger->mDodgeSubjectWin = mWindow;
 
@@ -598,8 +621,7 @@
 		    (1 - (float)dataDodger->dodgeOrder / numSelectedCandidates);
 	}
 
-	float transformTotalProgress =
-	    1 + animDodger->mTransformStartProgress;
+	float transformTotalProgress = 1 + animDodger->mTransformStartProgress;
 
 	if (maxTransformTotalProgress < transformTotalProgress)
 	    maxTransformTotalProgress = transformTotalProgress;
@@ -625,17 +647,15 @@
 		static_cast<DodgePersistentData *>
 		(AnimWindow::get (wDodgeChainLastVisited)->
 		 persistentData["dodge"]);
+
 	    if (raised)
-	    {
 		dataDodgeChainLastVisited->dodgeChainNext = dw;
-	    }
 	    else
 		dataDodgeChainLastVisited->dodgeChainPrev = dw;
 	}
 	else if (raised) // mark chain start
-	{
 	    dataSubject->dodgeChainStart = dw;
-	}
+
 	if (raised)
 	{
 	    dataDodger->dodgeChainPrev = wDodgeChainLastVisited;
@@ -679,6 +699,7 @@
     // Go through each dodger, calculating its dodge amount.
     // dw: Dodger window
     DodgePersistentData *dodgeDataDodger;
+
     for (CompWindow *dw = mDodgeData->dodgeChainStart; dw;
 	 dw = dodgeDataDodger->dodgeChainNext)
     {
@@ -687,8 +708,8 @@
 	dodgeDataDodger = static_cast<DodgePersistentData *>
 	    (adw->persistentData["dodge"]);
 
-	DodgeAnim *animDodger =
-	    dynamic_cast<DodgeAnim *> (adw->curAnimation ());
+	DodgeAnim *animDodger = dynamic_cast<DodgeAnim *> (adw->curAnimation ());
+
 	if (!animDodger)
 	    continue;
 
@@ -703,9 +724,11 @@
 	int amountMinActual = dodgeAmount[0];
 	int amountMinAbs = abs (amountMinActual);
 	int iMin = 0;
-	for (int i=1; i < 4; ++i)
+
+	for (int i = 1; i < 4; ++i)
 	{
 	    int absAmount = abs (dodgeAmount[i]);
+
 	    if (amountMinAbs > absAmount)
 	    {
 		amountMinAbs = absAmount;
@@ -713,11 +736,13 @@
 		iMin = i;
 	    }
 	}
+
 	if (iMin == DodgeDirectionUp ||
 	    iMin == DodgeDirectionDown)
 	{
 	    animDodger->mDodgeMaxAmountX = 0;
 	    animDodger->mDodgeMaxAmountY = dodgeAmount[iMin];
+
 	    if (mDodgeMode == AnimationOptions::DodgeModeAllMoving &&
 	    	maxDistY < amountMinAbs)
 	    {
@@ -729,6 +754,7 @@
 	{
 	    animDodger->mDodgeMaxAmountX = dodgeAmount[iMin];
 	    animDodger->mDodgeMaxAmountY = 0;
+
 	    if (mDodgeMode == AnimationOptions::DodgeModeAllMoving && maxDistX < amountMinAbs)
 	    {
 		maxDistX = amountMinAbs;
@@ -786,13 +812,16 @@
 	    AnimWindow *awCur = AnimWindow::get (wCur);
 
 	    dataCur = static_cast<RestackPersistentData *>
-	    	(awCur->persistentData["restack"]);
+		(awCur->persistentData["restack"]);
+
 	    if (!dataCur)
-	    	break;
+		break;
 
 	    Animation *curAnim = awCur->curAnimation ();
+
 	    if (!curAnim || curAnim->info () != AnimEffectDodge)
 		continue;
+
 	    DodgeAnim *dodgeAnim = dynamic_cast<DodgeAnim *> (curAnim);
 
 	    dodgeAnim->mDodgeMaxAmountX = dodgeAmountX + offsetX;
@@ -808,6 +837,7 @@
 	    // subject(s) is dodging in that axis (X or Y).
 	    // dw: Dodger window
 	    DodgePersistentData *dodgeDataDodger;
+
 	    for (CompWindow *dw = mDodgeData->dodgeChainStart; dw;
 		 dw = dodgeDataDodger->dodgeChainNext)
 	    {
@@ -818,6 +848,7 @@
 
 		DodgeAnim *animDodger =
 		    dynamic_cast<DodgeAnim *> (adw->curAnimation ());
+
 		if (!animDodger)
 		    continue;
 
@@ -825,11 +856,9 @@
 		if (subjectDodgesInX && animDodger->mDodgeMaxAmountX != 0)
 		{
 		    if (animDodger->mDodgeMaxAmountX *
-		    	(animDodger->mDodgeMaxAmountX + dodgeAmountX) < 0)
-		    {
-		    	// If the sign is going to change, just reset instead
+			(animDodger->mDodgeMaxAmountX + dodgeAmountX) < 0)
+			// If the sign is going to change, just reset instead
 			animDodger->mDodgeMaxAmountX = 0;
-		    }
 		    else
 		    	animDodger->mDodgeMaxAmountX += dodgeAmountX;
 		}
@@ -838,13 +867,13 @@
 		if (subjectDodgesInY && animDodger->mDodgeMaxAmountY != 0)
 		{
 		    if (animDodger->mDodgeMaxAmountY *
-		    	(animDodger->mDodgeMaxAmountY + dodgeAmountY) < 0)
+			(animDodger->mDodgeMaxAmountY + dodgeAmountY) < 0)
 		    {
-		    	// If the sign is going to change, just reset instead
+			// If the sign is going to change, just reset instead
 			animDodger->mDodgeMaxAmountY = 0;
 		    }
 		    else
-		    	animDodger->mDodgeMaxAmountY += dodgeAmountY;
+			animDodger->mDodgeMaxAmountY += dodgeAmountY;
 		}
 	    }
 	}
@@ -873,4 +902,3 @@
     dodgeChainNext (0)
 {
 }
-

=== modified file 'plugins/animation/src/dream.cpp'
--- plugins/animation/src/dream.cpp	2013-04-25 11:07:54 +0000
+++ plugins/animation/src/dream.cpp	2013-07-24 17:39:26 +0000
@@ -40,11 +40,11 @@
 
 // =====================  Effect: Dream  =========================
 
-DreamAnim::DreamAnim (CompWindow *w,
-		      WindowEvent curWindowEvent,
-		      float duration,
+DreamAnim::DreamAnim (CompWindow       *w,
+		      WindowEvent      curWindowEvent,
+		      float            duration,
 		      const AnimEffect info,
-		      const CompRect &icon) :
+		      const CompRect   &icon) :
     Animation::Animation (w, curWindowEvent, duration, info, icon),
     TransformAnim::TransformAnim (w, curWindowEvent, duration, info, icon),
     GridZoomAnim::GridZoomAnim (w, curWindowEvent, duration, info, icon)
@@ -74,7 +74,7 @@
 void
 DreamAnim::initGrid ()
 {
-    mGridWidth = 2;
+    mGridWidth  = 2;
     mGridHeight = optValI (AnimationOptions::MagicLampWavyGridRes); // TODO new option
 }
 
@@ -98,15 +98,16 @@
     int wx = winRect.x ();
     int wy = winRect.y ();
 
-    int owidth = outRect.width ();
+    int owidth  = outRect.width ();
     int oheight = outRect.height ();
 
     float waveAmpMax = MIN (oheight, owidth) * 0.125f;
-    float waveWidth = 10.0f;
-    float waveSpeed = 7.0f;
+    float waveWidth  = 10.0f;
+    float waveSpeed  = 7.0f;
 
     GridModel::GridObject *object = mModel->objects ();
     unsigned int n = mModel->numObjects ();
+
     for (unsigned int i = 0; i < n; ++i, ++object)
     {
 	Point3d &objPos = object->position ();
@@ -132,8 +133,7 @@
 	objPos.setX (
 	    origx +
 	    forwardProgress * waveAmpMax * mModel->scale ().x () *
-	    sin (objGridPos.y () * M_PI * waveWidth +
-		waveSpeed * forwardProgress));
+	    sin (objGridPos.y () * M_PI * waveWidth + waveSpeed * forwardProgress));
     }
 }
 
@@ -153,4 +153,3 @@
 	     mCurWindowEvent == WindowEventUnminimize) &&
 	    optValB (AnimationOptions::DreamZoomToTaskbar));
 }
-

=== modified file 'plugins/animation/src/extensionplugin.cpp'
--- plugins/animation/src/extensionplugin.cpp	2013-04-25 11:07:54 +0000
+++ plugins/animation/src/extensionplugin.cpp	2013-07-24 17:39:26 +0000
@@ -38,11 +38,11 @@
 
 
 ExtensionPluginAnimation::ExtensionPluginAnimation
-    (const CompString &name,
-     unsigned int nEffects,
-     AnimEffect *effects,
+    (const CompString   &name,
+     unsigned int       nEffects,
+     AnimEffect         *effects,
      CompOption::Vector *effectOptions,
-     unsigned int firstEffectOptionIndex) :
+     unsigned int       firstEffectOptionIndex) :
     ExtensionPluginInfo (name, nEffects, effects, effectOptions,
 			 firstEffectOptionIndex),
     mAWinWasRestackedJustNow (false),
@@ -64,8 +64,8 @@
 void
 ExtensionPluginAnimation::cleanUpParentChildChainItem (AnimWindow *aw)
 {
-    PersistentDataMap::iterator itData =
-	aw->persistentData.find ("restack");
+    PersistentDataMap::iterator itData = aw->persistentData.find ("restack");
+
     if (itData != aw->persistentData.end ()) // if found
     {
 	RestackPersistentData *restackData =
@@ -77,15 +77,18 @@
 	    RestackPersistentData *dataOther = static_cast<RestackPersistentData *>
 		(AnimWindow::get (restackData->mWinThisIsPaintedBefore)->
 		 persistentData["restack"]);
+
 	    if (dataOther)
 		dataOther->mWinToBePaintedBeforeThis = 0;
 	}
+
 	restackData->mWinThisIsPaintedBefore = 0;
 	restackData->mMoreToBePaintedPrev = 0;
 	restackData->mMoreToBePaintedNext = 0;
     }
 
     itData = aw->persistentData.find ("dodge");
+
     if (itData != aw->persistentData.end ()) // if found
     {
 	DodgePersistentData *dodgeData =
@@ -99,8 +102,9 @@
 bool
 ExtensionPluginAnimation::paintShouldSkipWindow (CompWindow *w)
 {
-    AnimWindow *aw = AnimWindow::get (w);
+    AnimWindow                  *aw    = AnimWindow::get (w);
     PersistentDataMap::iterator itData = aw->persistentData.find ("restack");
+
     if (itData != aw->persistentData.end ()) // if found
     {
 	RestackPersistentData *data =
@@ -115,6 +119,7 @@
 	    dynamic_cast<RestackAnim *> (aw->curAnimation ())->paintedElsewhere ())
 	    return true;
     }
+
     return false;
 }
 
@@ -123,6 +128,7 @@
 ExtensionPluginAnimation::relevantForRestackAnim (CompWindow *w)
 {
     unsigned int wmType = w->wmType ();
+
     if (!((wmType &
 	   // these two are to be used as "host" windows
 	   // to host the painting of windows being focused
@@ -144,30 +150,33 @@
     if (!mAWinWasRestackedJustNow)
 	return;
 
-    bool focusAnimInitiated = false;
-    AnimScreen *as = AnimScreen::get (::screen);
+    bool       focusAnimInitiated = false;
+    AnimScreen *as                = AnimScreen::get (::screen);
 
     // Go in reverse order so that restack chains are handled properly
     for (CompWindowVector::reverse_iterator rit = mLastClientList.rbegin ();
 	 rit != mLastClientList.rend (); ++rit)
     {
-	CompWindow *w = (*rit);
+	CompWindow *w  = (*rit);
 	AnimWindow *aw = AnimWindow::get (w);
 	RestackPersistentData *data = static_cast<RestackPersistentData *>
 	    (aw->persistentData["restack"]);
+
 	if (!data)
 	    continue;
+
 	RestackInfo *restackInfo = data->restackInfo ();
+
 	if (!restackInfo)
 	    continue;
 
 	data->mIsSecondary = false;
 
-	if (as->otherPluginsActive () ||
+	if (as->otherPluginsActive ()	||
 	    // Don't initiate focus anim for current dodgers
-	    aw->curAnimation () ||
+	    aw->curAnimation ()		||
 	    // Don't initiate focus anim for windows being passed thru
-	    data->mWinPassingThrough ||
+	    data->mWinPassingThrough	||
 	    // Don't animate with stale restack info
 	    !restackInfoStillGood (restackInfo))
 	{
@@ -177,11 +186,10 @@
 
 	// Find the first window at a higher stacking order than w
 	CompWindow *nw;
+
 	for (nw = w->next; nw; nw = nw->next)
-	{
 	    if (relevantForRestackAnim (nw))
 		break;
-	}
 
 	// If w is being lowered, there has to be a window
 	// at a higher stacking position than w (like a panel)
@@ -208,7 +216,7 @@
 	    if (dataNext && dataNext->restackInfo () &&
 		wontCreateCircularChain (w, nw))
 	    {
-	    	// Link the two
+		// Link the two
 		dataNext->mMoreToBePaintedPrev = w;
 		data->mMoreToBePaintedNext = nw;
 
@@ -233,10 +241,12 @@
 	AnimWindow *aw = AnimWindow::get (w);
 	RestackPersistentData *data = static_cast<RestackPersistentData *>
 	    (aw->persistentData["restack"]);
+
 	if (!data)
 	    continue;
 
 	RestackInfo *restackInfo = data->restackInfo ();
+
 	if (restackInfo)
 	{
 	    if (as->initiateFocusAnim (aw))
@@ -249,22 +259,24 @@
     if (!focusAnimInitiated)
 	resetStackingInfo ();
 
-    if (!focusAnimInitiated ||
-	as->otherPluginsActive () ||
+    if (!focusAnimInitiated	    ||
+	as->otherPluginsActive ()   ||
 	!as->isAnimEffectPossible (AnimEffectDodge)) // Only dodge stuff below
 	return;
 
     // Calculate dodge amounts
     foreach (CompWindow *w, mLastClientList)
     {
-	AnimWindow *aw = AnimWindow::get (w);
-	Animation *curAnim = aw->curAnimation ();
+	AnimWindow *aw      = AnimWindow::get (w);
+	Animation  *curAnim = aw->curAnimation ();
+
 	if (!curAnim || curAnim->info () != AnimEffectDodge)
 	    continue;
 
 	// Only process subjects with a dodge chain
 	DodgePersistentData *dodgeData = static_cast<DodgePersistentData *>
 		(aw->persistentData["dodge"]);
+
 	if (!dodgeData || !dodgeData->dodgeChainStart ||
 	    !dodgeData->isDodgeSubject)
 	    continue;
@@ -276,30 +288,36 @@
     for (CompWindowVector::reverse_iterator rit = mLastClientList.rbegin ();
 	 rit != mLastClientList.rend (); ++rit)
     {
-	CompWindow *w = (*rit);
-	AnimWindow *aw = AnimWindow::get (w);
+	CompWindow                  *w     = (*rit);
+	AnimWindow                  *aw    = AnimWindow::get (w);
 	PersistentDataMap::iterator itData = aw->persistentData.find ("dodge");
+
 	if (itData == aw->persistentData.end ()) // if not found
 	    continue;
 
 	DodgePersistentData *data = static_cast<DodgePersistentData *>
 	    (itData->second);
+
 	if (!data->isDodgeSubject)
 	    continue;
 
 	bool dodgersAreOnlySubjects = true;
 	CompWindow *dw;
 	DodgePersistentData *dataDodger;
+
 	for (dw = data->dodgeChainStart; dw;
 	     dw = dataDodger->dodgeChainNext)
 	{
 	    dataDodger = static_cast<DodgePersistentData *>
 		(AnimWindow::get (dw)->persistentData["dodge"]);
+
 	    if (!dataDodger)
 		break;
+
 	    if (!dataDodger->isDodgeSubject)
 		dodgersAreOnlySubjects = false;
 	}
+
 	if (dodgersAreOnlySubjects)
 	    data->skipPostPrepareScreen = true;
     }
@@ -312,24 +330,23 @@
 
     // Only handle restack notifies when the window is (or was) on the client
     // list (i.e. not for menus, combos, etc.).
-    if (find (clients.begin (), clients.end (), aw->mWindow) ==
-	    clients.end () &&
-    	find (mLastClientList.begin (), mLastClientList.end (), aw->mWindow) ==
-    	    mLastClientList.end ())
+    if (find (clients.begin (), clients.end (), aw->mWindow) == clients.end () &&
+	find (mLastClientList.begin (), mLastClientList.end (), aw->mWindow) ==
+	    mLastClientList.end ())
 	return;
 
     bool winOpenedClosed = false;
     unsigned int n = clients.size ();
 
     if (n != mLastClientList.size ())
-    {
 	winOpenedClosed = true;
-    }
+
     // if restacking occurred and not window open/close
     if (!winOpenedClosed)
     {
 	RestackPersistentData *data = static_cast<RestackPersistentData *>
 	    (aw->persistentData["restack"]);
+
 	data->mConfigureNotified = true;
 
 	// Find which window is restacked
@@ -394,9 +411,9 @@
 	    bool preferRaised = false;
 	    bool onlyTwo = false;
 
-	    if (wChangeEnd &&
+	    if (wChangeEnd				&&
 		clients[(unsigned)changeEnd] ==
-		mLastClientList[(unsigned)changeStart] &&
+		mLastClientList[(unsigned)changeStart]	&&
 		clients[(unsigned)changeStart] ==
 		mLastClientList[(unsigned)changeEnd])
 	    {
@@ -406,6 +423,7 @@
 		    static_cast<RestackPersistentData *>
 		    (AnimWindow::get (wChangeEnd)->
 		     persistentData["restack"]);
+
 		if (data->mConfigureNotified)
 		    preferRaised = true;
 
@@ -417,6 +435,7 @@
 		RestackPersistentData *data =
 		    static_cast<RestackPersistentData *>
 		    (AnimWindow::get (w2)->persistentData["restack"]);
+
 		data->mConfigureNotified = false;
 	    }
 
@@ -445,11 +464,10 @@
 		wEnd = wChangeEnd;
 		wOldAbove = mLastClientList[(unsigned)(changeEnd + 1)];
 	    }
+
 	    for (; wOldAbove; wOldAbove = wOldAbove->next)
-	    {
 		if (!wOldAbove->destroyed ())
 		    break;
-	    }
 	}
 
 	if (wRestacked && wStart && wEnd && wOldAbove)
@@ -500,7 +518,7 @@
 
 void
 ExtensionPluginAnimation::postUpdateEventEffects (AnimEvent e,
-						  bool forRandom)
+						  bool      forRandom)
 {
     AnimScreen *as = AnimScreen::get (::screen);
 
@@ -521,9 +539,11 @@
 		if (aw->persistentData.find ("restack") !=
 		    aw->persistentData.end ())
 		    continue;
+
 		aw->persistentData["restack"] = new RestackPersistentData ();
 	    }
 	}
+
 	if (as->isAnimEffectPossible (AnimEffectDodge))
 	{
 	    foreach (CompWindow *w, CompositeScreen::get (::screen)->getWindowPaintList ())
@@ -533,6 +553,7 @@
 		if (aw->persistentData.find ("dodge") !=
 		    aw->persistentData.end ())
 		    continue;
+
 		aw->persistentData["dodge"] = new DodgePersistentData ();
 	    }
 	}
@@ -550,19 +571,15 @@
     if (as->isRestackAnimPossible () &&
 	// doesn't exist yet
 	aw->persistentData.find ("restack") == aw->persistentData.end ())
-    {
 	aw->persistentData["restack"] = new RestackPersistentData ();
-    }
+
     if (as->isAnimEffectPossible (AnimEffectDodge) &&
 	// doesn't exist yet
 	aw->persistentData.find ("dodge") == aw->persistentData.end ())
-    {
 	aw->persistentData["dodge"] = new DodgePersistentData ();
-    }
+
     if (aw->persistentData.find ("multi") == aw->persistentData.end ())
-    {
 	aw->persistentData["multi"] = new MultiPersistentData ();
-    }
 }
 
 void
@@ -595,9 +612,9 @@
 bool
 ExtensionPluginAnimation::restackInfoStillGood (RestackInfo *restackInfo)
 {
-    bool wStartGood = false;
-    bool wEndGood = false;
-    bool wOldAboveGood = false;
+    bool wStartGood     = false;
+    bool wEndGood       = false;
+    bool wOldAboveGood  = false;
     bool wRestackedGood = false;
 
     foreach (CompWindow *w, CompositeScreen::get (::screen)->getWindowPaintList ())
@@ -609,13 +626,17 @@
 
 	if (restackInfo->wStart == w)
 	    wStartGood = true;
+
 	if (restackInfo->wEnd == w)
 	    wEndGood = true;
+
 	if (restackInfo->wRestacked == w)
 	    wRestackedGood = true;
+
 	if (restackInfo->wOldAbove == w)
 	    wOldAboveGood = true;
     }
+
     return (wStartGood && wEndGood && wOldAboveGood && wRestackedGood);
 }
 
@@ -626,13 +647,15 @@
     foreach (CompWindow *w, CompositeScreen::get (::screen)->getWindowPaintList ())
     {
 	AnimWindow *aw = AnimWindow::get (w);
-	PersistentDataMap::iterator itData =
-	    aw->persistentData.find ("restack");
+	PersistentDataMap::iterator itData = aw->persistentData.find ("restack");
+
 	if (itData != aw->persistentData.end ()) // if found
 	{
 	    RestackPersistentData *data =
 		static_cast<RestackPersistentData *> (itData->second);
+
 	    data->mConfigureNotified = false;
+
 	    if (data->restackInfo ())
 		data->resetRestackInfo ();
 	}
@@ -654,8 +677,8 @@
 	::screen->clientList ().end (), aw->mWindow) !=
 	::screen->clientList ().end ())
     {
-    	resetStackingInfo ();
-    	updateLastClientList ();
+	resetStackingInfo ();
+	updateLastClientList ();
     }
 }
 
@@ -704,7 +727,9 @@
 
     RestackPersistentData *dataBottommost = static_cast<RestackPersistentData *>
 	(AnimWindow::get (wBottommost)->persistentData["restack"]);
+
     CompWindow *wPrev = dataBottommost->mMoreToBePaintedPrev;
+
     while (wPrev)
     {
 	wBottommost = wPrev;
@@ -712,6 +737,7 @@
 	    (AnimWindow::get (wPrev)->persistentData["restack"]);
 	wPrev = dataPrev->mMoreToBePaintedPrev;
     }
+
     return wBottommost;
 }
 
@@ -720,14 +746,16 @@
 CompWindow *
 ExtensionPluginAnimation::getBottommostInRestackChain (CompWindow *wStartPoint)
 {
-    CompWindow *wBottommost = wStartPoint;
+    CompWindow            *wBottommost = wStartPoint;
     RestackPersistentData *dataCur;
+
     for (CompWindow *wCur = wStartPoint; wCur;
 	 wCur = dataCur->mMoreToBePaintedPrev)
     {
 	wBottommost = wCur;
 	dataCur = static_cast<RestackPersistentData *>
 	    (AnimWindow::get (wCur)->persistentData["restack"]);
+
 	if (!dataCur)
 	    break;
     }
@@ -758,11 +786,13 @@
     resetMarks ();
 
     CompWindow *w =
-    	getBottommostInExtendedFocusChain (*CompositeScreen::get (::screen)->getWindowPaintList ().begin ());
+	getBottommostInExtendedFocusChain (*CompositeScreen::get (::screen)->getWindowPaintList ().begin ());
+
     if (w)
     {
 	RestackPersistentData *data = static_cast<RestackPersistentData *>
 	    (AnimWindow::get (w)->persistentData["restack"]);
+
 	++data->mVisitCount;
     }
     return w;
@@ -781,6 +811,7 @@
 	data->mWalkerOverNewCopy = true;
 	return true;
     }
+
     return false;
 }
 
@@ -796,13 +827,9 @@
     {
 	// Within a chain? (not the 1st or 2nd window)
 	if (data->mMoreToBePaintedNext)
-	{
 	    wRet = data->mMoreToBePaintedNext;
-	}
 	else if (data->mWinThisIsPaintedBefore) // 2nd one in chain?
-	{
 	    wRet = data->mWinThisIsPaintedBefore;
-	}
     }
     else
 	data->mWalkerOverNewCopy = false;
@@ -823,6 +850,7 @@
 
 	++dataRet->mVisitCount;
     }
+
     return wRet;
 }
 
@@ -830,9 +858,9 @@
 ExtensionPluginAnimation::getWindowPaintList ()
 {
     mWindowList.clear ();
+
     for (CompWindow *w = walkFirst (); w; w = walkNext (w))
 	mWindowList.push_back (w);
 
     return mWindowList;
 }
-

=== modified file 'plugins/animation/src/fade.cpp'
--- plugins/animation/src/fade.cpp	2013-02-27 11:33:10 +0000
+++ plugins/animation/src/fade.cpp	2013-07-24 17:39:26 +0000
@@ -38,11 +38,11 @@
 
 // =====================  Effect: Fade  =========================
 
-FadeAnim::FadeAnim (CompWindow *w,
-		    WindowEvent curWindowEvent,
-		    float duration,
+FadeAnim::FadeAnim (CompWindow       *w,
+		    WindowEvent      curWindowEvent,
+		    float            duration,
 		    const AnimEffect info,
-		    const CompRect &icon) :
+		    const CompRect   &icon) :
     Animation::Animation (w, curWindowEvent, duration, info, icon)
 {
 }
@@ -58,4 +58,3 @@
 {
     mAWindow->expandBBWithWindow ();
 }
-

=== modified file 'plugins/animation/src/focusfade.cpp'
--- plugins/animation/src/focusfade.cpp	2013-02-27 11:33:10 +0000
+++ plugins/animation/src/focusfade.cpp	2013-07-24 17:39:26 +0000
@@ -55,14 +55,14 @@
 FocusFadeAnim::computeOpacity (GLushort opacityInt)
 {
     float progress = 1 - progressLinear ();
-    float opacity = opacityInt / (float)OPAQUE;
+    float opacity  = opacityInt / (float)OPAQUE;
     float multiplier;
 
     bool newCopy = overNewCopy ();
 
     // flip opacity behavior for the other side of the cross-fade
     if (newCopy)
-        progress = 1 - progress;
+	progress = 1 - progress;
 
     if (mWindow->alpha () || (newCopy && opacity >= 0.91f))
 	multiplier = progressDecelerate (progress);
@@ -81,10 +81,10 @@
     else
 	multiplier = progress;
 
-    multiplier = 1 - multiplier;
+    multiplier         = 1 - multiplier;
     float finalOpacity = opacity * multiplier;
-    finalOpacity = MIN (finalOpacity, 1);
-    finalOpacity = MAX (finalOpacity, 0);
+    finalOpacity       = MIN (finalOpacity, 1);
+    finalOpacity       = MAX (finalOpacity, 0);
 
     return (GLushort)(finalOpacity * OPAQUE);
 }
@@ -99,7 +99,7 @@
 FocusFadeAnim::processCandidate (CompWindow *candidateWin,
 				 CompWindow *subjectWin,
 				 CompRegion &candidateAndSubjectIntersection,
-				 int &numSelectedCandidates)
+				 int        &numSelectedCandidates)
 {
     AnimWindow *aCandidateWin = AnimWindow::get (candidateWin);
     RestackPersistentData *data = static_cast<RestackPersistentData *>
@@ -117,10 +117,12 @@
     {
 	AnimWindow *aw = AnimWindow::get (w);
 	PersistentDataMap::iterator itData = aw->persistentData.find ("restack");
+
 	if (itData != aw->persistentData.end ()) // if found
 	{
 	    RestackPersistentData *data =
 		static_cast<RestackPersistentData *> (itData->second);
+
 	    if (data->mWinPassingThrough == mWindow)
 		data->mWinPassingThrough = 0;
 	}
@@ -128,4 +130,3 @@
 
     RestackAnim::cleanUp (closing, destructing);
 }
-

=== modified file 'plugins/animation/src/glide.cpp'
--- plugins/animation/src/glide.cpp	2013-04-25 11:07:54 +0000
+++ plugins/animation/src/glide.cpp	2013-07-24 17:39:26 +0000
@@ -38,11 +38,11 @@
 
 // =====================  Effect: Glide  =========================
 
-GlideAnim::GlideAnim (CompWindow *w,
-		      WindowEvent curWindowEvent,
-		      float duration,
+GlideAnim::GlideAnim (CompWindow       *w,
+		      WindowEvent      curWindowEvent,
+		      float            duration,
 		      const AnimEffect info,
-		      const CompRect &icon) :
+		      const CompRect   &icon) :
     Animation::Animation (w, curWindowEvent, duration, info, icon),
     TransformAnim::TransformAnim (w, curWindowEvent, duration, info, icon),
     ZoomAnim::ZoomAnim (w, curWindowEvent, duration, info, icon),
@@ -50,11 +50,11 @@
 {
 }
 
-Glide2Anim::Glide2Anim (CompWindow *w,
-			WindowEvent curWindowEvent,
-			float duration,
+Glide2Anim::Glide2Anim (CompWindow       *w,
+			WindowEvent      curWindowEvent,
+			float            duration,
 			const AnimEffect info,
-			const CompRect &icon) :
+			const CompRect   &icon) :
     Animation::Animation (w, curWindowEvent, duration, info, icon),
     TransformAnim::TransformAnim (w, curWindowEvent, duration, info, icon),
     GlideAnim::GlideAnim (w, curWindowEvent, duration, info, icon)
@@ -67,7 +67,7 @@
 		      float *thickness)
 {
     *finalDistFac = optValF (AnimationOptions::Glide1AwayPosition);
-    *finalRotAng = optValF (AnimationOptions::Glide1AwayAngle);
+    *finalRotAng  = optValF (AnimationOptions::Glide1AwayAngle);
 }
 
 void
@@ -76,7 +76,7 @@
 		       float *thickness)
 {
     *finalDistFac = optValF (AnimationOptions::Glide2AwayPosition);
-    *finalRotAng = optValF (AnimationOptions::Glide2AwayAngle);
+    *finalRotAng  = optValF (AnimationOptions::Glide2AwayAngle);
 }
 
 float
@@ -128,7 +128,7 @@
 			    0, 0);
     GLVector translation (0, 0, finalz * forwardProgress, 0);
 
-    float rotAngle = finalRotAng * forwardProgress;
+    float rotAngle   = finalRotAng * forwardProgress;
     glideModRotAngle = fmodf (rotAngle + 720, 360.0f);
 
     // put back to window position

=== modified file 'plugins/animation/src/grid.cpp'
--- plugins/animation/src/grid.cpp	2013-04-25 11:07:54 +0000
+++ plugins/animation/src/grid.cpp	2013-07-24 17:39:26 +0000
@@ -54,18 +54,18 @@
     mGridPosition = gridPosition;
 }
 
-GridAnim::GridModel::GridModel (CompWindow *w,
+GridAnim::GridModel::GridModel (CompWindow  *w,
 				WindowEvent curWindowEvent,
-				int height,
-				int gridWidth,
-				int gridHeight,
-				int decorTopHeight,
-				int decorBottomHeight) :
+				int         height,
+				int         gridWidth,
+				int         gridHeight,
+				int         decorTopHeight,
+				int         decorBottomHeight) :
     mScale (1.0f, 1.0f),
     mScaleOrigin (0, 0)
 {
     mNumObjects = (unsigned)(gridWidth * gridHeight);
-    mObjects = new GridObject[mNumObjects];
+    mObjects    = new GridObject[mNumObjects];
 
     initObjects (curWindowEvent,
 		 height,
@@ -80,15 +80,17 @@
 
 void
 GridAnim::GridModel::initObjects (WindowEvent curWindowEvent,
-				  int height,
-				  int gridWidth, int gridHeight,
-				  int decorTopHeight, int decorBottomHeight)
+				  int         height,
+				  int         gridWidth,
+				  int         gridHeight,
+				  int         decorTopHeight,
+				  int         decorBottomHeight)
 {
     int gridX, gridY;
-    int nGridCellsX, nGridCellsY;
+    int nGridCellsY;
 
     // number of grid cells in x direction
-    nGridCellsX = gridWidth - 1;
+    int nGridCellsX = gridWidth - 1;
 
     if (curWindowEvent == WindowEventShade ||
 	curWindowEvent == WindowEventUnshade)
@@ -97,8 +99,7 @@
 	// One allocated for top, one for bottom.
 	nGridCellsY = gridHeight - 3;
 
-	float winContentsHeight =
-	    height - decorTopHeight - decorBottomHeight;
+	float winContentsHeight = height - decorTopHeight - decorBottomHeight;
 
 	//Top
 	for (gridX = 0; gridX < gridWidth; ++gridX)
@@ -108,13 +109,12 @@
 	    mObjects[gridX].setGridPosition (gridPos);
 	}
 
+	float inWinY, gridPosY;
 	// Window contents
 	for (gridY = 1; gridY < gridHeight - 1; ++gridY)
 	{
-	    float inWinY =
-		(gridY - 1) * winContentsHeight / nGridCellsY +
-		decorTopHeight;
-	    float gridPosY = inWinY / height;
+	    inWinY = (gridY - 1) * winContentsHeight / nGridCellsY + decorTopHeight;
+	    gridPosY = inWinY / height;
 
 	    for (gridX = 0; gridX < gridWidth; ++gridX)
 	    {
@@ -132,7 +132,7 @@
     }
     else
     {
-	int objIndex = 0;
+	int   objIndex = 0;
 
 	// number of grid cells in y direction
 	nGridCellsY = gridHeight - 1;
@@ -145,6 +145,7 @@
 		Point gridPos ((float)gridX / nGridCellsX,
 			       (float)gridY / nGridCellsY);
 		mObjects[objIndex].setGridPosition (gridPos);
+
 		++objIndex;
 	    }
 	}
@@ -156,6 +157,7 @@
 			   float ty)
 {
     GridObject *object = mObjects;
+
     for (unsigned int i = 0; i < mNumObjects; ++i, ++object)
     {
 	object->mPosition.add (Point3d (tx, ty, 0));
@@ -166,6 +168,7 @@
 GridAnim::updateBB (CompOutput &output)
 {
     GridModel::GridObject *object = mModel->mObjects;
+
     for (unsigned int i = 0; i < mModel->mNumObjects; ++i, ++object)
     {
 	mAWindow->expandBBWithPoint (object->position ().x () + 0.5,
@@ -180,13 +183,15 @@
     mGridHeight = 2;
 }
 
-GridAnim::GridAnim (CompWindow *w,
-		    WindowEvent curWindowEvent,
-		    float duration,
+GridAnim::GridAnim (CompWindow       *w,
+		    WindowEvent      curWindowEvent,
+		    float            duration,
 		    const AnimEffect info,
-		    const CompRect &icon) :
+		    const CompRect   &icon) :
     Animation::Animation (w, curWindowEvent, duration, info, icon),
     mModel (NULL),
+    mGridWidth (0),
+    mGridHeight (0),
     mUseQTexCoord (false)
 {
 }
@@ -259,13 +264,9 @@
 	    mCurWindowEvent == WindowEventUnshade)
 	{
 	    if (y1 < winContentsY)	// if at top part
-	    {
 		gridH = mDecorTopHeight;
-	    }
 	    else if (y2 > winContentsY + winContentsHeight)  // if at bottom
-	    {
 		gridH = mDecorBottomHeight;
-	    }
 	    else			// in window contents (only in Y coords)
 	    {
 		float winContentsHeight =
@@ -282,12 +283,12 @@
 	v = vertexBuffer->getVertices () + (oldCount * vSize);
 	vMax = vertexBuffer->getVertices () + (newCount * vSize);
  
+	float x, y, topiyFloat;
 	// For each vertex
 	for (; v < vMax; v += vSize)
 	{
-	    float x = v[0];
-	    float y = v[1];
-	    float topiyFloat;
+	    x = v[0];
+	    y = v[1];
 
 	    if (y > y2)
 		y = y2;
@@ -301,31 +302,26 @@
 		    topiyFloat = MIN (topiyFloat, 0.999);	// avoid 1.0
 		}
 		else if (y2 > winContentsY + winContentsHeight)	// if at bottom
-		{
 		    topiyFloat = (mGridHeight - 2) +
 			(mDecorBottomHeight ? (y - winContentsY -
 					       winContentsHeight) /
 			 mDecorBottomHeight : 0);
-		}
 		else		// in window contents (only in Y coords)
-		{
 		    topiyFloat = (mGridHeight - 3) *
 			(y - winContentsY) / winContentsHeight + 1;
-		}
 	    }
 	    else
-	    {
 		topiyFloat = (mGridHeight - 1) * (y - oy) / oheight;
-	    }
+
 	    // topiy should be at most (mGridHeight - 2)
 	    int topiy = (int)(topiyFloat + 1e-4);
 
 	    if (topiy == mGridHeight - 1)
 		--topiy;
 
-	    int bottomiy = topiy + 1;
-	    float iny = topiyFloat - topiy;
-	    float inyRest = 1 - iny;
+	    int   bottomiy = topiy + 1;
+	    float iny      = topiyFloat - topiy;
+	    float inyRest  = 1 - iny;
 
 	    // End of calculations for y
 
@@ -335,8 +331,7 @@
 		    x = x2;
 
 		// find containing grid cell (leftix rightix) x (topiy bottomiy)
-		float leftixFloat =
-		    (mGridWidth - 1) * (x - ox) / owidth;
+		float leftixFloat = (mGridWidth - 1) * (x - ox) / owidth;
 		int leftix = (int)(leftixFloat + 1e-4);
 
 		if (leftix == mGridWidth - 1)
@@ -399,11 +394,11 @@
     // Deprecated
 }
 
-GridTransformAnim::GridTransformAnim (CompWindow *w,
-				      WindowEvent curWindowEvent,
-				      float duration,
+GridTransformAnim::GridTransformAnim (CompWindow       *w,
+				      WindowEvent      curWindowEvent,
+				      float            duration,
 				      const AnimEffect info,
-				      const CompRect &icon) :
+				      const CompRect   &icon) :
     Animation::Animation (w, curWindowEvent, duration, info, icon),
     TransformAnim::TransformAnim (w, curWindowEvent, duration, info, icon),
     GridAnim::GridAnim (w, curWindowEvent, duration, info, icon),
@@ -443,6 +438,7 @@
     {
 	GridModel::GridObject *object = mModel->objects ();
 	unsigned int n = mModel->numObjects ();
+
 	for (unsigned int i = 0; i < n; ++i, ++object)
 	{
 	    GLVector coords (object->mPosition.x (),
@@ -471,4 +467,3 @@
 	wTransform *= skewTransform;
     }
 }
-

=== modified file 'plugins/animation/src/horizontalfold.cpp'
--- plugins/animation/src/horizontalfold.cpp	2013-04-25 11:07:54 +0000
+++ plugins/animation/src/horizontalfold.cpp	2013-07-24 17:39:26 +0000
@@ -38,11 +38,11 @@
 
 // =====================  Effect: Horizontal Folds  =========================
 
-HorizontalFoldsAnim::HorizontalFoldsAnim (CompWindow *w,
-					  WindowEvent curWindowEvent,
-					  float duration,
+HorizontalFoldsAnim::HorizontalFoldsAnim (CompWindow       *w,
+					  WindowEvent      curWindowEvent,
+					  float            duration,
 					  const AnimEffect info,
-					  const CompRect &icon) :
+					  const CompRect   &icon) :
     Animation::Animation (w, curWindowEvent, duration, info, icon),
     TransformAnim::TransformAnim (w, curWindowEvent, duration, info, icon),
     FoldAnim::FoldAnim (w, curWindowEvent, duration, info, icon)
@@ -53,6 +53,7 @@
 HorizontalFoldsAnim::initGrid ()
 {
     mGridWidth = 2;
+
     if (mCurWindowEvent == WindowEventShade ||
 	mCurWindowEvent == WindowEventUnshade)
 	mGridHeight = 3 + 2 *
@@ -64,10 +65,10 @@
 
 float
 HorizontalFoldsAnim::getObjectZ (GridAnim::GridModel *mModel,
-				 float forwardProgress,
-				 float sinForProg,
-				 float relDistToFoldCenter,
-				 float foldMaxAmp)
+				 float               forwardProgress,
+				 float               sinForProg,
+				 float               relDistToFoldCenter,
+				 float               foldMaxAmp)
 {
     return -(sinForProg *
 	     foldMaxAmp *
@@ -101,17 +102,15 @@
     int oheight = outRect.height ();
 
     float winHeight = 0;
+
     if (mCurWindowEvent == WindowEventShade ||
 	mCurWindowEvent == WindowEventUnshade)
-    {
 	winHeight = winRect.height ();
-    }
     else
-    {
 	winHeight = inRect.height ();
-    }
-    int nHalfFolds =
-	2.0 * optValI (AnimationOptions::HorizontalFoldsNumFolds);
+
+    int nHalfFolds = 2.0 * optValI (AnimationOptions::HorizontalFoldsNumFolds);
+
     float foldMaxAmp =
 	0.3 * pow ((winHeight / nHalfFolds) / ::screen->height (), 0.3) *
 	optValF (AnimationOptions::HorizontalFoldsAmpMult);
@@ -122,6 +121,7 @@
 
     GridModel::GridObject *object = mModel->objects ();
     unsigned int n = mModel->numObjects ();
+
     for (unsigned int i = 0; i < n; ++i, ++object)
     {
 	Point3d &objPos = object->position ();
@@ -134,11 +134,10 @@
 	    float origy = (wy +
 			   (oheight * objGridY -
 			    outExtents.top) * mModel->scale ().y ());
+
 	    if (mCurWindowEvent == WindowEventShade ||
 		mCurWindowEvent == WindowEventUnshade)
-	    {
-		// Execute shade mode
-
+	    {	 // Execute shade mode
 		if (objGridY == 0)
 		{
 		    objPos.setY (oy);
@@ -164,10 +163,8 @@
 				    relDistToFoldCenter, foldMaxAmp));
 		}
 	    }
-	    else
+	    else // Execute normal mode
 	    {
-		// Execute normal mode
-
 		float relDistToFoldCenter = (rowNo % 2 == 0 ? 0.5 : 0);
 
 		objPos.setY (
@@ -201,4 +198,3 @@
 	     mCurWindowEvent == WindowEventUnminimize) &&
 	    optValB (AnimationOptions::HorizontalFoldsZoomToTaskbar));
 }
-

=== modified file 'plugins/animation/src/magiclamp.cpp'
--- plugins/animation/src/magiclamp.cpp	2013-04-25 11:07:54 +0000
+++ plugins/animation/src/magiclamp.cpp	2013-07-24 17:39:26 +0000
@@ -52,11 +52,11 @@
     mGridHeight = optValI (AnimationOptions::MagicLampWavyGridRes);
 }
 
-MagicLampAnim::MagicLampAnim (CompWindow *w,
-			      WindowEvent curWindowEvent,
-			      float duration,
+MagicLampAnim::MagicLampAnim (CompWindow       *w,
+			      WindowEvent      curWindowEvent,
+			      float            duration,
 			      const AnimEffect info,
-			      const CompRect &icon) :
+			      const CompRect   &icon) :
     Animation::Animation (w, curWindowEvent, duration, info, icon),
     GridAnim::GridAnim (w, curWindowEvent, duration, info, icon),
     mTopLeftCornerObject (0),
@@ -72,21 +72,18 @@
     mUseQTexCoord = true;
 }
 
-MagicLampWavyAnim::MagicLampWavyAnim (CompWindow *w,
-				      WindowEvent curWindowEvent,
-				      float duration,
+MagicLampWavyAnim::MagicLampWavyAnim (CompWindow       *w,
+				      WindowEvent      curWindowEvent,
+				      float            duration,
 				      const AnimEffect info,
-				      const CompRect &icon) :
+				      const CompRect   &icon) :
     Animation::Animation (w, curWindowEvent, duration, info, icon),
     MagicLampAnim::MagicLampAnim (w, curWindowEvent, duration, info, icon)
 {
-    unsigned int maxWaves;
-    float waveAmpMin, waveAmpMax;
-    float distance;
-
-    maxWaves = (unsigned) optValI (AnimationOptions::MagicLampWavyMaxWaves);
-    waveAmpMin = optValF (AnimationOptions::MagicLampWavyAmpMin);
-    waveAmpMax = optValF (AnimationOptions::MagicLampWavyAmpMax);
+    unsigned int maxWaves   = (unsigned) optValI (AnimationOptions::MagicLampWavyMaxWaves);
+    float        waveAmpMin = optValF (AnimationOptions::MagicLampWavyAmpMin);
+    float        waveAmpMax = optValF (AnimationOptions::MagicLampWavyAmpMax);
+    float        distance;
 
     if (waveAmpMax < waveAmpMin)
 	waveAmpMax = waveAmpMin;
@@ -96,19 +93,19 @@
     CompRect outRect (mAWindow->savedRectsValid () ?
 		      mAWindow->savedOutRect () :
 		      w->outputRect ());
+
     if (mTargetTop)
 	distance = outRect.y () + outRect.height () - mIcon.y ();
     else
 	distance = mIcon.y () - outRect.y ();
 
-    mNumWaves =
-	1 + (float)maxWaves *distance / ::screen->height ();
+    mNumWaves = 1 + (float)maxWaves * distance / ::screen->height ();
 
     mWaves = new WaveParam[mNumWaves];
 
     // Compute wave parameters
 
-    int ampDirection = (RAND_FLOAT () < 0.5 ? 1 : -1);
+    int   ampDirection = (RAND_FLOAT () < 0.5 ? 1 : -1);
     float minHalfWidth = 0.22f;
     float maxHalfWidth = 0.38f;
 
@@ -148,12 +145,11 @@
 /// the whole window (like in MagicLampAnim with menus).
 MagicLampAnim::~MagicLampAnim ()
 {
-    if (mCurWindowEvent == WindowEventOpen ||
-    	mCurWindowEvent == WindowEventUnminimize ||
-    	mCurWindowEvent == WindowEventUnshade)
-    {
+    if (mCurWindowEvent == WindowEventOpen	    ||
+	mCurWindowEvent == WindowEventUnminimize    ||
+	mCurWindowEvent == WindowEventUnshade)
 	mAWindow->expandBBWithWindow ();
-    }
+
 }
 
 bool
@@ -176,8 +172,10 @@
     {
 	float cosx = ((x - mWaves[i].pos) /
 		       mWaves[i].halfWidth);
+
 	if (cosx < -1 || cosx > 1)
 	    continue;
+
 	targetX += (mWaves[i].amp * mModel->scale ().x () *
 		    (cos (cosx * M_PI) + 1) / 2);
     }
@@ -196,6 +194,7 @@
 	mIcon.setX (x);
 	mIcon.setY (y);
     }
+
     float forwardProgress = progressLinear ();
 
     float iconCloseEndY;
@@ -232,6 +231,7 @@
 	iconCloseEndY = mIcon.y () + mIcon.height ();
 	winFarEndY = outRect.y () + winh;
 	winVisibleCloseEndY = outRect.y ();
+
 	if (winVisibleCloseEndY < iconCloseEndY)
 	    winVisibleCloseEndY = iconCloseEndY;
     }
@@ -266,29 +266,24 @@
     }
 
     if (forwardProgress < preShapePhaseEnd)
-    {
 	stretchProgress = forwardProgress / stretchPhaseEnd;
-    }
     else
     {
 	if (forwardProgress < stretchPhaseEnd)
-	{
 	    stretchProgress = forwardProgress / stretchPhaseEnd;
-	}
 	else
-	{
 	    postStretchProgress =
 		(forwardProgress - stretchPhaseEnd) / (1 - stretchPhaseEnd);
-	}
     }
 
     // The other objects are squeezed into a horizontal line behind the icon
-    int topmostMovingObjectIdx = -1;
+    int topmostMovingObjectIdx    = -1;
     int bottommostMovingObjectIdx = -1;
 
-    unsigned int n = mModel->numObjects ();
-    float fx = 0.0f;
+    unsigned int n  = mModel->numObjects ();
+    float        fx = 0.0f;
     GridModel::GridObject *object = mModel->objects ();
+
     for (unsigned int i = 0; i < n; ++i, ++object)
     {
 	Point3d &objPos = object->position ();
@@ -304,6 +299,7 @@
 	    float iconY = (mIcon.y () + mIcon.height () * objGridY);
 
 	    float stretchedPos;
+
 	    if (mTargetTop)
 		stretchedPos = objGridY * origY + (1 - objGridY) * iconY;
 	    else
@@ -311,23 +307,17 @@
 
 	    // Compute current y position
 	    if (forwardProgress < preShapePhaseEnd)
-	    {
 		objPos.setY ((1 - stretchProgress) * origY +
 			     stretchProgress * stretchedPos);
-	    }
 	    else
 	    {
 		if (forwardProgress < stretchPhaseEnd)
-		{
 		    objPos.setY ((1 - stretchProgress) * origY +
 		    		 stretchProgress * stretchedPos);
-		}
 		else
-		{
 		    objPos.setY ((1 - postStretchProgress) * stretchedPos +
 		    		 postStretchProgress *
 		    		 (stretchedPos + (iconCloseEndY - winFarEndY)));
-		}
 	    }
 
 	    if (mTargetTop)
@@ -378,7 +368,7 @@
 	// Compute current x position
 	if (forwardProgress < preShapePhaseEnd)
 	    objPos.setX ((1 - preShapeProgress) * origX +
-	    		 preShapeProgress * targetX);
+			 preShapeProgress * targetX);
 	else
 	    objPos.setX (targetX);
 
@@ -388,8 +378,8 @@
 
     if (stepRegionUsed ())
     {
-    	// Pick objects that will act as the corners of rectangles subtracted
-    	// from this step's damaged region
+	// Pick objects that will act as the corners of rectangles subtracted
+	// from this step's damaged region
 
 	const float topCornerRowRatio =
 	    (mTargetTop ? 0.55 : 0.35);// 0.46 0.42; // rectangle corner row ratio
@@ -398,6 +388,7 @@
 
 	if (topmostMovingObjectIdx < 0)
 	    topmostMovingObjectIdx = 0;
+
 	if (bottommostMovingObjectIdx < 0)
 	    bottommostMovingObjectIdx = (int)n - 2;
 
@@ -417,6 +408,7 @@
 
     GridModel::GridObject *objects = mModel->objects ();
     unsigned int n = mModel->numObjects ();
+
     for (unsigned int i = 0; i < n; ++i)
     {
 	Point3d &objPos = objects[i].position ();
@@ -440,10 +432,10 @@
     if (objects[0].position ().x () >
     	objects[n-2].position ().x ())
     {
-    	// Top-left corner is empty
+	// Top-left corner is empty
 
-    	// Position of grid object to pick as the corner of the subtracted rect.
-    	Point3d &objPos = mTopLeftCornerObject->position ();
+	// Position of grid object to pick as the corner of the subtracted rect.
+	Point3d &objPos = mTopLeftCornerObject->position ();
 	region -= CompRect (BB->x1,
 			    BB->y1,
 			    objPos.x () - BB->x1,
@@ -451,9 +443,9 @@
     }
     else // Bottom-left corner is empty
     {
-    	// Position of grid object to pick as the corner of the subtracted rect.
-    	Point3d &objPos = mBottomLeftCornerObject->position ();
-    	region -= CompRect (BB->x1,
+	// Position of grid object to pick as the corner of the subtracted rect.
+	Point3d &objPos = mBottomLeftCornerObject->position ();
+	region -= CompRect (BB->x1,
 			    objPos.y (),
 			    objPos.x () - BB->x1,
 			    BB->y2);
@@ -461,22 +453,22 @@
 
     // Right side
     if (objects[1].position ().x () <
-    	objects[n-1].position ().x ())
+	objects[n-1].position ().x ())
     {
     	// Top-right corner is empty
 
-    	// Position of grid object to pick as the corner of the subtracted rect.
-    	Point3d &objPos = (mTopLeftCornerObject + 1)->position ();
-    	region -= CompRect (objPos.x (),
+	// Position of grid object to pick as the corner of the subtracted rect.
+	Point3d &objPos = (mTopLeftCornerObject + 1)->position ();
+	region -= CompRect (objPos.x (),
 			    BB->y1,
 			    BB->x2,
 			    objPos.y () - BB->y1);
     }
     else // Bottom-right corner is empty
     {
-    	// Position of grid object to pick as the corner of the subtracted rect.
-    	Point3d &objPos = (mBottomLeftCornerObject + 1)->position ();
-    	region -= CompRect (objPos.x (),
+	// Position of grid object to pick as the corner of the subtracted rect.
+	Point3d &objPos = (mBottomLeftCornerObject + 1)->position ();
+	region -= CompRect (objPos.x (),
 			    objPos.y (),
 			    BB->x2,
 			    BB->y2);
@@ -493,7 +485,7 @@
 MagicLampAnim::adjustPointerIconSize ()
 {
     mIcon.setWidth (MAX (4, optValI
-    			 (AnimationOptions::MagicLampOpenStartWidth)));
+			 (AnimationOptions::MagicLampOpenStartWidth)));
 
     // Adjust position so that the icon is centered at the original position.
     mIcon.setX (mIcon.x () - mIcon.width () / 2);
@@ -503,9 +495,8 @@
 MagicLampWavyAnim::adjustPointerIconSize ()
 {
     mIcon.setWidth (MAX (4, optValI
-    			 (AnimationOptions::MagicLampWavyOpenStartWidth)));
+			 (AnimationOptions::MagicLampWavyOpenStartWidth)));
 
     // Adjust position so that the icon is centered at the original position.
     mIcon.setX (mIcon.x () - mIcon.width () / 2);
 }
-

=== modified file 'plugins/animation/src/options.cpp'
--- plugins/animation/src/options.cpp	2013-04-25 11:07:54 +0000
+++ plugins/animation/src/options.cpp	2013-07-24 17:39:26 +0000
@@ -81,7 +81,7 @@
 
 bool
 IdValuePair::matchesPluginOption (ExtensionPluginInfo *testPluginInfo,
-				  int testOptionId) const
+				  int                 testOptionId) const
 {
     return (pluginInfo == testPluginInfo &&
 	    optionId == testOptionId);
@@ -89,8 +89,8 @@
 
 CompOption::Value &
 AnimWindow::pluginOptVal (ExtensionPluginInfo *pluginInfo,
-			  unsigned int optionId,
-			  Animation *anim)
+			  unsigned int        optionId,
+			  Animation           *anim)
 {
     PrivateAnimWindow *aw = priv;
     PrivateAnimScreen *as = aw->paScreen ();
@@ -114,24 +114,26 @@
 
 OptionSet *
 PrivateAnimScreen::getOptionSetForSelectedRow (PrivateAnimWindow *aw,
-					       Animation *anim)
+					       Animation         *anim)
 {
-    const AnimEvent  event = win2AnimEventMap[anim->curWindowEvent ()];
-    OptionSets &eventOptionSets = mEventOptionSets[event];
-    OptionSet  *setSelectedForRow = &eventOptionSets.sets[(unsigned int) aw->curAnimSelectionRow ()];
+    const AnimEvent  event              = win2AnimEventMap[anim->curWindowEvent ()];
+    OptionSets       &eventOptionSets   = mEventOptionSets[event];
+    OptionSet        *setSelectedForRow = &eventOptionSets.sets[(unsigned int)
+					  aw->curAnimSelectionRow ()];
 
     return setSelectedForRow;
 }
 
 void
-PrivateAnimScreen::updateOptionSet (OptionSet *os,
+PrivateAnimScreen::updateOptionSet (OptionSet  *os,
 				    const char *optNamesValuesOrig)
 {
-    unsigned int len = strlen (optNamesValuesOrig);
-    char *optNamesValues = (char *)calloc (len + 1, 1);
+    unsigned int len             = strlen (optNamesValuesOrig);
+    char         *optNamesValues = (char *)calloc (len + 1, 1);
 
     // Find the first substring with no spaces in it
     sscanf (optNamesValuesOrig, " %s ", optNamesValues);
+
     if (!strlen (optNamesValues))
     {
 	free (optNamesValues);
@@ -140,15 +142,14 @@
     // Backup original, since strtok is destructive
     strcpy (optNamesValues, optNamesValuesOrig);
 
-    char *name;
-    char *nameTrimmed = (char *)calloc (len + 1, 1);
-    char *valueStr = 0;
-    const char *betweenPairs = ",";
-    const char *betweenOptVal = "=";
+    char         *nameTrimmed   = (char *)calloc (len + 1, 1);
+    char         *valueStr      = 0;
+    const char   *betweenPairs  = ",";
+    const char   *betweenOptVal = "=";
 
     // Count number of pairs
-    char *pairToken = (char *)optNamesValuesOrig; // TODO do with CompString
-    unsigned int nPairs = 1;
+    char         *pairToken     = (char *)optNamesValuesOrig; // TODO do with CompString
+    unsigned int nPairs         = 1;
 
     while ((pairToken = strchr (pairToken, betweenPairs[0])))
     {
@@ -160,13 +161,15 @@
     os->pairs.reserve (nPairs);
 
     // Tokenize pairs
-    name = strtok (optNamesValues, betweenOptVal);
+    char *name = strtok (optNamesValues, betweenOptVal);
 
     int errorNo = -1;
     unsigned int i;
+
     for (i = 0; name && i < nPairs; ++i)
     {
 	errorNo = 0;
+
 	if (strchr (name, betweenPairs[0])) // handle "a, b=4" case
 	{
 	    errorNo = 1;
@@ -174,12 +177,15 @@
 	}
 
 	sscanf (name, " %s ", nameTrimmed);
+
 	if (!strlen (nameTrimmed))
 	{
 	    errorNo = 2;
 	    break;
 	}
+
 	valueStr = strtok (0, betweenPairs);
+
 	if (!valueStr)
 	{
 	    errorNo = 3;
@@ -189,13 +195,16 @@
 	// TODO: Fix: Convert to "pluginname:option_name" format
 	// Warning: Assumes that option names in different extension plugins
 	// will be different.
-	bool matched = false;
-	const ExtensionPluginInfo *chosenExtensionPlugin = NULL;
-	CompOption *o = 0;
-	int optId = -1;
+	bool         matched                                    = false;
+	const        ExtensionPluginInfo *chosenExtensionPlugin = NULL;
+	CompOption   *o                                         = 0;
+	int          optId                                      = -1;
+	unsigned int nOptions;
+
 	foreach (ExtensionPluginInfo *extensionPlugin, mExtensionPlugins)
 	{
-	    unsigned int nOptions = extensionPlugin->effectOptions->size ();
+	    nOptions = extensionPlugin->effectOptions->size ();
+
 	    for (optId = (int)extensionPlugin->firstEffectOptionIndex;
 		 optId < (int)nOptions; ++optId)
 	    {
@@ -208,14 +217,17 @@
 		    break;
 		}
 	    }
+
 	    if (matched)
 		break;
 	}
+
 	if (!matched)
 	{
 	    errorNo = 4;
 	    break;
 	}
+
 	CompOption::Value v;
 
 	os->pairs.push_back (IdValuePair ());
@@ -224,73 +236,87 @@
 	pair->pluginInfo = chosenExtensionPlugin;
 	pair->optionId = optId;
 	int valueRead = -1;
+
 	switch (o->type ())
 	{
-	case CompOption::TypeBool:
-	    int vb;
-	    valueRead = sscanf (valueStr, " %d ", &vb);
-	    if (valueRead)
-		pair->value.set ((bool)vb);
-	    break;
-	case CompOption::TypeInt:
-	{
-	    int vi;
-	    valueRead = sscanf (valueStr, " %d ", &vi);
-	    if (valueRead > 0)
-	    {
-		if (o->rest ().inRange (vi))
-		{
-		    v.set (vi);
-		    pair->value = v;
-		}
-		else
-		    errorNo = 7;
-	    }
-	    break;
-	}
-	case CompOption::TypeFloat:
-	{
-	    float vf;
-	    valueRead = sscanf (valueStr, " %f ", &vf);
-	    if (valueRead > 0)
-	    {
-		if (o->rest ().inRange (vf))
-		{
-		    v.set (vf);
-		    pair->value = v;
-		}
-		else
-		    errorNo = 7;
-	    }
-	    break;
-	}
-	case CompOption::TypeString:
-	{
-	    v.set (CompString (valueStr));
-	    valueRead = 1;
-	    break;
-	}
-	case CompOption::TypeColor:
-	{
-	    unsigned short vc[4];
-	    valueRead = sscanf (valueStr, " #%2hx%2hx%2hx%2hx ",
-				&vc[0], &vc[1], &vc[2], &vc[3]);
-	    if (valueRead == 4)
-	    {
-		CompOption::Value *pairVal = &pair->value;
-		for (int j = 0; j < 4; ++j)
-		    vc[j] = vc[j] << 8 | vc[j];
-		pairVal->set (vc);
-	    }
-	    else
-		errorNo = 6;
-	    break;
-	}
-	default:
-	    break;
-	}
+	    case CompOption::TypeBool:
+		int vb;
+		valueRead = sscanf (valueStr, " %d ", &vb);
+
+		if (valueRead)
+		    pair->value.set ((bool)vb);
+
+		break;
+
+	    case CompOption::TypeInt:
+	    {
+		int vi;
+		valueRead = sscanf (valueStr, " %d ", &vi);
+
+		if (valueRead > 0)
+		{
+		    if (o->rest ().inRange (vi))
+		    {
+			v.set (vi);
+			pair->value = v;
+		    }
+		    else
+			errorNo = 7;
+		}
+
+		break;
+	    }
+	    case CompOption::TypeFloat:
+	    {
+		float vf;
+		valueRead = sscanf (valueStr, " %f ", &vf);
+
+		if (valueRead > 0)
+		{
+		    if (o->rest ().inRange (vf))
+		    {
+			v.set (vf);
+			pair->value = v;
+		    }
+		    else
+			errorNo = 7;
+		}
+
+		break;
+	    }
+	    case CompOption::TypeString:
+	    {
+		v.set (CompString (valueStr));
+		valueRead = 1;
+		break;
+	    }
+
+	    case CompOption::TypeColor:
+	    {
+		unsigned short vc[4];
+		valueRead = sscanf (valueStr, " #%2hx%2hx%2hx%2hx ",
+				    &vc[0], &vc[1], &vc[2], &vc[3]);
+
+		if (valueRead == 4)
+		{
+		    CompOption::Value *pairVal = &pair->value;
+		    for (int j = 0; j < 4; ++j)
+			vc[j] = vc[j] << 8 | vc[j];
+		    pairVal->set (vc);
+		}
+		else
+		    errorNo = 6;
+
+		break;
+	    }
+
+	    default:
+		break;
+	}
+
 	if (valueRead == 0)
 	    errorNo = 6;
+
 	if (errorNo > 0)
 	    break;
 	// If valueRead is -1 here, then it must be a
@@ -305,38 +331,44 @@
     {
 	switch (errorNo)
 	{
-	case -1:
-	case 2:
-	    compLogMessage ("animation", CompLogLevelError,
-			    "Option name missing in \"%s\"",
-			    optNamesValuesOrig);
-	    break;
-	case 1:
-	case 3:
-	    compLogMessage ("animation", CompLogLevelError,
-			    "Option value missing in \"%s\"",
-			    optNamesValuesOrig);
-	    break;
-	case 4:
-	    //compLogMessage ("animation", CompLogLevelError,
-	    //	    "Unknown option \"%s\" in \"%s\"",
-	    //	    nameTrimmed, optNamesValuesOrig);
-	    break;
-	case 6:
-	    compLogMessage ("animation", CompLogLevelError,
-			    "Invalid value \"%s\" in \"%s\"",
-			    valueStr, optNamesValuesOrig);
-	    break;
-	case 7:
-	    compLogMessage ("animation", CompLogLevelError,
-			    "Value \"%s\" out of range in \"%s\"",
-			    valueStr, optNamesValuesOrig);
-	    break;
-	default:
-	    break;
+	    case -1:
+	    case 2:
+		compLogMessage ("animation", CompLogLevelError,
+				"Option name missing in \"%s\"",
+				optNamesValuesOrig);
+		break;
+
+	    case 1:
+	    case 3:
+		compLogMessage ("animation", CompLogLevelError,
+				"Option value missing in \"%s\"",
+				optNamesValuesOrig);
+		break;
+
+	    case 4:
+		//compLogMessage ("animation", CompLogLevelError,
+		//	    "Unknown option \"%s\" in \"%s\"",
+		//	    nameTrimmed, optNamesValuesOrig);
+		break;
+
+	    case 6:
+		compLogMessage ("animation", CompLogLevelError,
+				"Invalid value \"%s\" in \"%s\"",
+				valueStr, optNamesValuesOrig);
+		break;
+
+	    case 7:
+		compLogMessage ("animation", CompLogLevelError,
+				"Value \"%s\" out of range in \"%s\"",
+				valueStr, optNamesValuesOrig);
+		break;
+
+	    default:
+		break;
 	}
 	os->pairs.clear ();
     }
+
     free (optNamesValues);
     free (nameTrimmed);
 }
@@ -358,4 +390,3 @@
 	updateOptionSet (&oss->sets[i], (*listVal)[i].s ().c_str ());
     }
 }
-

=== modified file 'plugins/animation/src/private.h'
--- plugins/animation/src/private.h	2012-09-07 22:37:20 +0000
+++ plugins/animation/src/private.h	2013-07-24 17:39:26 +0000
@@ -21,27 +21,33 @@
 class RestackInfo
 {
 public:
+
     RestackInfo (CompWindow *wRestacked,
 		 CompWindow *wStart,
 		 CompWindow *wEnd,
 		 CompWindow *wOldAbove,
-		 bool raised);
-
-    CompWindow *wRestacked, *wStart, *wEnd, *wOldAbove;
-    bool raised;
+		 bool       raised);
+
+    CompWindow *wRestacked;
+    CompWindow *wStart;
+    CompWindow *wEnd;
+    CompWindow *wOldAbove;
+
+    bool       raised;
 };
 
 class IdValuePair
 {
 public:
+
     IdValuePair () : pluginInfo (0), optionId (-1), value () {}
 
     bool matchesPluginOption (ExtensionPluginInfo *pluginInfo,
-			      int optionId) const;
+			      int                 optionId) const;
 
     const ExtensionPluginInfo *pluginInfo;
-    int optionId;
-    CompOption::Value value;
+    int                       optionId;
+    CompOption::Value         value;
 };
 
 typedef std::vector<IdValuePair> IdValuePairVector;
@@ -49,6 +55,7 @@
 class OptionSet
 {
 public:
+
     OptionSet () {}
 
     IdValuePairVector pairs;
@@ -59,6 +66,7 @@
 class OptionSets
 {
 public:
+
     OptionSets () {}
 
     OptionSetVector sets;
@@ -67,6 +75,7 @@
 class EffectSet
 {
 public:
+
     EffectSet () {}
 
     AnimEffectVector effects;
@@ -120,15 +129,15 @@
 // in PrivateAnimScreenOptions
 #define NUM_NONEFFECT_OPTIONS AnimationOptions::CurvedFoldAmpMult
 
-
 class ExtensionPluginAnimation : public ExtensionPluginInfo
 {
 public:
-    ExtensionPluginAnimation (const CompString &name,
-			      unsigned int nEffects,
-			      AnimEffect *effects,
+
+    ExtensionPluginAnimation (const CompString   &name,
+			      unsigned int       nEffects,
+			      AnimEffect         *effects,
 			      CompOption::Vector *effectOptions,
-			      unsigned int firstEffectOptionIndex);
+			      unsigned int       firstEffectOptionIndex);
     ~ExtensionPluginAnimation ();
 
     // Overriden methods from ExtensionPluginInfo
@@ -144,7 +153,7 @@
     void initPersistentData (AnimWindow *aw);
     void destroyPersistentData (AnimWindow *aw);
     void postUpdateEventEffects (AnimEvent e,
-				 bool forRandom);
+				 bool      forRandom);
     void cleanUpAnimation (bool closing,
 			   bool destructing);
     void postStartupCountdown ();
@@ -163,7 +172,8 @@
     CompWindow * walkNext (CompWindow *w);
     void incrementCurRestackAnimCount ();
     void decrementCurRestackAnimCount ();
-    bool wontCreateCircularChain (CompWindow *wCur, CompWindow *wNext);
+    bool wontCreateCircularChain (CompWindow *wCur,
+				  CompWindow *wNext);
 
     static void cleanUpParentChildChainItem (AnimWindow *aw);
     static bool relevantForRestackAnim (CompWindow *w);
@@ -177,13 +187,13 @@
     bool mAWinWasRestackedJustNow;
 
 private:
-    CompWindowVector mLastClientList; ///< Last known stacking order
-    CompWindowVector mPrevClientList; ///< The stacking order before mLastClientList
-    int mRestackAnimCount; ///< Count of how many windows are currently involved in
-			   ///< animations that require walker (dodge & focus fade).
+    CompWindowVector          mLastClientList;	    ///< Last known stacking order
+    CompWindowVector          mPrevClientList;	    ///< The stacking order before mLastClientList
+    int                       mRestackAnimCount;    ///< Count of how many windows are currently involved in
+						    ///< animations that require walker (dodge & focus fade).
     std::vector<AnimWindow *> mRestackedWindows;
 
-    CompWindowList mWindowList;
+    CompWindowList            mWindowList;
 };
 
 class PrivateAnimScreen :
@@ -196,48 +206,50 @@
     friend class AnimWindow;
 
 public:
-    CompositeScreen *cScreen;
-    GLScreen *gScreen;
-    AnimScreen *aScreen;
+
+    CompositeScreen       *cScreen;
+    GLScreen              *gScreen;
+    AnimScreen            *aScreen;
 
 private:
-    struct timeval mLastRedrawTime;
-    bool mLastRedrawTimeFresh;
-
-    bool mPluginActive[WatchedScreenPluginNum];
-    int mSwitcherPostWait;
-    int mStartCountdown;
+
+    struct timeval        mLastRedrawTime;
+    bool                  mLastRedrawTimeFresh;
+
+    bool                  mPluginActive[WatchedScreenPluginNum];
+    int                   mSwitcherPostWait;
+    int                   mStartCountdown;
     ///< To mark windows as "created" if they were opened before compiz
     ///< was started and to prevent already opened windows from doing
     ///< open animation.
 
-    Window mLastActiveWindow; ///< Last known active window
-
-    bool mAnimInProgress;         ///< Is an animation currently being played?
-    bool mStartingNewPaintRound;  ///< Is a new round of glPaints starting?
-    bool mPrePaintWindowsBackToFrontEnabled;
-
-    EffectSet mRandomEffects[AnimEventNum];
-
-    OptionSets mEventOptionSets[AnimEventNum];
+    Window                mLastActiveWindow;	    ///< Last known active window
+
+    bool                  mAnimInProgress;	    ///< Is an animation currently being played?
+    bool                  mStartingNewPaintRound;   ///< Is a new round of glPaints starting?
+    bool                  mPrePaintWindowsBackToFrontEnabled;
+
+    EffectSet             mRandomEffects[AnimEventNum];
+
+    OptionSets            mEventOptionSets[AnimEventNum];
 
     // Effect extension plugins
     ExtensionPluginVector mExtensionPlugins;
 
     // Possible effects for each event
-    AnimEffectVector mEventEffectsAllowed[AnimEventNum];
+    AnimEffectVector      mEventEffectsAllowed[AnimEventNum];
 
     // List of chosen effects for each event
-    EffectSet mEventEffects[AnimEventNum];
-
-    CompOutput *mOutput;
-
-    Window mActiveWindow;
-    CompMatch mNeverAnimateMatch;
-
-    const CompWindowList *mLockedPaintList;
-    unsigned int         mLockedPaintListCnt;
-    unsigned int         mGetWindowPaintListEnableCnt;
+    EffectSet             mEventEffects[AnimEventNum];
+
+    CompOutput            *mOutput;
+
+    Window                mActiveWindow;
+    CompMatch             mNeverAnimateMatch;
+
+    const CompWindowList  *mLockedPaintList;
+    unsigned int          mLockedPaintListCnt;
+    unsigned int          mGetWindowPaintListEnableCnt;
 
     void updateEventEffects (AnimEvent e,
 			     bool forRandom,
@@ -245,25 +257,32 @@
     void updateAllEventEffects ();
 
     void updateOptionSets (AnimEvent e);
-    void updateOptionSet (OptionSet *os, const char *optNamesValuesOrig);
+    void updateOptionSet (OptionSet  *os,
+			  const char *optNamesValuesOrig);
 
     void activateEvent (bool activating);
     bool isWinVisible (CompWindow *w);
     AnimEvent getCorrespondingAnimEvent (AnimationOptions::Options optionId);
-    void eventMatchesChanged (CompOption *opt, AnimationOptions::Options num);
-    void eventOptionsChanged (CompOption *opt, AnimationOptions::Options num);
-    void eventEffectsChanged (CompOption *opt, AnimationOptions::Options num);
-    void eventRandomEffectsChanged (CompOption *opt, AnimationOptions::Options num);
+    void eventMatchesChanged (CompOption                *opt,
+			      AnimationOptions::Options num);
+    void eventOptionsChanged (CompOption                *opt,
+			      AnimationOptions::Options num);
+    void eventEffectsChanged (CompOption                *opt,
+			      AnimationOptions::Options num);
+    void eventRandomEffectsChanged (CompOption                *opt,
+				    AnimationOptions::Options num);
 
-    CompRect getIcon (CompWindow *w, bool alwaysUseMouse);
+    CompRect getIcon (CompWindow *w,
+		      bool       alwaysUseMouse);
     void updateAnimStillInProgress ();
 
     bool isAnimEffectInList (AnimEffect theEffect,
-			     EffectSet &effectList);
+			     EffectSet  &effectList);
     bool isAnimEffectPossibleForEvent (AnimEffect theEffect,
-				       AnimEvent event);
+				       AnimEvent  event);
 
 public:
+
     PrivateAnimScreen (CompScreen *s, AnimScreen *);
     ~PrivateAnimScreen ();
 
@@ -293,16 +312,17 @@
     bool isAnimEffectPossible (AnimEffect theEffect);
     inline CompOutput &output () { return *mOutput; }
     AnimEffect getActualEffect (AnimEffect effect,
-				AnimEvent animEvent);
-    bool shouldIgnoreWindowForAnim (CompWindow *w, bool checkPixmap);
+				AnimEvent  animEvent);
+    bool shouldIgnoreWindowForAnim (CompWindow *w,
+				    bool       checkPixmap);
     OptionSet *getOptionSetForSelectedRow (PrivateAnimWindow *aw,
-					   Animation *anim);
+					   Animation         *anim);
     void addExtension (ExtensionPluginInfo *extensionPluginInfo,
-		       bool shouldInitPersistentData);
+		       bool                shouldInitPersistentData);
     void removeExtension (ExtensionPluginInfo *extensionPluginInfo);
     AnimEffect getMatchingAnimSelection (CompWindow *w,
-					 AnimEvent e,
-					 int *duration);
+					 AnimEvent  e,
+					 int        *duration);
     bool otherPluginsActive ();
 
     void enablePrePaintWindowsBackToFront (bool enabled);
@@ -315,13 +335,14 @@
 
     // GLScreenInterface methods
     bool glPaintOutput (const GLScreenPaintAttrib &,
-			const GLMatrix &,
-			const CompRegion &,
-			CompOutput *,
-			unsigned int);
+			const GLMatrix            &,
+			const CompRegion          &,
+			CompOutput                *,
+			unsigned int                );
 
     // ScreenInterface methods
-    void handleCompizEvent (const char * plugin, const char *event,
+    void handleCompizEvent (const char         *plugin,
+			    const char         *event,
 			    CompOption::Vector &options);
 };
 
@@ -333,6 +354,7 @@
     friend class AnimWindow;
 
 public:
+
     PrivateAnimWindow (CompWindow *, AnimWindow *aw);
     ~PrivateAnimWindow ();
 
@@ -351,41 +373,43 @@
     GLWindow          *gWindow;
 
 private:
+
     CompWindow        *mWindow;
     AnimWindow        *mAWindow;
 
     PrivateAnimScreen *mPAScreen;
 
-    unsigned int mState;
-    unsigned int mNewState;
-
-    Animation *mCurAnimation;
-
-    bool mUnshadePending;
-    bool mEventNotOpenClose;
-    bool mNowShaded;
-    bool mGrabbed;
-
-    int mUnmapCnt;
-    int mDestroyCnt;
-
-    bool mIgnoreDamage;
-    bool mFinishingAnim;
-
-    int mCurAnimSelectionRow;
-    int mPrevAnimSelectionRow;	///< For the case when one event interrupts another
-
-    Box mBB;       ///< Bounding box of area to be damaged
-
-    CompRegion mStepRegion;     ///< Region to damage this step
-    CompRegion mLastStepRegion; ///< Region damaged last step
-
-    bool mPluginActive[WatchedWindowPluginNum];
+    unsigned int      mState;
+    unsigned int      mNewState;
+
+    Animation         *mCurAnimation;
+
+    bool              mUnshadePending;
+    bool              mEventNotOpenClose;
+    bool              mNowShaded;
+    bool              mGrabbed;
+
+    int               mUnmapCnt;
+    int               mDestroyCnt;
+
+    bool              mIgnoreDamage;
+    bool              mFinishingAnim;
+
+    int               mCurAnimSelectionRow;
+    int               mPrevAnimSelectionRow;	///< For the case when one event interrupts another
+
+    Box               mBB;			///< Bounding box of area to be damaged
+
+    CompRegion        mStepRegion;		///< Region to damage this step
+    CompRegion        mLastStepRegion;		///< Region damaged last step
+
+    bool              mPluginActive[WatchedWindowPluginNum];
 
     // Utility methods
     unsigned int getState ();
     void updateSelectionRow (unsigned int i);
-    void postAnimationCleanUpPrev (bool closing, bool clearMatchingRow);
+    void postAnimationCleanUpPrev (bool closing,
+				   bool clearMatchingRow);
     void postAnimationCleanUpCustom (bool closing,
 				     bool destructing,
 				     bool clearMatchingRow);
@@ -395,20 +419,34 @@
     void notifyAnimation (bool activation);
 
     // WindowInterface methods
-    void resizeNotify (int dx, int dy, int dwidth, int dheight);
-    void moveNotify (int dx, int dy, bool immediate);
+    void resizeNotify (int dx,
+		       int dy,
+		       int dwidth,
+		       int dheight);
+    void moveNotify (int  dx,
+		     int  dy,
+		     bool immediate);
     void windowNotify (CompWindowNotify n);
-    void grabNotify (int x, int y, unsigned int state, unsigned int mask);
+    void grabNotify (int          x,
+		     int          y,
+		     unsigned int state,
+		     unsigned int mask);
     void ungrabNotify ();
 
     // GLWindowInterface methods
-    bool glPaint (const GLWindowPaintAttrib &, const GLMatrix &,
-		  const CompRegion &, unsigned int);
+    bool glPaint (const GLWindowPaintAttrib &,
+		  const GLMatrix            &,
+		  const CompRegion          &,
+		  unsigned int                );
     void glAddGeometry (const GLTexture::MatrixList &,
-			const CompRegion &, const CompRegion &,
-			unsigned int = MAXSHORT, unsigned int = MAXSHORT);
-    void glDrawTexture (GLTexture *texture, const GLMatrix &,
-                        const GLWindowPaintAttrib &, unsigned int);
+			const CompRegion            &,
+			const CompRegion            &,
+			unsigned int                  = MAXSHORT,
+			unsigned int                  = MAXSHORT);
+    void glDrawTexture (GLTexture                 *texture,
+			const GLMatrix            &,
+			const GLWindowPaintAttrib &,
+			unsigned int                );
     //void glDrawGeometry ();
 };
 
@@ -416,12 +454,14 @@
     public GridAnim
 {
 public:
-    RollUpAnim (CompWindow *w,
-		WindowEvent curWindowEvent,
-		float duration,
+
+    RollUpAnim (CompWindow       *w,
+		WindowEvent      curWindowEvent,
+		float            duration,
 		const AnimEffect info,
-		const CompRect &icon);
+		const CompRect   &icon);
 protected:
+
     static const float kDurationFactor;
 
     void initGrid ();
@@ -432,15 +472,17 @@
     public GridAnim
 {
 public:
-    MagicLampAnim (CompWindow *w,
-    		   WindowEvent curWindowEvent,
-    		   float duration,
-    		   const AnimEffect info,
-    		   const CompRect &icon);
+
+    MagicLampAnim (CompWindow       *w,
+		   WindowEvent      curWindowEvent,
+		   float            duration,
+		   const AnimEffect info,
+		   const CompRect   &icon);
     virtual ~MagicLampAnim ();
 
 protected:
-    bool mTargetTop;
+
+    bool                  mTargetTop;
     GridModel::GridObject *mTopLeftCornerObject;
     GridModel::GridObject *mBottomLeftCornerObject;
 
@@ -451,30 +493,33 @@
     void adjustPointerIconSize ();
 
     virtual bool hasMovingEnd ();
-    virtual void filterTargetX (float &targetX, float x) { }
+    virtual void filterTargetX (float &targetX,
+				float x) { }
 };
 
 class MagicLampWavyAnim :
     public MagicLampAnim
 {
 public:
-    MagicLampWavyAnim (CompWindow *w,
-    		       WindowEvent curWindowEvent,
-    		       float duration,
-    		       const AnimEffect info,
-    		       const CompRect &icon);
+
+    MagicLampWavyAnim (CompWindow       *w,
+		       WindowEvent      curWindowEvent,
+		       float            duration,
+		       const AnimEffect info,
+		       const CompRect   &icon);
     ~MagicLampWavyAnim ();
 
 protected:
+
     struct WaveParam
     {
-	float halfWidth;
-	float amp;
-	float pos;
+	float    halfWidth;
+	float    amp;
+	float    pos;
     };
 
     unsigned int mNumWaves;
-    WaveParam *mWaves;
+    WaveParam    *mWaves;
 
     void initGrid ();
     void updateBB (CompOutput &output);
@@ -482,19 +527,21 @@
     void adjustPointerIconSize ();
 
     bool hasMovingEnd ();
-    void filterTargetX (float &targetX, float x);
+    void filterTargetX (float &targetX,
+			float x);
 };
 
 class SidekickAnim :
     public ZoomAnim
 {
 public:
-    SidekickAnim (CompWindow *w,
-		  WindowEvent curWindowEvent,
-		  float duration,
+    SidekickAnim (CompWindow       *w,
+		  WindowEvent      curWindowEvent,
+		  float            duration,
 		  const AnimEffect info,
-		  const CompRect &icon);
+		  const CompRect   &icon);
 protected:
+
     float mNumRotations;
 
     float getSpringiness ();
@@ -509,12 +556,14 @@
     public GridTransformAnim
 {
 public:
-    WaveAnim (CompWindow *w,
-	      WindowEvent curWindowEvent,
-	      float duration,
+
+    WaveAnim (CompWindow       *w,
+	      WindowEvent      curWindowEvent,
+	      float            duration,
 	      const AnimEffect info,
-	      const CompRect &icon);
+	      const CompRect   &icon);
 protected:
+
     void adjustDuration ();
     void initGrid ();
     inline bool using3D () { return true; }
@@ -528,13 +577,15 @@
     public ZoomAnim
 {
 public:
-    GlideAnim (CompWindow *w,
-	       WindowEvent curWindowEvent,
-	       float duration,
+
+    GlideAnim (CompWindow       *w,
+	       WindowEvent      curWindowEvent,
+	       float            duration,
 	       const AnimEffect info,
-	       const CompRect &icon);
+	       const CompRect   &icon);
 
 protected:
+
     void prePaintWindow ();
     inline bool postPaintWindowUsed () { return true; }
     void postPaintWindow ();
@@ -556,12 +607,14 @@
     public GlideAnim
 {
 public:
-    Glide2Anim (CompWindow *w,
-		WindowEvent curWindowEvent,
-		float duration,
+
+    Glide2Anim (CompWindow       *w,
+		WindowEvent      curWindowEvent,
+		float            duration,
 		const AnimEffect info,
-		const CompRect &icon);
+		const CompRect   &icon);
 protected:
+
     bool zoomToIcon ();
     void getParams (float *finalDistFac,
 		    float *finalRotAng,
@@ -574,16 +627,23 @@
     virtual public Animation
 {
 public:
-    RestackAnim (CompWindow *w,
-		 WindowEvent curWindowEvent,
-		 float duration,
+
+    RestackAnim (CompWindow       *w,
+		 WindowEvent      curWindowEvent,
+		 float            duration,
 		 const AnimEffect info,
-		 const CompRect &icon);
+		 const CompRect   &icon);
+
     void cleanUp (bool closing,
 		  bool destructing);
+
     bool initiateRestackAnim (int duration);
-    inline bool moveUpdate (int dx, int dy) { return false; }
-    static bool onSameRestackChain (CompWindow *wSubject, CompWindow *wOther);
+
+    inline bool moveUpdate (int dx,
+			    int dy) { return false; }
+
+    static bool onSameRestackChain (CompWindow *wSubject,
+				    CompWindow *wOther);
 
     /// Find union of restack chain (group)
     static CompRegion unionRestackChain (CompWindow *w);
@@ -595,12 +655,13 @@
     virtual void processCandidate (CompWindow *candidateWin,
 				   CompWindow *subjectWin,
 				   CompRegion &candidateAndSubjectIntersection,
-				   int &numSelectedCandidates) {}
-    virtual void postInitiateRestackAnim (int numSelectedCandidates,
-					  int duration,
+				   int        &numSelectedCandidates) {}
+
+    virtual void postInitiateRestackAnim (int        numSelectedCandidates,
+					  int        duration,
 					  CompWindow *wStart,
 					  CompWindow *wEnd,
-					  bool raised) {}
+					  bool       raised) {}
 
     // Other methods
     bool overNewCopy (); ///< Is glPaint on the copy at the new position?
@@ -617,30 +678,33 @@
     friend class DodgeAnim;
 
 public:
+
     RestackPersistentData ();
     ~RestackPersistentData ();
 
 protected:
+
     inline RestackInfo *restackInfo () { return mRestackInfo; }
     void resetRestackInfo (bool alsoResetChain = false);
     void setRestackInfo (CompWindow *wRestacked,
 			 CompWindow *wStart,
 			 CompWindow *wEnd,
 			 CompWindow *wOldAbove,
-			 bool raised);
-    void getHostedOnWin (CompWindow *wGuest, CompWindow *wHost);
+			 bool       raised);
+    void getHostedOnWin (CompWindow *wGuest,
+			 CompWindow *wHost);
 
-    RestackInfo *mRestackInfo;   ///< restack info if window was restacked this paint round
-    CompWindow *mWinToBePaintedBeforeThis; ///< Window which should be painted before this
-    CompWindow *mWinThisIsPaintedBefore; ///< the inverse relation of mWinToBePaintedBeforeThis
-    CompWindow *mMoreToBePaintedPrev;
-    CompWindow *mMoreToBePaintedNext; ///< doubly linked list for windows underneath that
-    				     ///< raise together with this one
-    bool mConfigureNotified;     ///< was mConfigureNotified before restack check
-    CompWindow *mWinPassingThrough; ///< win. passing through this one during focus effect
-    bool mWalkerOverNewCopy;  ///< whether walker is on the copy at the new pos.
-    int mVisitCount; ///< how many times walker/glPaint has visited this window
-    bool mIsSecondary; ///< whether this is one of the secondary (non-topmost) in its restack chain
+    RestackInfo *mRestackInfo;		    ///< restack info if window was restacked this paint round
+    CompWindow  *mWinToBePaintedBeforeThis; ///< Window which should be painted before this
+    CompWindow  *mWinThisIsPaintedBefore;   ///< the inverse relation of mWinToBePaintedBeforeThis
+    CompWindow  *mMoreToBePaintedPrev;
+    CompWindow  *mMoreToBePaintedNext;	    ///< doubly linked list for windows underneath that
+					    ///< raise together with this one
+    bool        mConfigureNotified;	    ///< was mConfigureNotified before restack check
+    CompWindow  *mWinPassingThrough;	    ///< win. passing through this one during focus effect
+    bool        mWalkerOverNewCopy;	    ///< whether walker is on the copy at the new pos.
+    int         mVisitCount;		    ///< how many times walker/glPaint has visited this window
+    bool        mIsSecondary;		    ///< whether this is one of the secondary (non-topmost) in its restack chain
 };
 
 class FocusFadeAnim :
@@ -648,20 +712,22 @@
     public FadeAnim
 {
 public:
-    FocusFadeAnim (CompWindow *w,
-		   WindowEvent curWindowEvent,
-		   float duration,
+
+    FocusFadeAnim (CompWindow       *w,
+		   WindowEvent      curWindowEvent,
+		   float            duration,
 		   const AnimEffect info,
-		   const CompRect &icon);
+		   const CompRect   &icon);
     void updateAttrib (GLWindowPaintAttrib &attrib);
     void cleanUp (bool closing,
 		  bool destructing);
 
 protected:
+
     void processCandidate (CompWindow *candidateWin,
 			   CompWindow *subjectWin,
 			   CompRegion &candidateAndSubjectIntersection,
-			   int &numSelectedCandidates);
+			   int        &numSelectedCandidates);
     GLushort computeOpacity (GLushort opacityInt);
 };
 
@@ -682,15 +748,16 @@
     public TransformAnim
 {
 public:
-    DodgeAnim (CompWindow *w,
-	       WindowEvent curWindowEvent,
-	       float duration,
+
+    DodgeAnim (CompWindow       *w,
+	       WindowEvent      curWindowEvent,
+	       float            duration,
 	       const AnimEffect info,
-	       const CompRect &icon);
+	       const CompRect   &icon);
     void cleanUp (bool closing,
 		  bool destructing);
-    static int getDodgeAmount (CompRect &rect,
-			       CompWindow *dw,
+    static int getDodgeAmount (CompRect       &rect,
+			       CompWindow     *dw,
 			       DodgeDirection dir);
     void step ();
     void updateTransform (GLMatrix &wTransform);
@@ -698,18 +765,20 @@
     void updateBB (CompOutput &output);
     void postPreparePaint ();
     void calculateDodgeAmounts ();
-    bool moveUpdate (int dx, int dy);
+    bool moveUpdate (int dx,
+		     int dy);
 
 protected:
+
     void processCandidate (CompWindow *candidateWin,
 			   CompWindow *subjectWin,
 			   CompRegion &candidateAndSubjectIntersection,
-			   int &numSelectedCandidates);
-    void postInitiateRestackAnim (int numSelectedCandidates,
-				  int duration,
+			   int        &numSelectedCandidates);
+    void postInitiateRestackAnim (int        numSelectedCandidates,
+				  int        duration,
 				  CompWindow *wStart,
 				  CompWindow *wEnd,
-				  bool raised);
+				  bool       raised);
     bool paintedElsewhere ();
     void applyDodgeTransform ();
     float dodgeProgress ();
@@ -733,14 +802,16 @@
     friend class DodgeAnim;
 
 public:
+
     DodgePersistentData ();
 
 private:
-    int dodgeOrder;		///< dodge order (used temporarily)
+
+    int        dodgeOrder;	///< dodge order (used temporarily)
 
     // TODO mov the below members into DodgeAnim
-    bool isDodgeSubject;	///< true if this window is the cause of dodging
-    bool skipPostPrepareScreen;
+    bool       isDodgeSubject;	///< true if this window is the cause of dodging
+    bool       skipPostPrepareScreen;
     CompWindow *dodgeChainStart;///< for the subject window
     CompWindow *dodgeChainPrev;	///< for dodging windows
     CompWindow *dodgeChainNext;	///< for dodging windows
@@ -750,12 +821,14 @@
     public GridZoomAnim
 {
 public:
-    DreamAnim (CompWindow *w,
-	       WindowEvent curWindowEvent,
-	       float duration,
+
+    DreamAnim (CompWindow       *w,
+	       WindowEvent      curWindowEvent,
+	       float            duration,
 	       const AnimEffect info,
-	       const CompRect &icon);
+	       const CompRect   &icon);
 protected:
+
     void init ();
     void initGrid ();
     void step ();
@@ -771,12 +844,14 @@
     public GridZoomAnim
 {
 public:
-    FoldAnim (CompWindow *w,
-	      WindowEvent curWindowEvent,
-	      float duration,
+
+    FoldAnim (CompWindow       *w,
+	      WindowEvent      curWindowEvent,
+	      float            duration,
 	      const AnimEffect info,
-	      const CompRect &icon);
+	      const CompRect   &icon);
 protected:
+
     inline bool using3D () { return true; }
     float getFadeProgress ();
     void updateWindowAttrib (GLWindowPaintAttrib &attrib);
@@ -787,21 +862,23 @@
     public FoldAnim
 {
 public:
-    CurvedFoldAnim (CompWindow *w,
-		    WindowEvent curWindowEvent,
-		    float duration,
+
+    CurvedFoldAnim (CompWindow       *w,
+		    WindowEvent      curWindowEvent,
+		    float            duration,
 		    const AnimEffect info,
-		    const CompRect &icon);
+		    const CompRect   &icon);
 protected:
+
     void initGrid ();
     void step ();
     void updateBB (CompOutput &output);
     bool zoomToIcon ();
     float getObjectZ (GridAnim::GridModel *mModel,
-		      float forwardProgress,
-		      float sinForProg,
-		      float relDistToCenter,
-		      float curveMaxAmp);
+		      float               forwardProgress,
+		      float               sinForProg,
+		      float               relDistToCenter,
+		      float               curveMaxAmp);
     bool requiresTransformedWindow () const { return true; }
 };
 
@@ -809,19 +886,21 @@
     public FoldAnim
 {
 public:
-    HorizontalFoldsAnim (CompWindow *w,