lp:~sil2100/compiz/quickfix_1141079_trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.10 at revision 3649

PS Jenkins bot (community): Approve (continuous-integration) on 2013-04-08

Compiz Maintainers: Pending requested 2013-04-04

Diff: 242 lines (+137/-22)

5 files modified

src/event.cpp (+21/-19)
tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp (+99/-0)
tests/xorg-gtest/include/compiz-xorg-gtest.h (+2/-1)
tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp (+1/-0)
tests/xorg-gtest/src/compiz-xorg-gtest.cpp (+14/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1141079: [regression-r3606] Compiz broken with QT menus/floating controls in 13.04

High

Fix Released

Link a bug report

Related blueprints

3646. By Łukasz Zemczak on 2013-04-03

Re-base the Qt menu fix for the new upstream branch for compiz.
Only add the additional attributes to the event when the XGetWindowAttributes call fails. Add tests for the strange override_redirect attribute pass-through.

3645. By Gabriel Ebner on 2013-04-03

Adding a uniform to a GLVertexBuffer that uses AutoProgram causes compiz to segfault.

Example:
  gWindow->addShaders("cms", "", fragment_shader);
  gWindow->vertexBuffer()->addUniform("cms_lut", unit);
  // segfault happens later in PrivateVertexBuffer::render

The patch modifies PrivateVertexBuffer::render to set the uniform on the generated AutoProgram instead of the provided program, which in this case is NULL, causing a segfault.

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

Approved by PS Jenkins bot, Sam Spilsbury.

3644. By MC Return on 2013-04-03

Hopefully fixed all memory leaks in libcompizconfig.
Minor whitespace fixes.

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

Approved by PS Jenkins bot, Sam Spilsbury.

3643. By MC Return on 2013-03-30

Workspacenames:

Damage the text area correctly.
Extract the method used to determine where the text area was
into a separate function and use that to determine where our
damage area should be.
Also fix a few errors that happened on the last frame of animation.

This also fixes the flickering during display.

Other minor code refactoring.

(LP: #1075578, LP: #1162246). Fixes: https://bugs.launchpad.net/bugs/1075578, https://bugs.launchpad.net/bugs/1162246.

Approved by PS Jenkins bot, Sam Spilsbury.

3642. By MC Return on 2013-03-30

Show Desktop Upgrade:

Renamed "Show desktop" to "Show Desktop" (uppercase).

New features:

* Added individual movement options for all 4 corners.

* Implemented the new movement direction option "Intelligent Random".
  This option will make windows slide out of view in one of 3
  random directions (Top/Bottom / Left/Right / ToCorners) using the
  shortest movement distance, when Show Desktop is invoked.

* Also implemented a "Fully Random" movement direction mode, which will
  move every window out of view using one of 8 randomly chosen directions
  (one of 4 corners or one of 4 edges of the virtual screen).

enum IRDirection represents allowed directions in Intelligent Random
Direction mode, while enum FRDirection represents allowed directions
in Fully Random Direction mode.

Refactored ShowdesktopPlacer:
1. Removed #define macros and replaced them with inline functions in ::.
2. Refactored out the offset algorithms into separate functions.
3. Placed the actual offset + setting algorithms into ShowdesktopPlacer
and re-used where appropriate. This reduces the size of
ShowdesktopWindow::repositionPlacer.

Simplified void ShowdesktopScreen::donePaint () and removed redundant
damageScreen () call.

Removal of redundant brackets, declaration and assignment of variables in
the same line, indentation fixes, readability improvements and general
cleanup.

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

Approved by PS Jenkins bot, MC Return.

3641. By MC Return on 2013-03-30

Grid:
Fixed completely broken indentation.
Declaration and assignment of variables in one line.
Removed redundant brackets.

Approved by PS Jenkins bot, Sam Spilsbury.

3640. By MC Return on 2013-03-28

wall.cpp:
Removed redundant check if (screen->otherGrabExist ("wall", 0)) in
bool WallScreen::initiateFlip (Direction direction, CompAction::State state),
because this check is already done a few lines earlier.

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

Approved by PS Jenkins bot, Sam Spilsbury.

3639. By MC Return on 2013-03-27

Removed empty and redundant CompWindow::syncPosition () function
and all calls to it.
Also removed some associated variables not needed anymore.

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

Approved by PS Jenkins bot, Sam Spilsbury.

3638. By Hu Kang <email address hidden> on 2013-03-27

put: Don't resize the option vector every time PutScreen::toViewport is called - this will leave stale values in the option vector. Instead, check if the option exists already and resize the vector that.

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

Approved by PS Jenkins bot, Sam Spilsbury.

3637. By Sam Spilsbury on 2013-03-27

Remove lots of superfluous boost::shared_static_cast usage, we only need it for the downcast situation (which in itself is a little silly).

Replace the remaining usage of boost::shared_static_cast with boost::static_pointer_cast.

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

Approved by PS Jenkins bot, MC Return.