1 files changed, 44 insertions, 43 deletions

diff --git a/src/plugins/platforms/windows/qwindowstabletsupport.h b/src/plugins/platforms/windows/qwindowstabletsupport.h
index 229677dae4..fb639294d3 100644
--- a/src/plugins/platforms/windows/qwindowstabletsupport.h
+++ b/src/plugins/platforms/windows/qwindowstabletsupport.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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) 2016 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
 
 #ifndef QWINDOWSTABLETSUPPORT_H
 #define QWINDOWSTABLETSUPPORT_H
@@ -47,6 +11,7 @@
 #include <QtCore/qhash.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qpoint.h>
+#include <QtCore/qsharedpointer.h>
 
 #include <wintab.h>
 
@@ -83,6 +48,8 @@ struct QWindowsWinTab32DLL
     PtrWTQueueSizeSet wTQueueSizeSet = nullptr;
 };
 
+// Data associated with a physical cursor (system ID) which is shared between
+// devices of varying device type/pointer type.
 struct QWindowsTabletDeviceData
 {
     QPointF scaleCoordinates(int coordX, int coordY,const QRect &targetArea) const;
@@ -99,13 +66,31 @@ struct QWindowsTabletDeviceData
     int maxY = 0;
     int minZ = 0;
     int maxZ = 0;
-    qint64 uniqueId = 0;
-    QInputDevice::DeviceType currentDevice = QInputDevice::DeviceType::Unknown;
-    QPointingDevice::PointerType currentPointerType = QPointingDevice::PointerType::Unknown;
+    qint64 systemId = 0;
     bool zCapability = false;
+    bool tiltCapability = false;
     QHash<quint8, quint8> buttonsMap;
 };
 
+class QWinTabPointingDevice : public QPointingDevice
+{
+public:
+    using DeviceDataPtr = QSharedPointer<QWindowsTabletDeviceData>;
+
+    explicit QWinTabPointingDevice(const DeviceDataPtr &data,
+                                   const QString &name, qint64 systemId,
+                                   QInputDevice::DeviceType devType,
+                                   PointerType pType, Capabilities caps, int maxPoints,
+                                   int buttonCount, const QString &seatName = QString(),
+                                   QPointingDeviceUniqueId uniqueId = QPointingDeviceUniqueId(),
+                                   QObject *parent = nullptr);
+
+    const DeviceDataPtr &deviceData() const { return m_deviceData; }
+
+private:
+    DeviceDataPtr m_deviceData;
+};
+
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug d, const QWindowsTabletDeviceData &t);
 #endif
@@ -117,6 +102,9 @@ class QWindowsTabletSupport
     explicit QWindowsTabletSupport(HWND window, HCTX context);
 
 public:
+    using DevicePtr = QSharedPointer<QWinTabPointingDevice>;
+    using Devices = QList<DevicePtr>;
+
     enum Mode
     {
         PenMode,
@@ -146,16 +134,29 @@ public:
 private:
     unsigned options() const;
     QWindowsTabletDeviceData tabletInit(qint64 uniqueId, UINT cursorType) const;
+    void updateData(QWindowsTabletDeviceData *data) const;
+    void updateButtons(unsigned currentCursor, QWindowsTabletDeviceData *data) const;
+    void enterProximity(ulong time = 0, QWindow *window = nullptr);
+    void leaveProximity(ulong time = 0, QWindow *window = nullptr);
+    void enterLeaveProximity(bool enter, ulong time, QWindow *window = nullptr);
+    DevicePtr findDevice(qint64 systemId) const;
+    DevicePtr findDevice(qint64 systemId,
+                         QInputDevice::DeviceType deviceType,
+                         QPointingDevice::PointerType pointerType) const;
+    DevicePtr clonePhysicalDevice(qint64 systemId,
+                                  QInputDevice::DeviceType deviceType,
+                                  QPointingDevice::PointerType pointerType);
 
     static QWindowsWinTab32DLL m_winTab32DLL;
     const HWND m_window;
     const HCTX m_context;
     static int m_absoluteRange;
     bool m_tiltSupport = false;
-    QList<QWindowsTabletDeviceData> m_devices;
-    int m_currentDevice = -1;
+    Devices m_devices;
+    DevicePtr m_currentDevice;
     Mode m_mode = PenMode;
     State m_state = PenUp;
+    ulong m_eventTime = 0;
 };
 
 QT_END_NAMESPACE