2022-05-10 10:06:48 +00:00
|
|
|
// Copyright (C) 2016 The Qt Company Ltd.
|
|
|
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
2011-04-27 10:05:43 +00:00
|
|
|
|
2020-07-06 14:37:47 +00:00
|
|
|
#include <QAction>
|
2011-04-27 10:05:43 +00:00
|
|
|
#include <QApplication>
|
2020-07-06 14:37:47 +00:00
|
|
|
#include <QCursor>
|
2011-04-27 10:05:43 +00:00
|
|
|
#include <QDebug>
|
2020-10-15 12:37:26 +00:00
|
|
|
#include <QDialog>
|
|
|
|
#include <QDialogButtonBox>
|
2020-07-06 14:37:47 +00:00
|
|
|
#include <QList>
|
2013-06-20 12:25:00 +00:00
|
|
|
#include <QMainWindow>
|
|
|
|
#include <QMenu>
|
2020-07-06 14:37:47 +00:00
|
|
|
#include <QMenuBar>
|
|
|
|
#include <QMouseEvent>
|
2013-06-20 12:25:00 +00:00
|
|
|
#include <QPainter>
|
2020-04-01 08:03:24 +00:00
|
|
|
#include <QPainterPath>
|
2020-10-15 12:37:26 +00:00
|
|
|
#include <QPlainTextEdit>
|
|
|
|
#include <QPointingDevice>
|
|
|
|
#include <QPointer>
|
|
|
|
#include <QPushButton>
|
2020-07-06 14:37:47 +00:00
|
|
|
#include <QStatusBar>
|
|
|
|
#include <QTabletEvent>
|
2020-10-15 12:37:26 +00:00
|
|
|
#include <QVBoxLayout>
|
2013-06-20 12:25:00 +00:00
|
|
|
|
2020-09-27 09:30:43 +00:00
|
|
|
#ifdef Q_OS_WIN
|
|
|
|
# include <QtGui/private/qguiapplication_p.h>
|
|
|
|
# include <QtGui/qpa/qplatformintegration.h>
|
|
|
|
#endif
|
|
|
|
|
2013-06-20 12:25:00 +00:00
|
|
|
enum TabletPointType {
|
|
|
|
TabletButtonPress,
|
|
|
|
TabletButtonRelease,
|
2014-06-06 07:43:00 +00:00
|
|
|
TabletMove
|
2013-06-20 12:25:00 +00:00
|
|
|
};
|
|
|
|
|
2020-09-27 09:30:43 +00:00
|
|
|
#ifdef Q_OS_WIN
|
2020-10-07 10:11:46 +00:00
|
|
|
using QWindowsApplication = QNativeInterface::Private::QWindowsApplication;
|
2020-09-27 09:30:43 +00:00
|
|
|
|
|
|
|
static void setWinTabEnabled(bool e)
|
|
|
|
{
|
|
|
|
if (auto nativeWindowsApp = dynamic_cast<QWindowsApplication *>(QGuiApplicationPrivate::platformIntegration()))
|
|
|
|
nativeWindowsApp->setWinTabEnabled(e);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool isWinTabEnabled()
|
|
|
|
{
|
|
|
|
auto nativeWindowsApp = dynamic_cast<QWindowsApplication *>(QGuiApplicationPrivate::platformIntegration());
|
|
|
|
return nativeWindowsApp && nativeWindowsApp->isWinTabEnabled();
|
|
|
|
}
|
|
|
|
#endif // Q_OS_WIN
|
|
|
|
|
2013-06-20 12:25:00 +00:00
|
|
|
struct TabletPoint
|
|
|
|
{
|
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>
2019-05-31 06:38:16 +00:00
|
|
|
TabletPoint(const QPointF &p = QPointF(), TabletPointType t = TabletMove, Qt::MouseButton b = Qt::LeftButton,
|
|
|
|
QPointingDevice::PointerType pt = QPointingDevice::PointerType::Unknown, qreal prs = 0, qreal rotation = 0) :
|
2014-08-15 11:09:18 +00:00
|
|
|
pos(p), type(t), button(b), ptype(pt), pressure(prs), angle(rotation) {}
|
2013-06-20 12:25:00 +00:00
|
|
|
|
2014-06-06 07:43:00 +00:00
|
|
|
QPointF pos;
|
2013-06-20 12:25:00 +00:00
|
|
|
TabletPointType type;
|
2014-06-06 07:43:00 +00:00
|
|
|
Qt::MouseButton button;
|
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>
2019-05-31 06:38:16 +00:00
|
|
|
QPointingDevice::PointerType ptype;
|
2014-06-06 07:43:00 +00:00
|
|
|
qreal pressure;
|
2014-08-15 11:09:18 +00:00
|
|
|
qreal angle;
|
2013-06-20 12:25:00 +00:00
|
|
|
};
|
2011-04-27 10:05:43 +00:00
|
|
|
|
2017-10-16 13:24:00 +00:00
|
|
|
class ProximityEventFilter : public QObject
|
|
|
|
{
|
2018-03-12 16:09:18 +00:00
|
|
|
Q_OBJECT
|
2017-10-16 13:24:00 +00:00
|
|
|
public:
|
|
|
|
explicit ProximityEventFilter(QObject *parent) : QObject(parent) { }
|
|
|
|
|
2018-03-12 16:09:18 +00:00
|
|
|
bool eventFilter(QObject *, QEvent *event) override;
|
|
|
|
|
|
|
|
static bool tabletPenProximity() { return m_tabletPenProximity; }
|
|
|
|
|
|
|
|
signals:
|
|
|
|
void proximityChanged();
|
|
|
|
|
|
|
|
private:
|
|
|
|
static bool m_tabletPenProximity;
|
2017-10-16 13:24:00 +00:00
|
|
|
};
|
|
|
|
|
2018-03-12 16:09:18 +00:00
|
|
|
bool ProximityEventFilter::eventFilter(QObject *, QEvent *event)
|
|
|
|
{
|
|
|
|
switch (event->type()) {
|
|
|
|
case QEvent::TabletEnterProximity:
|
|
|
|
case QEvent::TabletLeaveProximity:
|
|
|
|
ProximityEventFilter::m_tabletPenProximity = event->type() == QEvent::TabletEnterProximity;
|
|
|
|
emit proximityChanged();
|
|
|
|
qDebug() << event;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool ProximityEventFilter::m_tabletPenProximity = false;
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
class EventReportWidget : public QWidget
|
|
|
|
{
|
2013-06-20 12:25:00 +00:00
|
|
|
Q_OBJECT
|
2011-04-27 10:05:43 +00:00
|
|
|
public:
|
|
|
|
EventReportWidget();
|
2013-06-20 12:25:00 +00:00
|
|
|
|
|
|
|
public slots:
|
|
|
|
void clearPoints() { m_points.clear(); update(); }
|
|
|
|
|
2015-08-10 12:43:59 +00:00
|
|
|
signals:
|
2017-10-16 13:23:05 +00:00
|
|
|
void stats(QString s, int timeOut = 0);
|
2015-08-10 12:43:59 +00:00
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
protected:
|
2017-10-16 13:23:05 +00:00
|
|
|
void mouseDoubleClickEvent(QMouseEvent *event) override { outputMouseEvent(event); }
|
|
|
|
void mouseMoveEvent(QMouseEvent *event) override { outputMouseEvent(event); }
|
|
|
|
void mousePressEvent(QMouseEvent *event) override { outputMouseEvent(event); }
|
|
|
|
void mouseReleaseEvent(QMouseEvent *event) override { outputMouseEvent(event); }
|
2011-04-27 10:05:43 +00:00
|
|
|
|
2017-10-16 13:23:05 +00:00
|
|
|
void tabletEvent(QTabletEvent *) override;
|
2011-04-27 10:05:43 +00:00
|
|
|
|
2017-10-24 08:37:17 +00:00
|
|
|
bool event(QEvent *event) override;
|
2017-05-29 08:37:33 +00:00
|
|
|
|
2017-10-16 13:23:05 +00:00
|
|
|
void paintEvent(QPaintEvent *) override;
|
|
|
|
void timerEvent(QTimerEvent *) override;
|
2013-06-20 12:25:00 +00:00
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
private:
|
|
|
|
void outputMouseEvent(QMouseEvent *event);
|
|
|
|
|
2017-10-16 13:23:05 +00:00
|
|
|
bool m_lastIsMouseMove = false;
|
|
|
|
bool m_lastIsTabletMove = false;
|
|
|
|
Qt::MouseButton m_lastButton = Qt::NoButton;
|
2020-07-06 14:37:47 +00:00
|
|
|
QList<TabletPoint> m_points;
|
|
|
|
QList<QPointF> m_touchPoints;
|
2018-03-12 16:09:18 +00:00
|
|
|
QPointF m_tabletPos;
|
2017-10-16 13:23:05 +00:00
|
|
|
int m_tabletMoveCount = 0;
|
|
|
|
int m_paintEventCount = 0;
|
2011-04-27 10:05:43 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
EventReportWidget::EventReportWidget()
|
2015-08-10 12:43:59 +00:00
|
|
|
{
|
2017-05-29 08:37:33 +00:00
|
|
|
setAttribute(Qt::WA_AcceptTouchEvents);
|
2015-08-10 12:43:59 +00:00
|
|
|
startTimer(1000);
|
|
|
|
}
|
2011-04-27 10:05:43 +00:00
|
|
|
|
2013-06-20 12:25:00 +00:00
|
|
|
void EventReportWidget::paintEvent(QPaintEvent *)
|
|
|
|
{
|
|
|
|
QPainter p(this);
|
2015-03-06 15:05:20 +00:00
|
|
|
int lineSpacing = fontMetrics().lineSpacing();
|
|
|
|
int halfLineSpacing = lineSpacing / 2;
|
2014-06-06 07:43:00 +00:00
|
|
|
const QRectF geom = QRectF(QPoint(0, 0), size());
|
2013-06-20 12:25:00 +00:00
|
|
|
p.fillRect(geom, Qt::white);
|
2014-06-06 07:43:00 +00:00
|
|
|
p.drawRect(QRectF(geom.topLeft(), geom.bottomRight() - QPointF(1,1)));
|
|
|
|
p.setPen(Qt::white);
|
2014-08-15 11:09:18 +00:00
|
|
|
QPainterPath ellipse;
|
2015-03-06 15:05:20 +00:00
|
|
|
ellipse.addEllipse(0, 0, halfLineSpacing * 5, halfLineSpacing);
|
2017-10-16 13:23:05 +00:00
|
|
|
for (const TabletPoint &t : qAsConst(m_points)) {
|
2013-06-20 12:25:00 +00:00
|
|
|
if (geom.contains(t.pos)) {
|
|
|
|
QPainterPath pp;
|
2015-03-06 15:05:20 +00:00
|
|
|
pp.addEllipse(t.pos, halfLineSpacing, halfLineSpacing);
|
|
|
|
QRectF pointBounds(t.pos.x() - halfLineSpacing, t.pos.y() - halfLineSpacing, lineSpacing, lineSpacing);
|
2013-06-20 12:25:00 +00:00
|
|
|
switch (t.type) {
|
|
|
|
case TabletButtonPress:
|
2014-06-06 07:43:00 +00:00
|
|
|
p.fillPath(pp, Qt::darkGreen);
|
|
|
|
if (t.button != Qt::NoButton)
|
|
|
|
p.drawText(pointBounds, Qt::AlignCenter, QString::number(t.button));
|
2013-06-20 12:25:00 +00:00
|
|
|
break;
|
|
|
|
case TabletButtonRelease:
|
|
|
|
p.fillPath(pp, Qt::red);
|
2014-06-06 07:43:00 +00:00
|
|
|
if (t.button != Qt::NoButton)
|
|
|
|
p.drawText(pointBounds, Qt::AlignCenter, QString::number(t.button));
|
2013-06-20 12:25:00 +00:00
|
|
|
break;
|
|
|
|
case TabletMove:
|
2014-06-06 07:43:00 +00:00
|
|
|
if (t.pressure > 0.0) {
|
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>
2019-05-31 06:38:16 +00:00
|
|
|
p.setPen(t.ptype == QPointingDevice::PointerType::Eraser ? Qt::red : Qt::black);
|
2014-08-15 11:09:18 +00:00
|
|
|
if (t.angle != 0.0) {
|
|
|
|
p.save();
|
|
|
|
p.translate(t.pos);
|
|
|
|
p.scale(t.pressure, t.pressure);
|
|
|
|
p.rotate(t.angle);
|
|
|
|
p.drawPath(ellipse);
|
|
|
|
p.restore();
|
|
|
|
} else {
|
2015-03-06 15:05:20 +00:00
|
|
|
p.drawEllipse(t.pos, t.pressure * halfLineSpacing, t.pressure * halfLineSpacing);
|
2014-08-15 11:09:18 +00:00
|
|
|
}
|
2014-06-06 07:43:00 +00:00
|
|
|
p.setPen(Qt::white);
|
|
|
|
} else {
|
|
|
|
p.fillRect(t.pos.x() - 2, t.pos.y() - 2, 4, 4, Qt::black);
|
|
|
|
}
|
2013-06-20 12:25:00 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-03-12 16:09:18 +00:00
|
|
|
|
|
|
|
// Draw haircross when tablet pen is in proximity
|
|
|
|
if (ProximityEventFilter::tabletPenProximity() && geom.contains(m_tabletPos)) {
|
|
|
|
p.setPen(Qt::black);
|
|
|
|
p.drawLine(QPointF(0, m_tabletPos.y()), QPointF(geom.width(), m_tabletPos.y()));
|
|
|
|
p.drawLine(QPointF(m_tabletPos.x(), 0), QPointF(m_tabletPos.x(), geom.height()));
|
|
|
|
}
|
2017-05-29 08:37:33 +00:00
|
|
|
p.setPen(Qt::blue);
|
|
|
|
for (QPointF t : m_touchPoints) {
|
|
|
|
p.drawLine(t.x() - 40, t.y(), t.x() + 40, t.y());
|
|
|
|
p.drawLine(t.x(), t.y() - 40, t.x(), t.y() + 40);
|
|
|
|
}
|
2015-08-10 12:43:59 +00:00
|
|
|
++m_paintEventCount;
|
2013-06-20 12:25:00 +00:00
|
|
|
}
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
void EventReportWidget::tabletEvent(QTabletEvent *event)
|
|
|
|
{
|
2014-06-06 07:43:00 +00:00
|
|
|
QWidget::tabletEvent(event);
|
2015-02-27 13:56:55 +00:00
|
|
|
bool isMove = false;
|
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>
2019-05-31 06:38:16 +00:00
|
|
|
m_tabletPos = event->position();
|
2011-04-27 10:05:43 +00:00
|
|
|
switch (event->type()) {
|
|
|
|
case QEvent::TabletMove:
|
2018-03-12 16:09:18 +00:00
|
|
|
m_points.push_back(TabletPoint(m_tabletPos, TabletMove, m_lastButton, event->pointerType(), event->pressure(), event->rotation()));
|
2013-06-20 12:25:00 +00:00
|
|
|
update();
|
2015-02-27 13:56:55 +00:00
|
|
|
isMove = true;
|
2015-08-10 12:43:59 +00:00
|
|
|
++m_tabletMoveCount;
|
2011-04-27 10:05:43 +00:00
|
|
|
break;
|
|
|
|
case QEvent::TabletPress:
|
2018-03-12 16:09:18 +00:00
|
|
|
m_points.push_back(TabletPoint(m_tabletPos, TabletButtonPress, event->button(), event->pointerType(), event->rotation()));
|
2014-06-06 07:43:00 +00:00
|
|
|
m_lastButton = event->button();
|
2013-06-20 12:25:00 +00:00
|
|
|
update();
|
2011-04-27 10:05:43 +00:00
|
|
|
break;
|
|
|
|
case QEvent::TabletRelease:
|
2018-03-12 16:09:18 +00:00
|
|
|
m_points.push_back(TabletPoint(m_tabletPos, TabletButtonRelease, event->button(), event->pointerType(), event->rotation()));
|
2013-06-20 12:25:00 +00:00
|
|
|
update();
|
2011-04-27 10:05:43 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
Q_ASSERT(false);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2015-02-27 13:56:55 +00:00
|
|
|
if (!(isMove && m_lastIsTabletMove)) {
|
|
|
|
QDebug d = qDebug();
|
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>
2019-05-31 06:38:16 +00:00
|
|
|
d << event << " global position = " << event->globalPosition()
|
2015-02-27 13:56:55 +00:00
|
|
|
<< " cursor at " << QCursor::pos();
|
|
|
|
if (event->button() != Qt::NoButton)
|
|
|
|
d << " changed button " << event->button();
|
2014-06-06 07:43:00 +00:00
|
|
|
}
|
2015-02-27 13:56:55 +00:00
|
|
|
m_lastIsTabletMove = isMove;
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
2017-05-29 08:37:33 +00:00
|
|
|
bool EventReportWidget::event(QEvent *event)
|
|
|
|
{
|
|
|
|
switch (event->type()) {
|
|
|
|
case QEvent::TouchBegin:
|
|
|
|
case QEvent::TouchUpdate:
|
|
|
|
event->accept();
|
|
|
|
m_touchPoints.clear();
|
2020-07-07 06:19:12 +00:00
|
|
|
for (const QEventPoint &p : static_cast<const QPointerEvent *>(event)->points())
|
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>
2019-05-31 06:38:16 +00:00
|
|
|
m_touchPoints.append(p.position());
|
2017-05-29 08:37:33 +00:00
|
|
|
update();
|
|
|
|
break;
|
|
|
|
case QEvent::TouchEnd:
|
|
|
|
m_touchPoints.clear();
|
|
|
|
update();
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return QWidget::event(event);
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
void EventReportWidget::outputMouseEvent(QMouseEvent *event)
|
|
|
|
{
|
2015-02-27 13:56:55 +00:00
|
|
|
if (event->type() == QEvent::MouseMove) {
|
2011-04-27 10:05:43 +00:00
|
|
|
if (m_lastIsMouseMove)
|
|
|
|
return; // only show one move to keep things readable
|
|
|
|
m_lastIsMouseMove = true;
|
|
|
|
}
|
2015-02-27 13:56:55 +00:00
|
|
|
qDebug() << event;
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
2015-08-10 12:43:59 +00:00
|
|
|
void EventReportWidget::timerEvent(QTimerEvent *)
|
|
|
|
{
|
|
|
|
emit stats(QString("%1 moves/sec, %2 frames/sec").arg(m_tabletMoveCount).arg(m_paintEventCount));
|
|
|
|
m_tabletMoveCount = 0;
|
|
|
|
m_paintEventCount = 0;
|
|
|
|
}
|
|
|
|
|
2020-10-15 12:37:26 +00:00
|
|
|
class DevicesDialog : public QDialog
|
|
|
|
{
|
|
|
|
Q_OBJECT
|
|
|
|
public:
|
|
|
|
explicit DevicesDialog(QWidget *p);
|
|
|
|
|
|
|
|
public slots:
|
|
|
|
void refresh();
|
|
|
|
|
|
|
|
private:
|
|
|
|
QPlainTextEdit *m_edit;
|
|
|
|
};
|
|
|
|
|
|
|
|
DevicesDialog::DevicesDialog(QWidget *p) : QDialog(p)
|
|
|
|
{
|
|
|
|
auto layout = new QVBoxLayout(this);
|
|
|
|
m_edit = new QPlainTextEdit(this);
|
|
|
|
m_edit->setReadOnly(true);
|
|
|
|
layout->addWidget(m_edit);
|
|
|
|
auto box = new QDialogButtonBox(QDialogButtonBox::Close, this);
|
|
|
|
connect(box, &QDialogButtonBox::rejected, this, &QDialog::reject);
|
|
|
|
auto refreshButton = box->addButton("Refresh", QDialogButtonBox::ActionRole);
|
|
|
|
connect(refreshButton, &QAbstractButton::clicked, this, &DevicesDialog::refresh);
|
|
|
|
layout->addWidget(box);
|
|
|
|
setWindowTitle("Devices");
|
|
|
|
refresh();
|
|
|
|
}
|
|
|
|
|
|
|
|
void DevicesDialog::refresh()
|
|
|
|
{
|
|
|
|
QString text;
|
|
|
|
QDebug d(&text);
|
|
|
|
d.noquote();
|
|
|
|
d.nospace();
|
|
|
|
for (auto device : QInputDevice::devices())
|
|
|
|
d << device<< "\n\n";
|
|
|
|
m_edit->setPlainText(text);
|
|
|
|
}
|
|
|
|
|
2020-09-27 09:30:43 +00:00
|
|
|
class MainWindow : public QMainWindow
|
2011-04-27 10:05:43 +00:00
|
|
|
{
|
2020-10-15 12:37:26 +00:00
|
|
|
Q_OBJECT
|
2020-09-27 09:30:43 +00:00
|
|
|
public:
|
|
|
|
explicit MainWindow(ProximityEventFilter *proximityEventFilter);
|
2020-10-15 12:37:26 +00:00
|
|
|
|
|
|
|
public slots:
|
|
|
|
void showDevices();
|
|
|
|
|
|
|
|
private:
|
|
|
|
QPointer<DevicesDialog> m_devicesDialog;
|
2020-09-27 09:30:43 +00:00
|
|
|
};
|
2018-03-12 16:09:18 +00:00
|
|
|
|
2020-09-27 09:30:43 +00:00
|
|
|
MainWindow::MainWindow(ProximityEventFilter *proximityEventFilter)
|
|
|
|
{
|
|
|
|
setWindowTitle(QString::fromLatin1("Tablet Test %1").arg(QT_VERSION_STR));
|
|
|
|
auto widget = new EventReportWidget;
|
2018-03-12 16:09:18 +00:00
|
|
|
QObject::connect(proximityEventFilter, &ProximityEventFilter::proximityChanged,
|
2019-03-06 11:28:51 +00:00
|
|
|
widget, QOverload<>::of(&QWidget::update));
|
2013-06-20 12:25:00 +00:00
|
|
|
widget->setMinimumSize(640, 480);
|
2020-09-27 09:30:43 +00:00
|
|
|
auto fileMenu = menuBar()->addMenu("File");
|
2017-10-16 13:23:05 +00:00
|
|
|
fileMenu->addAction("Clear", widget, &EventReportWidget::clearPoints);
|
2020-10-15 12:37:26 +00:00
|
|
|
auto showAction = fileMenu->addAction("Show Devices", this, &MainWindow::showDevices);
|
|
|
|
showAction->setShortcut(Qt::CTRL | Qt::Key_D);
|
2017-10-16 13:23:05 +00:00
|
|
|
QObject::connect(widget, &EventReportWidget::stats,
|
2020-09-27 09:30:43 +00:00
|
|
|
statusBar(), &QStatusBar::showMessage);
|
2017-10-16 13:23:05 +00:00
|
|
|
QAction *quitAction = fileMenu->addAction("Quit", qApp, &QCoreApplication::quit);
|
2020-09-25 07:49:47 +00:00
|
|
|
quitAction->setShortcut(Qt::CTRL | Qt::Key_Q);
|
2020-09-27 09:30:43 +00:00
|
|
|
|
|
|
|
auto settingsMenu = menuBar()->addMenu("Settings");
|
|
|
|
auto winTabAction = settingsMenu->addAction("WinTab");
|
|
|
|
winTabAction->setCheckable(true);
|
|
|
|
#ifdef Q_OS_WIN
|
|
|
|
winTabAction->setChecked(isWinTabEnabled());
|
|
|
|
connect(winTabAction, &QAction::toggled, this, setWinTabEnabled);
|
|
|
|
#else
|
|
|
|
winTabAction->setEnabled(false);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
setCentralWidget(widget);
|
|
|
|
}
|
|
|
|
|
2020-10-15 12:37:26 +00:00
|
|
|
void MainWindow::showDevices()
|
|
|
|
{
|
|
|
|
if (m_devicesDialog.isNull()) {
|
|
|
|
m_devicesDialog = new DevicesDialog(nullptr);
|
|
|
|
m_devicesDialog->setModal(false);
|
|
|
|
m_devicesDialog->resize(500, 300);
|
|
|
|
m_devicesDialog->move(frameGeometry().topRight() + QPoint(20, 0));
|
|
|
|
m_devicesDialog->setAttribute(Qt::WA_DeleteOnClose);
|
|
|
|
}
|
|
|
|
m_devicesDialog->show();
|
|
|
|
m_devicesDialog->raise();
|
|
|
|
m_devicesDialog->refresh();
|
|
|
|
}
|
|
|
|
|
2020-09-27 09:30:43 +00:00
|
|
|
int main(int argc, char *argv[])
|
|
|
|
{
|
|
|
|
QApplication app(argc, argv);
|
|
|
|
|
|
|
|
ProximityEventFilter *proximityEventFilter = new ProximityEventFilter(&app);
|
|
|
|
app.installEventFilter(proximityEventFilter);
|
|
|
|
MainWindow mainWindow(proximityEventFilter);
|
2013-06-20 12:25:00 +00:00
|
|
|
mainWindow.show();
|
2011-04-27 10:05:43 +00:00
|
|
|
return app.exec();
|
|
|
|
}
|
2013-06-20 12:25:00 +00:00
|
|
|
|
|
|
|
#include "main.moc"
|