Merge lp:~mc-return/compiz/compiz.merge-wizard-improvements into lp:compiz/0.9.10

[MC Return]

Wizard, code cleanup:

Declare local variables outside of loops.
Declaration and assignment of local variables in one line.
Use pre- instead of postfix increments.
Merged if condition checks.
Added and removed newlines.
Added default case to switch (just a style issue).
Removed redundant brackets.
Fixed indentation.

Wizard, speed improvements:

Try to avoid redundant GL_BLEND state changes, check if GL_BLEND
is already enabled, and do nothing if that is the case.

Still WIP.

Unmerged revisions

3728. By MC Return on 2013-05-28

Wizard improvements (please see main commit message for details)

=== modified file 'plugins/wizard/src/wizard.cpp'
--- plugins/wizard/src/wizard.cpp	2013-05-09 13:43:07 +0000
+++ plugins/wizard/src/wizard.cpp	2013-05-28 21:58:24 +0000
@@ -30,16 +30,19 @@
 #include "wizard.h"
 
 static void
-initParticles (int hardLimit, int softLimit, ParticleSystem * ps)
+initParticles (int            hardLimit,
+	       int            softLimit,
+	       ParticleSystem *ps)
 {
     if (ps->particles)
 	free (ps->particles);
-    ps->particles    = (Particle*) calloc (hardLimit, sizeof (Particle));
-    ps->tex          = 0;
-    ps->hardLimit    = hardLimit;
-    ps->softLimit    = softLimit;
-    ps->active       = false;
-    ps->lastCount    = 0;
+
+    ps->particles = (Particle*) calloc (hardLimit, sizeof (Particle));
+    ps->tex       = 0;
+    ps->hardLimit = hardLimit;
+    ps->softLimit = softLimit;
+    ps->active    = false;
+    ps->lastCount = 0;
 
     // Initialize cache
     ps->vertices_cache      = NULL;
@@ -52,8 +55,8 @@
     ps->dcolors_cache_count = 0;
 
     Particle *part = ps->particles;
-    int i;
-    for (i = 0; i < hardLimit; i++, part++)
+
+    for (int i = 0; i < hardLimit; ++i, ++part)
 	part->t = 0.0f;
 }
 
@@ -63,39 +66,45 @@
     if (ps->g)
 	free (ps->g);
 
-    int i;
-    GPoint *gi;
+    int                       i;
     CompOption::Value::Vector cvv = optionGetGStrength ();
+
     ps->ng = cvv.size ();
-    ps->g = (GPoint*) calloc (ps->ng, sizeof (GPoint));
-
-    gi = ps->g;
-    for (i = 0; i < ps->ng; i++, gi++)
-	gi->strength = (float)cvv.at (i).i ()/ 1000.;
+    ps->g  = (GPoint*) calloc (ps->ng, sizeof (GPoint));
+
+    GPoint *gi = ps->g;
+
+    for (i = 0; i < ps->ng; ++i, ++gi)
+	gi->strength = (float)cvv.at (i).i () / 1000.;
 
     cvv = optionGetGPosx ();
-    gi = ps->g;
-    for (i = 0; i < ps->ng; i++, gi++)
+    gi  = ps->g;
+
+    for (i = 0; i < ps->ng; ++i, ++gi)
 	gi->x = (float)cvv.at (i).i ();
 
     cvv = optionGetGPosy ();
-    gi = ps->g;
-    for (i = 0; i < ps->ng; i++, gi++)
+    gi  = ps->g;
+
+    for (i = 0; i < ps->ng; ++i, ++gi)
 	gi->y = (float)cvv.at (i).i ();
 
     cvv = optionGetGSpeed ();
-    gi = ps->g;
-    for (i = 0; i < ps->ng; i++, gi++)
-	gi->espeed = (float)cvv.at (i).i () / 100.;
+    gi  = ps->g;
+
+    for (i = 0; i < ps->ng; ++i, ++gi)
+	gi->espeed = (float)cvv.at (i).i () / 100.0;
 
     cvv = optionGetGAngle ();
-    gi = ps->g;
-    for (i = 0; i < ps->ng; i++, gi++)
-	gi->eangle = (float)cvv.at (i).i () / 180.*M_PI;
+    gi  = ps->g;
+
+    for (i = 0; i < ps->ng; ++i, ++gi)
+	gi->eangle = (float)cvv.at (i).i () / 180.0 * M_PI;
 
     cvv = optionGetGMovement ();
-    gi = ps->g;
-    for (i = 0; i < ps->ng; i++, gi++)
+    gi  = ps->g;
+
+    for (i = 0; i < ps->ng; ++i, ++gi)
 	gi->movement = cvv.at (i).i ();
 }
 
@@ -106,173 +115,204 @@
 	free (ps->e);
 
     int i;
-    Emitter *ei;
     CompOption::Value::Vector cvv = optionGetEActive ();
