lp:~mc-return/compiz/compiz.merge-fix1134251-minor-issues
- Get this branch:
- bzr branch lp:~mc-return/compiz/compiz.merge-fix1134251-minor-issues
Branch merges
- Sam Spilsbury: Approve
- PS Jenkins bot: Pending (continuous-integration) requested
-
Diff: 728 lines (+60/-61)50 files modifiedCMakeLists.txt (+1/-1)
compizconfig/compizconfig-python/CMakeLists.txt (+1/-1)
compizconfig/libcompizconfig/src/compiz.cpp (+1/-2)
compizconfig/tests/compizconfig_ccs_setting_value_operators.cpp (+2/-2)
plugins/animation/src/animation.cpp (+1/-1)
plugins/animation/src/curvedfold.cpp (+1/-1)
plugins/animation/src/dodge.cpp (+1/-1)
plugins/animation/src/dream.cpp (+1/-1)
plugins/animation/src/extensionplugin.cpp (+1/-1)
plugins/animation/src/fade.cpp (+1/-1)
plugins/animation/src/focusfade.cpp (+1/-1)
plugins/animation/src/glide.cpp (+1/-1)
plugins/animation/src/grid.cpp (+1/-1)
plugins/animation/src/horizontalfold.cpp (+1/-1)
plugins/animation/src/magiclamp.cpp (+1/-1)
plugins/animation/src/options.cpp (+1/-1)
plugins/animation/src/restack.cpp (+1/-1)
plugins/animation/src/rollup.cpp (+1/-1)
plugins/animation/src/wave.cpp (+1/-1)
plugins/animation/src/zoomside.cpp (+1/-1)
plugins/animationaddon/src/airplane.cpp (+1/-1)
plugins/animationaddon/src/animationaddon.cpp (+1/-1)
plugins/animationaddon/src/beamup.cpp (+1/-1)
plugins/animationaddon/src/burn.cpp (+1/-1)
plugins/animationaddon/src/domino.cpp (+1/-1)
plugins/animationaddon/src/explode.cpp (+1/-1)
plugins/animationaddon/src/fold.cpp (+1/-1)
plugins/animationaddon/src/glide3.cpp (+1/-1)
plugins/animationaddon/src/leafspread.cpp (+1/-1)
plugins/animationaddon/src/particle.cpp (+1/-1)
plugins/animationaddon/src/polygon.cpp (+1/-1)
plugins/animationaddon/src/skewer.cpp (+1/-1)
plugins/bench/src/bench.cpp (+1/-1)
plugins/cubeaddon/src/cubeaddon.cpp (+1/-3)
plugins/expo/src/expo.cpp (+1/-1)
plugins/firepaint/src/firepaint.cpp (+1/-1)
plugins/group/src/group.h (+9/-9)
plugins/imgjpeg/src/imgjpeg.cpp (+2/-0)
plugins/mag/src/mag.cpp (+1/-1)
plugins/mousepoll/src/mousepoll.cpp (+1/-1)
plugins/resizeinfo/src/resizeinfo.cpp (+1/-1)
plugins/scalefilter/src/scalefilter.cpp (+1/-1)
plugins/session/src/session.cpp (+1/-1)
plugins/text/src/text.cpp (+1/-1)
plugins/trip/src/trip.cpp (+1/-1)
plugins/wall/src/offset_movement/src/offset-movement.cpp (+1/-1)
plugins/widget/src/widget.cpp (+1/-1)
src/pluginclasshandler/include/core/pluginclasshandler.h (+1/-1)
src/timer/tests/set-values/src/test-timer-set-values.cpp (+1/-1)
tests/system/xorg-gtest/tests/compiz_xorg_gtest_test_window_stacking.cpp (+1/-1)
Recent revisions
- 3625. By MC Return
-
Fixed the names of the .cpp files in their copyright headers
Most just needed change from .c to .cpp, other headers (of
some animation files) were refering to animation.c, which
now is fixed as well - 3622. By MC Return
-
Do not assign false to Bool readonly, because this value is never used
Instead declare the variable and assign a value in the same line - 3621. By MC Return
-
Do not assign a value to rv, because this value is never used
Instead declare and assign a value to bool rv in the same line - 3620. By danilo
-
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
-
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.
- 3618. By Sam Spilsbury
-
Redesign the optional pixmap deletion protocol to make the consumer responsible for deleting the pixmaps.
The previous optional protocol had the consumer send a message back to the producer when a pixmap was ready to be deleted, and then the producer would take it from its pool of pixmaps marked for deletion and delete it there. That protocol did not really work out in practise though, because of a race condition where the consumer would never become aware of a new pixmap (because the new pixmap value was read synchronously instead of delivered asynchronously) and then that pixmap would just sit there in the consumer's memory and never be deleted. The new optional protocol makes the consumer responsible for freeing the pixmap once the producer has marked it ready for deletion. That way the consumer can keep on using the pixmap until it needs to delete it. This is important on drivers that use loose binding, because the texture contents are undefined as soon as the pixmap is freed on the server side.
In order to represent that, there were a few new objects added. The first is a "communicator" object which handles all of the requests that come from the decorator through ClientMessage events and dispatch to the right place. The next are the individual message handlers, which determine whether or not the pixmap can be deleted immediately or if it should go into the pixmap release pool. The final is the release pool, which stores in-use pixmaps in a list which can then be marked for deletion when the texture they are bound to goes away.
Unit and Integration tests were added to demonstrate the code and protocol behaviour.
(LP: #1119608). Fixes: https:/
/bugs.launchpad .net/bugs/ 1119608. Approved by Brandon Schaefer, PS Jenkins bot.
- 3617. By Sam Spilsbury
-
Enable copytex by default and stick the upgrades in the right place
(LP: #1130160). Fixes: https:/
/bugs.launchpad .net/bugs/ 1130160. Approved by Michael Terry.
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.9