hyprwm/hypridle
1
0
Fork 0
mirror of https://github.com/hyprwm/hypridle.git synced 2025-12-20 01:00:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

core: fix dbus inhibit lock counting (#175)

Browse source 
Fixes #74 (root cause)

Fixes #111
This commit is contained in:
slowsage 2025-11-01 16:00:41 -04:00 • committed by GitHub
parent f158b2fe92
commit f3d1f3b232
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/Hypridle.cpp
View file

@ -371,15 +371,8 @@ bool CHypridle::unregisterDbusInhibitCookie(const CHypridle::SDbusInhibitCookie&
return true; return true;
} }
bool CHypridle::unregisterDbusInhibitCookies(const std::string& ownerID) { size_t CHypridle::unregisterDbusInhibitCookies(const std::string& ownerID) {
const auto IT = std::remove_if(m_sDBUSState.inhibitCookies.begin(), m_sDBUSState.inhibitCookies.end(), return std::erase_if(m_sDBUSState.inhibitCookies, [&ownerID](const CHypridle::SDbusInhibitCookie& item) { return item.ownerID == ownerID; });
[&ownerID](const CHypridle::SDbusInhibitCookie& item) { return item.ownerID == ownerID; });
if (IT == m_sDBUSState.inhibitCookies.end())
return false;
m_sDBUSState.inhibitCookies.erase(IT, m_sDBUSState.inhibitCookies.end());
return true;
} }
static void handleDbusLogin(sdbus::Message msg) { static void handleDbusLogin(sdbus::Message msg) {
@ -461,6 +454,7 @@ static void handleDbusBlockInhibitsPropertyChanged(sdbus::Message msg) {
static uint32_t handleDbusScreensaver(std::string app, std::string reason, uint32_t cookie, bool inhibit, const char* sender) { static uint32_t handleDbusScreensaver(std::string app, std::string reason, uint32_t cookie, bool inhibit, const char* sender) {
std::string ownerID = sender; std::string ownerID = sender;
bool cookieFound = false;
if (!inhibit) { if (!inhibit) {
Debug::log(TRACE, "Read uninhibit cookie: {}", cookie); Debug::log(TRACE, "Read uninhibit cookie: {}", cookie);
@ -471,6 +465,7 @@ static uint32_t handleDbusScreensaver(std::string app, std::string reason, uint3
app = COOKIE.app; app = COOKIE.app;
reason = COOKIE.reason; reason = COOKIE.reason;
ownerID = COOKIE.ownerID; ownerID = COOKIE.ownerID;
cookieFound = true;
if (!g_pHypridle->unregisterDbusInhibitCookie(COOKIE)) if (!g_pHypridle->unregisterDbusInhibitCookie(COOKIE))
Debug::log(WARN, "BUG THIS: attempted to unregister unknown cookie"); Debug::log(WARN, "BUG THIS: attempted to unregister unknown cookie");
@ -481,7 +476,7 @@ static uint32_t handleDbusScreensaver(std::string app, std::string reason, uint3
if (inhibit) if (inhibit)
g_pHypridle->onInhibit(true); g_pHypridle->onInhibit(true);
else else if (cookieFound)
g_pHypridle->onInhibit(false); g_pHypridle->onInhibit(false);
static uint32_t cookieID = 1337; static uint32_t cookieID = 1337;
@ -506,9 +501,11 @@ static void handleDbusNameOwnerChanged(sdbus::Message msg) {
if (!newOwner.empty()) if (!newOwner.empty())
return; return;
if (g_pHypridle->unregisterDbusInhibitCookies(oldOwner)) { size_t removed = g_pHypridle->unregisterDbusInhibitCookies(oldOwner);
if (removed > 0) {
Debug::log(LOG, "App with owner {} disconnected", oldOwner); Debug::log(LOG, "App with owner {} disconnected", oldOwner);
g_pHypridle->onInhibit(false); for (size_t i = 0; i < removed; i++)
g_pHypridle->onInhibit(false);
} }
} }

2
src/core/Hypridle.hpp
View file

@ -44,7 +44,7 @@ class CHypridle {
SDbusInhibitCookie getDbusInhibitCookie(uint32_t cookie); SDbusInhibitCookie getDbusInhibitCookie(uint32_t cookie);
void registerDbusInhibitCookie(SDbusInhibitCookie& cookie); void registerDbusInhibitCookie(SDbusInhibitCookie& cookie);
bool unregisterDbusInhibitCookie(const SDbusInhibitCookie& cookie); bool unregisterDbusInhibitCookie(const SDbusInhibitCookie& cookie);
bool unregisterDbusInhibitCookies(const std::string& ownerID); size_t unregisterDbusInhibitCookies(const std::string& ownerID);
void handleInhibitOnDbusSleep(bool toSleep); void handleInhibitOnDbusSleep(bool toSleep);
void inhibitSleep(); void inhibitSleep();