From 8abec2446d38e8963468f60e2436ba34595b644d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Wed, 14 Dec 2011 10:32:13 +0100 Subject: Added a resourcecollection class This class will typically be the super class of globals which creates wl_resources in the bind functions. If for some reason some other class needs to get a resource for a given client of the global, it can look it up Change-Id: I939cc7aaeb15586f2c760c600c188a8cbf19f358 Reviewed-by: Laszlo Agocs --- src/compositor/global/global.pri | 7 +- src/compositor/global/waylandobject.h | 87 ++++++++++++++++++++ .../global/waylandresourcecollection.cpp | 92 ++++++++++++++++++++++ src/compositor/global/waylandresourcecollection.h | 67 ++++++++++++++++ 4 files changed, 252 insertions(+), 1 deletion(-) create mode 100644 src/compositor/global/waylandobject.h create mode 100644 src/compositor/global/waylandresourcecollection.cpp create mode 100644 src/compositor/global/waylandresourcecollection.h (limited to 'src/compositor/global') diff --git a/src/compositor/global/global.pri b/src/compositor/global/global.pri index bdabcbfcf..4dcbe340e 100644 --- a/src/compositor/global/global.pri +++ b/src/compositor/global/global.pri @@ -1,5 +1,10 @@ INCLUDEPATH += $$PWD -HEADERS += $$PWD/waylandexport.h +HEADERS += \ + $$PWD/waylandexport.h \ + $$PWD/waylandobject.h \ + $$PWD/waylandresourcecollection.h \ +SOURCES += \ + $$PWD/waylandresourcecollection.cpp \ diff --git a/src/compositor/global/waylandobject.h b/src/compositor/global/waylandobject.h new file mode 100644 index 000000000..131cd0993 --- /dev/null +++ b/src/compositor/global/waylandobject.h @@ -0,0 +1,87 @@ +/**************************************************************************** +** +** This file is part of QtCompositor** +** +** Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** +** Contact: Nokia Corporation qt-info@nokia.com +** +** You may use this file under the terms of the BSD license as follows: +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** +** Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in the +** documentation and/or other materials provided with the distribution. +** +** Neither the name of Nokia Corporation and its Subsidiary(-ies) nor the +** names of its contributors may be used to endorse or promote products +** derived from this software without specific prior written permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** +****************************************************************************/ + +#ifndef WAYLAND_OBJECT_H +#define WAYLAND_OBJECT_H + +#include + +#include + +namespace Wayland { + +template +class Object +{ +public: + Object() { memset(&m_waylandObject, 0, sizeof(T)); } + + const T *base() const { return &m_waylandObject; } + T *base() { return &m_waylandObject; } + +private: + T m_waylandObject; +}; + +template +To wayland_cast(From *from) +{ + Object *object = reinterpret_cast *>(from); + return static_cast(object); +} + +template +void addClientResource(struct wl_client *client, + struct wl_resource *resource, + int id, const struct wl_interface *interface, + Implementation implementation, + void (*destroy)(struct wl_resource *resource)) +{ + resource->object.id = id; + resource->object.interface = interface; + resource->object.implementation = (void (**)(void))implementation; + resource->destroy = destroy; + + wl_client_add_resource(client, resource); +} + +} + +#endif //WAYLAND_OBJECT_H diff --git a/src/compositor/global/waylandresourcecollection.cpp b/src/compositor/global/waylandresourcecollection.cpp new file mode 100644 index 000000000..9601f6f49 --- /dev/null +++ b/src/compositor/global/waylandresourcecollection.cpp @@ -0,0 +1,92 @@ +/**************************************************************************** +** +** This file is part of QtCompositor** +** +** Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** +** Contact: Nokia Corporation qt-info@nokia.com +** +** You may use this file under the terms of the BSD license as follows: +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** +** Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in the +** documentation and/or other materials provided with the distribution. +** +** Neither the name of Nokia Corporation and its Subsidiary(-ies) nor the +** names of its contributors may be used to endorse or promote products +** derived from this software without specific prior written permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** +****************************************************************************/ + +#include "waylandresourcecollection.h" + +#include + +namespace Wayland { + +ResourceCollection::ResourceCollection() +{ + wl_list_init(&client_resources); +} + +ResourceCollection::~ResourceCollection() +{ + +} + +void ResourceCollection::registerResource(struct wl_resource *resource) +{ + wl_list_insert(&client_resources,&resource->link); + struct wl_listener *listener = new struct wl_listener; + listener->func = ResourceCollection::destroy_listener_func; + wl_list_insert(&resource->destroy_listener_list,&listener->link); +} + +struct wl_resource *ResourceCollection::resourceForClient(wl_client *client) const +{ + struct wl_resource *resource; + wl_list_for_each(resource,&client_resources, link) { + if (resource->client == client) { + return resource; + } + } + return 0; + +} + +bool ResourceCollection::resourceListIsEmpty() const +{ + return wl_list_empty(const_cast(&client_resources)); +} + +void ResourceCollection::destroy_listener_func(struct wl_listener *listener, + wl_resource *resource, + uint32_t time) +{ + Q_UNUSED(time); + wl_list_remove(&resource->link); + delete listener; +} + + +} diff --git a/src/compositor/global/waylandresourcecollection.h b/src/compositor/global/waylandresourcecollection.h new file mode 100644 index 000000000..104ec97d0 --- /dev/null +++ b/src/compositor/global/waylandresourcecollection.h @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** This file is part of QtCompositor** +** +** Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** +** Contact: Nokia Corporation qt-info@nokia.com +** +** You may use this file under the terms of the BSD license as follows: +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** +** Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in the +** documentation and/or other materials provided with the distribution. +** +** Neither the name of Nokia Corporation and its Subsidiary(-ies) nor the +** names of its contributors may be used to endorse or promote products +** derived from this software without specific prior written permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** +****************************************************************************/ + +#ifndef WAYLAND_RESOURCE_OBJECT_H +#define WAYLAND_RESOURCE_OBJECT_H + +#include + +namespace Wayland { + +class ResourceCollection +{ +public: + ResourceCollection(); + virtual ~ResourceCollection(); + void registerResource(struct wl_resource *resource); + struct wl_resource *resourceForClient(struct wl_client *client) const; + bool resourceListIsEmpty() const; + +protected: + struct wl_list client_resources; +private: + static void destroy_listener_func(struct wl_listener *listener, + struct wl_resource *resource, uint32_t time); + +}; + +} + +#endif //WAYLAND_RESOURCE_OBJECT_H -- cgit v1.2.3