From 9082908606e092be181330c201ddaaf74da6d11c Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 24 Feb 2025 21:45:22 +0100 Subject: [PATCH] Move is_input_allowed to GSFrameBase --- rpcs3/Emu/CMakeLists.txt | 1 + rpcs3/Emu/RSX/GSFrameBase.cpp | 10 ++++++++++ rpcs3/emucore.vcxproj | 1 + rpcs3/emucore.vcxproj.filters | 3 +++ rpcs3/rpcs3qt/gs_frame.cpp | 8 +------- 5 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 rpcs3/Emu/RSX/GSFrameBase.cpp diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt index d3ad281643..55138b2940 100644 --- a/rpcs3/Emu/CMakeLists.txt +++ b/rpcs3/Emu/CMakeLists.txt @@ -571,6 +571,7 @@ target_sources(rpcs3_emu PRIVATE RSX/Program/program_util.cpp RSX/Program/SPIRVCommon.cpp RSX/Program/VertexProgramDecompiler.cpp + RSX/GSFrameBase.cpp RSX/RSXDisAsm.cpp RSX/RSXFIFO.cpp RSX/RSXOffload.cpp diff --git a/rpcs3/Emu/RSX/GSFrameBase.cpp b/rpcs3/Emu/RSX/GSFrameBase.cpp new file mode 100644 index 0000000000..32121bf06e --- /dev/null +++ b/rpcs3/Emu/RSX/GSFrameBase.cpp @@ -0,0 +1,10 @@ +#include "stdafx.h" +#include "GSFrameBase.h" +#include "Emu/system_config.h" + +atomic_t g_game_window_focused = false; + +bool is_input_allowed() +{ + return g_game_window_focused || g_cfg.io.background_input_enabled; +} diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index 9a916678ae..106fb0885f 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -114,6 +114,7 @@ + diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters index de42637d4c..59da233382 100644 --- a/rpcs3/emucore.vcxproj.filters +++ b/rpcs3/emucore.vcxproj.filters @@ -1342,6 +1342,9 @@ Emu\GPU\RSX\Program + + Emu\GPU\RSX\Game Window + diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp index b24ce33fc3..b8371a19e4 100644 --- a/rpcs3/rpcs3qt/gs_frame.cpp +++ b/rpcs3/rpcs3qt/gs_frame.cpp @@ -53,20 +53,14 @@ extern atomic_t g_user_asked_for_recording; extern atomic_t g_user_asked_for_screenshot; extern atomic_t g_user_asked_for_frame_capture; extern atomic_t g_disable_frame_limit; +extern atomic_t g_game_window_focused; extern atomic_t g_recording_mode; -atomic_t g_game_window_focused = false; - namespace pad { extern atomic_t g_home_menu_requested; } -bool is_input_allowed() -{ - return g_game_window_focused || g_cfg.io.background_input_enabled; -} - gs_frame::gs_frame(QScreen* screen, const QRect& geometry, const QIcon& appIcon, std::shared_ptr gui_settings, bool force_fullscreen) : QWindow() , m_initial_geometry(geometry)