CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

general: Convert use_docked_mode to an enumeration 

Allows some special interactions with it in the Qt frontend.
master
lat9nq 2023-08-21 16:03:30 +07:00
parent 8a4cb3f902
commit 387ede76d2
17 changed files with 74 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/settings.h
Unescape Escape View File

@ -379,7 +379,13 @@ struct Values {
Setting<s32> current_user{linkage, 0, "current_user", Category::System}; Setting<s32> current_user{linkage, 0, "current_user", Category::System};
SwitchableSetting<bool> use_docked_mode{linkage, true, "use_docked_mode", Category::System}; SwitchableSetting<ConsoleMode> use_docked_mode{linkage,
ConsoleMode::Docked,
"use_docked_mode",
Category::System,
Specialization::Radio,
true,
true};
// Controls // Controls
InputSetting<std::array<PlayerInput, 10>> players; InputSetting<std::array<PlayerInput, 10>> players;

1
src/common/settings_common.h
Unescape Escape View File

@ -56,6 +56,7 @@ enum Specialization : u8 {
Scalar = 5, // Values are continuous Scalar = 5, // Values are continuous
Countable = 6, // Can be stepped through Countable = 6, // Can be stepped through
Paired = 7, // Another setting is associated with this setting Paired = 7, // Another setting is associated with this setting
Radio = 8, // Setting should be presented in a radio group
Percentage = (1 << SpecializationAttributeOffset), // Should be represented as a percentage Percentage = (1 << SpecializationAttributeOffset), // Should be represented as a percentage
}; };

2
src/common/settings_enums.h
Unescape Escape View File

@ -146,6 +146,8 @@ ENUM(AntiAliasing, None, Fxaa, Smaa, MaxEnum);
ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch); ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch);
ENUM(ConsoleMode, Handheld, Docked);
template <typename Type> template <typename Type>
inline std::string CanonicalizeEnum(Type id) { inline std::string CanonicalizeEnum(Type id) {
const auto group = EnumMetadata<Type>::Canonicalizations(); const auto group = EnumMetadata<Type>::Canonicalizations();

3
src/core/frontend/applets/controller.cpp
Unescape Escape View File

@ -3,6 +3,7 @@
#include "common/assert.h" #include "common/assert.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/settings_enums.h"
#include "core/frontend/applets/controller.h" #include "core/frontend/applets/controller.h"
#include "core/hid/emulated_controller.h" #include "core/hid/emulated_controller.h"
#include "core/hid/hid_core.h" #include "core/hid/hid_core.h"
@ -62,7 +63,7 @@ void DefaultControllerApplet::ReconfigureControllers(ReconfigureCallback callbac
controller->Connect(true); controller->Connect(true);
} }
} else if (index == 0 && parameters.enable_single_mode && parameters.allow_handheld && } else if (index == 0 && parameters.enable_single_mode && parameters.allow_handheld &&
!Settings::values.use_docked_mode.GetValue()) { Settings::values.use_docked_mode.GetValue() == Settings::ConsoleMode::Handheld) {
// We should *never* reach here under any normal circumstances. // We should *never* reach here under any normal circumstances.
controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld); controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld);
controller->Connect(true); controller->Connect(true);

4
src/core/frontend/framebuffer_layout.cpp
Unescape Escape View File

