smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: rename XWindowsPowerManager => XDGPowerManager

Browse source 
fixes: 8949
This commit is contained in:
sithlord48 2025-09-12 11:22:42 -04:00 committed by Nick Bolton
parent 4632bec405
commit 612ca91f9c
5 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/platform/CMakeLists.txt
View file

@ -96,6 +96,8 @@ elseif(APPLE)
) )
elseif(UNIX) elseif(UNIX)
set(PLATFORM_SOURCES set(PLATFORM_SOURCES
XDGPowerManager.cpp
XDGPowerManager.h
XWindowsClipboard.cpp XWindowsClipboard.cpp
XWindowsClipboard.h XWindowsClipboard.h
XWindowsClipboardAnyBitmapConverter.cpp XWindowsClipboardAnyBitmapConverter.cpp
@ -114,8 +116,6 @@ elseif(UNIX)
XWindowsEventQueueBuffer.h XWindowsEventQueueBuffer.h
XWindowsKeyState.cpp XWindowsKeyState.cpp
XWindowsKeyState.h XWindowsKeyState.h
XWindowsPowerManager.cpp
XWindowsPowerManager.h
XWindowsScreen.cpp XWindowsScreen.cpp
XWindowsScreen.h XWindowsScreen.h
XWindowsScreenSaver.cpp XWindowsScreenSaver.cpp

5
src/lib/platform/EiScreen.h
View file

@ -9,7 +9,7 @@
#include "deskflow/KeyMap.h" #include "deskflow/KeyMap.h"
#include "deskflow/PlatformScreen.h" #include "deskflow/PlatformScreen.h"
#include "platform/XWindowsPowerManager.h" #include "platform/XDGPowerManager.h"
#include <libei.h> #include <libei.h>
#include <memory> #include <memory>
@ -189,8 +189,7 @@ private:
using HotKeyMap = std::map<KeyID, HotKeySet>; using HotKeyMap = std::map<KeyID, HotKeySet>;
HotKeyMap m_hotkeys; HotKeyMap m_hotkeys;
// Despite the name XWindowsPowerManager, this works on Wayland too XDGPowerManager m_powerManager;
XWindowsPowerManager m_powerManager;
}; };
} // namespace deskflow } // namespace deskflow

22
src/lib/platform/XWindowsPowerManager.cpp → src/lib/platform/XDGPowerManager.cpp
View file

@ -5,7 +5,7 @@
* SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
*/ */
#include "XWindowsPowerManager.h" #include "XDGPowerManager.h"
#include "arch/Arch.h" #include "arch/Arch.h"
#include "base/Log.h" #include "base/Log.h"
#include "common/Constants.h" #include "common/Constants.h"
@ -17,9 +17,9 @@
namespace { namespace {
bool sleepInhibitCall(bool state, XWindowsPowerManager::InhibitScreenServices serviceID) bool sleepInhibitCall(bool state, XDGPowerManager::InhibitScreenServices serviceID)
{ {
if (std::string error; !XWindowsPowerManager::inhibitScreenCall(serviceID, state, error)) { if (std::string error; !XDGPowerManager::inhibitScreenCall(serviceID, state, error)) {
LOG_DEBUG("dbus inhibit error %s", error.c_str()); LOG_DEBUG("dbus inhibit error %s", error.c_str());
return false; return false;
} }
@ -29,28 +29,28 @@ bool sleepInhibitCall(bool state, XWindowsPowerManager::InhibitScreenServices se
} // namespace } // namespace
XWindowsPowerManager::~XWindowsPowerManager() XDGPowerManager::~XDGPowerManager()
{ {
enableSleep(); enableSleep();
} }
void XWindowsPowerManager::disableSleep() const void XDGPowerManager::disableSleep() const
{ {
if (!sleepInhibitCall(true, XWindowsPowerManager::InhibitScreenServices::kScreenSaver) && if (!sleepInhibitCall(true, XDGPowerManager::InhibitScreenServices::kScreenSaver) &&
!sleepInhibitCall(true, XWindowsPowerManager::InhibitScreenServices::kSessionManager)) { !sleepInhibitCall(true, XDGPowerManager::InhibitScreenServices::kSessionManager)) {
LOG_WARN("failed to prevent system from going to sleep"); LOG_WARN("failed to prevent system from going to sleep");
} }
} }
void XWindowsPowerManager::enableSleep() const void XDGPowerManager::enableSleep() const
{ {
if (!sleepInhibitCall(false, XWindowsPowerManager::InhibitScreenServices::kScreenSaver) && if (!sleepInhibitCall(false, XDGPowerManager::InhibitScreenServices::kScreenSaver) &&
!sleepInhibitCall(false, XWindowsPowerManager::InhibitScreenServices::kSessionManager)) { !sleepInhibitCall(false, XDGPowerManager::InhibitScreenServices::kSessionManager)) {
LOG_WARN("failed to enable system idle sleep"); LOG_WARN("failed to enable system idle sleep");
} }
} }
bool XWindowsPowerManager::inhibitScreenCall(InhibitScreenServices serviceID, bool state, std::string &error) bool XDGPowerManager::inhibitScreenCall(InhibitScreenServices serviceID, bool state, std::string &error)
{ {
error = ""; error = "";
static const std::array<QString, 2> services = {"org.freedesktop.ScreenSaver", "org.gnome.SessionManager"}; static const std::array<QString, 2> services = {"org.freedesktop.ScreenSaver", "org.gnome.SessionManager"};

10
src/lib/platform/XWindowsPowerManager.h → src/lib/platform/XDGPowerManager.h
View file

@ -9,11 +9,11 @@
#include <string> #include <string>
class XWindowsPowerManager class XDGPowerManager
{ {
public: public:
XWindowsPowerManager() = default; XDGPowerManager() = default;
~XWindowsPowerManager(); ~XDGPowerManager();
/** /**
* @brief Prevent the system from sleep * @brief Prevent the system from sleep
@ -25,8 +25,8 @@ public:
*/ */
void enableSleep() const; void enableSleep() const;
XWindowsPowerManager(const XWindowsPowerManager &) = delete; XDGPowerManager(const XDGPowerManager &) = delete;
XWindowsPowerManager &operator=(const XWindowsPowerManager &) = delete; XDGPowerManager &operator=(const XDGPowerManager &) = delete;
enum class InhibitScreenServices enum class InhibitScreenServices
{ {

4
src/lib/platform/XWindowsScreen.h
View file

@ -12,7 +12,7 @@
#include "deskflow/ClientArgs.h" #include "deskflow/ClientArgs.h"
#include "deskflow/KeyMap.h" #include "deskflow/KeyMap.h"
#include "deskflow/PlatformScreen.h" #include "deskflow/PlatformScreen.h"
#include "platform/XWindowsPowerManager.h" #include "platform/XDGPowerManager.h"
#include <set> #include <set>
#include <vector> #include <vector>
@ -251,5 +251,5 @@ private:
// pointer to (singleton) screen. this is only needed by // pointer to (singleton) screen. this is only needed by
// ioErrorHandler(). // ioErrorHandler().
static XWindowsScreen *s_screen; static XWindowsScreen *s_screen;
XWindowsPowerManager m_powerManager; XDGPowerManager m_powerManager;
}; };