From 3bf655e5960c8f0ac4cb8b99a671886b824c7191 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 10 Mar 2015 08:29:37 +0100 Subject: Support QCursor::setPos() properly for eglfs The internal state of the input handlers need updating too. This was not possible in the past due to the one way communication from the input handlers (that are potentially loaded as interface-less generic plugins), but using our new private QInputDeviceManager in QtGui we can now easily implement "talking back" from QtGui to the input handlers, regardless of them being plugins or compiled in. The rest of setPos() is in place already for eglfs. linuxfb will be handled in follow-up patches. Task-number: QTBUG-44856 Change-Id: Id72fdb8b1ea176ddfe082e466e7a538a2a98a005 Reviewed-by: Shawn Rutledge Reviewed-by: Andy Nichols --- .../input/evdevmouse/qevdevmousemanager.cpp | 35 +++++++++++++++------- .../input/evdevmouse/qevdevmousemanager_p.h | 3 ++ 2 files changed, 28 insertions(+), 10 deletions(-) (limited to 'src/platformsupport/input/evdevmouse') diff --git a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp index 6eb1fccba0..805397f021 100644 --- a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp +++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp @@ -92,6 +92,9 @@ QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specif connect(m_deviceDiscovery, SIGNAL(deviceRemoved(QString)), this, SLOT(removeMouse(QString))); } } + + connect(QGuiApplicationPrivate::inputDeviceManager(), SIGNAL(cursorPositionChangeRequested(QPoint)), + this, SLOT(handleCursorPositionChange(QPoint))); } QEvdevMouseManager::~QEvdevMouseManager() @@ -100,17 +103,8 @@ QEvdevMouseManager::~QEvdevMouseManager() m_mice.clear(); } -void QEvdevMouseManager::handleMouseEvent(int x, int y, bool abs, Qt::MouseButtons buttons) +void QEvdevMouseManager::clampPosition() { - // update current absolute coordinates - if (!abs) { - m_x += x; - m_y += y; - } else { - m_x = x; - m_y = y; - } - // clamp to screen geometry QRect g = QGuiApplication::primaryScreen()->virtualGeometry(); if (m_x + m_xoffset < g.left()) @@ -122,6 +116,20 @@ void QEvdevMouseManager::handleMouseEvent(int x, int y, bool abs, Qt::MouseButto m_y = g.top() - m_yoffset; else if (m_y + m_yoffset > g.bottom()) m_y = g.bottom() - m_yoffset; +} + +void QEvdevMouseManager::handleMouseEvent(int x, int y, bool abs, Qt::MouseButtons buttons) +{ + // update current absolute coordinates + if (!abs) { + m_x += x; + m_y += y; + } else { + m_x = x; + m_y = y; + } + + clampPosition(); QPoint pos(m_x + m_xoffset, m_y + m_yoffset); // Cannot track the keyboard modifiers ourselves here. Instead, report the @@ -163,4 +171,11 @@ void QEvdevMouseManager::removeMouse(const QString &deviceNode) } } +void QEvdevMouseManager::handleCursorPositionChange(const QPoint &pos) +{ + m_x = pos.x(); + m_y = pos.y(); + clampPosition(); +} + QT_END_NAMESPACE diff --git a/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h b/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h index 944effd80b..e1b24b807d 100644 --- a/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h +++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h @@ -69,8 +69,11 @@ public slots: private slots: void addMouse(const QString &deviceNode = QString()); void removeMouse(const QString &deviceNode); + void handleCursorPositionChange(const QPoint &pos); private: + void clampPosition(); + QString m_spec; QHash m_mice; QDeviceDiscovery *m_deviceDiscovery; -- cgit v1.2.3