1 files changed, 23 insertions, 41 deletions

diff --git a/src/client/qwaylandtabletv2.cpp b/src/client/qwaylandtabletv2.cpp
index 0f55aba9e..73524c166 100644
--- a/src/client/qwaylandtabletv2.cpp
+++ b/src/client/qwaylandtabletv2.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://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.LGPL3 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-3.0.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 (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2019 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qwaylandtabletv2_p.h"
 #include "qwaylandinputdevice_p.h"
@@ -56,6 +20,11 @@ QWaylandTabletManagerV2::QWaylandTabletManagerV2(QWaylandDisplay *display, uint
         createTabletSeat(seat);
 }
 
+QWaylandTabletManagerV2::~QWaylandTabletManagerV2()
+{
+    destroy();
+}
+
 QWaylandTabletSeatV2 *QWaylandTabletManagerV2::createTabletSeat(QWaylandInputDevice *seat)
 {
     return new QWaylandTabletSeatV2(this, seat);
@@ -63,6 +32,7 @@ QWaylandTabletSeatV2 *QWaylandTabletManagerV2::createTabletSeat(QWaylandInputDev
 
 QWaylandTabletSeatV2::QWaylandTabletSeatV2(QWaylandTabletManagerV2 *manager, QWaylandInputDevice *seat)
     : QtWayland::zwp_tablet_seat_v2(manager->get_tablet_seat(seat->wl_seat()))
+    , m_seat(seat)
 {
 }
 
@@ -74,6 +44,9 @@ QWaylandTabletSeatV2::~QWaylandTabletSeatV2()
         tool->destroy();
     for (auto *pad : m_pads)
         pad->destroy();
+    qDeleteAll(m_tablets);
+    qDeleteAll(m_tools);
+    qDeleteAll(m_pads);
     destroy();
 }
 
@@ -86,7 +59,7 @@ void QWaylandTabletSeatV2::zwp_tablet_seat_v2_tablet_added(zwp_tablet_v2 *id)
 
 void QWaylandTabletSeatV2::zwp_tablet_seat_v2_tool_added(zwp_tablet_tool_v2 *id)
 {
-    auto *tool = new QWaylandTabletToolV2(id);
+    auto *tool = new QWaylandTabletToolV2(this, id);
     m_tools.push_back(tool);
     connect(tool, &QWaylandTabletToolV2::destroyed, this, [this, tool] { m_tools.removeOne(tool); });
 }
@@ -109,8 +82,9 @@ void QWaylandTabletV2::zwp_tablet_v2_removed()
     delete this;
 }
 
-QWaylandTabletToolV2::QWaylandTabletToolV2(::zwp_tablet_tool_v2 *tool)
+QWaylandTabletToolV2::QWaylandTabletToolV2(QWaylandTabletSeatV2 *tabletSeat, ::zwp_tablet_tool_v2 *tool)
     : QtWayland::zwp_tablet_tool_v2(tool)
+    , m_tabletSeat(tabletSeat)
 {
 }
 
@@ -196,8 +170,14 @@ void QWaylandTabletToolV2::zwp_tablet_tool_v2_proximity_out()
 
 void QWaylandTabletToolV2::zwp_tablet_tool_v2_down(uint32_t serial)
 {
-    Q_UNUSED(serial);
     m_pending.down = true;
+
+    if (m_pending.proximitySurface) {
+        if (QWaylandWindow *window = m_pending.proximitySurface->waylandWindow()) {
+            QWaylandInputDevice *seat = m_tabletSeat->seat();
+            seat->display()->setLastInputDevice(seat, serial, window);
+        }
+    }
 }
 
 void QWaylandTabletToolV2::zwp_tablet_tool_v2_up()
@@ -330,3 +310,5 @@ void QWaylandTabletPadV2::zwp_tablet_pad_v2_removed()
 } // namespace QtWaylandClient
 
 QT_END_NAMESPACE
+
+#include "moc_qwaylandtabletv2_p.cpp"