-    ps->ne = cvv.size ();
-    ps->e = (Emitter*) calloc (ps->ne, sizeof (Emitter));
+    ps->ne      = cvv.size ();
+    ps->e       = (Emitter*) calloc (ps->ne, sizeof (Emitter));
+    Emitter *ei = ps->e;
 
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->set_active = ei->active = cvv.at (i).b ();
 
     cvv = optionGetETrigger ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->trigger = cvv.at (i).i ();
 
     cvv = optionGetEPosx ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->x = (float)cvv.at (i).i ();
 
     cvv = optionGetEPosy ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->y = (float)cvv.at (i).i ();
 
     cvv = optionGetESpeed ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->espeed = (float)cvv.at (i).i () / 100.;
 
     cvv = optionGetEAngle ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->eangle = (float)cvv.at (i).i () / 180.*M_PI;
 
     cvv = optionGetEMovement ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->movement = cvv.at (i).i ();
 
     cvv = optionGetECount ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->count = (float)cvv.at (i).i ();
 
     cvv = optionGetEH ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->h = (float)cvv.at (i).i () / 1000.;
 
     cvv = optionGetEDh ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->dh = (float)cvv.at (i).i () / 1000.;
 
     cvv = optionGetEL ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->l = (float)cvv.at (i).i () / 1000.;
 
     cvv = optionGetEDl ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->dl = (float)cvv.at (i).i () / 1000.;
 
     cvv = optionGetEA ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->a = (float)cvv.at (i).i () / 1000.;
 
     cvv = optionGetEDa ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->da = (float)cvv.at (i).i () / 1000.;
 
     cvv = optionGetEDx ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->dx = (float)cvv.at (i).i ();
 
     cvv = optionGetEDy ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->dy = (float)cvv.at (i).i ();
 
     cvv = optionGetEDcirc ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->dcirc = (float)cvv.at (i).i ();
 
     cvv = optionGetEVx ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->vx = (float)cvv.at (i).i () / 1000.;
 
     cvv = optionGetEVy ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->vy = (float)cvv.at (i).i () / 1000.;
 
     cvv = optionGetEVt ();
     ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->vt = (float)cvv.at (i).i () / 10000.;
 
     cvv = optionGetEVphi ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->vphi = (float)cvv.at (i).i () / 10000.;
 
     cvv = optionGetEDvx ();
     ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->dvx = (float)cvv.at (i).i () / 1000.;
 
     cvv = optionGetEDvy ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->dvy = (float)cvv.at (i).i () / 1000.;
 
     cvv = optionGetEDvcirc ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->dvcirc = (float)cvv.at (i).i () / 1000.;
 
     cvv = optionGetEDvt ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->dvt = (float)cvv.at (i).i () / 10000.;
 
     cvv = optionGetEDvphi ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->dvphi = (float)cvv.at (i).i () / 10000.;
 
     cvv = optionGetES ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->s = (float)cvv.at (i).i ();
 
     cvv = optionGetEDs ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->ds = (float)cvv.at (i).i ();
 
     cvv = optionGetESnew ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->snew = (float)cvv.at (i).i ();
 
     cvv = optionGetEDsnew ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->dsnew = (float)cvv.at (i).i ();
 
     cvv = optionGetEG ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->g = (float)cvv.at (i).i () / 1000.;
 
     cvv = optionGetEDg ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->dg = (float)cvv.at (i).i () / 1000.;
 
     cvv = optionGetEGp ();
-    ei = ps->e;
-    for (i = 0; i < ps->ne; i++, ei++)
+    ei  = ps->e;
+
+    for (i = 0; i < ps->ne; ++i, ++ei)
 	ei->gp = (float)cvv.at (i).i () / 10000.;
 }
 
