hyprwm/hypridle
1
0
Fork 0
mirror of https://github.com/hyprwm/hypridle.git synced 2024-11-17 07:35:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

move to sdbus-cpp2

Browse source
This commit is contained in:
Vaxry 2024-10-22 02:39:07 +01:00
parent 918fd78dec
commit 1266f0b6f3
2 changed files with 35 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -41,7 +41,7 @@ pkg_check_modules(
wayland-protocols wayland-protocols
hyprlang>=0.4.0 hyprlang>=0.4.0
hyprutils>=0.2.0 hyprutils>=0.2.0
sdbus-c++) sdbus-c++>=0.2.0)
file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp") file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
add_executable(hypridle ${SRCFILES}) add_executable(hypridle ${SRCFILES})

77
src/core/Hypridle.cpp
View file

@ -153,7 +153,7 @@ void CHypridle::enterEventLoop() {
if (pollfds[0].revents & POLLIN /* dbus */) { if (pollfds[0].revents & POLLIN /* dbus */) {
Debug::log(TRACE, "got dbus event"); Debug::log(TRACE, "got dbus event");
while (m_sDBUSState.connection->processPendingRequest()) { while (m_sDBUSState.connection->processPendingEvent()) {
; ;
} }
} }
@ -171,7 +171,7 @@ void CHypridle::enterEventLoop() {
if (pollfdsCount > 2 && pollfds[2].revents & POLLIN /* dbus2 */) { if (pollfdsCount > 2 && pollfds[2].revents & POLLIN /* dbus2 */) {
Debug::log(TRACE, "got dbus event"); Debug::log(TRACE, "got dbus event");
while (m_sDBUSState.screenSaverServiceConnection->processPendingRequest()) { while (m_sDBUSState.screenSaverServiceConnection->processPendingEvent()) {
; ;
} }
} }
@ -356,14 +356,14 @@ bool CHypridle::unregisterDbusInhibitCookies(const std::string& ownerID) {
return true; return true;
} }
void handleDbusLogin(sdbus::Message& msg) { static void handleDbusLogin(sdbus::Message msg) {
// lock & unlock // lock & unlock
static auto* const PLOCKCMD = (Hyprlang::STRING const*)g_pConfigManager->getValuePtr("general:lock_cmd"); static auto* const PLOCKCMD = (Hyprlang::STRING const*)g_pConfigManager->getValuePtr("general:lock_cmd");
static auto* const PUNLOCKCMD = (Hyprlang::STRING const*)g_pConfigManager->getValuePtr("general:unlock_cmd"); static auto* const PUNLOCKCMD = (Hyprlang::STRING const*)g_pConfigManager->getValuePtr("general:unlock_cmd");
Debug::log(LOG, "Got dbus .Session"); Debug::log(LOG, "Got dbus .Session");
const auto MEMBER = msg.getMemberName(); const std::string MEMBER = msg.getMemberName();
if (MEMBER == "Lock") { if (MEMBER == "Lock") {
Debug::log(LOG, "Got Lock from dbus"); Debug::log(LOG, "Got Lock from dbus");
@ -381,8 +381,8 @@ void handleDbusLogin(sdbus::Message& msg) {
} }
} }
void handleDbusSleep(sdbus::Message& msg) { static void handleDbusSleep(sdbus::Message msg) {
const auto MEMBER = msg.getMemberName(); const std::string MEMBER = msg.getMemberName();
if (MEMBER != "PrepareForSleep") if (MEMBER != "PrepareForSleep")
return; return;
@ -421,7 +421,7 @@ void handleDbusBlockInhibits(const std::string& inhibits) {
} }
} }
void handleDbusBlockInhibitsPropertyChanged(sdbus::Message& msg) { static void handleDbusBlockInhibitsPropertyChanged(sdbus::Message msg) {
std::string interface; std::string interface;
std::map<std::string, sdbus::Variant> changedProperties; std::map<std::string, sdbus::Variant> changedProperties;
msg >> interface >> changedProperties; msg >> interface >> changedProperties;
@ -430,16 +430,10 @@ void handleDbusBlockInhibitsPropertyChanged(sdbus::Message& msg) {
} }
} }
void handleDbusScreensaver(sdbus::MethodCall call, bool inhibit) { static int handleDbusScreensaver(std::string app, std::string reason, uint32_t cookie, bool inhibit, const char* sender) {
std::string app = "?", reason = "?"; std::string ownerID = sender;
std::string ownerID = call.getSender();
if (inhibit) { if (!inhibit) {
call >> app;
call >> reason;
} else {
uint32_t cookie = 0;
call >> cookie;
Debug::log(TRACE, "Read uninhibit cookie: {}", cookie); Debug::log(TRACE, "Read uninhibit cookie: {}", cookie);
const auto COOKIE = g_pHypridle->getDbusInhibitCookie(cookie); const auto COOKIE = g_pHypridle->getDbusInhibitCookie(cookie);
if (COOKIE.cookie == 0) { if (COOKIE.cookie == 0) {
@ -449,9 +443,8 @@ void handleDbusScreensaver(sdbus::MethodCall call, bool inhibit) {
reason = COOKIE.reason; reason = COOKIE.reason;
ownerID = COOKIE.ownerID; ownerID = COOKIE.ownerID;
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");
};
} }
} }
@ -467,21 +460,17 @@ void handleDbusScreensaver(sdbus::MethodCall call, bool inhibit) {
if (inhibit) { if (inhibit) {
auto cookie = CHypridle::SDbusInhibitCookie{uint32_t{cookieID}, app, reason, ownerID}; auto cookie = CHypridle::SDbusInhibitCookie{uint32_t{cookieID}, app, reason, ownerID};
auto reply = call.createReply(); Debug::log(LOG, "Cookie {} sent", cookieID);
reply << uint32_t{cookieID++};
reply.send();
Debug::log(LOG, "Cookie {} sent", cookieID - 1);
g_pHypridle->registerDbusInhibitCookie(cookie); g_pHypridle->registerDbusInhibitCookie(cookie);
} else {
auto reply = call.createReply(); return cookieID++;
reply.send();
Debug::log(TRACE, "Uninhibit response sent");
}
} }
void handleDbusNameOwnerChanged(sdbus::Message& msg) { return 0;
}
static void handleDbusNameOwnerChanged(sdbus::Message msg) {
std::string name, oldOwner, newOwner; std::string name, oldOwner, newOwner;
msg >> name >> oldOwner >> newOwner; msg >> name >> oldOwner >> newOwner;
@ -498,8 +487,8 @@ void CHypridle::setupDBUS() {
static auto const IGNORE_DBUS_INHIBIT = **(Hyprlang::INT* const*)g_pConfigManager->getValuePtr("general:ignore_dbus_inhibit"); static auto const IGNORE_DBUS_INHIBIT = **(Hyprlang::INT* const*)g_pConfigManager->getValuePtr("general:ignore_dbus_inhibit");
static auto const IGNORE_SYSTEMD_INHIBIT = **(Hyprlang::INT* const*)g_pConfigManager->getValuePtr("general:ignore_systemd_inhibit"); static auto const IGNORE_SYSTEMD_INHIBIT = **(Hyprlang::INT* const*)g_pConfigManager->getValuePtr("general:ignore_systemd_inhibit");
auto proxy = sdbus::createProxy("org.freedesktop.login1", "/org/freedesktop/login1"); auto proxy = sdbus::createProxy(sdbus::ServiceName{"org.freedesktop.login1"}, sdbus::ObjectPath{"/org/freedesktop/login1"});
auto method = proxy->createMethodCall("org.freedesktop.login1.Manager", "GetSession"); auto method = proxy->createMethodCall(sdbus::InterfaceName{"org.freedesktop.login1.Manager"}, sdbus::MethodName{"GetSession"});
method << "auto"; method << "auto";
sdbus::ObjectPath path; sdbus::ObjectPath path;
@ -507,18 +496,17 @@ void CHypridle::setupDBUS() {
auto reply = proxy->callMethod(method); auto reply = proxy->callMethod(method);
reply >> path; reply >> path;
m_sDBUSState.connection->addMatch("type='signal',path='" + path + "',interface='org.freedesktop.login1.Session'", handleDbusLogin, sdbus::floating_slot_t{}); m_sDBUSState.connection->addMatch("type='signal',path='" + path + "',interface='org.freedesktop.login1.Session'", ::handleDbusLogin);
m_sDBUSState.connection->addMatch("type='signal',path='/org/freedesktop/login1',interface='org.freedesktop.login1.Manager'", handleDbusSleep, sdbus::floating_slot_t{}); m_sDBUSState.connection->addMatch("type='signal',path='/org/freedesktop/login1',interface='org.freedesktop.login1.Manager'", ::handleDbusSleep);
} catch (std::exception& e) { Debug::log(WARN, "Couldn't connect to logind service ({})", e.what()); } } catch (std::exception& e) { Debug::log(WARN, "Couldn't connect to logind service ({})", e.what()); }
Debug::log(LOG, "Using dbus path {}", path.c_str()); Debug::log(LOG, "Using dbus path {}", path.c_str());
if (!IGNORE_SYSTEMD_INHIBIT) { if (!IGNORE_SYSTEMD_INHIBIT) {
m_sDBUSState.connection->addMatch("type='signal',path='/org/freedesktop/login1',interface='org.freedesktop.DBus.Properties'", handleDbusBlockInhibitsPropertyChanged, m_sDBUSState.connection->addMatch("type='signal',path='/org/freedesktop/login1',interface='org.freedesktop.DBus.Properties'", ::handleDbusBlockInhibitsPropertyChanged);
sdbus::floating_slot_t{});
try { try {
std::string value = proxy->getProperty("BlockInhibited").onInterface("org.freedesktop.login1.Manager"); std::string value = (proxy->getProperty("BlockInhibited").onInterface("org.freedesktop.login1.Manager")).get<std::string>();
handleDbusBlockInhibits(value); handleDbusBlockInhibits(value);
} catch (std::exception& e) { Debug::log(WARN, "Couldn't retrieve current systemd inhibits ({})", e.what()); } } catch (std::exception& e) { Debug::log(WARN, "Couldn't retrieve current systemd inhibits ({})", e.what()); }
} }
@ -531,21 +519,26 @@ void CHypridle::setupDBUS() {
}; };
try { try {
m_sDBUSState.screenSaverServiceConnection = sdbus::createSessionBusConnection("org.freedesktop.ScreenSaver"); m_sDBUSState.screenSaverServiceConnection = sdbus::createSessionBusConnection(sdbus::ServiceName{"org.freedesktop.ScreenSaver"});
for (const std::string& path : paths) { for (const std::string& path : paths) {
try { try {
auto obj = sdbus::createObject(*m_sDBUSState.screenSaverServiceConnection, path); auto obj = sdbus::createObject(*m_sDBUSState.screenSaverServiceConnection, sdbus::ObjectPath{path});
obj->registerMethod("org.freedesktop.ScreenSaver", "Inhibit", "ss", "u", [&](sdbus::MethodCall c) { handleDbusScreensaver(c, true); });
obj->registerMethod("org.freedesktop.ScreenSaver", "UnInhibit", "u", "", [&](sdbus::MethodCall c) { handleDbusScreensaver(c, false); }); obj->addVTable(sdbus::registerMethod("Inhibit").implementedAs([object = obj.get()](std::string s1, std::string s2) {
obj->finishRegistration(); return handleDbusScreensaver(s1, s2, 0, true, object->getCurrentlyProcessedMessage().getSender());
}),
sdbus::registerMethod("UnInhibit").implementedAs([object = obj.get()](uint32_t c) {
handleDbusScreensaver("", "", c, true, object->getCurrentlyProcessedMessage().getSender());
}))
.forInterface(sdbus::InterfaceName{"org.freedesktop.ScreenSaver"});
m_sDBUSState.screenSaverObjects.push_back(std::move(obj)); m_sDBUSState.screenSaverObjects.push_back(std::move(obj));
} catch (std::exception& e) { Debug::log(ERR, "Failed registering for {}, perhaps taken?\nerr: {}", path, e.what()); } } catch (std::exception& e) { Debug::log(ERR, "Failed registering for {}, perhaps taken?\nerr: {}", path, e.what()); }
} }
m_sDBUSState.screenSaverServiceConnection->addMatch("type='signal',sender='org.freedesktop.DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged'", m_sDBUSState.screenSaverServiceConnection->addMatch("type='signal',sender='org.freedesktop.DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged'",
handleDbusNameOwnerChanged, sdbus::floating_slot_t{}); ::handleDbusNameOwnerChanged);
} catch (std::exception& e) { Debug::log(ERR, "Couldn't connect to session dbus\nerr: {}", e.what()); } } catch (std::exception& e) { Debug::log(ERR, "Couldn't connect to session dbus\nerr: {}", e.what()); }
} }
} }