← Back to branch summary

~mc-return/compiz/compiz0.9.9.merge-plugin-screensaver

~mc-return/compiz/compiz0.9.9.merge-plugin-screensaver

« back to all changes in this revision

Viewing changes to plugins/opengl/src/privates.h

Committer: MC Return
Date: 2012-08-11 17:17:10 UTC
mfrom: (3286.2.20 compiz)
Revision ID: mc.return@gmx.net-20120811171710-6faligyjru69ejd5

Merged lp:compiz

files added:
postinst/convert-files

postinst/convert-files/compiz-profile-Default.convert

postinst/convert-files/compiz-profile-active-Default.convert

postinst/migration-scripts

postinst/migration-scripts/02_migrate_to_gsettings.py

tests/experimental-memcheck

tests/experimental-memcheck/compiz.supp

tests/migration-scripts

tests/migration-scripts/test_migration.py

files removed:
cmake/ParseArguments.cmake

files modified:
CMakeLists.txt

cmake/CMakeLists.txt

cmake/CompizCommon.cmake

cmake/CompizGSettings.cmake

cmake/EnableCoverageReport.cmake

cmake/FindCompiz.cmake

cmake/copy_file_install_user_env.cmake

cmake/src/compiz/compiz_discover_gtest_tests.cpp

compizconfig/ccsm/images/16x16/apps/ccsm.png

compizconfig/ccsm/images/22x22/categories/plugins-accessibility.png

compizconfig/ccsm/images/22x22/categories/plugins-all.png

compizconfig/ccsm/images/22x22/categories/plugins-effects.png

compizconfig/ccsm/images/22x22/categories/plugins-extras.png

compizconfig/ccsm/images/22x22/categories/plugins-general.png

compizconfig/ccsm/images/22x22/categories/plugins-profiles.png

compizconfig/ccsm/images/22x22/categories/plugins-uncategorized.png

compizconfig/ccsm/images/22x22/categories/plugins-utility.png

compizconfig/ccsm/images/22x22/devices/input-keyboard.png

compizconfig/ccsm/images/24x24/apps/ccsm.png

compizconfig/ccsm/images/48x48/apps/ccsm.png

compizconfig/ccsm/images/display.png *

compizconfig/ccsm/images/modifier.png *

compizconfig/compizconfig-python/src/compizconfig.pyx

compizconfig/compizconfig-python/tests/compiz_config_test.py

compizconfig/gsettings/tests/CMakeLists.txt

compizconfig/gsettings/tests/test_gsettings_tests.cpp

compizconfig/gsettings/tests/test_gsettings_tests.h

compizconfig/libcompizconfig/src/bindings.c

compizconfig/libcompizconfig/src/compiz.cpp

compizconfig/libcompizconfig/src/iniparser.c

compizconfig/libcompizconfig/src/main.c

compizconfig/libcompizconfig/tests/CMakeLists.txt

compizconfig/libcompizconfig/tests/test-ccs-object.cpp

gtk/window-decorator/cairo.c

gtk/window-decorator/events.c

kde/window-decorator-kde4/switcher.cpp

kde/window-decorator-kde4/window.cpp

libdecoration/decoration.c

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/colorfilter.cpp

plugins/colorfilter/src/parser.cpp

plugins/commands/commands.xml.in

plugins/compiztoolbox/src/compiztoolbox.cpp

plugins/composite/src/pixmapbinding/tests/CMakeLists.txt

plugins/composite/src/screen.cpp

plugins/cube/images/freedesktop.png

plugins/cubeaddon/images/compizcap.png

plugins/cubeaddon/images/cubecap_release.png

plugins/cubeaddon/images/fusioncap.png

plugins/cubeaddon/src/cubeaddon.cpp

plugins/dbus/src/dbus.cpp

plugins/decor/src/clip-groups/tests/CMakeLists.txt

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

plugins/decor/src/decor.cpp

plugins/decor/src/pixmap-requests/tests/CMakeLists.txt

plugins/extrawm/src/extrawm.cpp

plugins/ezoom/src/ezoom.cpp

plugins/firepaint/src/firepaint.cpp

plugins/grid/CMakeLists.txt

plugins/grid/src/grabhandler/tests/CMakeLists.txt

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/mag/images/Gnome/mask.png

plugins/mag/images/Gnome/overlay.png

plugins/mag/images/Oxygen/mask.png

plugins/mag/images/Oxygen/overlay.png

plugins/mousepoll/src/mousepoll.cpp

plugins/notification/images/compiz.png

plugins/opacify/src/opacify.cpp

plugins/opengl/src/fragment.cpp

plugins/opengl/src/paint.cpp

plugins/opengl/src/privates.h

plugins/opengl/src/screen.cpp

plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt

plugins/place/src/place.cpp

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

plugins/place/src/screen-size-change/tests/CMakeLists.txt

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

plugins/place/src/smart/tests/CMakeLists.txt

plugins/reflex/images/reflection.png

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/showmouse/images/Star.png

plugins/snap/src/snap.cpp

plugins/splash/images/splash_background.png

plugins/splash/images/splash_logo.png

plugins/staticswitcher/src/staticswitcher.cpp

plugins/switcher/src/switcher.cpp

plugins/td/src/3d.cpp

plugins/thumbnail/src/thumbnail.cpp

plugins/trailfocus/src/trailfocus.cpp

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

plugins/wall/src/offset_movement/tests/CMakeLists.txt

plugins/wallpaper/src/wallpaper.cpp

plugins/wobbly/src/wobbly.cpp

po/CMakeLists.txt

src/event.cpp

src/match.cpp

src/option/tests/CMakeLists.txt

src/plugin.cpp

src/plugin/tests/CMakeLists.txt

src/pluginclasshandler/tests/CMakeLists.txt

src/pluginclasshandler/tests/test-pluginclasshandler.cpp

src/point/tests/CMakeLists.txt

src/privatescreen/tests/CMakeLists.txt

src/rect/tests/CMakeLists.txt

src/region/tests/CMakeLists.txt

src/screen.cpp

src/servergrab/tests/CMakeLists.txt

src/stackdebugger.cpp

src/string/tests/CMakeLists.txt

src/timer/src/timeouthandler.cpp

src/timer/src/timer.cpp

src/timer/tests/CMakeLists.txt

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

src/timer/tests/test-timer.cpp

src/timer/tests/test-timer.h

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

src/window/constrainment/tests/CMakeLists.txt

src/window/extents/tests/CMakeLists.txt

src/window/geometry-saver/tests/CMakeLists.txt

src/window/geometry/tests/CMakeLists.txt

src/wrapsystem/tests/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

plugins/opengl/src/privates.h

120

120

121

121

std::vector<GLTexture::BindPixmapProc> bindPixmap;

122

122

bool hasCompositing;

123

bool commonFrontbuffer;

123

124

124

125

GLIcon defaultIcon;

125

126

Older »