ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

common: Add support for MATE Desktop. (#12174) 

This extends the screensaver inhibition function to MATE Desktop,
This commit is contained in:
spixi 2025-01-09 15:07:09 +01:00 committed by GitHub
parent 16b1095a7b
commit a5e4274cd2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/Linux/LnxMisc.cpp
View File

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team // SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
// SPDX-License-Identifier: GPL-3.0+ // SPDX-License-Identifier: GPL-3.0+
#include "common/Pcsx2Types.h" #include "common/Pcsx2Types.h"
@ -22,6 +22,8 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include <cstdlib>
#include <cstring>
// Returns 0 on failure (not supported by the operating system). // Returns 0 on failure (not supported by the operating system).
u64 GetPhysicalMemory() u64 GetPhysicalMemory()
@ -101,6 +103,7 @@ static bool SetScreensaverInhibitDBus(const bool inhibit_requested, const char*
DBusMessage* message = nullptr; DBusMessage* message = nullptr;
DBusMessage* response = nullptr; DBusMessage* response = nullptr;
DBusMessageIter message_itr; DBusMessageIter message_itr;
char* desktop_session = nullptr;
ScopedGuard cleanup = [&]() { ScopedGuard cleanup = [&]() {
if (dbus_error_is_set(&error_dbus)) if (dbus_error_is_set(&error_dbus))
@ -122,7 +125,17 @@ static bool SetScreensaverInhibitDBus(const bool inhibit_requested, const char*
s_cookie = 0; s_cookie = 0;
s_comparison_connection = connection; s_comparison_connection = connection;
} }
desktop_session = std::getenv("DESKTOP_SESSION");
if (desktop_session && std::strncmp(desktop_session, "mate", 4) == 0)
{
message = dbus_message_new_method_call("org.mate.ScreenSaver", "/org/mate/ScreenSaver", "org.mate.ScreenSaver", bus_method);
}
else
{
message = dbus_message_new_method_call("org.freedesktop.ScreenSaver", "/org/freedesktop/ScreenSaver", "org.freedesktop.ScreenSaver", bus_method); message = dbus_message_new_method_call("org.freedesktop.ScreenSaver", "/org/freedesktop/ScreenSaver", "org.freedesktop.ScreenSaver", bus_method);
}
if (!message) if (!message)
return false; return false;
// Initialize an append iterator for the message, gets freed with the message. // Initialize an append iterator for the message, gets freed with the message.