diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-05-31 08:38:16 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-06-16 22:06:56 +0200 |
commit | 6589f2ed0cf78c9b8a5bdffcdc458dc40a974c60 (patch) | |
tree | 61f29061a4cbaf925ef0ab7ba9fafc1db9ee4ef3 /src/gui/kernel/qtouchdevice.h | |
parent | 0a2e3ce85ce788b8a07380a458faf4ed3817d0c0 (diff) | |
download | qtbase-6589f2ed0cf78c9b8a5bdffcdc458dc40a974c60.tar.gz |
Introduce QInputDevice hierarchy; replace QTouchDevice
We have seen during the Qt 5 series that QMouseEvent::source() does
not provide enough information: if it is synthesized, it could have
come from any device for which mouse events are synthesized, not only
from a touchscreen. By providing in every QInputEvent as complete
information about the actual source device as possible, we will enable
very fine-tuned behavior in the object that handles each event.
Further, we would like to support multiple keyboards, pointing devices,
and named groups of devices that are known as "seats" in Wayland.
In Qt 5, QPA plugins registered each touchscreen as it was discovered.
Now we extend this pattern to all input devices. This new requirement
can be implemented gradually; for now, if a QTWSI input event is
received wtihout a device pointer, a default "core" device will be
created on-the-fly, and a warning emitted.
In Qt 5, QTouchEvent::TouchPoint::id() was forced to be unique even when
multiple devices were in use simultaneously. Now that each event
identifies the device it came from, this hack is no longer needed.
A stub of the new QPointerEvent is added; it will be developed further
in subsequent patches.
[ChangeLog][QtGui][QInputEvent] Every QInputEvent now carries a pointer
to an instance of QInputDevice, or the subclass QPointingDevice in case
of mouse, touch and tablet events. Each platform plugin is expected to
create the device instances, register them, and provide valid pointers
with all input events. If this is not done, warnings are emitted and
default devices are created as necessary. When the device has accurate
information, it provides the opportunity to fine-tune behavior depending
on device type and capabilities: for example if a QMouseEvent is
synthesized from a touchscreen, the recipient can see which touchscreen
it came from. Each device also has a seatName to distinguish users on
multi-user windowing systems. Touchpoint IDs are no longer unique on
their own, but the combination of ID and device is.
Fixes: QTBUG-46412
Fixes: QTBUG-72167
Task-number: QTBUG-69433
Task-number: QTBUG-52430
Change-Id: I933fb2b86182efa722037b7a33e404c5daf5292a
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/gui/kernel/qtouchdevice.h')
-rw-r--r-- | src/gui/kernel/qtouchdevice.h | 101 |
1 files changed, 0 insertions, 101 deletions
diff --git a/src/gui/kernel/qtouchdevice.h b/src/gui/kernel/qtouchdevice.h deleted file mode 100644 index c98aa69236..0000000000 --- a/src/gui/kernel/qtouchdevice.h +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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$ -** -****************************************************************************/ - -#ifndef QTOUCHDEVICE_H -#define QTOUCHDEVICE_H - -#include <QtGui/qtguiglobal.h> -#include <QtCore/qobject.h> - -QT_BEGIN_NAMESPACE - -class QDebug; -class QTouchDevicePrivate; - -class Q_GUI_EXPORT QTouchDevice -{ - Q_GADGET -public: - enum DeviceType { - TouchScreen, - TouchPad - }; - Q_ENUM(DeviceType) - - enum CapabilityFlag { - Position = 0x0001, - Area = 0x0002, - Pressure = 0x0004, - Velocity = 0x0008, - RawPositions = 0x0010, - NormalizedPosition = 0x0020, - MouseEmulation = 0x0040 - }; - Q_FLAG(CapabilityFlag) - Q_DECLARE_FLAGS(Capabilities, CapabilityFlag) - - QTouchDevice(); - ~QTouchDevice(); - - static QList<const QTouchDevice *> devices(); - - QString name() const; - DeviceType type() const; - Capabilities capabilities() const; - int maximumTouchPoints() const; - - void setName(const QString &name); - void setType(DeviceType devType); - void setCapabilities(Capabilities caps); - void setMaximumTouchPoints(int max); - -private: - QTouchDevicePrivate *d; - friend class QTouchDevicePrivate; -}; - -Q_DECLARE_OPERATORS_FOR_FLAGS(QTouchDevice::Capabilities) - -#ifndef QT_NO_DEBUG_STREAM -Q_GUI_EXPORT QDebug operator<<(QDebug, const QTouchDevice *); -#endif - -QT_END_NAMESPACE - -#endif // QTOUCHDEVICE_H |