Skip to content

WaylandBackend: re-arm the forced pointer lock when focus returns #2343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vincent562 wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −1
Open

WaylandBackend: re-arm the forced pointer lock when focus returns #2343

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion src/Backends/WaylandBackend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,7 @@ namespace gamescope

void SetCursorImage( std::shared_ptr<INestedHints::CursorInfo> info );
void SetRelativeMouseMode( wl_surface *pSurface, bool bRelative );
void ReArmForcedPointerLock();
void UpdateCursor();

friend CWaylandConnector;
Expand Down Expand Up @@ -837,6 +838,8 @@ namespace gamescope
wl_touch *m_pTouch = nullptr;
zwp_locked_pointer_v1 *m_pLockedPointer = nullptr;
bool m_bPointerLocked = false;
// Set when the host compositor deactivates our constraint, so we know to re-arm it.
bool m_bPointerUnlockedByHost = false;
wl_surface *m_pLockedSurface = nullptr;
zwp_relative_pointer_v1 *m_pRelativePointer = nullptr;

Expand Down Expand Up @@ -2419,7 +2422,8 @@ namespace gamescope
if ( !m_pPointer )
return;

if ( !!bRelative != !!m_pLockedPointer || ( pSurface != m_pLockedSurface && bRelative ) )
if ( !!bRelative != !!m_pLockedPointer || ( pSurface != m_pLockedSurface && bRelative ) ||
( bRelative && m_bPointerUnlockedByHost ) )
{
if ( m_pLockedPointer )
{
Expand All @@ -2443,6 +2447,7 @@ namespace gamescope
m_pRelativePointer = zwp_relative_pointer_manager_v1_get_relative_pointer( m_pRelativePointerManager, m_pPointer );

m_pLockedSurface = pSurface;
m_bPointerUnlockedByHost = false;
}

m_InputThread.SetRelativePointer( bRelative );
Expand All @@ -2451,6 +2456,17 @@ namespace gamescope
}
}

// With --force-grab-cursor the pointer lock is only ever armed once, from
// CWaylandConnector::Init(), because steamcompmgr's per-frame call to
// SetRelativeMouseMode is gated behind !g_bForceRelativeMouse. Re-arm it when
// focus returns, so the constraint survives the host dropping it while we
// were unfocused.
void CWaylandBackend::ReArmForcedPointerLock()
{
if ( g_bForceRelativeMouse && m_bPointerUnlockedByHost && m_pLockedSurface )
SetRelativeMouseMode( m_pLockedSurface, true );
}

void CWaylandBackend::UpdateCursor()
{
bool bUseHostCursor = false;
Expand Down Expand Up @@ -2662,6 +2678,8 @@ namespace gamescope
m_uPointerEnterSerial = uSerial;
m_bMouseEntered = true;

ReArmForcedPointerLock();

UpdateCursor();
}
void CWaylandBackend::Wayland_Pointer_Leave( wl_pointer *pPointer, uint32_t uSerial, wl_surface *pSurface )
Expand All @@ -2682,6 +2700,8 @@ namespace gamescope
m_uKeyboardEnterSerial = uSerial;
m_bKeyboardEntered = true;

ReArmForcedPointerLock();

UpdateCursor();
}
void CWaylandBackend::Wayland_Keyboard_Leave( wl_keyboard *pKeyboard, uint32_t uSerial, wl_surface *pSurface )
Expand All @@ -2702,6 +2722,7 @@ namespace gamescope
void CWaylandBackend::Wayland_LockedPointer_Unlocked( zwp_locked_pointer_v1 *pLockedPointer )
{
m_bPointerLocked = false;
m_bPointerUnlockedByHost = true;
UpdateCursor();
}

Expand Down