yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wayland: Avoid pointer warp if constraint region is invalid

Browse source 
It may happen that the constraint region doesn't include the specified
cursor hint anymore. If that's the case, avoid warping the pointer.

BUG: 457021
This commit is contained in:
Vlad Zahorodnii 2023-05-04 15:50:32 +03:00
parent 271d758f8c
commit 7c91c4bad9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/pointer_input.cpp
View file

@ -669,7 +669,7 @@ void PointerInputRedirection::updatePointerConstraints()
lock->setLocked(false); lock->setLocked(false);
m_locked = false; m_locked = false;
disconnectLockedPointerAboutToBeUnboundConnection(); disconnectLockedPointerAboutToBeUnboundConnection();
if (!(hint.x() < 0 || hint.y() < 0) && focus()) { if (!(hint.x() < 0 || hint.y() < 0 || !lock->region().contains(hint.toPoint())) && focus()) {
processMotionAbsolute(focus()->mapFromLocal(hint), waylandServer()->seat()->timestamp()); processMotionAbsolute(focus()->mapFromLocal(hint), waylandServer()->seat()->timestamp());
} }
} }
@ -684,7 +684,7 @@ void PointerInputRedirection::updatePointerConstraints()
// In this case the cached cursor position hint must be fetched before the resource goes away // In this case the cached cursor position hint must be fetched before the resource goes away
m_lockedPointerAboutToBeUnboundConnection = connect(lock, &KWaylandServer::LockedPointerV1Interface::aboutToBeDestroyed, this, [this, lock]() { m_lockedPointerAboutToBeUnboundConnection = connect(lock, &KWaylandServer::LockedPointerV1Interface::aboutToBeDestroyed, this, [this, lock]() {
const auto hint = lock->cursorPositionHint(); const auto hint = lock->cursorPositionHint();
if (hint.x() < 0 || hint.y() < 0 || !focus()) { if (hint.x() < 0 || hint.y() < 0 || !lock->region().contains(hint.toPoint()) || !focus()) {
return; return;
} }
auto globalHint = focus()->mapFromLocal(hint); auto globalHint = focus()->mapFromLocal(hint);