cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

session-lock: explicitly consider dpms states for sending locked or denied (#11278)

Browse source 
* session-lock: explicitly consider dpms states for sending locked or denied

* session-lock: check for active monitors before locking
This commit is contained in:
Maximilian Seidler 2025-07-30 20:36:02 +00:00 • committed by GitHub
parent 38e13282cd
commit f309d86003
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 34 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/managers/SessionLockManager.cpp
View file

@ -91,36 +91,41 @@ void CSessionLockManager::onNewSessionLock(SP<CSessionLock> pLock) {
g_pCompositor->focusSurface(nullptr); g_pCompositor->focusSurface(nullptr);
g_pSeatManager->setGrab(nullptr); g_pSeatManager->setGrab(nullptr);
if (!g_pCompositor->m_unsafeState) { const bool NOACTIVEMONS = std::ranges::all_of(g_pCompositor->m_monitors, [](const auto& m) { return !m->m_enabled || !m->m_dpmsStatus; });
m_sessionLock->sendDeniedTimer = makeShared<CEventLoopTimer>(
// Within this arbitrary amount of time, a session-lock client is expected to create and commit a lock surface for each output. If the client fails to do that, it will be denied.
std::chrono::seconds(5),
[](auto, auto) {
if (!g_pSessionLockManager || g_pSessionLockManager->clientLocked() || g_pSessionLockManager->clientDenied())
return;
if (g_pCompositor->m_unsafeState || !g_pCompositor->m_aqBackend->hasSession() || !g_pCompositor->m_aqBackend->session->active) { if (NOACTIVEMONS || g_pCompositor->m_unsafeState) {
// Because the session is inactive, there is a good reason for why the client did't receive locked or denied.
// We send locked, although this could lead to imperfect frames when we start to render again.
g_pSessionLockManager->m_sessionLock->lock->sendLocked();
g_pSessionLockManager->m_sessionLock->hasSentLocked = true;
return;
}
if (g_pSessionLockManager->m_sessionLock && g_pSessionLockManager->m_sessionLock->lock) {
g_pSessionLockManager->m_sessionLock->lock->sendDenied();
g_pSessionLockManager->m_sessionLock->hasSentDenied = true;
}
},
nullptr);
g_pEventLoopManager->addTimer(m_sessionLock->sendDeniedTimer);
} else {
// Normally the locked event is sent after each output rendered a lock screen frame. // Normally the locked event is sent after each output rendered a lock screen frame.
// When there are no outputs, send it right away. // When there are no active outputs, send it right away.
m_sessionLock->lock->sendLocked(); m_sessionLock->lock->sendLocked();
m_sessionLock->hasSentLocked = true; m_sessionLock->hasSentLocked = true;
return;
} }
m_sessionLock->sendDeniedTimer = makeShared<CEventLoopTimer>(
// Within this arbitrary amount of time, a session-lock client is expected to create and commit a lock surface for each output. If the client fails to do that, it will be denied.
std::chrono::seconds(5),
[](auto, auto) {
if (!g_pSessionLockManager || g_pSessionLockManager->clientLocked() || g_pSessionLockManager->clientDenied())
return;
if (!g_pSessionLockManager->m_sessionLock || !g_pSessionLockManager->m_sessionLock->lock)
return;
if (g_pCompositor->m_unsafeState || !g_pCompositor->m_aqBackend->hasSession() || !g_pCompositor->m_aqBackend->session->active) {
// Because the session is inactive, there is a good reason for why the client did't manage to render to all outputs.
// We send locked, although this could lead to imperfect frames when we start to render again.
g_pSessionLockManager->m_sessionLock->lock->sendLocked();
g_pSessionLockManager->m_sessionLock->hasSentLocked = true;
return;
}
LOGM(WARN, "Kicking lockscreen client, because it failed to render to all outputs within 5 seconds");
g_pSessionLockManager->m_sessionLock->lock->sendDenied();
g_pSessionLockManager->m_sessionLock->hasSentDenied = true;
},
nullptr);
g_pEventLoopManager->addTimer(m_sessionLock->sendDeniedTimer);
} }
void CSessionLockManager::removeSendDeniedTimer() { void CSessionLockManager::removeSendDeniedTimer() {
@ -154,8 +159,11 @@ WP<SSessionLockSurface> CSessionLockManager::getSessionLockSurfaceForMonitor(uin
void CSessionLockManager::onLockscreenRenderedOnMonitor(uint64_t id) { void CSessionLockManager::onLockscreenRenderedOnMonitor(uint64_t id) {
if (!m_sessionLock || m_sessionLock->hasSentLocked || m_sessionLock->hasSentDenied) if (!m_sessionLock || m_sessionLock->hasSentLocked || m_sessionLock->hasSentDenied)
return; return;
m_sessionLock->lockedMonitors.emplace(id); m_sessionLock->lockedMonitors.emplace(id);
const bool LOCKED = std::ranges::all_of(g_pCompositor->m_monitors, [this](auto m) { return m_sessionLock->lockedMonitors.contains(m->m_id); }); const bool LOCKED =
std::ranges::all_of(g_pCompositor->m_monitors, [this](auto m) { return !m->m_enabled || !m->m_dpmsStatus || m_sessionLock->lockedMonitors.contains(m->m_id); });
if (LOCKED && m_sessionLock->lock->good()) { if (LOCKED && m_sessionLock->lock->good()) {
removeSendDeniedTimer(); removeSendDeniedTimer();
m_sessionLock->lock->sendLocked(); m_sessionLock->lock->sendLocked();