Allowing Config class to resolve isFullscreen flag from CLI arguments

src/common/config.cpp

@@ -42,6 +42,7 @@ static std::string logFilter;
 static std::string logType = "async";
 static std::string userName = "shadPS4";
 static std::string updateChannel;
+static std::string patchFile = "";
 static std::string backButtonBehavior = "left";
 static bool useSpecialPad = false;
 static int specialPadClass = 1;
@@ -139,6 +140,10 @@ std::string getUpdateChannel() {
     return updateChannel;
 }
 
+std::string getPatchFile() {
+    return patchFile;
+}
+
 std::string getBackButtonBehavior() {
     return backButtonBehavior;
 }
@@ -307,6 +312,10 @@ void setUpdateChannel(const std::string& type) {
     updateChannel = type;
 }
 
+void setPatchFile(const std::string& fileName) {
+    patchFile = fileName;
+}
+
 void setBackButtonBehavior(const std::string& type) {
     backButtonBehavior = type;
 }
@@ -483,6 +492,7 @@ void load(const std::filesystem::path& path) {
         }
         isShowSplash = toml::find_or<bool>(general, "showSplash", true);
         isAutoUpdate = toml::find_or<bool>(general, "autoUpdate", false);
+        backButtonBehavior = toml::find_or<std::string>(general, "backButtonBehavior", "left");
     }
 
     if (data.contains("Input")) {
@@ -565,6 +575,18 @@ void load(const std::filesystem::path& path) {
         m_language = toml::find_or<int>(settings, "consoleLanguage", 1);
     }
 }
+
+void loadArgs(int& argc, char* argv[]) {
+    for (int i = 0; i < argc; i++) {
+        const std::string arg = argv[i];
+        if (arg == "-p") {
+            patchFile = argv[i + 1];
+        } else if (arg == "-f" || arg == "--fullscreen") {
+            isFullscreen = true;
+        }
+    }
+}
+
 void save(const std::filesystem::path& path) {
     toml::value data;
 
@@ -668,6 +690,7 @@ void setDefaultValues() {
     } else {
         updateChannel = "Nightly";
     }
+    patchFile = "";
     cursorState = HideCursorState::Idle;
     cursorHideTimeout = 5;
     backButtonBehavior = "left";

src/common/config.h

@@ -13,6 +13,7 @@ enum HideCursorState : s16 { Never, Idle, Always };
 
 void load(const std::filesystem::path& path);
 void save(const std::filesystem::path& path);
+void loadArgs(int& argc, char* argv[]);
 
 bool isNeoMode();
 bool isFullscreenMode();
@@ -24,6 +25,8 @@ std::string getLogFilter();
 std::string getLogType();
 std::string getUserName();
 std::string getUpdateChannel();
+std::string getPatchFile();
+std::string getBackButtonBehavior();
 
 s16 getCursorState();
 int getCursorHideTimeout();
@@ -62,6 +65,8 @@ void setLanguage(u32 language);
 void setNeoMode(bool enable);
 void setUserName(const std::string& type);
 void setUpdateChannel(const std::string& type);
+void setPatchFile(const std::string& fileName);
+void setBackButtonBehavior(const std::string& type);
 
 void setCursorState(s16 cursorState);
 void setCursorHideTimeout(int newcursorHideTimeout);

src/emulator.cpp

@@ -9,11 +9,11 @@
 #include "common/logging/log.h"
 #ifdef ENABLE_QT_GUI
 #include <QtCore>
-#include "common/memory_patcher.h"
 #endif
 #include "common/assert.h"
 #include "common/discord_rpc_handler.h"
 #include "common/elf_info.h"
+#include "common/memory_patcher.h"
 #include "common/ntapi.h"
 #include "common/path_util.h"
 #include "common/polyfill_thread.h"
@@ -256,6 +256,14 @@ void Emulator::Run(const std::filesystem::path& file) {
     std::exit(0);
 }
 
+void Emulator::Run(int& argc, char* argv[]) {
+    // Load config options from arguments
+    Config::loadArgs(argc, argv);
+    MemoryPatcher::patchFile = Config::getPatchFile();
+
+    this->Run(argv[1]);
+}
+
 void Emulator::LoadSystemModules(const std::filesystem::path& file) {
     constexpr std::array<SysModules, 13> ModulesToLoad{
         {{"libSceNgs2.sprx", &Libraries::Ngs2::RegisterlibSceNgs2},

src/emulator.h

@@ -26,6 +26,7 @@ class Emulator {
     ~Emulator();
 
     void Run(const std::filesystem::path& file);
+    void Run(int& argc, char* argv[]);
     void UpdatePlayTime(const std::string& serial);
 
 private:

src/main.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <fmt/core.h>
-#include "common/memory_patcher.h"
 #include "emulator.h"
 
 #ifdef _WIN32
@@ -24,16 +23,8 @@ int main(int argc, char* argv[]) {
         return -1;
     }
 
-    for (int i = 0; i < argc; i++) {
-        std::string curArg = argv[i];
-        if (curArg == "-p") {
-            std::string patchFile = argv[i + 1];
-            MemoryPatcher::patchFile = patchFile;
-        }
-    }
-
     Core::Emulator emulator;
-    emulator.Run(argv[1]);
+    emulator.Run(argc, argv);
 
     return 0;
 }

src/qt_gui/main.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "common/config.h"
-#include "common/memory_patcher.h"
 #include "core/file_sys/fs.h"
 #include "emulator.h"
 #include "game_install_dialog.h"
@@ -45,14 +44,7 @@ int main(int argc, char* argv[]) {
     // Check for command line arguments
     if (has_command_line_argument) {
         Core::Emulator emulator;
-        for (int i = 0; i < argc; i++) {
-            std::string curArg = argv[i];
-            if (curArg == "-p") {
-                std::string patchFile = argv[i + 1];
-                MemoryPatcher::patchFile = patchFile;
-            }
-        }
-        emulator.Run(argv[1]);
+        emulator.Run(argc, argv);
     }
 
     // Run the Qt application