diff options
Diffstat (limited to 'src/gui/kernel/qpointingdevice_p.h')
| -rw-r--r-- | src/gui/kernel/qpointingdevice_p.h | 55 |
1 files changed, 15 insertions, 40 deletions
diff --git a/src/gui/kernel/qpointingdevice_p.h b/src/gui/kernel/qpointingdevice_p.h index 871c39939f..b2f0574e9b 100644 --- a/src/gui/kernel/qpointingdevice_p.h +++ b/src/gui/kernel/qpointingdevice_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module 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) 2020 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 QPOINTINGDEVICE_P_H #define QPOINTINGDEVICE_P_H @@ -51,14 +15,19 @@ // We mean it. // +#include <QtCore/qloggingcategory.h> #include <QtGui/private/qevent_p.h> #include <QtGui/qpointingdevice.h> #include <QtGui/private/qtguiglobal_p.h> #include <QtGui/private/qinputdevice_p.h> + +#include <QtCore/qpointer.h> #include <QtCore/private/qflatmap_p.h> QT_BEGIN_NAMESPACE +Q_DECLARE_LOGGING_CATEGORY(lcPointerGrab); + class Q_GUI_EXPORT QPointingDevicePrivate : public QInputDevicePrivate { Q_DECLARE_PUBLIC(QPointingDevice) @@ -76,6 +45,7 @@ public: pointingDeviceType = true; activePoints.reserve(maxPoints); } + ~QPointingDevicePrivate() override; void sendTouchCancelEvent(QTouchEvent *cancelEvent); @@ -85,7 +55,9 @@ public: struct EventPointData { QEventPoint eventPoint; QPointer<QObject> exclusiveGrabber; + QPointer<QObject> exclusiveGrabberContext; // extra info about where the grab happened QList<QPointer <QObject> > passiveGrabbers; + QList<QPointer <QObject> > passiveGrabbersContext; // parallel list: extra info about where the grabs happened }; EventPointData *queryPointById(int id) const; EventPointData *pointById(int id) const; @@ -97,14 +69,14 @@ public: void setExclusiveGrabber(const QPointerEvent *event, const QEventPoint &point, QObject *exclusiveGrabber); bool removeExclusiveGrabber(const QPointerEvent *event, const QObject *grabber); bool addPassiveGrabber(const QPointerEvent *event, const QEventPoint &point, QObject *grabber); + static bool setPassiveGrabberContext(EventPointData *epd, QObject *grabber, QObject *context); bool removePassiveGrabber(const QPointerEvent *event, const QEventPoint &point, QObject *grabber); void clearPassiveGrabbers(const QPointerEvent *event, const QEventPoint &point); void removeGrabber(QObject *grabber, bool cancel = false); - using EventPointMap = QFlatMap<int, EventPointData>; + using EventPointMap = QVarLengthFlatMap<int, EventPointData, 20>; mutable EventPointMap activePoints; - void * extra = nullptr; // QPA plugins can store platform-specific stuff here QPointingDeviceUniqueId uniqueId; quint32 toolId = 0; // only for Wacom tablets qint8 maximumTouchPoints = 0; @@ -129,7 +101,10 @@ public: static const QPointingDevice *queryTabletDevice(QInputDevice::DeviceType deviceType, QPointingDevice::PointerType pointerType, QPointingDeviceUniqueId uniqueId, + QInputDevice::Capabilities capabilities = QInputDevice::Capability::None, qint64 systemId = 0); + + static const QPointingDevice *pointingDeviceById(qint64 systemId); }; QT_END_NAMESPACE |