Compiz

lp:~townsend/compiz/fix-lp890747

Created by Christopher Townsend and last modified
Get this branch:
bzr branch lp:~townsend/compiz/fix-lp890747
Only Christopher Townsend can upload to this branch. If you are Christopher Townsend please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Christopher Townsend
Project:
Compiz
Status:
Merged

Recent revisions

3785. By Christopher Townsend

Re-copied the patch output for the new patch files due to some unseen error in patching the files.

3784. By Christopher Townsend

Set gnome-system-monitor as a Recommends for the compiz-gnome package.

3783. By Christopher Townsend

Ctrl-Alt-Del should open the gnome-system-monitor at the processes tab. This fix uses the commands plugin to override the default action. This includes:
  - Enable and start the commands plugin by default.
  - Patch commands.xml and intergrated.xml to map gnome-system-monitor ot Ctrl-Alt-Del by default.
In this fix, the compiz-plugins-defaults package now breaks/replaces the compiz-plugins package for versions < 0.9.10.

3782. By Michail Bitzes

Wizard plugin:

No more segfaults/crashes when changing options in CCSM. (LP: #1195996)
Gradual fade out of particles when terminating. (LP: #1196010)
Typo fixed in wizard.xml.in.
optionNotify added for some options that were missing it.

Code cleanup:

Declare variables outside of loops.

Functions moved from class WizardScreen to class ParticleSystem.
(similar to firepaint/showmouse)

We just enable GL_BLEND if it is disabled and
we just disable GL_BLEND if it was disabled before.

Many other style and indentation fixes. Fixes: https://bugs.launchpad.net/bugs/1195996, https://bugs.launchpad.net/bugs/1196010.

Approved by PS Jenkins bot, MC Return.

3781. By 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). Fixes: https://bugs.launchpad.net/bugs/1101618.

Approved by Sami Jaktholm, PS Jenkins bot.

3780. By Andrea Azzarone

Disable show_desktop_key by default on ubuntu. Will provide the same option under the unityshell panel. Fixes: https://bugs.launchpad.net/bugs/1204664.

Approved by PS Jenkins bot, Sam Spilsbury.

3779. By MC Return

gears.cpp, gears.h:

Do not render the gears if we are viewing the cube from the inside -
the gears are otherwise obstructing the users' view on his workspaces.

Print a warning to the console once in this case.

(LP: #1185819). Fixes: https://bugs.launchpad.net/bugs/1185819.

Approved by Sam Spilsbury, PS Jenkins bot.

3778. By Daniel van Vugt

This branch is 0.9.11

3777. By MC Return

plugins/ezoom/src/ezoom.cpp:
Also initialize xtrans and ytrans in the ctors.
Just just enable blending if it is disabled and just
disable it if it was disabled before.
Introduced the variables oWidth, oHeight, halfOWidth and
halfOHeight to speed up following calculations.
Return ASAP, do not calculate possibly redundant stuff.
Declaration and assignment of local variables in one line.
Improved readability.
Added and removed newlines.
Minor indentation fixes.

plugins/ezoom/ezoom.xml.in:
Removed redundant whitespaces from a tooltip.

(LP: #1101572). Fixes: https://bugs.launchpad.net/bugs/1101572.

Approved by Sam Spilsbury, PS Jenkins bot.

3776. By MC Return

cube.cpp, code cleanup:

#include "privates.h", not <privates.h>.
Merged if condition checks.
Declaration of variables, where you need them to improve
the code structure and readability.
Use C++ standard bool for topDir, bottomDir, allCaps and
mCapsPainted[output] (bool true/false instead Bool TRUE/FALSE).
Initialize all of the class member variables in the constructor.
Replaced if (priv->mSky.size () > 0) with if (!priv->mSky.empty ()).
Removed redundant brackets.
Fixed indentation.
Added TODO.

cube.cpp, code speedup:

Do not call optionGetInactiveOpacity () twice, instead save
the value as float inactiveOpacity and use this variable in
the following calculation.
Introduced the variables float halfHsize = hsize / 2.0; and
float tsSize = 360.0f / size; and used those in following
calculations to not have to recalculate those values multiple
times.
Do not calculate M_PI / sides and 2 * M_PI / sides multiple times
in loops, instead save those values in the GLfloats mps and tmps
and use those values inside the loops.
Use GLdouble mDist2 = 0.5 / mDistance; in the GLdouble clipPlane*
arrays, instead of recalculating this value multiple times.
Use GLfloat oneMinusFStepX = 1.0f - fStepX; and
GLfloat oneMinusFStepY = 1.0f - fStepY; instead of calculating
those values multiple times.
Use float outputWidth = outputPtr->width (); and float outputHeight =
outputPtr->height (); instead of calling the functions multiple
times.
Introduced the GLfloat normInvert = 0.5f * invert; and used this
variable instead of recalculating this value multiple times.
Introduced the GLfloats mSkyWidth and mSkyHeight and used those
in the following loops instead of calling mSkySize.width () and
mSkySize.height () multiple times.
Try to avoid redundant GL_BLEND state changes, because OpenGL
will blindly change the global state, no matter what it currently
is set to and that state change is expensive. So we query and
save the actual blending state in the variable GLboolean
glBlendEnabled = glIsEnabled (GL_BLEND); and just enable it if
it isn't already and just disable it, if it was disabled before.

(LP: #1101422, LP: #1195977)

cube.cpp, other fixes:

Return false in function PrivateCubeScreen::updateGeometry (int, int)
if sides should ever be 0, which should never happen, but should make
Coverity happy.

(LP: #1101541)

Initialize all class member variables in the PrivateCubeScreen::
PrivateCubeScreen (CompScreen *) constructor.
(mTc, mNOutput, mOutput, mOutputMask, mCleared, mCapsPainted)

(LP: #1101575). Fixes: https://bugs.launchpad.net/bugs/1101422, https://bugs.launchpad.net/bugs/1101541, https://bugs.launchpad.net/bugs/1101575.

Approved by Sam Spilsbury, PS Jenkins bot.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:compiz/0.9.11
This branch contains Public information 
Everyone can see this information.