Move display sleep functions to emu callbacks

rpcs3/Emu/System.cpp

@@ -51,8 +51,6 @@
 
 #include "Utilities/JIT.h"
 
-#include "display_sleep_control.h"
-
 #include "Emu/IPC_socket.h"
 
 #if defined(HAVE_VULKAN)
@@ -2506,7 +2504,7 @@ void Emulator::Run(bool start_playtime)
 
 	if (g_cfg.misc.prevent_display_sleep)
 	{
-		disable_display_sleep();
+		Emu.GetCallbacks().enable_display_sleep(false);
 	}
 }
 
@@ -2791,7 +2789,7 @@ bool Emulator::Pause(bool freeze_emulation, bool show_resume_message)
 	}
 
 	// Always Enable display sleep, not only if it was prevented.
-	enable_display_sleep();
+	Emu.GetCallbacks().enable_display_sleep(true);
 
 	return true;
 }
@@ -2888,7 +2886,7 @@ void Emulator::Resume()
 
 	if (g_cfg.misc.prevent_display_sleep)
 	{
-		disable_display_sleep();
+		Emu.GetCallbacks().enable_display_sleep(false);
 	}
 }
 
@@ -3798,7 +3796,7 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
 			GetCallbacks().on_stop();
 
 			// Always Enable display sleep, not only if it was prevented.
-			enable_display_sleep();
+			Emu.GetCallbacks().enable_display_sleep(true);
 
 			if (allow_autoexit)
 			{

rpcs3/Emu/System.h

@@ -107,6 +107,8 @@ struct EmuCallbacks
 	std::function<std::vector<std::string>()> get_font_dirs;
 	std::function<bool(const std::vector<std::string>&)> on_install_pkgs;
 	std::function<void(u32)> add_breakpoint;
+	std::function<bool()> display_sleep_control_supported;
+	std::function<void(bool)> enable_display_sleep;
 	std::function<void()> check_microphone_permissions;
 };
 

rpcs3/display_sleep_control.cpp

@@ -39,7 +39,7 @@ bool display_sleep_control_supported()
 #endif
 }
 
-void enable_display_sleep()
+void enable_display_sleep(bool enabled)
 {
 	if (!display_sleep_control_supported())
 	{
@@ -47,15 +47,23 @@ void enable_display_sleep()
 	}
 
 #ifdef _WIN32
-	SetThreadExecutionState(ES_CONTINUOUS);
+	SetThreadExecutionState(enabled ? ES_CONTINUOUS : (ES_CONTINUOUS | ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED));
 #elif defined(__APPLE__)
-	if (s_pm_assertion != kIOPMNullAssertionID)
+	if (enabled && s_pm_assertion != kIOPMNullAssertionID)
 	{
 		IOPMAssertionRelease(s_pm_assertion);
 		s_pm_assertion = kIOPMNullAssertionID;
 	}
+	else if (!enabled)
+	{
+#pragma GCC diagnostic push
+// Necessary as some of those values are macro using old casts
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+		IOPMAssertionCreateWithName(kIOPMAssertionTypePreventUserIdleDisplaySleep, kIOPMAssertionLevelOn, CFSTR("Game running"), &s_pm_assertion);
+#pragma GCC diagnostic pop
+	}
 #elif defined(HAVE_QTDBUS)
-	if (s_dbus_cookie != 0)
+	if (enabled && s_dbus_cookie != 0)
 	{
 		for (const char* service : { "org.freedesktop.ScreenSaver", "org.mate.ScreenSaver" })
 		{
@@ -68,25 +76,8 @@ void enable_display_sleep()
 		}
 		s_dbus_cookie = 0;
 	}
-#endif
+	else if (!enabled)
-}
-
-void disable_display_sleep()
 	{
-	if (!display_sleep_control_supported())
-	{
-		return;
-	}
-
-#ifdef _WIN32
-	SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED);
-#elif defined(__APPLE__)
-#pragma GCC diagnostic push
-// Necessary as some of those values are macro using old casts
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-	IOPMAssertionCreateWithName(kIOPMAssertionTypePreventUserIdleDisplaySleep, kIOPMAssertionLevelOn, CFSTR("Game running"), &s_pm_assertion);
-#pragma GCC diagnostic pop
-#elif defined(HAVE_QTDBUS)
 		for (const char* service : { "org.freedesktop.ScreenSaver", "org.mate.ScreenSaver" })
 		{
 			QDBusInterface interface(service, "/ScreenSaver", service, QDBusConnection::sessionBus());
@@ -100,5 +91,6 @@ void disable_display_sleep()
 				break;
 			}
 		}
+	}
 #endif
 }

rpcs3/display_sleep_control.h

@@ -1,5 +1,4 @@
 #pragma once
 
 bool display_sleep_control_supported();
-void enable_display_sleep();
+void enable_display_sleep(bool enabled);
-void disable_display_sleep();

rpcs3/headless_application.cpp

@@ -168,6 +168,9 @@ void headless_application::InitializeCallbacks()
 	callbacks.play_sound = [](const std::string&){};
 	callbacks.add_breakpoint = [](u32 /*addr*/){};
 
+	callbacks.display_sleep_control_supported = [](){ return false; };
+	callbacks.enable_display_sleep = [](bool /*enabled*/){};
+
 	callbacks.check_microphone_permissions = [](){};
 
 	Emu.SetCallbacks(std::move(callbacks));

rpcs3/main_application.cpp

@@ -73,14 +73,7 @@ void main_application::OnEmuSettingsChange()
 {
 	if (Emu.IsRunning())
 	{
-		if (g_cfg.misc.prevent_display_sleep)
+		enable_display_sleep(!g_cfg.misc.prevent_display_sleep);
-		{
-			disable_display_sleep();
-		}
-		else
-		{
-			enable_display_sleep();
-		}
 	}
 
 	if (!Emu.IsStopped())

rpcs3/rpcs3qt/gui_application.cpp

@@ -13,6 +13,7 @@
 #include "qt_camera_handler.h"
 #include "qt_music_handler.h"
 #include "rpcs3_version.h"
+#include "display_sleep_control.h"
 
 #ifdef WITH_DISCORD_RPC
 #include "_discord_utils.h"
@@ -882,6 +883,9 @@ void gui_application::InitializeCallbacks()
 		});
 	};
 
+	callbacks.display_sleep_control_supported = [](){ return display_sleep_control_supported(); };
+	callbacks.enable_display_sleep = [](bool enabled){ enable_display_sleep(enabled); };
+
 	callbacks.check_microphone_permissions = []()
 	{
 #if QT_CONFIG(permissions)

rpcs3/rpcs3qt/settings_dialog.cpp

@@ -14,7 +14,6 @@
 #include <QStyleFactory>
 
 #include "gui_settings.h"
-#include "display_sleep_control.h"
 #include "qt_utils.h"
 #include "uuid.h"
 #include "settings_dialog.h"
@@ -1822,7 +1821,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 
 	m_emu_settings->EnhanceCheckBox(ui->preventDisplaySleep, emu_settings_type::PreventDisplaySleep);
 	SubscribeTooltip(ui->preventDisplaySleep, tooltips.settings.prevent_display_sleep);
-	ui->preventDisplaySleep->setEnabled(display_sleep_control_supported());
+	ui->preventDisplaySleep->setEnabled(Emu.GetCallbacks().display_sleep_control_supported());
 
 	m_emu_settings->EnhanceCheckBox(ui->showTrophyPopups, emu_settings_type::ShowTrophyPopups);
 	SubscribeTooltip(ui->showTrophyPopups, tooltips.settings.show_trophy_popups);