1 files changed, 68 insertions, 38 deletions

diff --git a/src/compositor/compositor_api/qwaylanddrag.cpp b/src/compositor/compositor_api/qwaylanddrag.cpp
index b31df31b8..cc45c1279 100644
--- a/src/compositor/compositor_api/qwaylanddrag.cpp
+++ b/src/compositor/compositor_api/qwaylanddrag.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$
 **
@@ -42,51 +38,85 @@
 
 #include <private/qobject_p.h>
 
-#include "qwlcompositor_p.h"
-#include "qwlinputdevice_p.h"
 #include "qwldatadevice_p.h"
-#include "qwlsurface_p.h"
-#include "qwaylandsurfaceview.h"
+#include "qwaylandview.h"
+#include <QtWaylandCompositor/private/qwaylandinput_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QWaylandDragPrivate : public QObjectPrivate
 {
 public:
-    QWaylandDragPrivate(QtWayland::InputDevice *id)
+    QWaylandDragPrivate(QWaylandInputDevice *id)
         : inputDevice(id)
     {
     }
 
-    QtWayland::InputDevice *inputDevice;
-};
+    QtWayland::DataDevice *dataDevice()
+    {
+        return QWaylandInputDevicePrivate::get(inputDevice)->dataDevice();
+    }
+
+    const QtWayland::DataDevice *dataDevice() const
+    {
+        return QWaylandInputDevicePrivate::get(inputDevice)->dataDevice();
+    }
 
+    QWaylandInputDevice *inputDevice;
+};
 
-QWaylandDrag::QWaylandDrag(QtWayland::InputDevice *inputDevice)
+QWaylandDrag::QWaylandDrag(QWaylandInputDevice *inputDevice)
     : QObject(* new QWaylandDragPrivate(inputDevice))
 {
 }
 
-QWaylandSurfaceView *QWaylandDrag::icon() const
+QWaylandSurface *QWaylandDrag::icon() const
 {
     Q_D(const QWaylandDrag);
 
-    const QtWayland::DataDevice *dataDevice = d->inputDevice->dataDevice();
+    const QtWayland::DataDevice *dataDevice = d->dataDevice();
     if (!dataDevice)
         return 0;
 
     return dataDevice->dragIcon();
 }
 
+
 bool QWaylandDrag::visible() const
 {
     Q_D(const QWaylandDrag);
 
-    const QtWayland::DataDevice *dataDevice = d->inputDevice->dataDevice();
+    const QtWayland::DataDevice *dataDevice = d->dataDevice();
     if (!dataDevice)
         return false;
 
     return dataDevice->dragIcon() != 0;
 }
 
+void QWaylandDrag::dragMove(QWaylandSurface *target, const QPointF &pos)
+{
+    Q_D(QWaylandDrag);
+    QtWayland::DataDevice *dataDevice = d->dataDevice();
+    if (!dataDevice)
+        return;
+    dataDevice->dragMove(target, pos);
+}
+void QWaylandDrag::drop()
+{
+    Q_D(QWaylandDrag);
+    QtWayland::DataDevice *dataDevice = d->dataDevice();
+    if (!dataDevice)
+        return;
+    dataDevice->drop();
+}
+
+void QWaylandDrag::cancelDrag()
+{
+    Q_D(QWaylandDrag);
+    QtWayland::DataDevice *dataDevice = d->dataDevice();
+    if (!dataDevice)
+        return;
+    dataDevice->cancelDrag();
+}
+
 QT_END_NAMESPACE