← Back to branch summary

~timo-jyrinki/compiz/metacity-key-migrations

~timo-jyrinki/compiz/metacity-key-migrations

« back to all changes in this revision

Viewing changes to plugins/loginout/src/loginout.cpp

Committer: Tarmac
Author(s): MC Return
Date: 2012-08-03 09:23:59 UTC
mfrom: (3294.4.166 compiz.fix1030473-part1)
Revision ID: tarmac-20120803092359-pe2e1cpe6u0toxt3

Fixed various problems described in bug 1030473.
Optimized performance and style following suggestions reported by cppcheck:

1. Reduced the scope of various variables.

2. Used prefix ++ operators for non-primitive types, because those can be more efficient than post-increment. Post-increment usually keeps a copy of the previous value, adds extra code and is slower.. Fixes: https://bugs.launchpad.net/bugs/1030473. Approved by Daniel van Vugt, Sam Spilsbury.

files modified:
cmake/src/compiz/compiz_discover_gtest_tests.cpp

compizconfig/libcompizconfig/src/bindings.c

compizconfig/libcompizconfig/src/compiz.cpp

gtk/window-decorator/events.c

kde/window-decorator-kde4/window.cpp

plugins/animation/src/animation.cpp

plugins/animation/src/extensionplugin.cpp

plugins/animationaddon/src/burn.cpp

plugins/annotate/src/annotate.cpp

plugins/ccp/src/ccp.cpp

plugins/clone/src/clone.cpp

plugins/colorfilter/src/parser.cpp

plugins/compiztoolbox/src/compiztoolbox.cpp

plugins/composite/src/screen.cpp

plugins/cubeaddon/src/cubeaddon.cpp

plugins/dbus/src/dbus.cpp

plugins/decor/src/clip-groups/tests/clip-groups/src/test-decor-clip-groups.cpp

plugins/decor/src/decor.cpp

plugins/extrawm/src/extrawm.cpp

plugins/ezoom/src/ezoom.cpp

plugins/firepaint/src/firepaint.cpp

plugins/grid/src/grid.cpp

plugins/group/src/group.cpp

plugins/group/src/init.cpp

plugins/group/src/paint.cpp

plugins/group/src/selection.cpp

plugins/group/src/tab.cpp

plugins/loginout/src/loginout.cpp

plugins/mousepoll/src/mousepoll.cpp

plugins/opengl/src/fragment.cpp

plugins/opengl/src/paint.cpp

plugins/place/src/place.cpp

plugins/place/src/screen-size-change/src/screen-size-change.cpp

plugins/resize/src/resize.cpp

plugins/ring/src/ring.cpp

plugins/scale/src/scale.cpp

plugins/session/src/session.cpp

plugins/shift/src/shift.cpp

plugins/snap/src/snap.cpp

plugins/staticswitcher/src/staticswitcher.cpp

plugins/switcher/src/switcher.cpp

plugins/td/src/3d.cpp

plugins/trailfocus/src/trailfocus.cpp

plugins/wall/src/offset_movement/src/offset-movement.cpp

plugins/wobbly/src/wobbly.cpp

src/event.cpp

src/match.cpp

src/plugin.cpp

src/screen.cpp

src/stackdebugger.cpp

src/timer/src/timeouthandler.cpp

src/timer/src/timer.cpp

src/timer/tests/callbacks/src/test-timer-callbacks.cpp

src/timer/tests/while-calling/src/test-timer-set-times-while-calling.cpp

Show diffs side-by-side

added added

removed removed

plugins/loginout/src/loginout.cpp

171

171

void

172

172

LoginoutScreen::preparePaint (int ms)

173

173

{

174

float val, val2;

174

float val;

175

175

176

176

val = ((float)ms / 1000.0) / optionGetInTime ();

177

177

190

190

if (in > 0.0 || out > 0.0)

191

191

{

192

192

val = (in * optionGetInOpacity () / 100.0) + (1.0 - in);

193

val2 = (out * optionGetOutOpacity () / 100.0) + (1.0 - out);

193

float val2 = (out * optionGetOutOpacity () / 100.0) + (1.0 - out);

194

194

opacity = MIN (val, val2);

195

195

196

196

val = (in * optionGetInSaturation () / 100.0) + (1.0 - in);

Older »