Merge branch 'wip-compositor-api' into dev

This introduces the new compositor API, removing the
old API (which was never officially supported).

Change-Id: I1dc01f0fb4edc749e34ed8356e56ad87d7d64913

1 files changed, 40 insertions, 55 deletions

diff --git a/src/compositor/compositor_api/qwaylandinputpanel.cpp b/src/compositor/compositor_api/qwaylandinputpanel.cpp
index db4cd3296..6f774cd98 100644
--- a/src/compositor/compositor_api/qwaylandinputpanel.cpp
+++ b/src/compositor/compositor_api/qwaylandinputpanel.cpp
@@ -3,36 +3,32 @@
 ** Copyright (C) 2013 Klarälvdalens Datakonsult AB (KDAB).
 ** Contact: http://www.qt.io/licensing/
 **
-** This file is part of the Qt Compositor.
+** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** $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.
 **
-** "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 The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
+** 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.
 **
-**
-** 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."
+** 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$
 **
@@ -40,59 +36,48 @@
 
 #include "qwaylandinputpanel.h"
 
+#include <QtWaylandCompositor/QWaylandCompositor>
+
 #include <private/qobject_p.h>
 
 #include "qwlinputpanel_p.h"
-#include "qwlsurface_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandInputPanelPrivate : public QObjectPrivate
-{
-public:
-    QWaylandInputPanelPrivate(QtWayland::InputPanel *panel)
-        : inputPanel(panel)
-    {
-    }
-
-    QtWayland::InputPanel *inputPanel;
-};
-
-
-QWaylandInputPanel::QWaylandInputPanel(QtWayland::InputPanel *inputPanel)
-    : QObject(*new QWaylandInputPanelPrivate(inputPanel))
+QWaylandInputPanel::QWaylandInputPanel(QWaylandCompositor *compositor)
+    : QWaylandExtensionTemplate(compositor, *new QWaylandInputPanelPrivate(compositor))
 {
 }
 
-QtWayland::InputPanel *QWaylandInputPanel::handle() const
+QWaylandSurface *QWaylandInputPanel::focus() const
 {
-    Q_D(const QWaylandInputPanel);
+   Q_D(const QWaylandInputPanel);
 
-    return d->inputPanel;
+    return d->focus();
 }
 
-QWaylandSurface *QWaylandInputPanel::focus() const
+bool QWaylandInputPanel::visible() const
 {
     Q_D(const QWaylandInputPanel);
 
-    QtWayland::Surface *surface = d->inputPanel->focus();
-    if (surface)
-        return surface->waylandSurface();
-    return 0;
+    return d->inputPanelVisible();
 }
 
-bool QWaylandInputPanel::visible() const
+QRect QWaylandInputPanel::cursorRectangle() const
 {
     Q_D(const QWaylandInputPanel);
 
-    return d->inputPanel->inputPanelVisible();
+    return d->cursorRectangle();
 }
 
-QRect QWaylandInputPanel::cursorRectangle() const
+const struct wl_interface *QWaylandInputPanel::interface()
 {
-    Q_D(const QWaylandInputPanel);
+    return QWaylandInputPanelPrivate::interface();
+}
 
-    return d->inputPanel->cursorRectangle();
+QByteArray QWaylandInputPanel::interfaceName()
+{
+    return QWaylandInputPanelPrivate::interfaceName();
 }
 
 QT_END_NAMESPACE