git.iko.soy/unity8
on xenial help sign in
disable input filtering
ac05870Nick Dedekind
plugins/Cursor/InputDispatcherFilter.cpp+29−26
compare with xenial
unifiedsplit
@@ -72,32 +72,35 @@ bool InputDispatcherFilter::eventFilter(QObject *o, QEvent *e)
72 case QEvent::MouseButtonPress:
72 case QEvent::MouseButtonPress:
73 case QEvent::MouseButtonRelease:
73 case QEvent::MouseButtonRelease:
74 {
74 {
75+ // FIXME - removed all input filtering for now - this was for extended display
76+ return false;
77+
75− QMouseEvent* me = static_cast<QMouseEvent*>(e);
78+// QMouseEvent* me = static_cast<QMouseEvent*>(e);
76−
79+
77− // Local position gives relative change of mouse pointer.
80+// // Local position gives relative change of mouse pointer.
78− QPointF localPos = me->localPos();
81+// QPointF localPos = me->localPos();
79− QPointF globalPos = me->screenPos();
82+// QPointF globalPos = me->screenPos();
80−
83+
81− // Adjust the position
84+// // Adjust the position
82− QPointF oldPos(mousePosition.isNull() ? globalPos : mousePosition);
85+// QPointF oldPos(mousePosition.isNull() ? globalPos : mousePosition);
83− QPointF newPos = adjustedPositionForMovement(oldPos, localPos);
86+// QPointF newPos = adjustedPositionForMovement(oldPos, localPos);
84−
87+
85− QScreen* currentScreen = screenAt(newPos);
88+// QScreen* currentScreen = screenAt(newPos);
86− if (currentScreen) {
89+// if (currentScreen) {
87− QRect screenRect = currentScreen->geometry();
90+// QRect screenRect = currentScreen->geometry();
88− qreal unadjustedX = (oldPos + localPos).x();
91+// qreal unadjustedX = (oldPos + localPos).x();
89− if (unadjustedX < screenRect.left()) {
92+// if (unadjustedX < screenRect.left()) {
90− Q_EMIT pushedLeftBoundary(currentScreen, qAbs(unadjustedX - screenRect.left()), me->buttons());
93+// Q_EMIT pushedLeftBoundary(currentScreen, qAbs(unadjustedX - screenRect.left()), me->buttons());
91− } else if (unadjustedX > screenRect.right()) {
94+// } else if (unadjustedX > screenRect.right()) {
92− Q_EMIT pushedRightBoundary(currentScreen, qAbs(unadjustedX - screenRect.right()), me->buttons());
95+// Q_EMIT pushedRightBoundary(currentScreen, qAbs(unadjustedX - screenRect.right()), me->buttons());
93− }
96+// }
94− }
97+// }
95−
98+
96− // Send the event
99+// // Send the event
97− QMouseEvent eCopy(me->type(), me->localPos(), newPos, me->button(), me->buttons(), me->modifiers());
100+// QMouseEvent eCopy(me->type(), me->localPos(), newPos, me->button(), me->buttons(), me->modifiers());
98− eCopy.setTimestamp(me->timestamp());
101+// eCopy.setTimestamp(me->timestamp());
99− o->event(&eCopy);
102+// o->event(&eCopy);
100− return true;
103+// return true;
101 }
104 }
102 default:
105 default:
103 break;
106 break;