@ -5,6 +5,7 @@
#include "common/assert.h" #include "common/assert.h"
#include "common/settings.h" #include "common/settings.h"
#include "common/settings_enums.h"
#include "core/frontend/framebuffer_layout.h" #include "core/frontend/framebuffer_layout.h"
namespace Layout { namespace Layout {
@ -49,7 +50,8 @@ FramebufferLayout DefaultFrameLayout(u32 width, u32 height) {
} }
FramebufferLayout FrameLayoutFromResolutionScale(f32 res_scale) { FramebufferLayout FrameLayoutFromResolutionScale(f32 res_scale) {
const bool is_docked = Settings::values.use_docked_mode.GetValue(); const bool is_docked =
Settings::values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked;
const u32 screen_width = is_docked ? ScreenDocked::Width : ScreenUndocked::Width; const u32 screen_width = is_docked ? ScreenDocked::Width : ScreenUndocked::Width;
const u32 screen_height = is_docked ? ScreenDocked::Height : ScreenUndocked::Height; const u32 screen_height = is_docked ? ScreenDocked::Height : ScreenUndocked::Height;

6
src/core/hle/service/am/am.cpp
Unescape Escape View File

@ -6,6 +6,7 @@
#include <cinttypes> #include <cinttypes>
#include <cstring> #include <cstring>
#include "common/settings.h" #include "common/settings.h"
#include "common/settings_enums.h"
#include "core/core.h" #include "core/core.h"
#include "core/file_sys/control_metadata.h" #include "core/file_sys/control_metadata.h"
#include "core/file_sys/patch_manager.h" #include "core/file_sys/patch_manager.h"
@ -833,7 +834,7 @@ void ICommonStateGetter::GetDefaultDisplayResolution(HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 4}; IPC::ResponseBuilder rb{ctx, 4};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
if (Settings::values.use_docked_mode.GetValue()) { if (Settings::values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked) {
rb.Push(static_cast<u32>(Service::VI::DisplayResolution::DockedWidth)); rb.Push(static_cast<u32>(Service::VI::DisplayResolution::DockedWidth));
rb.Push(static_cast<u32>(Service::VI::DisplayResolution::DockedHeight)); rb.Push(static_cast<u32>(Service::VI::DisplayResolution::DockedHeight));
} else { } else {
@ -921,7 +922,8 @@ void IStorage::Open(HLERequestContext& ctx) {
} }
void ICommonStateGetter::GetOperationMode(HLERequestContext& ctx) { void ICommonStateGetter::GetOperationMode(HLERequestContext& ctx) {
const bool use_docked_mode{Settings::values.use_docked_mode.GetValue()}; const bool use_docked_mode{Settings::values.use_docked_mode.GetValue() ==
Settings::ConsoleMode::Docked};
LOG_DEBUG(Service_AM, "called, use_docked_mode={}", use_docked_mode); LOG_DEBUG(Service_AM, "called, use_docked_mode={}", use_docked_mode);
IPC::ResponseBuilder rb{ctx, 3}; IPC::ResponseBuilder rb{ctx, 3};

6
src/core/hle/service/apm/apm_controller.cpp
Unescape Escape View File

@ -7,6 +7,7 @@
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/settings.h" #include "common/settings.h"
#include "common/settings_enums.h"
#include "core/core_timing.h" #include "core/core_timing.h"
#include "core/hle/service/apm/apm_controller.h" #include "core/hle/service/apm/apm_controller.h"
@ -67,8 +68,9 @@ void Controller::SetFromCpuBoostMode(CpuBoostMode mode) {
} }
PerformanceMode Controller::GetCurrentPerformanceMode() const { PerformanceMode Controller::GetCurrentPerformanceMode() const {
return Settings::values.use_docked_mode.GetValue() ? PerformanceMode::Boost return Settings::values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked
: PerformanceMode::Normal; ? PerformanceMode::Boost
: PerformanceMode::Normal;
} }
PerformanceConfiguration Controller::GetCurrentPerformanceConfiguration(PerformanceMode mode) { PerformanceConfiguration Controller::GetCurrentPerformanceConfiguration(PerformanceMode mode) {

2
src/core/hle/service/hid/controllers/gesture.cpp
Unescape Escape View File

@ -331,7 +331,7 @@ Controller_Gesture::GestureProperties Controller_Gesture::GetGestureProperties()
}; };
// Hack: There is no touch in docked but games still allow it // Hack: There is no touch in docked but games still allow it
if (Settings::values.use_docked_mode.GetValue()) { if (Settings::values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked) {
gesture.points[id] = { gesture.points[id] = {
.x = static_cast<s32>(active_x * Layout::ScreenDocked::Width), .x = static_cast<s32>(active_x * Layout::ScreenDocked::Width),
.y = static_cast<s32>(active_y * Layout::ScreenDocked::Height), .y = static_cast<s32>(active_y * Layout::ScreenDocked::Height),

2
src/core/hle/service/hid/controllers/npad.cpp
Unescape Escape View File

@ -1518,7 +1518,7 @@ bool Controller_NPad::IsControllerSupported(Core::HID::NpadStyleIndex controller
return false; return false;
} }
// Handheld shouldn't be supported in docked mode // Handheld shouldn't be supported in docked mode
if (Settings::values.use_docked_mode.GetValue()) { if (Settings::values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked) {
return false; return false;
} }

2
src/core/hle/service/vi/vi.cpp
Unescape Escape View File

@ -217,7 +217,7 @@ private:
IPC::ResponseBuilder rb{ctx, 6}; IPC::ResponseBuilder rb{ctx, 6};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
if (Settings::values.use_docked_mode.GetValue()) { if (Settings::values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked) {
rb.Push(static_cast<u32>(Service::VI::DisplayResolution::DockedWidth)); rb.Push(static_cast<u32>(Service::VI::DisplayResolution::DockedWidth));
rb.Push(static_cast<u32>(Service::VI::DisplayResolution::DockedHeight)); rb.Push(static_cast<u32>(Service::VI::DisplayResolution::DockedHeight));
} else { } else {

4
src/core/telemetry_session.cpp
Unescape Escape View File

@ -14,6 +14,7 @@
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/settings.h" #include "common/settings.h"
#include "common/settings_enums.h"
#include "core/file_sys/control_metadata.h" #include "core/file_sys/control_metadata.h"
#include "core/file_sys/patch_manager.h" #include "core/file_sys/patch_manager.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
@ -275,7 +276,8 @@ void TelemetrySession::AddInitialInfo(Loader::AppLoader& app_loader,
static_cast<u32>(Settings::values.shader_backend.GetValue())); static_cast<u32>(Settings::values.shader_backend.GetValue()));
AddField(field_type, "Renderer_UseAsynchronousShaders", AddField(field_type, "Renderer_UseAsynchronousShaders",
Settings::values.use_asynchronous_shaders.GetValue()); Settings::values.use_asynchronous_shaders.GetValue());
AddField(field_type, "System_UseDockedMode", Settings::values.use_docked_mode.GetValue()); AddField(field_type, "System_UseDockedMode",
Settings::values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked);
} }
bool TelemetrySession::SubmitTestcase() { bool TelemetrySession::SubmitTestcase() {

18
src/yuzu/applets/qt_controller.cpp
Unescape Escape View File

@ -5,6 +5,7 @@
#include <thread> #include <thread>
#include "common/assert.h" #include "common/assert.h"
#include "common/settings_enums.h"
#include "common/string_util.h" #include "common/string_util.h"
#include "core/core.h" #include "core/core.h"
#include "core/hid/emulated_controller.h" #include "core/hid/emulated_controller.h"
@ -226,9 +227,14 @@ int QtControllerSelectorDialog::exec() {
} }
void QtControllerSelectorDialog::ApplyConfiguration() { void QtControllerSelectorDialog::ApplyConfiguration() {
const bool pre_docked_mode = Settings::values.use_docked_mode.GetValue(); const bool pre_docked_mode =
Settings::values.use_docked_mode.SetValue(ui->radioDocked->isChecked()); Settings::values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked;
OnDockedModeChanged(pre_docked_mode, Settings::values.use_docked_mode.GetValue(), system); Settings::values.use_docked_mode.SetValue(ui->radioDocked->isChecked()
? Settings::ConsoleMode::Docked
: Settings::ConsoleMode::Handheld);
OnDockedModeChanged(
pre_docked_mode,
Settings::values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked, system);
Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked()); Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked());
Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked()); Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked());
@ -616,8 +622,10 @@ void QtControllerSelectorDialog::UpdateDockedState(bool is_handheld) {
ui->radioDocked->setEnabled(!is_handheld); ui->radioDocked->setEnabled(!is_handheld);
ui->radioUndocked->setEnabled(!is_handheld); ui->radioUndocked->setEnabled(!is_handheld);
ui->radioDocked->setChecked(Settings::values.use_docked_mode.GetValue()); ui->radioDocked->setChecked(Settings::values.use_docked_mode.GetValue() ==
ui->radioUndocked->setChecked(!Settings::values.use_docked_mode.GetValue()); Settings::ConsoleMode::Docked);
ui->radioUndocked->setChecked(Settings::values.use_docked_mode.GetValue() ==
Settings::ConsoleMode::Handheld);
// Also force into undocked mode if the controller type is handheld. // Also force into undocked mode if the controller type is handheld.
if (is_handheld) { if (is_handheld) {

5
src/yuzu/bootmanager.cpp
Unescape Escape View File

@ -928,8 +928,9 @@ void GRenderWindow::CaptureScreenshot(const QString& screenshot_path) {
const Layout::FramebufferLayout layout{[]() { const Layout::FramebufferLayout layout{[]() {
u32 height = UISettings::values.screenshot_height.GetValue(); u32 height = UISettings::values.screenshot_height.GetValue();
if (height == 0) { if (height == 0) {
height = Settings::values.use_docked_mode.GetValue() ? Layout::ScreenDocked::Height height = Settings::values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked
: Layout::ScreenUndocked::Height; ? Layout::ScreenDocked::Height
: Layout::ScreenUndocked::Height;
height *= Settings::values.resolution_info.up_factor; height *= Settings::values.resolution_info.up_factor;
} }
const u32 width = const u32 width =

9
src/yuzu/configuration/config.cpp
Unescape Escape View File

@ -9,6 +9,7 @@
#include "common/fs/path_util.h" #include "common/fs/path_util.h"
#include "common/settings.h" #include "common/settings.h"
#include "common/settings_common.h" #include "common/settings_common.h"
#include "common/settings_enums.h"
#include "core/core.h" #include "core/core.h"
#include "core/hle/service/acc/profile_manager.h" #include "core/hle/service/acc/profile_manager.h"
#include "core/hle/service/hid/controllers/npad.h" #include "core/hle/service/hid/controllers/npad.h"
@ -85,9 +86,9 @@ const std::map<Settings::ScalingFilter, QString> Config::scaling_filter_texts_ma
{Settings::ScalingFilter::Fsr, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "FSR"))}, {Settings::ScalingFilter::Fsr, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "FSR"))},
}; };
const std::map<bool, QString> Config::use_docked_mode_texts_map = { const std::map<Settings::ConsoleMode, QString> Config::use_docked_mode_texts_map = {
{true, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Docked"))}, {Settings::ConsoleMode::Docked, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Docked"))},
{false, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Handheld"))}, {Settings::ConsoleMode::Handheld, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Handheld"))},
}; };
const std::map<Settings::GpuAccuracy, QString> Config::gpu_accuracy_texts_map = { const std::map<Settings::GpuAccuracy, QString> Config::gpu_accuracy_texts_map = {
@ -376,7 +377,7 @@ void Config::ReadControlValues() {
const auto controller_type = Settings::values.players.GetValue()[0].controller_type; const auto controller_type = Settings::values.players.GetValue()[0].controller_type;
if (controller_type == Settings::ControllerType::Handheld) { if (controller_type == Settings::ControllerType::Handheld) {
Settings::values.use_docked_mode.SetGlobal(!IsCustomConfig()); Settings::values.use_docked_mode.SetGlobal(!IsCustomConfig());
Settings::values.use_docked_mode.SetValue(false); Settings::values.use_docked_mode.SetValue(Settings::ConsoleMode::Handheld);
} }
if (IsCustomConfig()) { if (IsCustomConfig()) {

3
src/yuzu/configuration/config.h
Unescape Escape View File

@ -9,6 +9,7 @@
#include <QMetaType> #include <QMetaType>
#include <QVariant> #include <QVariant>
#include "common/settings.h" #include "common/settings.h"
#include "common/settings_enums.h"
#include "yuzu/uisettings.h" #include "yuzu/uisettings.h"
class QSettings; class QSettings;
@ -51,7 +52,7 @@ public:
static const std::map<Settings::AntiAliasing, QString> anti_aliasing_texts_map; static const std::map<Settings::AntiAliasing, QString> anti_aliasing_texts_map;
static const std::map<Settings::ScalingFilter, QString> scaling_filter_texts_map; static const std::map<Settings::ScalingFilter, QString> scaling_filter_texts_map;
static const std::map<bool, QString> use_docked_mode_texts_map; static const std::map<Settings::ConsoleMode, QString> use_docked_mode_texts_map;
static const std::map<Settings::GpuAccuracy, QString> gpu_accuracy_texts_map; static const std::map<Settings::GpuAccuracy, QString> gpu_accuracy_texts_map;
static const std::map<Settings::RendererBackend, QString> renderer_backend_texts_map; static const std::map<Settings::RendererBackend, QString> renderer_backend_texts_map;
static const std::map<Settings::ShaderBackend, QString> shader_backend_texts_map; static const std::map<Settings::ShaderBackend, QString> shader_backend_texts_map;

18
src/yuzu/configuration/configure_input.cpp
Unescape Escape View File

@ -4,6 +4,7 @@
#include <memory> #include <memory>
#include <thread> #include <thread>
#include "common/settings_enums.h"
#include "core/core.h" #include "core/core.h"
#include "core/hid/emulated_controller.h" #include "core/hid/emulated_controller.h"
#include "core/hid/hid_core.h" #include "core/hid/hid_core.h"
@ -197,9 +198,14 @@ void ConfigureInput::ApplyConfiguration() {
advanced->ApplyConfiguration(); advanced->ApplyConfiguration();
const bool pre_docked_mode = Settings::values.use_docked_mode.GetValue(); const bool pre_docked_mode =
Settings::values.use_docked_mode.SetValue(ui->radioDocked->isChecked()); Settings::values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked;
OnDockedModeChanged(pre_docked_mode, Settings::values.use_docked_mode.GetValue(), system); Settings::values.use_docked_mode.SetValue(ui->radioDocked->isChecked()
? Settings::ConsoleMode::Docked
: Settings::ConsoleMode::Handheld);
OnDockedModeChanged(
pre_docked_mode,
Settings::values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked, system);
Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked()); Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked());
Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked()); Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked());
@ -267,8 +273,10 @@ void ConfigureInput::UpdateDockedState(bool is_handheld) {
ui->radioDocked->setEnabled(!is_handheld); ui->radioDocked->setEnabled(!is_handheld);
ui->radioUndocked->setEnabled(!is_handheld); ui->radioUndocked->setEnabled(!is_handheld);
ui->radioDocked->setChecked(Settings::values.use_docked_mode.GetValue()); ui->radioDocked->setChecked(Settings::values.use_docked_mode.GetValue() ==
ui->radioUndocked->setChecked(!Settings::values.use_docked_mode.GetValue()); Settings::ConsoleMode::Docked);
ui->radioUndocked->setChecked(Settings::values.use_docked_mode.GetValue() ==
Settings::ConsoleMode::Handheld);
// Also force into undocked mode if the controller type is handheld. // Also force into undocked mode if the controller type is handheld.
if (is_handheld) { if (is_handheld) {

16
src/yuzu/main.cpp
Unescape Escape View File

@ -1158,9 +1158,9 @@ void GMainWindow::InitializeWidgets() {
[this](const QPoint& menu_location) { [this](const QPoint& menu_location) {
QMenu context_menu; QMenu context_menu;
for (auto const& docked_mode_pair : Config::use_docked_mode_texts_map) { for (auto const& [value, text] : Config::use_docked_mode_texts_map) {
context_menu.addAction(docked_mode_pair.second, [this, docked_mode_pair] { context_menu.addAction(text, [this, value] {
if (docked_mode_pair.first != Settings::values.use_docked_mode.GetValue()) { if (value != Settings::values.use_docked_mode.GetValue()) {
OnToggleDockedMode(); OnToggleDockedMode();
} }
}); });
@ -3636,7 +3636,8 @@ void GMainWindow::OnTasReset() {
} }
void GMainWindow::OnToggleDockedMode() { void GMainWindow::OnToggleDockedMode() {
const bool is_docked = Settings::values.use_docked_mode.GetValue(); const bool is_docked =
Settings::values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked;
auto* player_1 = system->HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1); auto* player_1 = system->HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1);
auto* handheld = system->HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld); auto* handheld = system->HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld);
@ -3650,7 +3651,8 @@ void GMainWindow::OnToggleDockedMode() {
controller_dialog->refreshConfiguration(); controller_dialog->refreshConfiguration();
} }
Settings::values.use_docked_mode.SetValue(!is_docked); Settings::values.use_docked_mode.SetValue(is_docked ? Settings::ConsoleMode::Docked
: Settings::ConsoleMode::Handheld);
UpdateDockedButton(); UpdateDockedButton();
OnDockedModeChanged(is_docked, !is_docked, *system); OnDockedModeChanged(is_docked, !is_docked, *system);
} }
@ -4080,8 +4082,8 @@ void GMainWindow::UpdateGPUAccuracyButton() {
} }
void GMainWindow::UpdateDockedButton() { void GMainWindow::UpdateDockedButton() {
const bool is_docked = Settings::values.use_docked_mode.GetValue(); const auto is_docked = Settings::values.use_docked_mode.GetValue();
dock_status_button->setChecked(is_docked); dock_status_button->setChecked(is_docked == Settings::ConsoleMode::Docked);
dock_status_button->setText( dock_status_button->setText(
Config::use_docked_mode_texts_map.find(is_docked)->second.toUpper()); Config::use_docked_mode_texts_map.find(is_docked)->second.toUpper());
} }