Rework how we manage extensions

Change-Id: If2cbf096e7419bc1bda007d5167ce39d1a5d50ae

4 files changed, 304 insertions, 1 deletions

diff --git a/src/compositor/global/global.pri b/src/compositor/global/global.pri
index fdb2049cd..68b385e92 100644
--- a/src/compositor/global/global.pri
+++ b/src/compositor/global/global.pri
@@ -1,5 +1,10 @@
 INCLUDEPATH += global/
 
 HEADERS += \
-    global/qwaylandexport.h
+    global/qwaylandexport.h \
+    global/qwaylandextension.h \
+    global/qwaylandextension_p.h
+
+SOURCES += \
+    global/qwaylandextension.cpp
 
diff --git a/src/compositor/global/qwaylandextension.cpp b/src/compositor/global/qwaylandextension.cpp
new file mode 100644
index 000000000..55fd994ee
--- /dev/null
+++ b/src/compositor/global/qwaylandextension.cpp
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include "qwaylandextension.h"
+#include "qwaylandextension_p.h"
+
+#include <wayland-server.h>
+
+QT_BEGIN_NAMESPACE
+
+QWaylandExtension::QWaylandExtension(QWaylandExtensionContainer *container, QObject *parent)
+    : QObject(*new QWaylandExtensionPrivate(container), parent)
+{
+    container->addExtension(this);
+}
+
+QWaylandExtension::QWaylandExtension(QWaylandExtensionPrivate &dd, QObject *parent)
+    : QObject(dd,parent)
+{
+    d_func()->extension_container->addExtension(this);
+}
+
+QWaylandExtension::~QWaylandExtension()
+{
+    Q_D(QWaylandExtension);
+    d->extension_container->removeExtension(this);
+}
+
+QWaylandExtensionContainer::~QWaylandExtensionContainer()
+{
+    foreach (QWaylandExtension *extension, extension_vector) {
+        delete extension;
+    }
+}
+
+QWaylandExtension *QWaylandExtensionContainer::extension(const QByteArray &name)
+{
+    for (int i = 0; i < extension_vector.size(); i++) {
+        if (extension_vector.at(i)->name() == name)
+            return extension_vector.at(i);
+    }
+    return Q_NULLPTR;
+}
+
+QWaylandExtension *QWaylandExtensionContainer::extension(const wl_interface *interface)
+{
+    for (int i = 0; i < extension_vector.size(); i++) {
+        if (extension_vector.at(i)->interface() == interface)
+            return extension_vector.at(i);
+    }
+    return Q_NULLPTR;
+}
+
+QVector<QWaylandExtension *> QWaylandExtensionContainer::extensions() const
+{
+    return extension_vector;
+}
+
+void QWaylandExtensionContainer::addExtension(QWaylandExtension *extension)
+{
+    Q_ASSERT(!extension_vector.contains(extension));
+    extension_vector.append(extension);
+}
+
+void QWaylandExtensionContainer::removeExtension(QWaylandExtension *extension)
+{
+    extension_vector.removeOne(extension);
+}
+
+QWaylandExtensionTemplate::QWaylandExtensionTemplate(QWaylandExtensionContainer *container, QObject *parent)
+    : QWaylandExtension(container, parent)
+{ }
+
+QWaylandExtensionTemplate::QWaylandExtensionTemplate(QWaylandExtensionTemplatePrivate &dd, QObject *parent)
+    : QWaylandExtension(dd, parent)
+{ }
+
+const struct wl_interface *QWaylandExtensionTemplate::interface() const
+{
+    Q_D(const QWaylandExtensionTemplate);
+    return d->interface();
+}
+
+QT_END_NAMESPACE
diff --git a/src/compositor/global/qwaylandextension.h b/src/compositor/global/qwaylandextension.h
new file mode 100644
index 000000000..c051e366f
--- /dev/null
+++ b/src/compositor/global/qwaylandextension.h
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QWAYLANDEXTENSION_H
+#define QWAYLANDEXTENSION_H
+
+#include <QtCompositor/qwaylandexport.h>
+#include <wayland-server.h>
+
+#include <QtCore/QObject>
+#include <QtCore/QVector>
+
+QT_BEGIN_NAMESPACE
+
+class QWaylandCompositor;
+class QWaylandExtensionContainer;
+class QWaylandExtensionPrivate;
+
+class Q_COMPOSITOR_EXPORT QWaylandExtension : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QWaylandExtension)
+public:
+    QWaylandExtension(QWaylandExtensionContainer *container, QObject *parent = 0);
+    virtual ~QWaylandExtension();
+
+    virtual const struct wl_interface *interface() const = 0;
+
+    const QByteArray name() const { return interface()->name; }
+    quint32 version() const { return interface()->version; }
+
+protected:
+    QWaylandExtension(QWaylandExtensionPrivate &dd, QObject *parent = 0);
+};
+
+class Q_COMPOSITOR_EXPORT QWaylandExtensionContainer
+{
+public:
+    virtual ~QWaylandExtensionContainer();
+
+    QWaylandExtension *extension(const QByteArray &name);
+    QWaylandExtension *extension(const wl_interface *interface);
+    QVector<QWaylandExtension *> extensions() const;
+    void addExtension(QWaylandExtension *extension);
+    void removeExtension(QWaylandExtension *extension);
+
+protected:
+    QVector<QWaylandExtension *> extension_vector;
+};
+
+class QWaylandExtensionTemplatePrivate;
+class Q_COMPOSITOR_EXPORT QWaylandExtensionTemplate : public QWaylandExtension
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QWaylandExtensionTemplate)
+public:
+    QWaylandExtensionTemplate(QWaylandExtensionContainer *container, QObject *parent = 0);
+
+    const struct wl_interface *interface() const Q_DECL_OVERRIDE;
+
+protected:
+    QWaylandExtensionTemplate(QWaylandExtensionTemplatePrivate &dd, QObject *parent = 0);
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/compositor/global/qwaylandextension_p.h b/src/compositor/global/qwaylandextension_p.h
new file mode 100644
index 000000000..b86943650
--- /dev/null
+++ b/src/compositor/global/qwaylandextension_p.h
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QWAYLANDEXTENSION_P_H
+#define QWAYLANDEXTENSION_P_H
+
+#include "qwaylandextension.h"
+#include <QtCore/private/qobject_p.h>
+
+class Q_COMPOSITOR_EXPORT QWaylandExtensionPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QWaylandExtension)
+
+public:
+    QWaylandExtensionPrivate(QWaylandExtensionContainer *container)
+        : QObjectPrivate()
+        , extension_container(container)
+    {
+    }
+
+    QWaylandExtensionContainer *extension_container;
+};
+
+class Q_COMPOSITOR_EXPORT QWaylandExtensionTemplatePrivate : public QWaylandExtensionPrivate
+{
+    Q_DECLARE_PUBLIC(QWaylandExtension)
+
+public:
+    QWaylandExtensionTemplatePrivate(QWaylandExtensionContainer *container)
+        : QWaylandExtensionPrivate(container)
+    {}
+
+    virtual const struct wl_interface *interface() const = 0;
+};
+
+template <typename T>
+class Q_COMPOSITOR_EXPORT QWaylandExtensionTemplatePrivateImpl : public QWaylandExtensionTemplatePrivate, public T
+{
+public:
+    QWaylandExtensionTemplatePrivateImpl(QWaylandExtensionContainer *container)
+        : QWaylandExtensionTemplatePrivate(container)
+    { }
+
+    const struct wl_interface *interface() const Q_DECL_OVERRIDE { return T::interface(); }
+};
+
+#endif  /*QWAYLANDEXTENSION_P_H*/