summaryrefslogtreecommitdiff
path: root/src/display.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/display.cpp')
-rw-r--r--src/display.cpp49
1 files changed, 8 insertions, 41 deletions
diff --git a/src/display.cpp b/src/display.cpp
index b78c0e9..2305c5e 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -114,44 +114,6 @@ freeDisplayObjectPrivateIndex (CompObject *parent,
freePrivateIndex (displayPrivateLen, displayPrivateIndices, index);
}
-CompBool
-forEachDisplayObject (CompObject *parent,
- ObjectCallBackProc proc,
- void *closure)
-{
- if (parent->type == COMP_OBJECT_TYPE_CORE)
- {
- CompDisplay *d;
-
- for (d = core->displays(); d; d = d->next)
- {
- if (!(*proc) (d, closure))
- return FALSE;
- }
- }
-
- return TRUE;
-}
-
-char *
-nameDisplayObject (CompObject *object)
-{
- return NULL;
-}
-
-CompObject *
-findDisplayObject (CompObject *parent,
- const char *name)
-{
- if (parent->type == COMP_OBJECT_TYPE_CORE)
- {
- if (!name || !name[0])
- return core->displays ();
- }
-
- return NULL;
-}
-
int
allocateDisplayPrivateIndex (void)
{
@@ -832,6 +794,7 @@ setDisplayAction (CompDisplay *display,
}
CompDisplay::CompDisplay () :
+ CompObject (COMP_OBJECT_TYPE_DISPLAY, "display"),
next (0),
screenPrivateIndices (0),
screenPrivateLen (0)
@@ -855,8 +818,6 @@ CompDisplay::~CompDisplay ()
while (priv->screens)
removeScreen (priv->screens);
- core->objectRemove (core, this);
-
objectFiniPlugins (this);
core->removeTimeout (priv->pingHandle);
@@ -1065,7 +1026,7 @@ CompDisplay::init (const char *name)
/* TODO: bailout properly when objectInitPlugins fails */
assert (objectInitPlugins (this));
- core->objectAdd (core, this);
+ core->addChild (this);
if (onlyCurrentScreen)
{
@@ -1125,6 +1086,12 @@ CompDisplay::init (const char *name)
return true;
}
+CompString
+CompDisplay::name ()
+{
+ return CompString ("");
+}
+
CompDisplay::Atoms
CompDisplay::atoms ()
{