VERY experimental Nintendo Switch 2 emulator
C++
yuzu: create linux group in general settings
flodavid6bd3056c5269
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txtindex 36fc60e0ec..4ce9f201e1 100644--- a/externals/CMakeLists.txt+++ b/externals/CMakeLists.txt@@ -189,8 +189,7 @@ if (ANDROID)endif()endif()-# Gamemode-if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")+if (UNIX)add_subdirectory(gamemode)target_include_directories(gamemode PUBLIC gamemode/include)endif()diff --git a/externals/gamemode/CMakeLists.txt b/externals/gamemode/CMakeLists.txtindex 3dddc6dbde..eb970023db 100644--- a/externals/gamemode/CMakeLists.txt+++ b/externals/gamemode/CMakeLists.txt@@ -4,4 +4,8 @@project(gamemode)add_library(gamemode include/gamemode_client.h)++target_link_libraries(gamemode PRIVATE common)++target_include_directories(gamemode PUBLIC include)set_target_properties(gamemode PROPERTIES LINKER_LANGUAGE C)diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txtindex e216eb3dee..57cbb9d072 100644--- a/src/common/CMakeLists.txt+++ b/src/common/CMakeLists.txt@@ -174,6 +174,15 @@ if(ANDROID))endif()+if (UNIX)+ target_sources(common PRIVATE+ linux/gamemode.cpp+ linux/gamemode.h+ )++ target_link_libraries(common PRIVATE gamemode)+endif()+if(ARCHITECTURE_x86_64)target_sources(commonPRIVATEdiff --git a/src/common/linux/gamemode.cpp b/src/common/linux/gamemode.cppnew file mode 100644index 0000000000..8876d8dc42--- /dev/null+++ b/src/common/linux/gamemode.cpp@@ -0,0 +1,39 @@+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#include <gamemode_client.h>++#include "common/linux/gamemode.h"+#include "common/settings.h"++namespace Common::Linux {++void StartGamemode() {+ if (Settings::values.enable_gamemode) {+ if (gamemode_request_start() < 0) {+ LOG_WARNING(Frontend, "Failed to start gamemode: {}", gamemode_error_string());+ } else {+ LOG_INFO(Frontend, "Started gamemode");+ }+ }+}++void StopGamemode() {+ if (Settings::values.enable_gamemode) {+ if (gamemode_request_end() < 0) {+ LOG_WARNING(Frontend, "Failed to stop gamemode: {}", gamemode_error_string());+ } else {+ LOG_INFO(Frontend, "Stopped gamemode");+ }+ }+}++void SetGamemodeState(bool state) {+ if (state) {+ StartGamemode();+ } else {+ StopGamemode();+ }+}++} // namespace Common::Linuxdiff --git a/src/common/linux/gamemode.h b/src/common/linux/gamemode.hnew file mode 100644index 0000000000..b80646ae27--- /dev/null+++ b/src/common/linux/gamemode.h@@ -0,0 +1,24 @@+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#pragma once++namespace Common::Linux {++/**+ * Start the (Feral Interactive) Linux gamemode if it is installed and it is activated+ */+void StartGamemode();++/**+ * Stop the (Feral Interactive) Linux gamemode if it is installed and it is activated+ */+void StopGamemode();++/**+ * Start or stop the (Feral Interactive) Linux gamemode if it is installed and it is activated+ * @param state The new state the gamemode should have+ */+void SetGamemodeState(bool state);++} // namespace Common::Linuxdiff --git a/src/common/settings.cpp b/src/common/settings.cppindex a10131eb28..3e829253fe 100644--- a/src/common/settings.cpp+++ b/src/common/settings.cpp@@ -219,6 +219,8 @@ const char* TranslateCategory(Category category) {return "Services";case Category::Paths:return "Paths";+ case Category::Linux:+ return "Linux";case Category::MaxEnum:break;}diff --git a/src/common/settings.h b/src/common/settings.hindex 788020bdea..491f0d3e08 100644--- a/src/common/settings.h+++ b/src/common/settings.h@@ -178,8 +178,6 @@ struct Values {true,&use_speed_limit};- Setting<bool> enable_gamemode{linkage, false, "enable_gamemode", Category::Core};-// CpuSwitchableSetting<CpuAccuracy, true> cpu_accuracy{linkage, CpuAccuracy::Auto,CpuAccuracy::Auto, CpuAccuracy::Paranoid,@@ -429,6 +427,9 @@ struct Values {true,true};+ // Linux+ SwitchableSetting<bool> enable_gamemode{linkage, true, "enable_gamemode", Category::Linux};+// ControlsInputSetting<std::array<PlayerInput, 10>> players;diff --git a/src/common/settings_common.h b/src/common/settings_common.hindex 7943223eba..344c044394 100644--- a/src/common/settings_common.h+++ b/src/common/settings_common.h@@ -41,6 +41,7 @@ enum class Category : u32 {Multiplayer,Services,Paths,+ Linux,MaxEnum,};diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cppindex ce7e17850b..701b895e70 100644--- a/src/yuzu/configuration/configure_general.cpp+++ b/src/yuzu/configuration/configure_general.cpp@@ -29,9 +29,6 @@ ConfigureGeneral::ConfigureGeneral(const Core::System& system_,if (!Settings::IsConfiguringGlobal()) {ui->button_reset_defaults->setVisible(false);}-#ifndef __linux__- ui->enable_gamemode->setVisible(false);-#endif}ConfigureGeneral::~ConfigureGeneral() = default;@@ -39,12 +36,29 @@ ConfigureGeneral::~ConfigureGeneral() = default;void ConfigureGeneral::SetConfiguration() {}void ConfigureGeneral::Setup(const ConfigurationShared::Builder& builder) {- QLayout& layout = *ui->general_widget->layout();+ QLayout& general_layout = *ui->general_widget->layout();+ QLayout& linux_layout = *ui->linux_widget->layout();++ std::map<u32, QWidget*> general_hold{};+ std::map<u32, QWidget*> linux_hold{};++ std::vector<Settings::BasicSetting*> settings;++ auto push = [&settings](auto& list) {+ for (auto setting : list) {+ settings.push_back(setting);+ }+ };- std::map<u32, QWidget*> hold{};+ push(UISettings::values.linkage.by_category[Settings::Category::UiGeneral]);+ push(Settings::values.linkage.by_category[Settings::Category::Linux]);- for (const auto setting :- UISettings::values.linkage.by_category[Settings::Category::UiGeneral]) {+ // Only show Linux group on Unix+#ifndef __unix__+ ui->LinuxGroupBox->setVisible(false);+#endif++ for (const auto setting : settings) {auto* widget = builder.BuildWidget(setting, apply_funcs);if (widget == nullptr) {@@ -55,11 +69,23 @@ void ConfigureGeneral::Setup(const ConfigurationShared::Builder& builder) {continue;}- hold.emplace(setting->Id(), widget);+ switch (setting->GetCategory()) {+ case Settings::Category::UiGeneral:+ general_hold.emplace(setting->Id(), widget);+ break;+ case Settings::Category::Linux:+ linux_hold.emplace(setting->Id(), widget);+ break;+ default:+ widget->deleteLater();+ }}- for (const auto& [id, widget] : hold) {- layout.addWidget(widget);+ for (const auto& [id, widget] : general_hold) {+ general_layout.addWidget(widget);+ }+ for (const auto& [id, widget] : linux_hold) {+ linux_layout.addWidget(widget);}}diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.uiindex a10e7d3a50..ef20891a32 100644--- a/src/yuzu/configuration/configure_general.ui+++ b/src/yuzu/configuration/configure_general.ui@@ -46,6 +46,33 @@</layout></widget></item>+ <item>+ <widget class="QGroupBox" name="LinuxGroupBox">+ <property name="title">+ <string>Linux</string>+ </property>+ <layout class="QVBoxLayout" name="LinuxVerticalLayout_1">+ <item>+ <widget class="QWidget" name="linux_widget" native="true">+ <layout class="QVBoxLayout" name="LinuxVerticalLayout_2">+ <property name="leftMargin">+ <number>0</number>+ </property>+ <property name="topMargin">+ <number>0</number>+ </property>+ <property name="rightMargin">+ <number>0</number>+ </property>+ <property name="bottomMargin">+ <number>0</number>+ </property>+ </layout>+ </widget>+ </item>+ </layout>+ </widget>+ </item><item><spacer name="verticalSpacer"><property name="orientation">diff --git a/src/yuzu/configuration/configure_system.ui b/src/yuzu/configuration/configure_system.uiindex 2a735836e1..04b771129d 100644--- a/src/yuzu/configuration/configure_system.ui+++ b/src/yuzu/configuration/configure_system.ui@@ -57,7 +57,7 @@</widget></item><item>- <widget class="QGroupBox" name="groupBox">+ <widget class="QGroupBox" name="coreGroup"><property name="title"><string>Core</string></property>diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cppindex 903805e755..ee0ca4aa73 100644--- a/src/yuzu/configuration/shared_translation.cpp+++ b/src/yuzu/configuration/shared_translation.cpp@@ -175,7 +175,9 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) {INSERT(UISettings, hide_mouse, tr("Hide mouse on inactivity"), QStringLiteral());INSERT(UISettings, controller_applet_disabled, tr("Disable controller applet"),QStringLiteral());- INSERT(UISettings, enable_gamemode, tr("Enable Gamemode"), QStringLiteral());++ // Linux+ INSERT(Settings, enable_gamemode, tr("Enable Gamemode"), QStringLiteral());// Ui Debuggingdiff --git a/src/yuzu/main.cpp b/src/yuzu/main.cppindex cf61d42584..6ef518b6a8 100644--- a/src/yuzu/main.cpp+++ b/src/yuzu/main.cpp@@ -17,6 +17,7 @@#ifdef __unix__#include <csignal>#include <sys/socket.h>+#include "common/linux/gamemode.h"#endif#include <boost/container/flat_set.hpp>@@ -185,10 +186,6 @@ __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;}#endif-#ifdef __linux__-#include <gamemode_client.h>-#endif-constexpr int default_mouse_hide_timeout = 2500;constexpr int default_mouse_center_timeout = 10;constexpr int default_input_update_timeout = 1;@@ -323,6 +320,7 @@ GMainWindow::GMainWindow(std::unique_ptr<QtConfig> config_, bool has_broken_vulkprovider{std::make_unique<FileSys::ManualContentProvider>()} {#ifdef __unix__SetupSigInterrupts();+ SetGamemodeEnabled(Settings::values.enable_gamemode.GetValue());#endifsystem->Initialize();@@ -2130,14 +2128,8 @@ void GMainWindow::OnEmulationStopped() {discord_rpc->Update();-#ifdef __linux__- if (UISettings::values.enable_gamemode) {- if (gamemode_request_end() < 0) {- LOG_WARNING(Frontend, "Failed to stop gamemode: {}", gamemode_error_string());- } else {- LOG_INFO(Frontend, "Stopped gamemode");- }- }+#ifdef __unix__+ Common::Linux::StopGamemode();#endif// The emulation is stopped, so closing the window or not does not matter anymore@@ -3519,14 +3511,8 @@ void GMainWindow::OnStartGame() {discord_rpc->Update();-#ifdef __linux__- if (UISettings::values.enable_gamemode) {- if (gamemode_request_start() < 0) {- LOG_WARNING(Frontend, "Failed to start gamemode: {}", gamemode_error_string());- } else {- LOG_INFO(Frontend, "Started gamemode");- }- }+#ifdef __unix__+ Common::Linux::StartGamemode();#endif}@@ -3549,14 +3535,8 @@ void GMainWindow::OnPauseGame() {UpdateMenuState();AllowOSSleep();-#ifdef __linux__- if (UISettings::values.enable_gamemode) {- if (gamemode_request_end() < 0) {- LOG_WARNING(Frontend, "Failed to stop gamemode: {}", gamemode_error_string());- } else {- LOG_INFO(Frontend, "Stopped gamemode");- }- }+#ifdef __unix__+ Common::Linux::StopGamemode();#endif}@@ -3839,6 +3819,9 @@ void GMainWindow::OnConfigure() {const auto old_theme = UISettings::values.theme;const bool old_discord_presence = UISettings::values.enable_discord_presence.GetValue();const auto old_language_index = Settings::values.language_index.GetValue();+#ifdef __unix__+ const bool old_gamemode = Settings::values.enable_gamemode.GetValue();+#endifSettings::SetConfiguringGlobal(true);ConfigureDialog configure_dialog(this, hotkey_registry, input_subsystem.get(),@@ -3900,6 +3883,11 @@ void GMainWindow::OnConfigure() {if (UISettings::values.enable_discord_presence.GetValue() != old_discord_presence) {SetDiscordEnabled(UISettings::values.enable_discord_presence.GetValue());}+#ifdef __unix__+ if (Settings::values.enable_gamemode.GetValue() != old_gamemode) {+ SetGamemodeEnabled(Settings::values.enable_gamemode.GetValue());+ }+#endifif (!multiplayer_state->IsHostingPublicRoom()) {multiplayer_state->UpdateCredentials();@@ -5215,25 +5203,13 @@ void GMainWindow::SetDiscordEnabled([[maybe_unused]] bool state) {discord_rpc->Update();}-void GMainWindow::SetGamemodeDisabled([[maybe_unused]] bool state) {-#ifdef __linux__+#ifdef __unix__+void GMainWindow::SetGamemodeEnabled(bool state) {if (emulation_running) {- if (state) {- if (gamemode_request_end() < 0) {- LOG_WARNING(Frontend, "Failed to stop gamemode: {}", gamemode_error_string());- } else {- LOG_INFO(Frontend, "Stopped gamemode");- }- } else {- if (gamemode_request_start() < 0) {- LOG_WARNING(Frontend, "Failed to start gamemode: {}", gamemode_error_string());- } else {- LOG_INFO(Frontend, "Started gamemode");- }- }+ Common::Linux::SetGamemodeState(state);}-#endif}+#endifvoid GMainWindow::changeEvent(QEvent* event) {#ifdef __unix__diff --git a/src/yuzu/main.h b/src/yuzu/main.hindex c989c079d5..2e13e1834a 100644--- a/src/yuzu/main.h+++ b/src/yuzu/main.h@@ -340,6 +340,7 @@ private:void SetupSigInterrupts();static void HandleSigInterrupt(int);void OnSigInterruptNotifierActivated();+ void SetGamemodeEnabled(bool state);#endifprivate slots:diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.hindex 3e5ddc07ab..549a39e1bd 100644--- a/src/yuzu/uisettings.h+++ b/src/yuzu/uisettings.h@@ -140,9 +140,6 @@ struct Values {Settings::Specialization::Default,true,true};- // Gamemode- Setting<bool> enable_gamemode{linkage, false, "enable_gamemode", Category::UiGeneral};-Setting<bool> disable_web_applet{linkage, true, "disable_web_applet", Category::Ui};// Discord RPCdiff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cppindex 1c3a1809b1..a81635fa47 100644--- a/src/yuzu_cmd/yuzu.cpp+++ b/src/yuzu_cmd/yuzu.cpp@@ -63,8 +63,8 @@ __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;}#endif-#ifdef __linux__-#include <gamemode_client.h>+#ifdef __unix__+#include "common/linux/gamemode.h"#endifstatic void PrintHelp(const char* argv0) {@@ -429,14 +429,8 @@ int main(int argc, char** argv) {exit(0);});-#ifdef __linux__- if (Settings::values.disable_gamemode) {- if (gamemode_request_start() < 0) {- LOG_WARNING(Frontend, "Failed to start gamemode: {}", gamemode_error_string());- } else {- LOG_INFO(Frontend, "Started gamemode");- }- }+#ifdef __unix__+ Common::Linux::StartGamemode();#endifvoid(system.Run());@@ -450,14 +444,8 @@ int main(int argc, char** argv) {void(system.Pause());system.ShutdownMainProcess();-#ifdef __linux__- if (Settings::values.disable_gamemode) {- if (gamemode_request_end() < 0) {- LOG_WARNING(Frontend, "Failed to stop gamemode: {}", gamemode_error_string());- } else {- LOG_INFO(Frontend, "Stopped gamemode");- }- }+#ifdef __unix__+ Common::Linux::StopGamemode();#endifdetached_tasks.WaitForAllTasks();