Created by MC Return on 2013-03-24 and last modified on 2013-03-24
Get this branch:
bzr branch lp:~mc-return/compiz/compiz.merge-revert-wrong-commit
Only MC Return can upload to this branch. If you are MC Return please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

MC Return

Recent revisions

3628. By MC Return on 2013-03-24

Merged latest lp:compiz

3627. By MC Return on 2013-03-24

Backport http://gitweb.compiz.org/?p=compiz/core;a=commitdiff;h=cf47a92f29866e0830441c8d8093c24e21e7a2fd
from git master, which reverts git commit 2a7cd9b94097a59f1074697ef7dac25b9ccd4a5c with the title "Fix typoes"
(see: http://gitweb.compiz.org/?p=compiz/core;a=commit;h=2a7cd9b94097a59f1074697ef7dac25b9ccd4a5c).

Original commit message:
Revert "Fix typoes". This commit does not fix typoes but makes changes for reasons not announced by the commit message.
This fixes bugs.compiz.org/show_bug.cgi?id=51

This reverts commit 2a7cd9b94097a59f1074697ef7dac25b9ccd4a5c.

3626. By Brandon Schaefer on 2013-02-27

Move CompScreenImpl::focusTopMostWindow() over to use the serverWindows list, as its more up-to-date. Now lowering a window will have an up-to-date stacking order.

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

Approved by Sam Spilsbury.

3625. By Sam Spilsbury on 2013-02-27

Reset nQuad to 0 for the WINDOW_DECORATION_TYPE_WINDOW case.

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

Approved by Brandon Schaefer, PS Jenkins bot, MC Return.

3624. By Paul Donohue on 2013-02-26

Fixed addhelper failing to autostart.
Credits and thanks for this patch go to Paul Donohue.

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

Approved by Sam Spilsbury.

3623. By Sam Spilsbury on 2013-02-26

Allow plugins to throttle delivery of ConfigureWindow requests within reason (LP: #1027211)

(LP: #1027211) seems to be caused by vsync in the nvidia driver and posting lots of ConfigureWindow requests to the server. The driver really chokes on these for some reason. As a result, two things were happening:

1. The driver slows down quite significantly
2. We get more time to post more ConfigureWindow requests to the driver, which just slows it down even more until it grinds to a halt.

This branch does three things:
1. Introduces infrastructure for plugins to hold a "lock" on delivering ConfigureWindow requests until they choose to release it later (eg, on paint, or on ungrab), while still allowing core to override the plugin's decisions in cases where we actually need to post a ConfigureWindow request to the server in order to continue (eg, some other request is dependent on it). That code was TDD'ed into existence and has test coverage.
2. Optimizes reconfigureXWindow to only configure the frame window if the only thing that happened was that we moved the window. This means that we only buffer up one ConfigureWindow instead of three per call to reconfigureXWindow
3. Implements ConfigureRequestBuffer in both opengl and move. The default implementation in "opengl" is the "safe" version and releases its lock every time the window paints. That means that dragging around opengl rendered windows goes from a complete halt to a steady 12fps. In the move plugin, I've revived "lazy positioning" - off by default as it might be more unsafe, but this prevents all ConfigureWindow requests from being posted until the window is ungrabbed. That goes brings us from 12fps to 60fps.

Approved by Brandon Schaefer.

3622. By PS Jenkins bot on 2013-02-26

Releasing 1:0.9.9~daily13.02.26-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

3621. By serveralex on 2013-02-26

Fixed infinite loop in InotifyScreen::processEvents ().
wIter needs to be increased here.
Credits and thanks for this patch go to serveralex !

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

Approved by Sam Spilsbury.

3620. By danilo on 2013-02-25

Fixed missing icons and text in CCSM main screen.
Credits for this fix go to danilo, thanks a lot !

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

Approved by Sam Spilsbury.

3619. By Sam Spilsbury on 2013-02-22

Fix startup issues

Amalgamated changes:

0. Re-set the setting parents correctly after an upgrade
1. Move the backend loading and config file handling code into separate objects, we need to inject them by interface in order to isolate CCSContextDefaultImpl for testing
2. Add the ccp plugin to "initialPlugins" rather than setting the option directly, that never worked.
3. Added some framework to force-import any profile available in the system config dirs and not reported as existing by the backing. This is so that we have a guaruntee that we will get its values
4. Bail out correctly when a schema couldn't be found

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

Approved by Brandon Schaefer, PS Jenkins bot, Ɓukasz Zemczak.

Branch metadata

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