diff options
author | Dennis Kasprzyk <onestone@compiz-fusion.org> | 2008-09-17 21:08:46 +0200 |
---|---|---|
committer | Dennis Kasprzyk <onestone@compiz-fusion.org> | 2008-09-17 21:08:46 +0200 |
commit | dddbb16680e4f8ef5101c471766ca7fa00213562 (patch) | |
tree | b5ae90c4d935af656688023d8994530532f26629 | |
parent | 1153a9ee1459576b9a26ccdc0c3d923f7b24019a (diff) | |
download | unity-window-decorator-dddbb16680e4f8ef5101c471766ca7fa00213562.tar.gz unity-window-decorator-dddbb16680e4f8ef5101c471766ca7fa00213562.tar.bz2 |
Move core headers into core subdirectory.
-rw-r--r-- | include/Makefile.am | 1 | ||||
-rw-r--r-- | include/composite/composite.h | 4 | ||||
-rw-r--r-- | include/core/action.h (renamed from include/compaction.h) | 2 | ||||
-rw-r--r-- | include/core/core.h (renamed from include/compiz-core.h) | 17 | ||||
-rw-r--r-- | include/core/icon.h (renamed from include/compicon.h) | 0 | ||||
-rw-r--r-- | include/core/match.h (renamed from include/compmatch.h) | 2 | ||||
-rw-r--r-- | include/core/metadata.h (renamed from include/compmetadata.h) | 2 | ||||
-rw-r--r-- | include/core/option.h (renamed from include/compoption.h) | 0 | ||||
-rw-r--r-- | include/core/output.h (renamed from include/compoutput.h) | 2 | ||||
-rw-r--r-- | include/core/plugin.h (renamed from include/compplugin.h) | 2 | ||||
-rw-r--r-- | include/core/privatehandler.h (renamed from include/compprivatehandler.h) | 0 | ||||
-rw-r--r-- | include/core/screen.h | 10 | ||||
-rw-r--r-- | include/core/session.h (renamed from include/compsession.h) | 0 | ||||
-rw-r--r-- | include/core/window.h | 4 | ||||
-rw-r--r-- | include/core/wrapsystem.h (renamed from include/compwrapsystem.h) | 0 | ||||
-rw-r--r-- | include/opengl/opengl.h | 2 | ||||
-rw-r--r-- | plugins/composite/composite.cpp | 2 | ||||
-rw-r--r-- | plugins/decor.cpp | 2 | ||||
-rw-r--r-- | plugins/decor.h | 4 | ||||
-rw-r--r-- | plugins/move.h | 4 | ||||
-rw-r--r-- | plugins/opengl/fragment.cpp | 2 | ||||
-rw-r--r-- | plugins/opengl/icon.cpp | 49 | ||||
-rw-r--r-- | plugins/opengl/matrix.cpp | 2 | ||||
-rw-r--r-- | plugins/opengl/opengl.cpp | 4 | ||||
-rw-r--r-- | plugins/opengl/paint.cpp | 2 | ||||
-rw-r--r-- | plugins/opengl/texture.cpp | 2 | ||||
-rw-r--r-- | plugins/resize.cpp | 2 | ||||
-rw-r--r-- | plugins/resize.h | 4 | ||||
-rw-r--r-- | src/action.cpp | 4 | ||||
-rw-r--r-- | src/event.cpp | 2 | ||||
-rw-r--r-- | src/icon.cpp | 2 | ||||
-rw-r--r-- | src/main.cpp | 2 | ||||
-rw-r--r-- | src/match.cpp | 6 | ||||
-rw-r--r-- | src/metadata.cpp | 2 | ||||
-rw-r--r-- | src/option.cpp | 4 | ||||
-rw-r--r-- | src/output.cpp | 4 | ||||
-rw-r--r-- | src/plugin.cpp | 2 | ||||
-rw-r--r-- | src/privatematch.h | 2 | ||||
-rw-r--r-- | src/privateobject.h | 4 | ||||
-rw-r--r-- | src/privateoption.h | 4 | ||||
-rw-r--r-- | src/privatescreen.h | 2 | ||||
-rw-r--r-- | src/privatewindow.h | 2 | ||||
-rw-r--r-- | src/rect.cpp | 2 | ||||
-rw-r--r-- | src/screen.cpp | 4 | ||||
-rw-r--r-- | src/session.cpp | 4 | ||||
-rw-r--r-- | src/window.cpp | 4 | ||||
-rw-r--r-- | src/windowgeometry.cpp | 2 |
47 files changed, 67 insertions, 118 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 9cb22da..03718e6 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,7 +1,6 @@ compizincludedir = $(includedir)/compiz compizinclude_HEADERS = \ compiz.h \ - compiz-core.h \ compiz-cube.h \ compiz-scale.h \ decoration.h diff --git a/include/composite/composite.h b/include/composite/composite.h index fcd3b3a..8b21a8a 100644 --- a/include/composite/composite.h +++ b/include/composite/composite.h @@ -6,9 +6,9 @@ #define COMPIZ_COMPOSITE_ABI 1 #define PLUGIN Composite -#include <compprivatehandler.h> +#include <core/privatehandler.h> #include <core/timer.h> -#include <compiz-core.h> +#include <core/core.h> #define COMPOSITE_SCREEN_DAMAGE_PENDING_MASK (1 << 0) #define COMPOSITE_SCREEN_DAMAGE_REGION_MASK (1 << 1) diff --git a/include/compaction.h b/include/core/action.h index 0ae702c..e317a25 100644 --- a/include/compaction.h +++ b/include/core/action.h @@ -5,7 +5,7 @@ #include <X11/Xlib-xcb.h> -#include <compoption.h> +#include <core/option.h> class PrivateAction; diff --git a/include/compiz-core.h b/include/core/core.h index b5d96b0..d8c45ce 100644 --- a/include/compiz-core.h +++ b/include/core/core.h @@ -69,17 +69,16 @@ typedef XBool Bool; #include <core/privates.h> #include <core/screen.h> #include <core/window.h> -#include <compplugin.h> -#include <compoption.h> -#include <compmetadata.h> -#include <compaction.h> -#include <compicon.h> -#include <compmatch.h> -#include <compoutput.h> +#include <core/plugin.h> +#include <core/option.h> +#include <core/metadata.h> +#include <core/action.h> +#include <core/icon.h> +#include <core/match.h> +#include <core/output.h> #include <core/point.h> #include <core/rect.h> -#include <compsession.h> +#include <core/session.h> #include <core/size.h> - #endif diff --git a/include/compicon.h b/include/core/icon.h index 34cfce8..34cfce8 100644 --- a/include/compicon.h +++ b/include/core/icon.h diff --git a/include/compmatch.h b/include/core/match.h index 3a0c5f4..227175e 100644 --- a/include/compmatch.h +++ b/include/core/match.h @@ -1,7 +1,7 @@ #ifndef _COMPMATCH_H #define _COMPMATCH_H -#include <compiz-core.h> +#include <core/core.h> class PrivateMatch; class CompWindow; diff --git a/include/compmetadata.h b/include/core/metadata.h index e482fe5..1e2fcf2 100644 --- a/include/compmetadata.h +++ b/include/core/metadata.h @@ -5,7 +5,7 @@ #include <libxml/parser.h> -#include <compaction.h> +#include <core/action.h> #define STRINGIFY(x) #x #define TOSTRING(x) STRINGIFY (x) diff --git a/include/compoption.h b/include/core/option.h index 227c156..227c156 100644 --- a/include/compoption.h +++ b/include/core/option.h diff --git a/include/compoutput.h b/include/core/output.h index 400e09c..6c1e1dd 100644 --- a/include/compoutput.h +++ b/include/core/output.h @@ -1,7 +1,7 @@ #ifndef _COMPOUTPUT_H #define _COMPOUTPUT_H -#include <compiz-core.h> +#include <core/core.h> #include <core/rect.h> class CompOutput : public CompRect { diff --git a/include/compplugin.h b/include/core/plugin.h index 6e6cfd2..d78a70f 100644 --- a/include/compplugin.h +++ b/include/core/plugin.h @@ -27,7 +27,7 @@ #define _COMPIZ_PLUGIN_H #include <compiz.h> -#include <compoption.h> +#include <core/option.h> #include <map> diff --git a/include/compprivatehandler.h b/include/core/privatehandler.h index fc911a2..fc911a2 100644 --- a/include/compprivatehandler.h +++ b/include/core/privatehandler.h diff --git a/include/core/screen.h b/include/core/screen.h index 52b3fbf..8037d4e 100644 --- a/include/core/screen.h +++ b/include/core/screen.h @@ -2,11 +2,11 @@ #define _COMPSCREEN_H #include <core/window.h> -#include <compoutput.h> -#include <compsession.h> -#include <compmetadata.h> -#include <compplugin.h> -#include <compmatch.h> +#include <core/output.h> +#include <core/session.h> +#include <core/metadata.h> +#include <core/plugin.h> +#include <core/match.h> #include <core/privates.h> class CompScreen; diff --git a/include/compsession.h b/include/core/session.h index b4d5631..b4d5631 100644 --- a/include/compsession.h +++ b/include/core/session.h diff --git a/include/core/window.h b/include/core/window.h index d91642f..b771895 100644 --- a/include/core/window.h +++ b/include/core/window.h @@ -9,12 +9,12 @@ #include <X11/extensions/Xdamage.h> #include <X11/extensions/sync.h> -#include <compaction.h> +#include <core/action.h> #include <core/privates.h> #include <core/size.h> #include <core/point.h> -#include <compwrapsystem.h> +#include <core/wrapsystem.h> #include <map> diff --git a/include/compwrapsystem.h b/include/core/wrapsystem.h index 93319b5..93319b5 100644 --- a/include/compwrapsystem.h +++ b/include/core/wrapsystem.h diff --git a/include/opengl/opengl.h b/include/opengl/opengl.h index 963938d..e74feaf 100644 --- a/include/opengl/opengl.h +++ b/include/opengl/opengl.h @@ -11,7 +11,7 @@ #define COMPIZ_OPENGL_ABI 1 #define PLUGIN OpenGL -#include <compprivatehandler.h> +#include <core/privatehandler.h> class PrivateGLScreen; class PrivateGLWindow; diff --git a/plugins/composite/composite.cpp b/plugins/composite/composite.cpp index 9cff756..5142b4e 100644 --- a/plugins/composite/composite.cpp +++ b/plugins/composite/composite.cpp @@ -1,4 +1,4 @@ -#include <compiz-core.h> +#include <core/core.h> #include <composite/composite.h> #include "privates.h" diff --git a/plugins/decor.cpp b/plugins/decor.cpp index 036cc0d..a820b49 100644 --- a/plugins/decor.cpp +++ b/plugins/decor.cpp @@ -33,7 +33,7 @@ #include <math.h> #include <unistd.h> -#include <compiz-core.h> +#include <core/core.h> #include <decoration.h> #include "decor.h" diff --git a/plugins/decor.h b/plugins/decor.h index 285437a..c6676e8 100644 --- a/plugins/decor.h +++ b/plugins/decor.h @@ -1,6 +1,6 @@ #include <boost/shared_ptr.hpp> -#include <compiz-core.h> -#include <compprivatehandler.h> +#include <core/core.h> +#include <core/privatehandler.h> #include <composite/composite.h> #include <opengl/opengl.h> diff --git a/plugins/move.h b/plugins/move.h index 383fb3e..7e699a9 100644 --- a/plugins/move.h +++ b/plugins/move.h @@ -1,5 +1,5 @@ -#include <compiz-core.h> -#include <compprivatehandler.h> +#include <core/core.h> +#include <core/privatehandler.h> #include <composite/composite.h> #include <opengl/opengl.h> diff --git a/plugins/opengl/fragment.cpp b/plugins/opengl/fragment.cpp index 651fea6..e31285a 100644 --- a/plugins/opengl/fragment.cpp +++ b/plugins/opengl/fragment.cpp @@ -28,7 +28,7 @@ #include <boost/foreach.hpp> #define foreach BOOST_FOREACH -#include <compiz-core.h> +#include <core/core.h> #include <opengl/texture.h> #include <opengl/fragment.h> #include "privatefragment.h" diff --git a/plugins/opengl/icon.cpp b/plugins/opengl/icon.cpp deleted file mode 100644 index f15a278..0000000 --- a/plugins/opengl/icon.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include <compicon.h> - -CompIcon::CompIcon (CompScreen *screen, unsigned int width, - unsigned int height) : - mTexture (screen), - mWidth (width), - mHeight (height), - mData (new unsigned char[width * height * 4]), - mUpdateTex (true) -{ -} - -CompIcon::~CompIcon () -{ - free (mData); -} - -CompTexture & -CompIcon::texture () -{ - if (mUpdateTex) - { - mUpdateTex = false; - mTexture.reset (); - if (!mTexture.imageBufferToTexture (&mTexture, - reinterpret_cast<const char *> (mData), mWidth, mHeight)) - mTexture.reset (); - } - return mTexture; -} - -unsigned int -CompIcon::width () -{ - return mWidth; -} - -unsigned int -CompIcon::height () -{ - return mHeight; -} - -unsigned char* -CompIcon::data () -{ - mUpdateTex = true; - return mData; -} diff --git a/plugins/opengl/matrix.cpp b/plugins/opengl/matrix.cpp index 02efb3c..10cf613 100644 --- a/plugins/opengl/matrix.cpp +++ b/plugins/opengl/matrix.cpp @@ -24,7 +24,7 @@ #include <compiz.h> #include <string.h> #include <math.h> -#include <compiz-core.h> +#include <core/core.h> #include <opengl/matrix.h> /** diff --git a/plugins/opengl/opengl.cpp b/plugins/opengl/opengl.cpp index e0bd4e4..ae25036 100644 --- a/plugins/opengl/opengl.cpp +++ b/plugins/opengl/opengl.cpp @@ -1,5 +1,5 @@ -#include <compiz-core.h> -#include <compprivatehandler.h> +#include <core/core.h> +#include <core/privatehandler.h> #include "privates.h" const CompMetadata::OptionInfo glOptionInfo[GL_OPTION_NUM] = { diff --git a/plugins/opengl/paint.cpp b/plugins/opengl/paint.cpp index 1baf39b..f1bb9c5 100644 --- a/plugins/opengl/paint.cpp +++ b/plugins/opengl/paint.cpp @@ -30,7 +30,7 @@ #include <boost/foreach.hpp> #define foreach BOOST_FOREACH -#include <compiz-core.h> +#include <core/core.h> #include <opengl/opengl.h> #include "privates.h" diff --git a/plugins/opengl/texture.cpp b/plugins/opengl/texture.cpp index 395bc5c..c385ffb 100644 --- a/plugins/opengl/texture.cpp +++ b/plugins/opengl/texture.cpp @@ -33,7 +33,7 @@ #include <stdlib.h> #include <string.h> -#include <compiz-core.h> +#include <core/core.h> #include <opengl/texture.h> #include <privatetexture.h> #include "privates.h" diff --git a/plugins/resize.cpp b/plugins/resize.cpp index e2f9f84..6b77586 100644 --- a/plugins/resize.cpp +++ b/plugins/resize.cpp @@ -31,7 +31,7 @@ #include <X11/Xatom.h> #include <X11/cursorfont.h> -#include <compiz-core.h> +#include <core/core.h> #include <core/atoms.h> #include "resize.h" diff --git a/plugins/resize.h b/plugins/resize.h index ca55a55..c84e0b5 100644 --- a/plugins/resize.h +++ b/plugins/resize.h @@ -1,8 +1,8 @@ #ifndef _RESIZE_H #define _RESIZE_H -#include <compiz-core.h> -#include <compprivatehandler.h> +#include <core/core.h> +#include <core/privatehandler.h> #include <composite/composite.h> #include <opengl/opengl.h> diff --git a/src/action.cpp b/src/action.cpp index 2169da3..ea94e48 100644 --- a/src/action.cpp +++ b/src/action.cpp @@ -29,8 +29,8 @@ #include <compiz.h> -#include <compoption.h> -#include <compaction.h> +#include <core/option.h> +#include <core/action.h> #include <core/screen.h> #include "privateaction.h" #include "privatescreen.h" diff --git a/src/event.cpp b/src/event.cpp index 1f828e2..4e4d385 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -36,7 +36,7 @@ #include <X11/extensions/Xrandr.h> #include <X11/extensions/Xfixes.h> -#include <compiz-core.h> +#include <core/core.h> #include <core/atoms.h> #include "privatescreen.h" #include "privatewindow.h" diff --git a/src/icon.cpp b/src/icon.cpp index 5dcdd0d..f5fd231 100644 --- a/src/icon.cpp +++ b/src/icon.cpp @@ -1,4 +1,4 @@ -#include <compicon.h> +#include <core/icon.h> CompIcon::CompIcon (CompScreen *screen, unsigned int width, unsigned int height) : diff --git a/src/main.cpp b/src/main.cpp index 806ff40..8c01333 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -36,7 +36,7 @@ #include <string.h> #include <sys/wait.h> -#include <compiz-core.h> +#include <core/core.h> #include "privatescreen.h" char *programName; diff --git a/src/match.cpp b/src/match.cpp index 8ba56e5..ad0651a 100644 --- a/src/match.cpp +++ b/src/match.cpp @@ -29,12 +29,12 @@ #include <boost/foreach.hpp> #define foreach BOOST_FOREACH -#include <compiz-core.h> +#include <core/core.h> #include <core/screen.h> -#include <compmatch.h> +#include <core/match.h> #include <core/window.h> -#include <compplugin.h> +#include <core/plugin.h> #include "privatematch.h" #include "privatescreen.h" #include "privatewindow.h" diff --git a/src/metadata.cpp b/src/metadata.cpp index ea91d40..291b808 100644 --- a/src/metadata.cpp +++ b/src/metadata.cpp @@ -34,7 +34,7 @@ #define foreach BOOST_FOREACH #include <compiz.h> -#include <compmetadata.h> +#include <core/metadata.h> #include <core/screen.h> #include "privatescreen.h" diff --git a/src/option.cpp b/src/option.cpp index cc3b1a1..4848f7b 100644 --- a/src/option.cpp +++ b/src/option.cpp @@ -32,8 +32,8 @@ #include <boost/foreach.hpp> #define foreach BOOST_FOREACH -#include <compiz-core.h> -#include <compoption.h> +#include <core/core.h> +#include <core/option.h> #include "privateoption.h" CompOption::Vector noOptions (0); diff --git a/src/output.cpp b/src/output.cpp index 3d5fe53..96d687f 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -1,6 +1,6 @@ -#include <compiz-core.h> -#include <compoutput.h> +#include <core/core.h> +#include <core/output.h> CompOutput::CompOutput () { diff --git a/src/plugin.cpp b/src/plugin.cpp index e15acea..e455251 100644 --- a/src/plugin.cpp +++ b/src/plugin.cpp @@ -33,7 +33,7 @@ #include <boost/foreach.hpp> #define foreach BOOST_FOREACH -#include <compiz-core.h> +#include <core/core.h> #include "privatescreen.h" CompPlugin::Map pluginsMap; diff --git a/src/privatematch.h b/src/privatematch.h index 6cb1608..62b0009 100644 --- a/src/privatematch.h +++ b/src/privatematch.h @@ -1,7 +1,7 @@ #ifndef _PRIVATEMATCH_H #define _PRIVATEMATCH_H -#include <compmatch.h> +#include <core/match.h> #include <boost/shared_ptr.hpp> #define MATCH_OP_AND_MASK (1 << 0) diff --git a/src/privateobject.h b/src/privateobject.h index eb059f3..b2cb7e9 100644 --- a/src/privateobject.h +++ b/src/privateobject.h @@ -2,8 +2,8 @@ #define _PRIVATEOBJECT_H #include <list> -#include <compiz-core.h> -#include <compobject.h> +#include <core/core.h> +#include <core/object.h> class PrivateObject { public : diff --git a/src/privateoption.h b/src/privateoption.h index f8ef51c..e1786bd 100644 --- a/src/privateoption.h +++ b/src/privateoption.h @@ -3,8 +3,8 @@ #include <vector> -#include <compaction.h> -#include <compmatch.h> +#include <core/action.h> +#include <core/match.h> #include <core/screen.h> typedef struct _CompOptionIntRestriction { diff --git a/src/privatescreen.h b/src/privatescreen.h index 0e68698..2104253 100644 --- a/src/privatescreen.h +++ b/src/privatescreen.h @@ -1,7 +1,7 @@ #ifndef _PRIVATESCREEN_H #define _PRIVATESCREEN_H -#include <compiz-core.h> +#include <core/core.h> #include <core/screen.h> #include <core/size.h> #include <core/point.h> diff --git a/src/privatewindow.h b/src/privatewindow.h index 9151572..489232e 100644 --- a/src/privatewindow.h +++ b/src/privatewindow.h @@ -1,7 +1,7 @@ #ifndef _PRIVATEWINDOW_H #define _PRIVATEWINDOW_H -#include <compiz-core.h> +#include <core/core.h> #include <core/window.h> #include <core/point.h> #include <core/timer.h> diff --git a/src/rect.cpp b/src/rect.cpp index 52d1608..1b391ce 100644 --- a/src/rect.cpp +++ b/src/rect.cpp @@ -1,4 +1,4 @@ -#include <compiz-core.h> +#include <core/core.h> #include <core/rect.h> CompRect::CompRect () diff --git a/src/screen.cpp b/src/screen.cpp index 768d3f5..29e4bd9 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -53,10 +53,10 @@ #include <X11/cursorfont.h> -#include <compiz-core.h> +#include <core/core.h> #include <core/screen.h> -#include <compicon.h> +#include <core/icon.h> #include <core/atoms.h> #include "privatescreen.h" #include "privatewindow.h" diff --git a/src/session.cpp b/src/session.cpp index 1b2b30d..e70b5e4 100644 --- a/src/session.cpp +++ b/src/session.cpp @@ -40,8 +40,8 @@ #include <boost/bind.hpp> -#include <compsession.h> -#include <compiz-core.h> +#include <core/session.h> +#include <core/core.h> #define SM_DEBUG(x) diff --git a/src/window.cpp b/src/window.cpp index 8c3c24e..23f63cb 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -40,8 +40,8 @@ #include <boost/bind.hpp> -#include <compiz-core.h> -#include <compicon.h> +#include <core/core.h> +#include <core/icon.h> #include <core/atoms.h> #include "privatewindow.h" #include "privatescreen.h" diff --git a/src/windowgeometry.cpp b/src/windowgeometry.cpp index ea969db..2e2fac3 100644 --- a/src/windowgeometry.cpp +++ b/src/windowgeometry.cpp @@ -1,4 +1,4 @@ -#include <compiz-core.h> +#include <core/core.h> #include <core/window.h> #include <privatewindow.h> |