Merge lp:~mc-return/compiz/compiz.merge-fix1105969-showmouse-code-needs-cleanup into lp:compiz/0.9.9

[MC Return]

Showmouse cleanup:

Made nE an unsigned int to begin with as optionGetEmitters ()
will just return u-int values from 1 to 10.
No need to calculate MIN (10, optionGetEmitters ()) for the
same reason.

Removed redundant calculation of one rVal (random value), because
this rVal is being recalculated a few lines later before being used
again.

(LP: #1105969)

No formatting changes. :)

[Sam Spilsbury (smspillaz)]

This all looks fine, the only bit I have a concern over is:

18 - int nE = MIN (10, optionGetEmitters ());
19 + unsigned int nE = optionGetEmitters ();

That would change behaviour, but I guess the point is that the real minimum should be controlled by the user, yes?

review: Needs Information

[MC Return (mc-return)]

> This all looks fine, the only bit I have a concern over is:
>
> 18 - int nE = MIN (10, optionGetEmitters ());
> 19 + unsigned int nE = optionGetEmitters ();
>
> That would change behaviour, but I guess the point is that the real minimum
> should be controlled by the user, yes?

nE is just the number of Emitters, which is controlled by showmouse.xml.in anyway
and can just take values from 1 to 10, so there is no need for a type conversion
and also no need to calculate this minimum...

But I will set this branch to WIP for now as it will collide with the GL|ES
port anyway and I will probably have to fix conflicts before this can merge...

[Brandon Schaefer (brandontschaefer)]

LGTM.

review: Approve

=== modified file 'plugins/showmouse/src/showmouse.cpp'
--- plugins/showmouse/src/showmouse.cpp	2013-01-27 19:34:52 +0000
+++ plugins/showmouse/src/showmouse.cpp	2013-01-31 13:18:24 +0000
@@ -368,10 +368,10 @@
     unsigned int i, j;
 
     float pos[10][2];
-    int nE       = MIN (10, optionGetEmitters ());
+    unsigned int nE = optionGetEmitters ();
     float rA     = (2 * M_PI) / nE;
     int radius   = optionGetRadius ();
-    for (i = 0; i < (unsigned int) nE; i++)
+    for (i = 0; i < nE; i++)
     {
 	pos[i][0]  = sin (rot + (i * rA)) * radius;
 	pos[i][0] += mousePos.x ();
@@ -392,7 +392,6 @@
 	    // set size
 	    part.width = partw;
 	    part.height = parth;
-	    rVal = (float)(random() & 0xff) / 255.0;
 	    part.w_mod = part.h_mod = -1;
 
 	    // choose random position