summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/composite/composite.h6
-rw-r--r--include/core/CMakeLists.txt6
-rw-r--r--include/core/core.h2
-rw-r--r--include/core/plugin.h7
-rw-r--r--include/core/pluginclasses.h (renamed from include/core/privates.h)31
-rw-r--r--include/core/pluginclasshandler.h (renamed from include/core/privatehandler.h)72
-rw-r--r--include/core/screen.h8
-rw-r--r--include/core/window.h8
-rw-r--r--include/opengl/opengl.h6
-rw-r--r--include/scale/scale.h6
-rw-r--r--plugins/blur.cpp4
-rw-r--r--plugins/blur.h4
-rw-r--r--plugins/commands.cpp2
-rw-r--r--plugins/commands.h4
-rw-r--r--plugins/composite/screen.cpp2
-rw-r--r--plugins/composite/window.cpp2
-rw-r--r--plugins/copytex.cpp2
-rw-r--r--plugins/copytex.h4
-rw-r--r--plugins/decor.cpp4
-rw-r--r--plugins/decor.h6
-rw-r--r--plugins/fade.cpp4
-rw-r--r--plugins/fade.h6
-rw-r--r--plugins/gnomecompat.cpp2
-rw-r--r--plugins/gnomecompat.h4
-rw-r--r--plugins/imgpng.cpp2
-rw-r--r--plugins/imgpng.h4
-rw-r--r--plugins/imgsvg.cpp4
-rw-r--r--plugins/imgsvg.h6
-rw-r--r--plugins/ini.cpp2
-rw-r--r--plugins/ini.h4
-rw-r--r--plugins/inotify.cpp2
-rw-r--r--plugins/inotify.h4
-rw-r--r--plugins/move.cpp2
-rw-r--r--plugins/move.h8
-rw-r--r--plugins/obs.cpp4
-rw-r--r--plugins/obs.h6
-rw-r--r--plugins/opengl/opengl.cpp2
-rw-r--r--plugins/opengl/screen.cpp2
-rw-r--r--plugins/opengl/window.cpp2
-rw-r--r--plugins/place.cpp4
-rw-r--r--plugins/place.h6
-rw-r--r--plugins/regex.cpp4
-rw-r--r--plugins/regexplugin.h6
-rw-r--r--plugins/resize.cpp4
-rw-r--r--plugins/resize.h6
-rw-r--r--plugins/scale/scale.cpp4
-rw-r--r--plugins/switcher.cpp2
-rw-r--r--plugins/switcher.h8
-rw-r--r--plugins/water.cpp2
-rw-r--r--plugins/water.h8
-rw-r--r--plugins/zoom.cpp2
-rw-r--r--plugins/zoom.h4
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/main.cpp2
-rw-r--r--src/pluginclasses.cpp (renamed from src/privates.cpp)14
-rw-r--r--src/screen.cpp20
-rw-r--r--src/window.cpp20
57 files changed, 188 insertions, 188 deletions
diff --git a/include/composite/composite.h b/include/composite/composite.h
index dc6a597..01b6432 100644
--- a/include/composite/composite.h
+++ b/include/composite/composite.h
@@ -35,7 +35,7 @@
#define COMPIZ_COMPOSITE_ABI 1
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#include <core/timer.h>
#include <core/core.h>
@@ -77,7 +77,7 @@ class CompositeScreenInterface :
class CompositeScreen :
public WrapableHandler<CompositeScreenInterface, 4>,
- public PrivateHandler<CompositeScreen, CompScreen, COMPIZ_COMPOSITE_ABI>
+ public PluginClassHandler<CompositeScreen, CompScreen, COMPIZ_COMPOSITE_ABI>
{
public:
@@ -213,7 +213,7 @@ class CompositeWindowInterface :
class CompositeWindow :
public WrapableHandler<CompositeWindowInterface, 1>,
- public PrivateHandler<CompositeWindow, CompWindow, COMPIZ_COMPOSITE_ABI>
+ public PluginClassHandler<CompositeWindow, CompWindow, COMPIZ_COMPOSITE_ABI>
{
public:
diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt
index dc94393..565e1c2 100644
--- a/include/core/CMakeLists.txt
+++ b/include/core/CMakeLists.txt
@@ -9,8 +9,8 @@ set (_headers
output.h
plugin.h
point.h
- privatehandler.h
- privates.h
+ pluginclasshandler.h
+ pluginclasses.h
rect.h
region.h
screen.h
@@ -24,4 +24,4 @@ set (_headers
install (
FILES ${_headers}
DESTINATION ${includedir}/compiz/core
-) \ No newline at end of file
+)
diff --git a/include/core/core.h b/include/core/core.h
index 33d9645..2937a35 100644
--- a/include/core/core.h
+++ b/include/core/core.h
@@ -66,7 +66,7 @@ typedef XBool Bool;
# define BITMAP_BIT_ORDER LSBFirst
#endif
-#include <core/privates.h>
+#include <core/pluginclasses.h>
#include <core/screen.h>
#include <core/window.h>
#include <core/plugin.h>
diff --git a/include/core/plugin.h b/include/core/plugin.h
index 40aed47..02e35a1 100644
--- a/include/core/plugin.h
+++ b/include/core/plugin.h
@@ -84,6 +84,13 @@ extern LoadPluginProc loaderLoadPlugin;
extern UnloadPluginProc loaderUnloadPlugin;
extern ListPluginsProc loaderListPlugins;
+union CompPrivate {
+ void *ptr;
+ long val;
+ unsigned long uval;
+ void *(*fptr) (void);
+};
+
class CompPlugin {
public:
class VTable {
diff --git a/include/core/privates.h b/include/core/pluginclasses.h
index bd64798..0ba2502 100644
--- a/include/core/privates.h
+++ b/include/core/pluginclasses.h
@@ -25,32 +25,39 @@
* David Reveman <davidr@novell.com>
*/
-#ifndef _PRIVATES_H
-#define _PRIVATES_H
+#ifndef _PLUGINCLASSES_H
+#define _PLUGINCLASSES_H
#include <vector>
-union CompPrivate {
- void *ptr;
- long val;
- unsigned long uval;
- void *(*fptr) (void);
+class PluginClassIndex {
+ public:
+ PluginClassIndex () : index(-1), refCount (0),
+ initiated (false), failed (false),
+ pcFailed (false), pcIndex (0) {}
+
+ int index;
+ int refCount;
+ bool initiated;
+ bool failed;
+ bool pcFailed;
+ unsigned int pcIndex;
};
-class CompPrivateStorage {
+class PluginClassStorage {
public:
typedef std::vector<bool> Indices;
public:
- CompPrivateStorage (Indices& iList);
+ PluginClassStorage (Indices& iList);
public:
- std::vector<CompPrivate> privates;
+ std::vector<void *> pluginClasses;
protected:
- static int allocatePrivateIndex (Indices& iList);
- static void freePrivateIndex (Indices& iList, int idx);
+ static int allocatePluginClassIndex (Indices& iList);
+ static void freePluginClassIndex (Indices& iList, int idx);
};
#endif
diff --git a/include/core/privatehandler.h b/include/core/pluginclasshandler.h
index f7ee5db..a833e53 100644
--- a/include/core/privatehandler.h
+++ b/include/core/pluginclasshandler.h
@@ -23,37 +23,23 @@
* Authors: Dennis Kasprzyk <onestone@compiz-fusion.org>
*/
-#ifndef _COMPPRIVATEHANDLER_H
-#define _COMPPRIVATEHANDLER_H
+#ifndef _COMPPLUGINCLASSHANDLER_H
+#define _COMPPLUGINCLASSHANDLER_H
#include <typeinfo>
#include <boost/preprocessor/cat.hpp>
#include <compiz.h>
#include <core/screen.h>
-#include <core/privates.h>
+#include <core/pluginclasses.h>
-extern unsigned int privateHandlerIndex;
-
-class CompPrivateIndex {
- public:
- CompPrivateIndex () : index(-1), refCount (0),
- initiated (false), failed (false),
- privFailed (false), privIndex (0) {}
-
- int index;
- int refCount;
- bool initiated;
- bool failed;
- bool privFailed;
- unsigned int privIndex;
-};
+extern unsigned int pluginClassHandlerIndex;
template<class Tp, class Tb, int ABI = 0>
-class PrivateHandler {
+class PluginClassHandler {
public:
- PrivateHandler (Tb *);
- ~PrivateHandler ();
+ PluginClassHandler (Tb *);
+ ~PluginClassHandler ();
void setFailed () { mFailed = true; };
bool loadFailed () { return mFailed; };
@@ -71,18 +57,18 @@ class PrivateHandler {
bool mFailed;
Tb *mBase;
- static CompPrivateIndex mIndex;
+ static PluginClassIndex mIndex;
};
template<class Tp, class Tb, int ABI>
-CompPrivateIndex PrivateHandler<Tp,Tb,ABI>::mIndex;
+PluginClassIndex PluginClassHandler<Tp,Tb,ABI>::mIndex;
template<class Tp, class Tb, int ABI>
-PrivateHandler<Tp,Tb,ABI>::PrivateHandler (Tb *base) :
+PluginClassHandler<Tp,Tb,ABI>::PluginClassHandler (Tb *base) :
mFailed (false),
mBase (base)
{
- if (mIndex.privFailed)
+ if (mIndex.pcFailed)
{
mFailed = true;
}
@@ -90,12 +76,12 @@ PrivateHandler<Tp,Tb,ABI>::PrivateHandler (Tb *base) :
{
if (!mIndex.initiated)
{
- mIndex.index = Tb::allocPrivateIndex ();
+ mIndex.index = Tb::allocPluginClassIndex ();
if (mIndex.index >= 0)
{
mIndex.initiated = true;
mIndex.failed = false;
- mIndex.privIndex = privateHandlerIndex;
+ mIndex.pcIndex = pluginClassHandlerIndex;
CompPrivate p;
p.val = mIndex.index;
@@ -103,7 +89,7 @@ PrivateHandler<Tp,Tb,ABI>::PrivateHandler (Tb *base) :
if (!screen->hasValue (keyName ()))
{
screen->storeValue (keyName (), p);
- privateHandlerIndex++;
+ pluginClassHandlerIndex++;
}
else
{
@@ -116,8 +102,8 @@ PrivateHandler<Tp,Tb,ABI>::PrivateHandler (Tb *base) :
{
mIndex.failed = true;
mIndex.initiated = false;
- mIndex.privFailed = true;
- mIndex.privIndex = privateHandlerIndex;
+ mIndex.pcFailed = true;
+ mIndex.pcIndex = pluginClassHandlerIndex;
mFailed = true;
}
}
@@ -125,40 +111,40 @@ PrivateHandler<Tp,Tb,ABI>::PrivateHandler (Tb *base) :
if (!mIndex.failed)
{
mIndex.refCount++;
- mBase->privates[mIndex.index].ptr = static_cast<Tp *> (this);
+ mBase->pluginClasses[mIndex.index] = static_cast<Tp *> (this);
}
}
}
template<class Tp, class Tb, int ABI>
-PrivateHandler<Tp,Tb,ABI>::~PrivateHandler ()
+PluginClassHandler<Tp,Tb,ABI>::~PluginClassHandler ()
{
- if (!mIndex.privFailed)
+ if (!mIndex.pcFailed)
{
mIndex.refCount--;
if (mIndex.refCount == 0)
{
- Tb::freePrivateIndex (mIndex.index);
+ Tb::freePluginClassIndex (mIndex.index);
mIndex.initiated = false;
mIndex.failed = false;
- mIndex.privIndex = privateHandlerIndex;
+ mIndex.pcIndex = pluginClassHandlerIndex;
screen->eraseValue (keyName ());
- privateHandlerIndex++;
+ pluginClassHandlerIndex++;
}
}
}
template<class Tp, class Tb, int ABI>
Tp *
-PrivateHandler<Tp,Tb,ABI>::get (Tb *base)
+PluginClassHandler<Tp,Tb,ABI>::get (Tb *base)
{
- if (mIndex.initiated && privateHandlerIndex == mIndex.privIndex)
+ if (mIndex.initiated && pluginClassHandlerIndex == mIndex.pcIndex)
{
return static_cast<Tp *>
- (base->privates[mIndex.index].ptr);
+ (base->pluginClasses[mIndex.index]);
}
- if (mIndex.failed && privateHandlerIndex == mIndex.privIndex)
+ if (mIndex.failed && pluginClassHandlerIndex == mIndex.pcIndex)
return NULL;
if (screen->hasValue (keyName ()))
@@ -166,14 +152,14 @@ PrivateHandler<Tp,Tb,ABI>::get (Tb *base)
mIndex.index = screen->getValue (keyName ()).val;
mIndex.initiated = true;
mIndex.failed = false;
- mIndex.privIndex = privateHandlerIndex;
- return static_cast<Tp *> (base->privates[mIndex.index].ptr);
+ mIndex.pcIndex = pluginClassHandlerIndex;
+ return static_cast<Tp *> (base->pluginClasses[mIndex.index]);
}
else
{
mIndex.initiated = false;
mIndex.failed = true;
- mIndex.privIndex = privateHandlerIndex;
+ mIndex.pcIndex = pluginClassHandlerIndex;
return NULL;
}
}
diff --git a/include/core/screen.h b/include/core/screen.h
index f7b5e60..29467d2 100644
--- a/include/core/screen.h
+++ b/include/core/screen.h
@@ -34,7 +34,7 @@
#include <core/metadata.h>
#include <core/plugin.h>
#include <core/match.h>
-#include <core/privates.h>
+#include <core/pluginclasses.h>
#include <core/region.h>
class CompScreen;
@@ -127,7 +127,7 @@ class ScreenInterface : public WrapableInterface<CompScreen, ScreenInterface> {
class CompScreen :
public CompSize,
public WrapableHandler<ScreenInterface, 17>,
- public CompPrivateStorage
+ public PluginClassStorage
{
public:
@@ -316,8 +316,8 @@ class CompScreen :
bool updateDefaultIcon ();
- static int allocPrivateIndex ();
- static void freePrivateIndex (int index);
+ static int allocPluginClassIndex ();
+ static void freePluginClassIndex (int index);
WRAPABLE_HND (0, ScreenInterface, void, fileWatchAdded, CompFileWatch *)
WRAPABLE_HND (1, ScreenInterface, void, fileWatchRemoved, CompFileWatch *)
diff --git a/include/core/window.h b/include/core/window.h
index cf4e0bc..145d9a8 100644
--- a/include/core/window.h
+++ b/include/core/window.h
@@ -37,7 +37,7 @@
#include <X11/extensions/sync.h>
#include <core/action.h>
-#include <core/privates.h>
+#include <core/pluginclasses.h>
#include <core/size.h>
#include <core/point.h>
#include <core/region.h>
@@ -220,7 +220,7 @@ class WindowInterface : public WrapableInterface<CompWindow, WindowInterface> {
class CompWindow :
public WrapableHandler<WindowInterface, 13>,
- public CompPrivateStorage
+ public PluginClassStorage
{
public:
@@ -453,8 +453,8 @@ class CompWindow :
static unsigned int constrainWindowState (unsigned int state,
unsigned int actions);
- static int allocPrivateIndex ();
- static void freePrivateIndex (int index);
+ static int allocPluginClassIndex ();
+ static void freePluginClassIndex (int index);
WRAPABLE_HND (0, WindowInterface, void, getOutputExtents,
CompWindowExtents&);
diff --git a/include/opengl/opengl.h b/include/opengl/opengl.h
index 3cd5a77..a7003f4 100644
--- a/include/opengl/opengl.h
+++ b/include/opengl/opengl.h
@@ -37,7 +37,7 @@
#define COMPIZ_OPENGL_ABI 1
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
/* camera distance from screen, 0.5 * tan (FOV) */
#define DEFAULT_Z_CAMERA 0.866025404f
@@ -253,7 +253,7 @@ class GLScreenInterface :
class GLScreen :
public WrapableHandler<GLScreenInterface, 5>,
- public PrivateHandler<GLScreen, CompScreen, COMPIZ_OPENGL_ABI>
+ public PluginClassHandler<GLScreen, CompScreen, COMPIZ_OPENGL_ABI>
{
public:
GLScreen (CompScreen *s);
@@ -345,7 +345,7 @@ class GLWindowInterface :
class GLWindow :
public WrapableHandler<GLWindowInterface, 5>,
- public PrivateHandler<GLWindow, CompWindow, COMPIZ_OPENGL_ABI>
+ public PluginClassHandler<GLWindow, CompWindow, COMPIZ_OPENGL_ABI>
{
public:
diff --git a/include/scale/scale.h b/include/scale/scale.h
index c81b07d..c035297 100644
--- a/include/scale/scale.h
+++ b/include/scale/scale.h
@@ -27,7 +27,7 @@
#define _COMPIZ_SCALE_H
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#include <composite/composite.h>
#include <opengl/opengl.h>
@@ -49,7 +49,7 @@ class ScaleScreenInterface :
class ScaleScreen :
public WrapableHandler<ScaleScreenInterface, 1>,
- public PrivateHandler<ScaleScreen, CompScreen, COMPIZ_SCALE_ABI>
+ public PluginClassHandler<ScaleScreen, CompScreen, COMPIZ_SCALE_ABI>
{
public:
typedef enum {
@@ -98,7 +98,7 @@ class ScaleWindowInterface :
class ScaleWindow :
public WrapableHandler<ScaleWindowInterface, 3>,
- public PrivateHandler<ScaleWindow, CompWindow, COMPIZ_SCALE_ABI>
+ public PluginClassHandler<ScaleWindow, CompWindow, COMPIZ_SCALE_ABI>
{
public:
ScaleWindow (CompWindow *w);
diff --git a/plugins/blur.cpp b/plugins/blur.cpp
index 766f98c..2735773 100644
--- a/plugins/blur.cpp
+++ b/plugins/blur.cpp
@@ -2275,7 +2275,7 @@ BlurScreen::setOption (const char *name,
}
BlurScreen::BlurScreen (CompScreen *screen) :
- PrivateHandler<BlurScreen,CompScreen> (screen),
+ PluginClassHandler<BlurScreen,CompScreen> (screen),
cScreen (CompositeScreen::get (screen)),
gScreen (GLScreen::get (screen)),
opt(BLUR_OPTION_NUM),
@@ -2355,7 +2355,7 @@ BlurScreen::~BlurScreen ()
}
BlurWindow::BlurWindow (CompWindow *w) :
- PrivateHandler<BlurWindow,CompWindow> (w),
+ PluginClassHandler<BlurWindow,CompWindow> (w),
window (w),
gWindow (GLWindow::get (w)),
cWindow (CompositeWindow::get (w)),
diff --git a/plugins/blur.h b/plugins/blur.h
index 6773add..e7df267 100644
--- a/plugins/blur.h
+++ b/plugins/blur.h
@@ -88,7 +88,7 @@ class BlurScreen :
public ScreenInterface,
public CompositeScreenInterface,
public GLScreenInterface,
- public PrivateHandler<BlurScreen,CompScreen>
+ public PluginClassHandler<BlurScreen,CompScreen>
{
public:
@@ -195,7 +195,7 @@ class BlurScreen :
class BlurWindow :
public WindowInterface,
public GLWindowInterface,
- public PrivateHandler<BlurWindow,CompWindow>
+ public PluginClassHandler<BlurWindow,CompWindow>
{
public:
diff --git a/plugins/commands.cpp b/plugins/commands.cpp
index 932017e..b3869bb 100644
--- a/plugins/commands.cpp
+++ b/plugins/commands.cpp
@@ -115,7 +115,7 @@ static const CompMetadata::OptionInfo commandsOptionInfo[] = {
};
CommandsScreen::CommandsScreen (CompScreen *s) :
- PrivateHandler<CommandsScreen, CompScreen> (s)
+ PluginClassHandler<CommandsScreen, CompScreen> (s)
{
if (!commandsVTable->getMetadata ()->initOptions (commandsOptionInfo,
COMMANDS_OPTION_NUM,
diff --git a/plugins/commands.h b/plugins/commands.h
index 217695d..de3bec6 100644
--- a/plugins/commands.h
+++ b/plugins/commands.h
@@ -24,7 +24,7 @@
*/
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#define COMMANDS_OPTION_COMMAND0 0
#define COMMANDS_OPTION_COMMAND1 1
@@ -77,7 +77,7 @@
#define COMMANDS_OPTION_NUM 48
class CommandsScreen :
- public PrivateHandler<CommandsScreen, CompScreen>
+ public PluginClassHandler<CommandsScreen, CompScreen>
{
public:
CommandsScreen (CompScreen *s);
diff --git a/plugins/composite/screen.cpp b/plugins/composite/screen.cpp
index a0c01b4..c5be9dc 100644
--- a/plugins/composite/screen.cpp
+++ b/plugins/composite/screen.cpp
@@ -196,7 +196,7 @@ CompositeScreen::damageEvent ()
CompositeScreen::CompositeScreen (CompScreen *s) :
- PrivateHandler<CompositeScreen, CompScreen, COMPIZ_COMPOSITE_ABI> (s),
+ PluginClassHandler<CompositeScreen, CompScreen, COMPIZ_COMPOSITE_ABI> (s),
priv (new PrivateCompositeScreen (this))
{
int compositeMajor, compositeMinor;
diff --git a/plugins/composite/window.cpp b/plugins/composite/window.cpp
index edc114c..94dd36b 100644
--- a/plugins/composite/window.cpp
+++ b/plugins/composite/window.cpp
@@ -28,7 +28,7 @@
#include "privates.h"
CompositeWindow::CompositeWindow (CompWindow *w) :
- PrivateHandler<CompositeWindow, CompWindow, COMPIZ_COMPOSITE_ABI> (w),
+ PluginClassHandler<CompositeWindow, CompWindow, COMPIZ_COMPOSITE_ABI> (w),
priv (new PrivateCompositeWindow (w, this))
{
CompScreen *s = screen;
diff --git a/plugins/copytex.cpp b/plugins/copytex.cpp
index 51551cb..e4827bd 100644
--- a/plugins/copytex.cpp
+++ b/plugins/copytex.cpp
@@ -260,7 +260,7 @@ CopytexScreen::handleEvent (XEvent *event)
CopytexScreen::CopytexScreen (CompScreen *screen) :
- PrivateHandler<CopytexScreen,CompScreen> (screen)
+ PluginClassHandler<CopytexScreen,CompScreen> (screen)
{
useShm = false;
if (XShmQueryExtension (screen->dpy ()))
diff --git a/plugins/copytex.h b/plugins/copytex.h
index 6d38414..4bb83a2 100644
--- a/plugins/copytex.h
+++ b/plugins/copytex.h
@@ -23,7 +23,7 @@
*/
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#include <composite/composite.h>
#include <opengl/opengl.h>
@@ -84,7 +84,7 @@ class CopyTexture : public GLTexture {
class CopytexScreen :
public ScreenInterface,
- public PrivateHandler<CopytexScreen,CompScreen>
+ public PluginClassHandler<CopytexScreen,CompScreen>
{
public:
diff --git a/plugins/decor.cpp b/plugins/decor.cpp
index 100e0ce..01edb00 100644
--- a/plugins/decor.cpp
+++ b/plugins/decor.cpp
@@ -1633,7 +1633,7 @@ static const CompMetadata::OptionInfo decorOptionInfo[] = {
};
DecorScreen::DecorScreen (CompScreen *s) :
- PrivateHandler<DecorScreen,CompScreen> (s),
+ PluginClassHandler<DecorScreen,CompScreen> (s),
cScreen (CompositeScreen::get (s)),
textures (),
dmWin (None),
@@ -1707,7 +1707,7 @@ DecorScreen::~DecorScreen ()
}
DecorWindow::DecorWindow (CompWindow *w) :
- PrivateHandler<DecorWindow,CompWindow> (w),
+ PluginClassHandler<DecorWindow,CompWindow> (w),
window (w),
gWindow (GLWindow::get (w)),
cWindow (CompositeWindow::get (w)),
diff --git a/plugins/decor.h b/plugins/decor.h
index 596e784..928f3c2 100644
--- a/plugins/decor.h
+++ b/plugins/decor.h
@@ -25,7 +25,7 @@
#include <boost/shared_ptr.hpp>
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#include <composite/composite.h>
#include <opengl/opengl.h>
@@ -114,7 +114,7 @@ class DecorWindow;
class DecorScreen :
public ScreenInterface,
- public PrivateHandler<DecorScreen,CompScreen>
+ public PluginClassHandler<DecorScreen,CompScreen>
{
public:
DecorScreen (CompScreen *s);
@@ -167,7 +167,7 @@ class DecorWindow :
public WindowInterface,
public CompositeWindowInterface,
public GLWindowInterface,
- public PrivateHandler<DecorWindow,CompWindow>
+ public PluginClassHandler<DecorWindow,CompWindow>
{
public:
DecorWindow (CompWindow *w);
diff --git a/plugins/fade.cpp b/plugins/fade.cpp
index 78ecc53..4c1824d 100644
--- a/plugins/fade.cpp
+++ b/plugins/fade.cpp
@@ -326,7 +326,7 @@ static const CompMetadata::OptionInfo fadeOptionInfo[] = {
};
FadeScreen::FadeScreen (CompScreen *s) :
- PrivateHandler<FadeScreen, CompScreen> (s),
+ PluginClassHandler<FadeScreen, CompScreen> (s),
cScreen (CompositeScreen::get (s)),
displayModals (0)
{
@@ -392,7 +392,7 @@ FadeScreen::setOption (const char *name,
}
FadeWindow::FadeWindow (CompWindow *w) :
- PrivateHandler<FadeWindow, CompWindow> (w),
+ PluginClassHandler<FadeWindow, CompWindow> (w),
fScreen (FadeScreen::get (screen)),
window (w),
cWindow (CompositeWindow::get (w)),
diff --git a/plugins/fade.h b/plugins/fade.h
index 8f4445b..196531a 100644
--- a/plugins/fade.h
+++ b/plugins/fade.h
@@ -24,7 +24,7 @@
*/
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#include <composite/composite.h>
#include <opengl/opengl.h>
@@ -46,7 +46,7 @@
class FadeScreen :
public ScreenInterface,
public CompositeScreenInterface,
- public PrivateHandler<FadeScreen, CompScreen>
+ public PluginClassHandler<FadeScreen, CompScreen>
{
public:
FadeScreen (CompScreen *s);
@@ -68,7 +68,7 @@ class FadeScreen :
class FadeWindow :
public WindowInterface,
public GLWindowInterface,
- public PrivateHandler<FadeWindow, CompWindow>
+ public PluginClassHandler<FadeWindow, CompWindow>
{
public:
FadeWindow (CompWindow *w);
diff --git a/plugins/gnomecompat.cpp b/plugins/gnomecompat.cpp
index 8b8e331..9912a81 100644
--- a/plugins/gnomecompat.cpp
+++ b/plugins/gnomecompat.cpp
@@ -120,7 +120,7 @@ static const CompMetadata::OptionInfo gnomeOptionInfo[] = {
};
GnomeCompatScreen::GnomeCompatScreen (CompScreen *s) :
- PrivateHandler<GnomeCompatScreen, CompScreen> (s)
+ PluginClassHandler<GnomeCompatScreen, CompScreen> (s)
{
if (!gnomecompatVTable->getMetadata ()->initOptions (gnomeOptionInfo,
GNOME_OPTION_NUM,
diff --git a/plugins/gnomecompat.h b/plugins/gnomecompat.h
index 56c4b7a..156a8f9 100644
--- a/plugins/gnomecompat.h
+++ b/plugins/gnomecompat.h
@@ -24,7 +24,7 @@
*/
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#define GNOME_OPTION_MAIN_MENU_KEY 0
#define GNOME_OPTION_RUN_DIALOG_KEY 1
@@ -37,7 +37,7 @@
#define GNOME_OPTION_NUM 8
class GnomeCompatScreen :
- public PrivateHandler<GnomeCompatScreen, CompScreen>
+ public PluginClassHandler<GnomeCompatScreen, CompScreen>
{
public:
GnomeCompatScreen (CompScreen *s);
diff --git a/plugins/imgpng.cpp b/plugins/imgpng.cpp
index 7ee866e..d0dc8af 100644
--- a/plugins/imgpng.cpp
+++ b/plugins/imgpng.cpp
@@ -28,7 +28,7 @@
COMPIZ_PLUGIN_20081216 (imgpng, PngPluginVTable)
PngScreen::PngScreen (CompScreen *screen) :
- PrivateHandler<PngScreen, CompScreen> (screen)
+ PluginClassHandler<PngScreen, CompScreen> (screen)
{
ScreenInterface::setHandler (screen, true);
diff --git a/plugins/imgpng.h b/plugins/imgpng.h
index 1e97a22..4433277 100644
--- a/plugins/imgpng.h
+++ b/plugins/imgpng.h
@@ -33,13 +33,13 @@
#include <fstream>
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#define PNG_SIG_SIZE 8
class PngScreen :
public ScreenInterface,
- public PrivateHandler<PngScreen, CompScreen>
+ public PluginClassHandler<PngScreen, CompScreen>
{
public:
PngScreen (CompScreen *screen);
diff --git a/plugins/imgsvg.cpp b/plugins/imgsvg.cpp
index 9416c7b..abee8fd 100644
--- a/plugins/imgsvg.cpp
+++ b/plugins/imgsvg.cpp
@@ -71,7 +71,7 @@ static const CompMetadata::OptionInfo svgOptionInfo[] = {
};
SvgScreen::SvgScreen (CompScreen *screen) :
- PrivateHandler<SvgScreen, CompScreen> (screen),
+ PluginClassHandler<SvgScreen, CompScreen> (screen),
opt (SVG_OPTION_NUM)
{
if (!imgsvgVTable->getMetadata ()->initOptions (svgOptionInfo,
@@ -219,7 +219,7 @@ SvgScreen::readSvgToImage (const char *file,
}
SvgWindow::SvgWindow (CompWindow *window) :
- PrivateHandler<SvgWindow, CompWindow> (window),
+ PluginClassHandler<SvgWindow, CompWindow> (window),
sScreen (SvgScreen::get (screen)),
gScreen (GLScreen::get (screen)),
window (window),
diff --git a/plugins/imgsvg.h b/plugins/imgsvg.h
index b7eb698..467dd52 100644
--- a/plugins/imgsvg.h
+++ b/plugins/imgsvg.h
@@ -34,7 +34,7 @@
#include <X11/extensions/shape.h>
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#include <composite/composite.h>
#include <opengl/opengl.h>
#include <decoration.h>
@@ -50,7 +50,7 @@
class SvgScreen :
public ScreenInterface,
- public PrivateHandler<SvgScreen, CompScreen>
+ public PluginClassHandler<SvgScreen, CompScreen>
{
public:
SvgScreen (CompScreen *screen);
@@ -75,7 +75,7 @@ class SvgScreen :
class SvgWindow :
public WindowInterface,
public GLWindowInterface,
- public PrivateHandler<SvgWindow, CompWindow>
+ public PluginClassHandler<SvgWindow, CompWindow>
{
public:
SvgWindow (CompWindow *window);
diff --git a/plugins/ini.cpp b/plugins/ini.cpp
index a7a610d..4d7f010 100644
--- a/plugins/ini.cpp
+++ b/plugins/ini.cpp
@@ -565,7 +565,7 @@ IniScreen::initPluginForScreen (CompPlugin *p)
}
IniScreen::IniScreen (CompScreen *screen) :
- PrivateHandler<IniScreen, CompScreen> (screen),
+ PluginClassHandler<IniScreen, CompScreen> (screen),
directoryWatchHandle (0),
blockWrites (false)
{
diff --git a/plugins/ini.h b/plugins/ini.h
index 0790072..f64e7d9 100644
--- a/plugins/ini.h
+++ b/plugins/ini.h
@@ -31,7 +31,7 @@
#include <fstream>
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#define HOME_OPTIONDIR ".compiz/options"
#define CORE_NAME "general"
@@ -39,7 +39,7 @@
class IniScreen :
public ScreenInterface,
- public PrivateHandler<IniScreen, CompScreen>
+ public PluginClassHandler<IniScreen, CompScreen>
{
public:
IniScreen (CompScreen *screen);
diff --git a/plugins/inotify.cpp b/plugins/inotify.cpp
index 58b0205..16a9ee7 100644
--- a/plugins/inotify.cpp
+++ b/plugins/inotify.cpp
@@ -28,7 +28,7 @@
COMPIZ_PLUGIN_20081216 (inotify, InotifyPluginVTable)
InotifyScreen::InotifyScreen (CompScreen *screen) :
- PrivateHandler<InotifyScreen, CompScreen> (screen)
+ PluginClassHandler<InotifyScreen, CompScreen> (screen)
{
fd = inotify_init ();
diff --git a/plugins/inotify.h b/plugins/inotify.h
index c65f438..b0b24ad 100644
--- a/plugins/inotify.h
+++ b/plugins/inotify.h
@@ -29,11 +29,11 @@
#include <sys/inotify.h>
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
class InotifyScreen :
public ScreenInterface,
- public PrivateHandler<InotifyScreen, CompScreen>
+ public PluginClassHandler<InotifyScreen, CompScreen>
{
public:
InotifyScreen (CompScreen *screen);
diff --git a/plugins/move.cpp b/plugins/move.cpp
index 25e0bba..d41946e 100644
--- a/plugins/move.cpp
+++ b/plugins/move.cpp
@@ -718,7 +718,7 @@ static const CompMetadata::OptionInfo moveOptionInfo[] = {
};
MoveScreen::MoveScreen (CompScreen *screen) :
- PrivateHandler<MoveScreen,CompScreen> (screen),
+ PluginClassHandler<MoveScreen,CompScreen> (screen),
w (0),
region (NULL),
status (RectangleOut),
diff --git a/plugins/move.h b/plugins/move.h
index 2eb6786..19e518d 100644
--- a/plugins/move.h
+++ b/plugins/move.h
@@ -24,7 +24,7 @@
*/
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#include <composite/composite.h>
#include <opengl/opengl.h>
@@ -57,7 +57,7 @@ struct _MoveKeys {
class MoveScreen :
public ScreenInterface,
- public PrivateHandler<MoveScreen,CompScreen>
+ public PluginClassHandler<MoveScreen,CompScreen>
{
public:
@@ -98,11 +98,11 @@ class MoveScreen :
class MoveWindow :
public GLWindowInterface,
- public PrivateHandler<MoveWindow,CompWindow>
+ public PluginClassHandler<MoveWindow,CompWindow>
{
public:
MoveWindow (CompWindow *window) :
- PrivateHandler<MoveWindow,CompWindow> (window),
+ PluginClassHandler<MoveWindow,CompWindow> (window),
window (window),
gWindow (GLWindow::get (window)),
cWindow (CompositeWindow::get (window))
diff --git a/plugins/obs.cpp b/plugins/obs.cpp
index b4a1f7f..15a4d14 100644
--- a/plugins/obs.cpp
+++ b/plugins/obs.cpp
@@ -243,7 +243,7 @@ static const CompMetadata::OptionInfo obsOptionInfo[] = {
};
ObsScreen::ObsScreen (CompScreen *s) :
- PrivateHandler<ObsScreen, CompScreen> (s),
+ PluginClassHandler<ObsScreen, CompScreen> (s),
opt (OBS_OPTION_NUM)
{
unsigned int mod;
@@ -321,7 +321,7 @@ ObsScreen::setOption (const char *name,
}
ObsWindow::ObsWindow (CompWindow *w) :
- PrivateHandler<ObsWindow, CompWindow> (w),
+ PluginClassHandler<ObsWindow, CompWindow> (w),
window (w),
cWindow (CompositeWindow::get (w)),
gWindow (GLWindow::get (w)),
diff --git a/plugins/obs.h b/plugins/obs.h
index 132a5a5..d006967 100644
--- a/plugins/obs.h
+++ b/plugins/obs.h
@@ -24,7 +24,7 @@
*/
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#include <composite/composite.h>
#include <opengl/opengl.h>
@@ -59,7 +59,7 @@
class ObsScreen :
public ScreenInterface,
- public PrivateHandler<ObsScreen, CompScreen>
+ public PluginClassHandler<ObsScreen, CompScreen>
{
public:
ObsScreen (CompScreen *);
@@ -80,7 +80,7 @@ class ObsScreen :
class ObsWindow :
public GLWindowInterface,
- public PrivateHandler<ObsWindow, CompWindow>
+ public PluginClassHandler<ObsWindow, CompWindow>
{
public:
ObsWindow (CompWindow *);
diff --git a/plugins/opengl/opengl.cpp b/plugins/opengl/opengl.cpp
index d85f164..4b4306e 100644
--- a/plugins/opengl/opengl.cpp
+++ b/plugins/opengl/opengl.cpp
@@ -26,7 +26,7 @@
*/
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#include "privates.h"
const CompMetadata::OptionInfo glOptionInfo[GL_OPTION_NUM] = {
diff --git a/plugins/opengl/screen.cpp b/plugins/opengl/screen.cpp
index 61cc2e4..918fbac 100644
--- a/plugins/opengl/screen.cpp
+++ b/plugins/opengl/screen.cpp
@@ -79,7 +79,7 @@ namespace GL {
CompOutput *targetOutput = NULL;
GLScreen::GLScreen (CompScreen *s) :
- PrivateHandler<GLScreen, CompScreen, COMPIZ_OPENGL_ABI> (s),
+ PluginClassHandler<GLScreen, CompScreen, COMPIZ_OPENGL_ABI> (s),
priv (new PrivateGLScreen (this))
{
Display *dpy = s->dpy ();
diff --git a/plugins/opengl/window.cpp b/plugins/opengl/window.cpp
index cabd8bc..52a4488 100644
--- a/plugins/opengl/window.cpp
+++ b/plugins/opengl/window.cpp
@@ -28,7 +28,7 @@
#include "privates.h"
GLWindow::GLWindow (CompWindow *w) :
- PrivateHandler<GLWindow, CompWindow, COMPIZ_OPENGL_ABI> (w),
+ PluginClassHandler<GLWindow, CompWindow, COMPIZ_OPENGL_ABI> (w),
priv (new PrivateGLWindow (w, this))
{
CompositeWindow *cw = CompositeWindow::get (w);
diff --git a/plugins/place.cpp b/plugins/place.cpp
index c9f051a..52558e3 100644
--- a/plugins/place.cpp
+++ b/plugins/place.cpp
@@ -41,7 +41,7 @@ static const CompMetadata::OptionInfo placeOptionInfo[] = {
};
PlaceScreen::PlaceScreen (CompScreen *screen) :
- PrivateHandler<PlaceScreen, CompScreen> (screen),
+ PluginClassHandler<PlaceScreen, CompScreen> (screen),
opt (PLACE_OPTION_NUM)
{
if (!placeVTable->getMetadata ()->initOptions (placeOptionInfo,
@@ -218,7 +218,7 @@ compareNorthWestCorner (CompWindow *a,
}
PlaceWindow::PlaceWindow (CompWindow *w) :
- PrivateHandler<PlaceWindow, CompWindow> (w),
+ PluginClassHandler<PlaceWindow, CompWindow> (w),
window (w)
{
WindowInterface::setHandler (w);
diff --git a/plugins/place.h b/plugins/place.h
index f640d27..cabc865 100644
--- a/plugins/place.h
+++ b/plugins/place.h
@@ -26,7 +26,7 @@
#include <core/core.h>
#include <core/atoms.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#define PLACE_MODE_CASCADE 0
#define PLACE_MODE_CENTERED 1
@@ -57,7 +57,7 @@
#define PLACE_SCREEN(s) PlaceScreen *ps = PlaceScreen::get (s)
class PlaceScreen :
- public PrivateHandler<PlaceScreen, CompScreen>,
+ public PluginClassHandler<PlaceScreen, CompScreen>,
public ScreenInterface
{
public:
@@ -74,7 +74,7 @@ class PlaceScreen :
};
class PlaceWindow :
- public PrivateHandler<PlaceWindow, CompWindow>,
+ public PluginClassHandler<PlaceWindow, CompWindow>,
public WindowInterface
{
public:
diff --git a/plugins/regex.cpp b/plugins/regex.cpp
index c09f66d..4ecb5dd 100644
--- a/plugins/regex.cpp
+++ b/plugins/regex.cpp
@@ -275,7 +275,7 @@ RegexScreen::handleEvent (XEvent *event)
}
RegexScreen::RegexScreen (CompScreen *s) :
- PrivateHandler<RegexScreen, CompScreen> (s)
+ PluginClassHandler<RegexScreen, CompScreen> (s)
{
ScreenInterface::setHandler (s);
@@ -292,7 +292,7 @@ RegexScreen::~RegexScreen ()
}
RegexWindow::RegexWindow (CompWindow *w) :
- PrivateHandler<RegexWindow, CompWindow> (w),
+ PluginClassHandler<RegexWindow, CompWindow> (w),
window (w)
{
updateRole ();
diff --git a/plugins/regexplugin.h b/plugins/regexplugin.h
index 49c4ea6..7fe1d3d 100644
--- a/plugins/regexplugin.h
+++ b/plugins/regexplugin.h
@@ -28,10 +28,10 @@
#include <core/core.h>
#include <core/atoms.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
class RegexScreen :
- public PrivateHandler<RegexScreen, CompScreen>,
+ public PluginClassHandler<RegexScreen, CompScreen>,
public ScreenInterface
{
public:
@@ -47,7 +47,7 @@ class RegexScreen :
};
class RegexWindow :
- public PrivateHandler<RegexWindow, CompWindow>
+ public PluginClassHandler<RegexWindow, CompWindow>
{
public:
RegexWindow (CompWindow *w);
diff --git a/plugins/resize.cpp b/plugins/resize.cpp
index ae505a8..1bb406c 100644
--- a/plugins/resize.cpp
+++ b/plugins/resize.cpp
@@ -1080,7 +1080,7 @@ static const CompMetadata::OptionInfo resizeOptionInfo[] = {
};
ResizeScreen::ResizeScreen (CompScreen *s) :
- PrivateHandler<ResizeScreen,CompScreen> (s),
+ PluginClassHandler<ResizeScreen,CompScreen> (s),
gScreen (GLScreen::get (s)),
cScreen (CompositeScreen::get (s)),
w (NULL),
@@ -1153,7 +1153,7 @@ ResizeScreen::~ResizeScreen ()
}
ResizeWindow::ResizeWindow (CompWindow *w) :
- PrivateHandler<ResizeWindow,CompWindow> (w),
+ PluginClassHandler<ResizeWindow,CompWindow> (w),
window (w),
gWindow (GLWindow::get (w)),
cWindow (CompositeWindow::get (w)),
diff --git a/plugins/resize.h b/plugins/resize.h
index 5a41293..5000a46 100644
--- a/plugins/resize.h
+++ b/plugins/resize.h
@@ -27,7 +27,7 @@
#define _RESIZE_H
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#include <composite/composite.h>
#include <opengl/opengl.h>
@@ -80,7 +80,7 @@ struct _ResizeKeys {
#define MIN_KEY_HEIGHT_INC 24
class ResizeScreen :
- public PrivateHandler<ResizeScreen,CompScreen>,
+ public PluginClassHandler<ResizeScreen,CompScreen>,
public GLScreenInterface,
public ScreenInterface
{
@@ -158,7 +158,7 @@ class ResizeWindow :
public WindowInterface,
public CompositeWindowInterface,
public GLWindowInterface,
- public PrivateHandler<ResizeWindow,CompWindow>
+ public PluginClassHandler<ResizeWindow,CompWindow>
{
public:
ResizeWindow (CompWindow *w);
diff --git a/plugins/scale/scale.cpp b/plugins/scale/scale.cpp
index 2ae42a8..9ee8914 100644
--- a/plugins/scale/scale.cpp
+++ b/plugins/scale/scale.cpp
@@ -1565,7 +1565,7 @@ static const CompMetadata::OptionInfo scaleOptionInfo[] = {
#undef SCALEBIND
ScaleScreen::ScaleScreen (CompScreen *s) :
- PrivateHandler<ScaleScreen, CompScreen, COMPIZ_SCALE_ABI> (s),
+ PluginClassHandler<ScaleScreen, CompScreen, COMPIZ_SCALE_ABI> (s),
priv (new PrivateScaleScreen (s))
{
}
@@ -1576,7 +1576,7 @@ ScaleScreen::~ScaleScreen ()
}
ScaleWindow::ScaleWindow (CompWindow *w) :
- PrivateHandler<ScaleWindow, CompWindow, COMPIZ_SCALE_ABI> (w),
+ PluginClassHandler<ScaleWindow, CompWindow, COMPIZ_SCALE_ABI> (w),
priv (new PrivateScaleWindow (w))
{
}
diff --git a/plugins/switcher.cpp b/plugins/switcher.cpp
index a13c47f..fad8198 100644
--- a/plugins/switcher.cpp
+++ b/plugins/switcher.cpp
@@ -1563,7 +1563,7 @@ SwitchScreen::setOption (const char *name,
}
SwitchScreen::SwitchScreen (CompScreen *screen) :
- PrivateHandler<SwitchScreen,CompScreen> (screen),
+ PluginClassHandler<SwitchScreen,CompScreen> (screen),
cScreen (CompositeScreen::get (screen)),
gScreen (GLScreen::get (screen)),
opt(SWITCH_OPTION_NUM),
diff --git a/plugins/switcher.h b/plugins/switcher.h
index f2c5a81..7cd6f49 100644
--- a/plugins/switcher.h
+++ b/plugins/switcher.h
@@ -32,7 +32,7 @@
#include <decoration.h>
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#include <core/atoms.h>
#include <composite/composite.h>
@@ -84,7 +84,7 @@ class SwitchScreen :
public ScreenInterface,
public CompositeScreenInterface,
public GLScreenInterface,
- public PrivateHandler<SwitchScreen,CompScreen>
+ public PluginClassHandler<SwitchScreen,CompScreen>
{
public:
@@ -162,11 +162,11 @@ class SwitchScreen :
class SwitchWindow :
public CompositeWindowInterface,
public GLWindowInterface,
- public PrivateHandler<SwitchWindow,CompWindow>
+ public PluginClassHandler<SwitchWindow,CompWindow>
{
public:
SwitchWindow (CompWindow *window) :
- PrivateHandler<SwitchWindow,CompWindow> (window),
+ PluginClassHandler<SwitchWindow,CompWindow> (window),
window (window),
gWindow (GLWindow::get (window)),
cWindow (CompositeWindow::get (window)),
diff --git a/plugins/water.cpp b/plugins/water.cpp
index 30970cb..3c506ea 100644
--- a/plugins/water.cpp
+++ b/plugins/water.cpp
@@ -1303,7 +1303,7 @@ static const CompMetadata::OptionInfo waterOptionInfo[] = {
};
WaterScreen::WaterScreen (CompScreen *screen) :
- PrivateHandler<WaterScreen,CompScreen> (screen),
+ PluginClassHandler<WaterScreen,CompScreen> (screen),
cScreen (CompositeScreen::get (screen)),
gScreen (GLScreen::get (screen)),
opt(WATER_OPTION_NUM),
diff --git a/plugins/water.h b/plugins/water.h
index c53026a..fb393db 100644
--- a/plugins/water.h
+++ b/plugins/water.h
@@ -32,7 +32,7 @@
#include <X11/cursorfont.h>
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#include <composite/composite.h>
#include <opengl/opengl.h>
@@ -77,7 +77,7 @@ struct WaterFunction {
class WaterScreen :
public ScreenInterface,
public CompositeScreenInterface,
- public PrivateHandler<WaterScreen,CompScreen>
+ public PluginClassHandler<WaterScreen,CompScreen>
{
public:
@@ -159,11 +159,11 @@ class WaterScreen :
class WaterWindow :
public GLWindowInterface,
- public PrivateHandler<WaterWindow,CompWindow>
+ public PluginClassHandler<WaterWindow,CompWindow>
{
public:
WaterWindow (CompWindow *window) :
- PrivateHandler<WaterWindow,CompWindow> (window),
+ PluginClassHandler<WaterWindow,CompWindow> (window),
window (window),
gWindow (GLWindow::get (window)),
wScreen (WaterScreen::get (screen)),
diff --git a/plugins/zoom.cpp b/plugins/zoom.cpp
index 4f7a05b..74f6919 100644
--- a/plugins/zoom.cpp
+++ b/plugins/zoom.cpp
@@ -721,7 +721,7 @@ static const CompMetadata::OptionInfo zoomOptionInfo[] = {
};
ZoomScreen::ZoomScreen (CompScreen *screen) :
- PrivateHandler<ZoomScreen,CompScreen> (screen),
+ PluginClassHandler<ZoomScreen,CompScreen> (screen),
cScreen (CompositeScreen::get (screen)),
gScreen (GLScreen::get (screen)),
opt(ZOOM_OPTION_NUM),
diff --git a/plugins/zoom.h b/plugins/zoom.h
index 41e64a1..d292d9f 100644
--- a/plugins/zoom.h
+++ b/plugins/zoom.h
@@ -32,7 +32,7 @@
#include <X11/cursorfont.h>
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#include <composite/composite.h>
#include <opengl/opengl.h>
@@ -61,7 +61,7 @@ class ZoomScreen :
public ScreenInterface,
public CompositeScreenInterface,
public GLScreenInterface,
- public PrivateHandler<ZoomScreen,CompScreen>
+ public PluginClassHandler<ZoomScreen,CompScreen>
{
public:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2bf2db4..1d3aad4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,7 +29,7 @@ add_executable (compiz
option.cpp
string.cpp
match.cpp
- privates.cpp
+ pluginclasses.cpp
event.cpp
plugin.cpp
session.cpp
@@ -48,4 +48,4 @@ target_link_libraries (
install (
TARGETS compiz
DESTINATION ${exec_prefix}
-) \ No newline at end of file
+)
diff --git a/src/main.cpp b/src/main.cpp
index 4f42558..5071d83 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -59,7 +59,7 @@ bool useCow = true;
CompMetadata *coreMetadata = NULL;
-unsigned int privateHandlerIndex = 0;
+unsigned int pluginClassHandlerIndex = 0;
static void
usage (void)
diff --git a/src/privates.cpp b/src/pluginclasses.cpp
index 1d7b6ef..f48bede 100644
--- a/src/privates.cpp
+++ b/src/pluginclasses.cpp
@@ -25,17 +25,17 @@
* David Reveman <davidr@novell.com>
*/
-#include <core/privates.h>
+#include <core/pluginclasses.h>
-CompPrivateStorage::CompPrivateStorage (CompPrivateStorage::Indices& iList) :
- privates (0)
+PluginClassStorage::PluginClassStorage (PluginClassStorage::Indices& iList) :
+ pluginClasses (0)
{
if (iList.size() > 0)
- privates.resize (iList.size ());
+ pluginClasses.resize (iList.size ());
}
int
-CompPrivateStorage::allocatePrivateIndex (CompPrivateStorage::Indices& iList)
+PluginClassStorage::allocatePluginClassIndex (PluginClassStorage::Indices& iList)
{
unsigned int i;
@@ -56,8 +56,8 @@ CompPrivateStorage::allocatePrivateIndex (CompPrivateStorage::Indices& iList)
}
void
-CompPrivateStorage::freePrivateIndex (CompPrivateStorage::Indices& iList,
- int idx)
+PluginClassStorage::freePluginClassIndex (PluginClassStorage::Indices& iList,
+ int idx)
{
int size = iList.size ();
diff --git a/src/screen.cpp b/src/screen.cpp
index 2b64b52..e4c0f07 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -92,26 +92,26 @@ CompScreen *screen;
#define NUM_OPTIONS(s) (sizeof ((s)->priv->opt) / sizeof (CompOption))
-CompPrivateStorage::Indices screenPrivateIndices (0);
+PluginClassStorage::Indices screenPluginClassIndices (0);
int
-CompScreen::allocPrivateIndex ()
+CompScreen::allocPluginClassIndex ()
{
- int i = CompPrivateStorage::allocatePrivateIndex (screenPrivateIndices);
+ int i = PluginClassStorage::allocatePluginClassIndex (screenPluginClassIndices);
- if (screenPrivateIndices.size () != screen->privates.size ())
- screen->privates.resize (screenPrivateIndices.size ());
+ if (screenPluginClassIndices.size () != screen->pluginClasses.size ())
+ screen->pluginClasses.resize (screenPluginClassIndices.size ());
return i;
}
void
-CompScreen::freePrivateIndex (int index)
+CompScreen::freePluginClassIndex (int index)
{
- CompPrivateStorage::freePrivateIndex (screenPrivateIndices, index);
+ PluginClassStorage::freePluginClassIndex (screenPluginClassIndices, index);
- if (screenPrivateIndices.size () != screen->privates.size ())
- screen->privates.resize (screenPrivateIndices.size ());
+ if (screenPluginClassIndices.size () != screen->pluginClasses.size ())
+ screen->pluginClasses.resize (screenPluginClassIndices.size ());
}
#define TIMEVALDIFF(tv1, tv2) \
@@ -4210,7 +4210,7 @@ CompScreen::screenInfo ()
}
CompScreen::CompScreen ():
- CompPrivateStorage (screenPrivateIndices)
+ PluginClassStorage (screenPluginClassIndices)
{
priv = new PrivateScreen (this);
assert (priv);
diff --git a/src/window.cpp b/src/window.cpp
index e317f77..3dc551f 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -46,28 +46,28 @@
#include "privatewindow.h"
#include "privatescreen.h"
-CompPrivateStorage::Indices windowPrivateIndices (0);
+PluginClassStorage::Indices windowPluginClassIndices (0);
int
-CompWindow::allocPrivateIndex ()
+CompWindow::allocPluginClassIndex ()
{
- int i = CompPrivateStorage::allocatePrivateIndex (windowPrivateIndices);
+ int i = PluginClassStorage::allocatePluginClassIndex (windowPluginClassIndices);
foreach (CompWindow *w, screen->windows ())
- if (windowPrivateIndices.size () != w->privates.size ())
- w->privates.resize (windowPrivateIndices.size ());
+ if (windowPluginClassIndices.size () != w->pluginClasses.size ())
+ w->pluginClasses.resize (windowPluginClassIndices.size ());
return i;
}
void
-CompWindow::freePrivateIndex (int index)
+CompWindow::freePluginClassIndex (int index)
{
- CompPrivateStorage::freePrivateIndex (windowPrivateIndices, index);
+ PluginClassStorage::freePluginClassIndex (windowPluginClassIndices, index);
foreach (CompWindow *w, ::screen->windows ())
- if (windowPrivateIndices.size () != w->privates.size ())
- w->privates.resize (windowPrivateIndices.size ());
+ if (windowPluginClassIndices.size () != w->pluginClasses.size ())
+ w->pluginClasses.resize (windowPluginClassIndices.size ());
}
bool
@@ -4637,7 +4637,7 @@ CompWindow::syncAlarm ()
CompWindow::CompWindow (Window id,
Window aboveId) :
- CompPrivateStorage (windowPrivateIndices)
+ PluginClassStorage (windowPluginClassIndices)
{
priv = new PrivateWindow (this);
assert (priv);