@@ -19,7 +19,9 @@
1919
2020#include <QEvent>
2121#include <QGuiApplication>
22+#include <QQuickWindow>
2223#include <QScreen>
24+#include <QtMath>
2325#include <qpa/qplatformnativeinterface.h>
2426#include <qpa/qplatformscreen.h>
2527
@@ -31,6 +33,7 @@ InputDispatcherFilter *InputDispatcherFilter::instance()
3133
3234InputDispatcherFilter::InputDispatcherFilter(QObject *parent)
3335 : QObject(parent)
36+ , m_pushing(false)
3437{
3538 QPlatformNativeInterface *ni = QGuiApplication::platformNativeInterface();
3639 m_inputDispatcher = static_cast<QObject*>(ni->nativeResourceForIntegration("InputDispatcher"));
@@ -42,25 +45,12 @@ InputDispatcherFilter::InputDispatcherFilter(QObject *parent)
4245void InputDispatcherFilter::registerPointer(MousePointer *pointer)
4346{
4447 // allow first registered pointer to be visible.
45− pointer->setVisible(m_pointers.count() == 0);
46−
4748 m_pointers.insert(pointer);
48− connect(pointer, &MousePointer::mouseMoved, this, [this, pointer]() {
49− Q_FOREACH(auto p, m_pointers) {
50− p->setVisible(p == pointer);
51− }
52− });
5349}
5450
5551void InputDispatcherFilter::unregisterPointer(MousePointer *pointer)
5652{
5753 m_pointers.remove(pointer);
58− disconnect(pointer, &MousePointer::mouseMoved, this, 0);
59−}
60−
61−void InputDispatcherFilter::setPosition(const QPointF &pos)
62−{
63− mousePosition = pos;
6454}
6555
6656bool InputDispatcherFilter::eventFilter(QObject *o, QEvent *e)
@@ -72,35 +62,63 @@ bool InputDispatcherFilter::eventFilter(QObject *o, QEvent *e)
7262 case QEvent::MouseButtonPress:
7363 case QEvent::MouseButtonRelease:
7464 {
75− // FIXME - removed all input filtering for now - this was for extended display
76− return false;
77−
78−// QMouseEvent* me = static_cast<QMouseEvent*>(e);
79−
80−// // Local position gives relative change of mouse pointer.
81−// QPointF localPos = me->localPos();
82−// QPointF globalPos = me->screenPos();
83−
84−// // Adjust the position
85−// QPointF oldPos(mousePosition.isNull() ? globalPos : mousePosition);
86−// QPointF newPos = adjustedPositionForMovement(oldPos, localPos);
87−
88−// QScreen* currentScreen = screenAt(newPos);
89−// if (currentScreen) {
90−// QRect screenRect = currentScreen->geometry();
91−// qreal unadjustedX = (oldPos + localPos).x();
92−// if (unadjustedX < screenRect.left()) {
93−// Q_EMIT pushedLeftBoundary(currentScreen, qAbs(unadjustedX - screenRect.left()), me->buttons());
94−// } else if (unadjustedX > screenRect.right()) {
95−// Q_EMIT pushedRightBoundary(currentScreen, qAbs(unadjustedX - screenRect.right()), me->buttons());
96−// }
97−// }
98−
99−// // Send the event
100−// QMouseEvent eCopy(me->type(), me->localPos(), newPos, me->button(), me->buttons(), me->modifiers());
101−// eCopy.setTimestamp(me->timestamp());
102−// o->event(&eCopy);
103−// return true;
65+ // if we don't have any pointers, filter all mouse events.
66+ auto pointer = currentPointer();
67+ if (!pointer) return true;
68+
69+ QMouseEvent* me = static_cast<QMouseEvent*>(e);
70+
71+ // Local position gives relative change of mouse pointer.
72+ QPointF movement = me->localPos();
73+
74+ // Adjust the position
75+ QPointF oldPos = pointer->window()->geometry().topLeft() + pointer->position();
76+ QPointF newPos = adjustedPositionForMovement(oldPos, movement);
77+
78+ QScreen* currentScreen = screenAt(newPos);
79+ if (currentScreen) {
80+ QRect screenRect = currentScreen->geometry();
81+ qreal newX = (oldPos + movement).x();
82+ qreal newY = (oldPos + movement).y();
83+
84+ if (newX <= screenRect.left() && newY < screenRect.top() + pointer->topBoundaryOffset()) { // top left corner
85+ const auto distance = qSqrt(qPow(newX, 2) + qPow(newY- screenRect.top() - pointer->topBoundaryOffset(), 2));
86+ Q_EMIT pushedTopLeftCorner(currentScreen, qAbs(distance), me->buttons());
87+ m_pushing = true;
88+ } else if (newX >= screenRect.right()-1 && newY < screenRect.top() + pointer->topBoundaryOffset()) { // top right corner
89+ const auto distance = qSqrt(qPow(newX-screenRect.right(), 2) + qPow(newY - screenRect.top() - pointer->topBoundaryOffset(), 2));
90+ Q_EMIT pushedTopRightCorner(currentScreen, qAbs(distance), me->buttons());
91+ m_pushing = true;
92+ } else if (newX < 0 && newY >= screenRect.bottom()-1) { // bottom left corner
93+ const auto distance = qSqrt(qPow(newX, 2) + qPow(newY-screenRect.bottom(), 2));
94+ Q_EMIT pushedBottomLeftCorner(currentScreen, qAbs(distance), me->buttons());
95+ m_pushing = true;
96+ } else if (newX >= screenRect.right()-1 && newY >= screenRect.bottom()-1) { // bottom right corner
97+ const auto distance = qSqrt(qPow(newX-screenRect.right(), 2) + qPow(newY-screenRect.bottom(), 2));
98+ Q_EMIT pushedBottomRightCorner(currentScreen, qAbs(distance), me->buttons());
99+ m_pushing = true;
100+ } else if (newX < screenRect.left()) { // left edge
101+ Q_EMIT pushedLeftBoundary(currentScreen, qAbs(newX), me->buttons());
102+ m_pushing = true;
103+ } else if (newX >= screenRect.right()) { // right edge
104+ Q_EMIT pushedRightBoundary(currentScreen, newX - (screenRect.right() - 1), me->buttons());
105+ m_pushing = true;
106+ } else if (newY < screenRect.top() + pointer->topBoundaryOffset()) { // top edge
107+ Q_EMIT pushedTopBoundary(currentScreen, qAbs(newY - screenRect.top() - pointer->topBoundaryOffset()), me->buttons());
108+ m_pushing = true;
109+ } else if (Q_LIKELY(newX > 0 && newX < screenRect.right()-1 && newY > 0 && newY < screenRect.bottom()-1)) { // normal pos, not pushing
110+ if (m_pushing) {
111+ Q_EMIT pushStopped(currentScreen);
112+ m_pushing = false;
113+ }
114+ }
115+ }
116+
117+ // Send the event
118+ QMouseEvent eCopy(me->type(), me->localPos(), newPos, me->button(), me->buttons(), me->modifiers());
119+ eCopy.setTimestamp(me->timestamp());
120+ o->event(&eCopy);
121+ return true;
104122 }
105123 default:
106124 break;
@@ -112,7 +130,7 @@ QPointF InputDispatcherFilter::adjustedPositionForMovement(const QPointF &pt, co
112130{
113131 QPointF adjusted = pt + movement;
114132
115− auto screen = screenAt(adjusted); // first check if our move was to a valid screen.
133+ auto screen = screenAt(adjusted); // first check if our move was to a screen with an enabled pointer.
116134 if (screen) {
117135 return adjusted;
118136 } else if ((screen = screenAt(pt))) { // then check if our old position was valid
@@ -126,7 +144,7 @@ QPointF InputDispatcherFilter::adjustedPositionForMovement(const QPointF &pt, co
126144 // center of first screen with a pointer.
127145 Q_FOREACH(QScreen* screen, screens) {
128146 Q_FOREACH(MousePointer* pointer, m_pointers) {
129− if (pointer->screen() == screen) {
147+ if (pointer->isEnabled() && pointer->screen() == screen) {
130148 return screen->geometry().center();
131149 }
132150 }
@@ -138,9 +156,20 @@ QPointF InputDispatcherFilter::adjustedPositionForMovement(const QPointF &pt, co
138156QScreen *InputDispatcherFilter::screenAt(const QPointF &pt) const
139157{
140158 Q_FOREACH(MousePointer* pointer, m_pointers) {
159+ if (!pointer->isEnabled()) continue;
160+
141161 QScreen* screen = pointer->screen();
142162 if (screen && screen->geometry().contains(pt.toPoint()))
143163 return screen;
144164 }
145165 return nullptr;
146166}
167+
168+MousePointer *InputDispatcherFilter::currentPointer() const
169+{
170+ Q_FOREACH(MousePointer* pointer, m_pointers) {
171+ if (!pointer->isEnabled()) continue;
172+ return pointer;
173+ }
174+ return nullptr;
175+}