6589f2ed0c
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>
302 lines
10 KiB
C++
302 lines
10 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the test suite of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
|
|
** 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 General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** 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-3.0.html.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <QApplication>
|
|
#include <QDebug>
|
|
#include <QMouseEvent>
|
|
#include <QTabletEvent>
|
|
#include <QMainWindow>
|
|
#include <QMenuBar>
|
|
#include <QMenu>
|
|
#include <QAction>
|
|
#include <QStatusBar>
|
|
#include <QVector>
|
|
#include <QPainter>
|
|
#include <QPainterPath>
|
|
#include <QCursor>
|
|
|
|
enum TabletPointType {
|
|
TabletButtonPress,
|
|
TabletButtonRelease,
|
|
TabletMove
|
|
};
|
|
|
|
struct TabletPoint
|
|
{
|
|
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) :
|
|
pos(p), type(t), button(b), ptype(pt), pressure(prs), angle(rotation) {}
|
|
|
|
QPointF pos;
|
|
TabletPointType type;
|
|
Qt::MouseButton button;
|
|
QPointingDevice::PointerType ptype;
|
|
qreal pressure;
|
|
qreal angle;
|
|
};
|
|
|
|
class ProximityEventFilter : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit ProximityEventFilter(QObject *parent) : QObject(parent) { }
|
|
|
|
bool eventFilter(QObject *, QEvent *event) override;
|
|
|
|
static bool tabletPenProximity() { return m_tabletPenProximity; }
|
|
|
|
signals:
|
|
void proximityChanged();
|
|
|
|
private:
|
|
static bool m_tabletPenProximity;
|
|
};
|
|
|
|
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;
|
|
|
|
class EventReportWidget : public QWidget
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
EventReportWidget();
|
|
|
|
public slots:
|
|
void clearPoints() { m_points.clear(); update(); }
|
|
|
|
signals:
|
|
void stats(QString s, int timeOut = 0);
|
|
|
|
protected:
|
|
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); }
|
|
|
|
void tabletEvent(QTabletEvent *) override;
|
|
|
|
bool event(QEvent *event) override;
|
|
|
|
void paintEvent(QPaintEvent *) override;
|
|
void timerEvent(QTimerEvent *) override;
|
|
|
|
private:
|
|
void outputMouseEvent(QMouseEvent *event);
|
|
|
|
bool m_lastIsMouseMove = false;
|
|
bool m_lastIsTabletMove = false;
|
|
Qt::MouseButton m_lastButton = Qt::NoButton;
|
|
QVector<TabletPoint> m_points;
|
|
QVector<QPointF> m_touchPoints;
|
|
QPointF m_tabletPos;
|
|
int m_tabletMoveCount = 0;
|
|
int m_paintEventCount = 0;
|
|
};
|
|
|
|
EventReportWidget::EventReportWidget()
|
|
{
|
|
setAttribute(Qt::WA_AcceptTouchEvents);
|
|
startTimer(1000);
|
|
}
|
|
|
|
void EventReportWidget::paintEvent(QPaintEvent *)
|
|
{
|
|
QPainter p(this);
|
|
int lineSpacing = fontMetrics().lineSpacing();
|
|
int halfLineSpacing = lineSpacing / 2;
|
|
const QRectF geom = QRectF(QPoint(0, 0), size());
|
|
p.fillRect(geom, Qt::white);
|
|
p.drawRect(QRectF(geom.topLeft(), geom.bottomRight() - QPointF(1,1)));
|
|
p.setPen(Qt::white);
|
|
QPainterPath ellipse;
|
|
ellipse.addEllipse(0, 0, halfLineSpacing * 5, halfLineSpacing);
|
|
for (const TabletPoint &t : qAsConst(m_points)) {
|
|
if (geom.contains(t.pos)) {
|
|
QPainterPath pp;
|
|
pp.addEllipse(t.pos, halfLineSpacing, halfLineSpacing);
|
|
QRectF pointBounds(t.pos.x() - halfLineSpacing, t.pos.y() - halfLineSpacing, lineSpacing, lineSpacing);
|
|
switch (t.type) {
|
|
case TabletButtonPress:
|
|
p.fillPath(pp, Qt::darkGreen);
|
|
if (t.button != Qt::NoButton)
|
|
p.drawText(pointBounds, Qt::AlignCenter, QString::number(t.button));
|
|
break;
|
|
case TabletButtonRelease:
|
|
p.fillPath(pp, Qt::red);
|
|
if (t.button != Qt::NoButton)
|
|
p.drawText(pointBounds, Qt::AlignCenter, QString::number(t.button));
|
|
break;
|
|
case TabletMove:
|
|
if (t.pressure > 0.0) {
|
|
p.setPen(t.ptype == QPointingDevice::PointerType::Eraser ? Qt::red : Qt::black);
|
|
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 {
|
|
p.drawEllipse(t.pos, t.pressure * halfLineSpacing, t.pressure * halfLineSpacing);
|
|
}
|
|
p.setPen(Qt::white);
|
|
} else {
|
|
p.fillRect(t.pos.x() - 2, t.pos.y() - 2, 4, 4, Qt::black);
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
// 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()));
|
|
}
|
|
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);
|
|
}
|
|
++m_paintEventCount;
|
|
}
|
|
|
|
void EventReportWidget::tabletEvent(QTabletEvent *event)
|
|
{
|
|
QWidget::tabletEvent(event);
|
|
bool isMove = false;
|
|
m_tabletPos = event->position();
|
|
switch (event->type()) {
|
|
case QEvent::TabletMove:
|
|
m_points.push_back(TabletPoint(m_tabletPos, TabletMove, m_lastButton, event->pointerType(), event->pressure(), event->rotation()));
|
|
update();
|
|
isMove = true;
|
|
++m_tabletMoveCount;
|
|
break;
|
|
case QEvent::TabletPress:
|
|
m_points.push_back(TabletPoint(m_tabletPos, TabletButtonPress, event->button(), event->pointerType(), event->rotation()));
|
|
m_lastButton = event->button();
|
|
update();
|
|
break;
|
|
case QEvent::TabletRelease:
|
|
m_points.push_back(TabletPoint(m_tabletPos, TabletButtonRelease, event->button(), event->pointerType(), event->rotation()));
|
|
update();
|
|
break;
|
|
default:
|
|
Q_ASSERT(false);
|
|
break;
|
|
}
|
|
|
|
if (!(isMove && m_lastIsTabletMove)) {
|
|
QDebug d = qDebug();
|
|
d << event << " global position = " << event->globalPosition()
|
|
<< " cursor at " << QCursor::pos();
|
|
if (event->button() != Qt::NoButton)
|
|
d << " changed button " << event->button();
|
|
}
|
|
m_lastIsTabletMove = isMove;
|
|
}
|
|
|
|
bool EventReportWidget::event(QEvent *event)
|
|
{
|
|
switch (event->type()) {
|
|
case QEvent::TouchBegin:
|
|
case QEvent::TouchUpdate:
|
|
event->accept();
|
|
m_touchPoints.clear();
|
|
for (const QTouchEvent::TouchPoint &p : static_cast<const QTouchEvent *>(event)->touchPoints())
|
|
m_touchPoints.append(p.position());
|
|
update();
|
|
break;
|
|
case QEvent::TouchEnd:
|
|
m_touchPoints.clear();
|
|
update();
|
|
break;
|
|
default:
|
|
return QWidget::event(event);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void EventReportWidget::outputMouseEvent(QMouseEvent *event)
|
|
{
|
|
if (event->type() == QEvent::MouseMove) {
|
|
if (m_lastIsMouseMove)
|
|
return; // only show one move to keep things readable
|
|
m_lastIsMouseMove = true;
|
|
}
|
|
qDebug() << event;
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
QApplication app(argc, argv);
|
|
|
|
ProximityEventFilter *proximityEventFilter = new ProximityEventFilter(&app);
|
|
app.installEventFilter(proximityEventFilter);
|
|
QMainWindow mainWindow;
|
|
mainWindow.setWindowTitle(QString::fromLatin1("Tablet Test %1").arg(QT_VERSION_STR));
|
|
EventReportWidget *widget = new EventReportWidget;
|
|
QObject::connect(proximityEventFilter, &ProximityEventFilter::proximityChanged,
|
|
widget, QOverload<>::of(&QWidget::update));
|
|
widget->setMinimumSize(640, 480);
|
|
QMenu *fileMenu = mainWindow.menuBar()->addMenu("File");
|
|
fileMenu->addAction("Clear", widget, &EventReportWidget::clearPoints);
|
|
QObject::connect(widget, &EventReportWidget::stats,
|
|
mainWindow.statusBar(), &QStatusBar::showMessage);
|
|
QAction *quitAction = fileMenu->addAction("Quit", qApp, &QCoreApplication::quit);
|
|
quitAction->setShortcut(Qt::CTRL + Qt::Key_Q);
|
|
mainWindow.setCentralWidget(widget);
|
|
mainWindow.show();
|
|
return app.exec();
|
|
}
|
|
|
|
#include "main.moc"
|