@@ -281,12 +321,17 @@
 {
     glPushMatrix ();
 
-    glEnable (GL_BLEND);
+    GLboolean glBlendEnabled = glIsEnabled (GL_BLEND);
+
+    if (!glBlendEnabled)
+	glEnable (GL_BLEND);
+
     if (ps->tex)
     {
 	glBindTexture (GL_TEXTURE_2D, ps->tex);
 	glEnable (GL_TEXTURE_2D);
     }
+
     glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 
     /* Check that the cache is big enough */
@@ -333,32 +378,35 @@
     int cornersSize = sizeof (GLfloat) * 8;
     int colorSize   = sizeof (GLfloat) * 4;
 
-    GLfloat cornerCoords[8] = {0.0, 0.0,
-			       0.0, 1.0,
-			       1.0, 1.0,
-			       1.0, 0.0};
-
-    int numActive = 0;
-
-    Particle *part = ps->particles;
-    int i;
-    for (i = 0; i < ps->hardLimit; i++, part++)
+    GLfloat cornerCoords[8] =
+    {
+	0.0, 0.0,
+	0.0, 1.0,
+	1.0, 1.0,
+	1.0, 0.0
+    };
+
+    int      numActive = 0;
+    float    offA, offB, cOff;
+    Particle *part     = ps->particles;
+
+    for (int i = 0; i < ps->hardLimit; ++i, ++part)
     {
 	if (part->t > 0.0f)
 	{
 	    numActive += 4;
 
-	    float cOff = part->s / 2.;		//Corner offset from center
+	    cOff = part->s / 2.0;		//Corner offset from center
 
 	    if (part->t > ps->tnew)		//New particles start larger
 		cOff += (part->snew - part->s) * (part->t - ps->tnew)
-			/ (1. - ps->tnew) / 2.;
+			/ (1.0 - ps->tnew) / 2.0;
 	    else if (part->t < ps->told)	//Old particles shrink
-		cOff -= part->s * (ps->told - part->t) / ps->told / 2.;
+		cOff -= part->s * (ps->told - part->t) / ps->told / 2.0;
 
 	    //Offsets after rotation of Texture
-	    float offA = cOff * (cos (part->phi) - sin (part->phi));
-	    float offB = cOff * (cos (part->phi) + sin (part->phi));
+	    offA = cOff * (cos (part->phi) - sin (part->phi));
+	    offB = cOff * (cos (part->phi) + sin (part->phi));
 
 	    vertices[0] = part->x - offB;
 	    vertices[1] = part->y - offA;
@@ -387,8 +435,8 @@
 	    colors[2] = part->c[2];
 
 	    if (part->t > ps->tnew)		//New particles start at a == 1
-		colors[3] = part->a + (1. - part->a) * (part->t - ps->tnew)
-			    / (1. - ps->tnew);
+		colors[3] = part->a + (1.0 - part->a) * (part->t - ps->tnew)
+			    / (1.0 - ps->tnew);
 	    else if (part->t < ps->told)	//Old particles fade to a = 0
 		colors[3] = part->a * part->t / ps->told;
 	    else				//The others have their own a
@@ -414,6 +462,7 @@
 	    }
 	}
     }
+
     glEnableClientState (GL_VERTEX_ARRAY);
     glEnableClientState (GL_TEXTURE_COORD_ARRAY);
     glEnableClientState (GL_COLOR_ARRAY);
@@ -428,6 +477,7 @@
 	glColorPointer (4, GL_FLOAT, 4 * sizeof (GLfloat), ps->dcolors_cache);
 	glDrawArrays (GL_QUADS, 0, numActive);
     }
+
     // draw particles
     glBlendFunc (GL_SRC_ALPHA, ps->blendMode);
 
@@ -445,20 +495,30 @@
     glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
     glDisable (GL_TEXTURE_2D);
     glDisable (GL_BLEND);
+
+    glDisableClientState (GL_COLOR_ARRAY);
+    glDisableClientState (GL_TEXTURE_COORD_ARRAY);
+    glDisableClientState (GL_VERTEX_ARRAY);
+
+    glPopMatrix ();
+    glColor4usv (defaultColor);
+    gScreen->setTexEnvMode (GL_REPLACE);
+    glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 }
 
 static void
-updateParticles (ParticleSystem * ps, float time)
+updateParticles (ParticleSystem *ps,
+		 float          time)
 {
-    int i, j;
-    int newCount = 0;
-    Particle *part;
-    GPoint *gi;
-    float gdist, gangle;
+    int      i, j;
+    int      newCount = 0;
+    Particle *part    = ps->particles;
+    GPoint   *gi;
+    float    gdist, gangle;
+
     ps->active = false;
 
-    part = ps->particles;
-    for (i = 0; i < ps->hardLimit; i++, part++)
+    for (i = 0; i < ps->hardLimit; ++i, ++part)
     {
 	if (part->t > 0.0f)
 	{
@@ -482,12 +542,14 @@
 
 	    //GPoint gravity
 	    gi = ps->g;
-	    for (j = 0; j < ps->ng; j++, gi++)
+
+	    for (j = 0; j < ps->ng; ++j, ++gi)
 	    {
 		if (gi->strength != 0)
 		{
-		    gdist = sqrt ((part->x-gi->x)*(part->x-gi->x)
-				  + (part->y-gi->y)*(part->y-gi->y));
+		    gdist = sqrt ((part->x - gi->x) * (part->x - gi->x) +
+				  (part->y - gi->y) * (part->y - gi->y));
+
 		    if (gdist > 1)
 		    {
 			gangle = atan2 (gi->y-part->y, gi->x-part->x);
@@ -498,7 +560,7 @@
 	    }
 
 	    ps->active  = true;
-	    newCount++;
+	    ++newCount;
 	}
     }
     ps->lastCount = newCount;
@@ -506,22 +568,25 @@
     //Particle gravity
     Particle *gpart;
     part = ps->particles;
-    for (i = 0; i < ps->hardLimit; i++, part++)
+
+    for (i = 0; i < ps->hardLimit; ++i, ++part)
     {
 	if (part->t > 0.0f && part->g != 0)
 	{
 	    gpart = ps->particles;
-	    for (j = 0; j < ps->hardLimit; j++, gpart++)
+
+	    for (j = 0; j < ps->hardLimit; ++j, ++gpart)
 	    {
 		if (gpart->t > 0.0f)
 		{
-		    gdist = sqrt ((part->x-gpart->x)*(part->x-gpart->x)
-				  + (part->y-gpart->y)*(part->y-gpart->y));
+		    gdist = sqrt ((part->x - gpart->x) * (part->x - gpart->x) +
+				  (part->y - gpart->y) * (part->y - gpart->y));
+
 		    if (gdist > 1)
 		    {
-			gangle = atan2 (part->y-gpart->y, part->x-gpart->x);
-			gpart->vx += part->g/gdist* cos (gangle) * part->t*time;
-			gpart->vy += part->g/gdist* sin (gangle) * part->t*time;
+			gangle     = atan2 (part->y - gpart->y, part->x - gpart->x);
+			gpart->vx += part->g / gdist * cos (gangle) * part->t * time;
+			gpart->vy += part->g / gdist * sin (gangle) * part->t * time;
 		    }
 		}
 	    }
@@ -530,41 +595,46 @@
 }
 
 static void
-finiParticles (ParticleSystem * ps)
+finiParticles (ParticleSystem *ps)
 {
     free (ps->e);
     free (ps->particles);
+
     if (ps->tex)
 	glDeleteTextures (1, &ps->tex);
 
     if (ps->vertices_cache)
 	free (ps->vertices_cache);
+
     if (ps->colors_cache)
 	free (ps->colors_cache);
+
     if (ps->coords_cache)
 	free (ps->coords_cache);
+
     if (ps->dcolors_cache)
 	free (ps->dcolors_cache);
 }
 
 static void
-genNewParticles (ParticleSystem *ps, Emitter *e)
+genNewParticles (ParticleSystem *ps,
+		 Emitter        *e)
 {
-
     float q, p, t = 0, h, l;
     int count = e->count;
 
     Particle *part = ps->particles;
-    int i, j;
+    int j;
 
-    for (i = 0; i < ps->hardLimit && count > 0; i++, part++)
+    for (int i = 0; i < ps->hardLimit && count > 0; ++i, ++part)
     {
 	if (part->t <= 0.0f)
 	{
 	    //Position
 	    part->x = rRange (e->x, e->dx);		// X Position
 	    part->y = rRange (e->y, e->dy);		// Y Position
-	    if ((q = rRange (e->dcirc/2.,e->dcirc/2.)) > 0)
+
+	    if ((q = rRange (e->dcirc / 2.0, e->dcirc / 2.0)) > 0)
 	    {
 		p = rRange (0, M_PI);
 		part->x += q * cos (p);
@@ -574,70 +644,84 @@
 	    //Speed
 	    part->vx = rRange (e->vx, e->dvx);		// X Speed
 	    part->vy = rRange (e->vy, e->dvy);		// Y Speed
-	    if ((q = rRange (e->dvcirc/2.,e->dvcirc/2.)) > 0)
+
+	    if ((q = rRange (e->dvcirc / 2.0, e->dvcirc / 2.0)) > 0)
 	    {
 		p = rRange (0, M_PI);
 		part->vx += q * cos (p);
 		part->vy += q * sin (p);
 	    }
 	    part->vt = rRange (e->vt, e->dvt);		// Aging speed
+
 	    if (part->vt > -0.0001)
 		part->vt = -0.0001;
 
 	    //Size, Gravity and Rotation
-	    part->s = rRange (e->s, e->ds);		// Particle size
+	    part->s    = rRange (e->s, e->ds);		// Particle size
 	    part->snew = rRange (e->snew, e->dsnew);	// Particle start size
-	    if (e->gp > (float)(random () & 0xffff) / 65535.)
+
+	    if (e->gp > (float)(random () & 0xffff) / 65535.0)
 		part->g = rRange (e->g, e->dg);		// Particle gravity
 	    else
-		part->g = 0.;
-	    part->phi = rRange (0, M_PI);		// Random orientation
+		part->g = 0.0;
+
+	    part->phi  = rRange (0, M_PI);		// Random orientation
 	    part->vphi = rRange (e->vphi, e->dvphi);	// Rotation speed
 
 	    //Alpha
 	    part->a = rRange (e->a, e->da);		// Alpha
+
 	    if (part->a > 1)
-		part->a = 1.;
+		part->a = 1.0;
 	    else if (part->a < 0)
-		part->a = 0.;
+		part->a = 0.0;
 
 	    //HSL to RGB conversion from Wikipedia simplified by S = 1
 	    h = rRange (e->h, e->dh); //Random hue within range
+
 	    if (h < 0)
-		h += 1.;
+		h += 1.0;
 	    else if (t > 1)
-		h -= 1.;
+		h -= 1.0;
+
 	    l = rRange (e->l, e->dl); //Random lightness ...
+
 	    if (l > 1)
-		l = 1.;
+		l = 1.0;
 	    else if (l < 0)
-		l = 0.;
+		l = 0.0;
+
 	    q = e->l * 2;
+
 	    if (q > 1)
-		q = 1.;
+		q = 1.0;
+
 	    p = 2 * e->l - q;
+
 	    for (j = 0; j < 3; j++)
 	    {
-		t = h + (1-j)/3.;
+		t = h + (1 - j) / 3.0;
+
 		if (t < 0)
-		    t += 1.;
+		    t += 1.0;
 		else if (t > 1)
-		    t -= 1.;
-		if (t < 1/6.)
-		    part->c[j] = p + ((q-p)*6*t);
-		else if (t < .5)
+		    t -= 1.0;
+
+		if (t < 1 / 6.0)
+		    part->c[j] = p + ((q - p) * 6 * t);
+		else if (t < 0.5)
 		    part->c[j] = q;
-		else if (t < 2/3.)
-		    part->c[j] = p + ((q-p)*6*(2/3.-t));
+		else if (t < 2 / 3.0)
+		    part->c[j] = p + ((q - p) * 6 * (2 / 3.0 - t));
 		else
 		    part->c[j] = p;
 	    }
 
 	    // give new life
-	    part->t = 1.;
+	    part->t = 1.0;
 
 	    ps->active = true;
-	    count -= 1;
+	    count     -= 1;
 	}
     }
 }
@@ -653,7 +737,8 @@
 	Emitter *ei = ps->e;
 	GPoint  *gi = ps->g;
 	int i;
-	for (i = 0; i < ps->ng; i++, gi++)
+
+	for (i = 0; i < ps->ng; ++i, ++gi)
 	{
 	    if (gi->movement == MOVEMENT_MOUSEPOSITION)
 	    {
@@ -662,13 +747,14 @@
 	    }
 	}
 
-	for (i = 0; i < ps->ne; i++, ei++)
+	for (i = 0; i < ps->ne; ++i, ++ei)
 	{
 	    if (ei->movement == MOVEMENT_MOUSEPOSITION)
 	    {
 		ei->x = pos.x ();
 		ei->y = pos.y ();
 	    }
+
 	    if (ei->active && ei->trigger == TRIGGER_MOUSEMOVEMENT)
 		genNewParticles (ps, ei);
 	}
@@ -684,21 +770,23 @@
     if (active && !ps)
     {
 	ps = (ParticleSystem*) calloc(1, sizeof (ParticleSystem));
+
 	if (!ps)
 	{
 	    cScreen->preparePaint (time);
 	    return;
 	}
+
 	loadGPoints (ps);
 	loadEmitters (ps);
 	initParticles (optionGetHardLimit (), optionGetSoftLimit (), ps);
-	ps->darken = optionGetDarken ();
+	ps->darken    = optionGetDarken ();
 	ps->blendMode = (optionGetBlend ()) ? GL_ONE :
 					      GL_ONE_MINUS_SRC_ALPHA;
-	ps->tnew = optionGetTnew ();
-	ps->told = optionGetTold ();
-	ps->gx = optionGetGx ();
-	ps->gy = optionGetGy ();
+	ps->tnew      = optionGetTnew ();
+	ps->told      = optionGetTold ();
+	ps->gx        = optionGetGx ();
+	ps->gy        = optionGetGy ();
 
 	glGenTextures (1, &ps->tex);
 	glBindTexture (GL_TEXTURE_2D, ps->tex);
@@ -714,127 +802,133 @@
     if (ps && active && ps->e)
     {
 	Emitter *ei = ps->e;
-	GPoint *gi = ps->g;
+	GPoint  *gi = ps->g;
 	int i;
 
-	for (i = 0; i < ps->ng; i++, gi++)
+	for (i = 0; i < ps->ng; ++i, ++gi)
 	{
-	    if (gi->movement==MOVEMENT_BOUNCE || gi->movement==MOVEMENT_WRAP)
+	    if (gi->movement == MOVEMENT_BOUNCE || gi->movement == MOVEMENT_WRAP)
 	    {
 		gi->x += gi->espeed * cos (gi->eangle) * time;
 		gi->y += gi->espeed * sin (gi->eangle) * time;
+
 		if (gi->x >= screen->width ())
 		{
-		    if (gi->movement==MOVEMENT_BOUNCE)
+		    if (gi->movement == MOVEMENT_BOUNCE)
 		    {
-			gi->x = 2*screen->width () - gi->x - 1;
+			gi->x      = 2 * screen->width () - gi->x - 1;
 			gi->eangle = M_PI - gi->eangle;
 		    }
-		    else if (gi->movement==MOVEMENT_WRAP)
+		    else if (gi->movement == MOVEMENT_WRAP)
 			gi->x -= screen->width ();
 		}
 		else if (gi->x < 0)
 		{
-		    if (gi->movement==MOVEMENT_BOUNCE)
+		    if (gi->movement == MOVEMENT_BOUNCE)
 		    {
-			gi->x *= -1;
+			gi->x     *= -1;
 			gi->eangle = M_PI - gi->eangle;
 		    }
-		    else if (gi->movement==MOVEMENT_WRAP)
+		    else if (gi->movement == MOVEMENT_WRAP)
 			gi->x += screen->width ();
 		}
+
 		if (gi->y >= screen->height ())
 		{
-		    if (gi->movement==MOVEMENT_BOUNCE)
+		    if (gi->movement == MOVEMENT_BOUNCE)
 		    {
-			gi->y = 2*screen->height () - gi->y - 1;
+			gi->y       = 2 * screen->height () - gi->y - 1;
 			gi->eangle *= -1;
 		    }
-		    else if (gi->movement==MOVEMENT_WRAP)
+		    else if (gi->movement == MOVEMENT_WRAP)
 			gi->y -= screen->height ();
 		}
 		else if (gi->y < 0)
 		{
-		    if (gi->movement==MOVEMENT_BOUNCE)
+		    if (gi->movement == MOVEMENT_BOUNCE)
 		    {
-			gi->y *= -1;
+			gi->y      *= -1;
 			gi->eangle *= -1;
 		    }
-		    else if (gi->movement==MOVEMENT_WRAP)
+		    else if (gi->movement == MOVEMENT_WRAP)
 			gi->y += screen->height ();
 		}
 	    }
-	    if (gi->movement==MOVEMENT_FOLLOWMOUSE
+
+	    if (gi->movement == MOVEMENT_FOLLOWMOUSE
 		&& (my!=gi->y||mx!=gi->x))
 	    {
-		gi->eangle = atan2(my-gi->y, mx-gi->x);
+		gi->eangle = atan2 (my-gi->y, mx-gi->x);
 		gi->x += gi->espeed * cos(gi->eangle) * time;
 		gi->y += gi->espeed * sin(gi->eangle) * time;
 	    }
 	}
 
-	for (i = 0; i < ps->ne; i++, ei++)
+	for (i = 0; i < ps->ne; ++i, ++ei)
 	{
-	    if (ei->movement==MOVEMENT_BOUNCE || ei->movement==MOVEMENT_WRAP)
+	    if (ei->movement == MOVEMENT_BOUNCE || ei->movement == MOVEMENT_WRAP)
 	    {
 		ei->x += ei->espeed * cos (ei->eangle) * time;
 		ei->y += ei->espeed * sin (ei->eangle) * time;
+
 		if (ei->x >= screen->width ())
 		{
-		    if (ei->movement==MOVEMENT_BOUNCE)
+		    if (ei->movement == MOVEMENT_BOUNCE)
 		    {
-			ei->x = 2*screen->width () - ei->x - 1;
+			ei->x = 2 * screen->width () - ei->x - 1;
 			ei->eangle = M_PI - ei->eangle;
 		    }
-		    else if (ei->movement==MOVEMENT_WRAP)
+		    else if (ei->movement == MOVEMENT_WRAP)
 			ei->x -= screen->width ();
 		}
 		else if (ei->x < 0)
 		{
-		    if (ei->movement==MOVEMENT_BOUNCE)
+		    if (ei->movement == MOVEMENT_BOUNCE)
 		    {
 			ei->x *= -1;
 			ei->eangle = M_PI - ei->eangle;
 		    }
-		    else if (ei->movement==MOVEMENT_WRAP)
+		    else if (ei->movement == MOVEMENT_WRAP)
 			ei->x += screen->width ();
 		}
 		if (ei->y >= screen->height ())
 		{
-		    if (ei->movement==MOVEMENT_BOUNCE)
+		    if (ei->movement == MOVEMENT_BOUNCE)
 		    {
-			ei->y = 2*screen->height () - ei->y - 1;
+			ei->y = 2 * screen->height () - ei->y - 1;
 			ei->eangle *= -1;
 		    }
-		    else if (ei->movement==MOVEMENT_WRAP)
+		    else if (ei->movement == MOVEMENT_WRAP)
 			ei->y -= screen->height ();
 		}
 		else if (ei->y < 0)
 		{
-		    if (ei->movement==MOVEMENT_BOUNCE)
+		    if (ei->movement == MOVEMENT_BOUNCE)
 		    {
 			ei->y *= -1;
 			ei->eangle *= -1;
 		    }
-		    else if (ei->movement==MOVEMENT_WRAP)
+		    else if (ei->movement == MOVEMENT_WRAP)
 			ei->y += screen->height ();
 		}
 	    }
-	    if (ei->movement==MOVEMENT_FOLLOWMOUSE
+
+	    if (ei->movement == MOVEMENT_FOLLOWMOUSE
 		&& (my!=ei->y||mx!=ei->x))
 	    {
 		ei->eangle = atan2 (my-ei->y, mx-ei->x);
 		ei->x += ei->espeed * cos (ei->eangle) * time;
 		ei->y += ei->espeed * sin (ei->eangle) * time;
 	    }
-	    if (ei->trigger == TRIGGER_RANDOMPERIOD
-		&& ei->set_active && !((int)random ()&0xff))
+
+	    if (ei->trigger == TRIGGER_RANDOMPERIOD &&
+		ei->set_active			    &&
+		!((int)random ()&0xff))
 		ei->active = !ei->active;
-	    if (ei->active && (
-		    (ei->trigger == TRIGGER_PERSISTENT) ||
-		    (ei->trigger == TRIGGER_RANDOMSHOT && !((int)random()&0xff)) ||
-		    (ei->trigger == TRIGGER_RANDOMPERIOD)
-		    ))
+
+	    if (ei->active && ((ei->trigger == TRIGGER_PERSISTENT)			    ||
+			       (ei->trigger == TRIGGER_RANDOMSHOT && !((int)random()&0xff)) ||
+			       (ei->trigger == TRIGGER_RANDOMPERIOD)))
 		genNewParticles (ps, ei);
 	}
     }
@@ -868,16 +962,15 @@
 }
 
 bool
-WizardScreen::glPaintOutput (const GLScreenPaintAttrib	&sa,
-			     const GLMatrix		&transform,
-			     const CompRegion		&region,
-			     CompOutput			*output,
-			     unsigned int		mask)
+WizardScreen::glPaintOutput (const GLScreenPaintAttrib &sa,
+			     const GLMatrix            &transform,
+			     const CompRegion          &region,
+			     CompOutput                *output,
+			     unsigned int              mask)
 {
-    bool           status;
-    GLMatrix  sTransform;
+    GLMatrix sTransform;
 
-    status = gScreen->glPaintOutput (sa, transform, region, output, mask);
+    bool status = gScreen->glPaintOutput (sa, transform, region, output, mask);
 
     if (!ps || !ps->active)
 	return status;
@@ -902,16 +995,17 @@
 WizardScreen::toggle ()
 {
     active = !active;
+
     cScreen->preparePaintSetEnabled (this, active);
     cScreen->donePaintSetEnabled (this, active);
     gScreen->glPaintOutputSetEnabled (this, active);
-    
+
     cScreen->damageScreen ();
     return true;
 }
 
 void
-WizardScreen::optionChanged (CompOption	      *opt,
+WizardScreen::optionChanged (CompOption             *opt,
 			     WizardOptions::Options num)
 {
     loadGPoints (ps);

=== renamed file 'plugins/wizard/include/wizard.h' => 'plugins/wizard/src/wizard.h'
--- plugins/wizard/include/wizard.h	2010-09-14 01:57:47 +0000
+++ plugins/wizard/src/wizard.h	2013-05-28 21:58:24 +0000
@@ -33,9 +33,10 @@
 #include "wizard_tex.h"
 
 static float
-rRange (float avg, float range)
+rRange (float avg,
+	float range)
 {
-    return avg + (float)((random () & 0xff)/127.5-1.)*range;
+    return avg + (float)((random () & 0xff) / 127.5-1.) * range;
 }
 
 typedef enum
@@ -59,8 +60,8 @@
     public:
 
 	float strength;		// Strength of this gravity source
-	float x;			// X position
-	float y;			// Y position
+	float x;		// X position
+	float y;		// Y position
 	float espeed;		// Speed of the gravity source
 	float eangle;		// Angle for the movement of this gravity source
 	int   movement;		// Type of movement of this gravity source
@@ -70,69 +71,69 @@
 {
     public:
 
-	float c[3];			// Color
-	float a;			// alpha value
-	float x;			// X position
-	float y;			// Y position
-	float t;			// t position (age, born at 1, dies at 0)
-	float phi;			// Orientation of texture
-	float vx;			// X speed
-	float vy;			// Y speed
-	float vt;			// t speed (aging speed)
-	float vphi;			// Rotation speed
-	float s;			// size (side of the square)
-	float snew;			// Size when born (reduced to s while new)
-	float g;			// Gravity from this particle
+	float c[3];		// Color
+	float a;		// alpha value
+	float x;		// X position
+	float y;		// Y position
+	float t;		// t position (age, born at 1, dies at 0)
+	float phi;		// Orientation of texture
+	float vx;		// X speed
+	float vy;		// Y speed
+	float vt;		// t speed (aging speed)
+	float vphi;		// Rotation speed
+	float s;		// size (side of the square)
+	float snew;		// Size when born (reduced to s while new)
+	float g;		// Gravity from this particle
 };
 
 class Emitter
 {
     public:
 
-	bool  set_active;		// Set to active in the settings
+	bool  set_active;	// Set to active in the settings
 	bool  active;		// Currently active (differs from set_active for
-				    //                   the random period trigger)
+				//                   the random period trigger)
 	int   trigger;		// When to generate particles
 	int   count;		// Amount of particles to be generated
-	float h;			// color hue (0..1)
-	float dh;			// color hue range
-	float l;			// color lightness (0..1)
-	float dl;			// color lightness range
-	float a;			// Alpha
-	float da;			// Alpha range
-	float x;			// X position
-	float y;			// Y position
+	float h;		// color hue (0..1)
+	float dh;		// color hue range
+	float l;		// color lightness (0..1)
+	float dl;		// color lightness range
+	float a;		// Alpha
+	float da;		// Alpha range
+	float x;		// X position
+	float y;		// Y position
 	float espeed;		// Speed of the emitter
 	float eangle;		// Angle for the movement of this emitter
 	int   movement;		// Type of movement of this emitter
-	float dx;			// X range
-	float dy;			// Y range
+	float dx;		// X range
+	float dy;		// Y range
 	float dcirc;		// Circular range
-	float vx;			// X speed
-	float vy;			// Y speed
-	float vt;			// t speed (aging speed)
-	float vphi;			// Rotation speed
-	float dvx;			// X speed range
-	float dvy;			// Y speed range
+	float vx;		// X speed
+	float vy;		// Y speed
+	float vt;		// t speed (aging speed)
+	float vphi;		// Rotation speed
+	float dvx;		// X speed range
+	float dvy;		// Y speed range
 	float dvcirc;		// Circular speed range
-	float dvt;			// t speed (aging speed) range
+	float dvt;		// t speed (aging speed) range
 	float dvphi;		// Rotation speed range
-	float s;			// size (side of the square)
-	float ds;			// size (side of the square) range
-	float snew;			// Size when born (reduced to s while new)
+	float s;		// size (side of the square)
+	float ds;		// size (side of the square) range
+	float snew;		// Size when born (reduced to s while new)
 	float dsnew;		// Size when born (reduced to s while new) range
-	float g;			// Gravity of particles
-	float dg;			// Gravity range
-	float gp;			// Part of particles that have gravity
+	float g;		// Gravity of particles
+	float dg;		// Gravity range
+	float gp;		// Part of particles that have gravity
 };
 
 class ParticleSystem
 {
     public:
 
-	int      hardLimit;		// Not to be exceeded
-	int      softLimit;		// If exceeded, old particles age faster
-	int      lastCount;		// Living particle count to evaluate softLimit
+	int      hardLimit;	// Not to be exceeded
+	int      softLimit;	// If exceeded, old particles age faster
+	int      lastCount;	// Living particle count to evaluate softLimit
 	float    tnew;		// Particle is new if t > tnew
 	float    told;		// Particle is old if t < told
 	float    gx;		// Global gravity x
@@ -140,21 +141,21 @@
 	Particle *particles;	// The actual particles
 	GLuint   tex;		// Particle Texture
 	bool     active;
-	float    darken;		// Darken background
+	float    darken;	// Darken background
 	GLuint   blendMode;
 	Emitter  *e;		// All emitters in here
 	GPoint   *g;		// All gravity point sources in here
 	int      ne;		// Emitter count
 	int      ng;		// GPoint count
 
-	GLfloat *vertices_cache;
-	int     vertex_cache_count;
-	GLfloat *coords_cache;
-	int     coords_cache_count;
-	GLfloat *colors_cache;
-	int     color_cache_count;
-	GLfloat *dcolors_cache;
-	int     dcolors_cache_count;
+	GLfloat  *vertices_cache;
+	int      vertex_cache_count;
+	GLfloat  *coords_cache;
+	int      coords_cache_count;
+	GLfloat  *colors_cache;
+	int      color_cache_count;
+	GLfloat  *dcolors_cache;
+	int      dcolors_cache_count;
 };
 
 class WizardScreen :
@@ -165,19 +166,21 @@
     public GLScreenInterface
 {
     public:
+
 	WizardScreen (CompScreen *screen);
 	~WizardScreen ();
 
 	CompositeScreen *cScreen;
-	GLScreen	*gScreen;
-
-	int mx, my; //Mouse Position from polling
-
-	bool active;
-
-	ParticleSystem *ps;
-
-	MousePoller pollHandle;
+	GLScreen        *gScreen;
+
+	int             mx;
+	int             my;	//Mouse Position from polling
+
+	bool            active;
+
+	ParticleSystem  *ps;
+
+	MousePoller     pollHandle;
 
 	void loadGPoints (ParticleSystem *ps);
 
@@ -192,16 +195,16 @@
 	void donePaint ();
 
 	bool
-	glPaintOutput (const GLScreenPaintAttrib	&sa,
-		       const GLMatrix		&transform,
-		       const CompRegion		&region,
-		       CompOutput			*output,
-		       unsigned int		mask);
+	glPaintOutput (const GLScreenPaintAttrib &sa,
+		       const GLMatrix            &transform,
+		       const CompRegion          &region,
+		       CompOutput                *output,
+		       unsigned int              mask);
 
 	bool toggle ();
 
 	void
-	optionChanged (CompOption	      *opt,
+	optionChanged (CompOption             *opt,
 		       WizardOptions::Options num);
 };