OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 14:20:14 +00:00
Code Issues Projects Releases Wiki Activity

Input-GUI: Fix most PR issues

Browse Source
This commit is contained in:
Steven Cherry 2016-06-11 23:14:57 -05:00
parent 93308de8ec
commit 61144d2ab1
5 changed files with 1469 additions and 1443 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

436
src/citra_qt/config.cpp
View File

@ -1,218 +1,218 @@
// Copyright 2014 Citra Emulator Project // Copyright 2014 Citra Emulator Project
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <QSettings>
#include "citra_qt/config.h" #include "citra_qt/config.h"
#include "citra_qt/ui_settings.h" #include "citra_qt/ui_settings.h"
#include "common/file_util.h" #include "common/file_util.h"
Config::Config() { Config::Config() {
// TODO: Don't hardcode the path; let the frontend decide where to put the config files. // TODO: Don't hardcode the path; let the frontend decide where to put the config files.
qt_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "qt-config.ini"; qt_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "qt-config.ini";
FileUtil::CreateFullPath(qt_config_loc); FileUtil::CreateFullPath(qt_config_loc);
qt_config = new QSettings(QString::fromStdString(qt_config_loc), QSettings::IniFormat); qt_config = new QSettings(QString::fromStdString(qt_config_loc), QSettings::IniFormat);
Reload(); Reload();
} }
const std::array<QVariant, Settings::NativeInput::NUM_INPUTS> defaults = { const std::array<QVariant, Settings::NativeInput::NUM_INPUTS> defaults = {
// directly mapped keys // directly mapped keys
Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X,
Qt::Key_Q, Qt::Key_W, Qt::Key_1, Qt::Key_2, Qt::Key_Q, Qt::Key_W, Qt::Key_1, Qt::Key_2,
Qt::Key_M, Qt::Key_N, Qt::Key_B, Qt::Key_M, Qt::Key_N, Qt::Key_B,
Qt::Key_T, Qt::Key_G, Qt::Key_F, Qt::Key_H, Qt::Key_T, Qt::Key_G, Qt::Key_F, Qt::Key_H,
Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L,
// indirectly mapped keys // indirectly mapped keys
Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right,
Qt::Key_D, Qt::Key_D,
}; };
void Config::ReadValues() { void Config::ReadValues() {
qt_config->beginGroup("Controls"); qt_config->beginGroup("Controls");
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) { for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) {
Settings::values.input_mappings[Settings::NativeInput::All[i]] = Settings::values.input_mappings[Settings::NativeInput::All[i]] =
qt_config->value(QString::fromStdString(Settings::NativeInput::Mapping[i]), defaults[i]).toInt(); qt_config->value(QString::fromStdString(Settings::NativeInput::Mapping[i]), defaults[i]).toInt();
} }
Settings::values.pad_circle_modifier_scale = qt_config->value("pad_circle_modifier_scale", 0.5).toFloat(); Settings::values.pad_circle_modifier_scale = qt_config->value("pad_circle_modifier_scale", 0.5).toFloat();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Core"); qt_config->beginGroup("Core");
Settings::values.frame_skip = qt_config->value("frame_skip", 0).toInt(); Settings::values.frame_skip = qt_config->value("frame_skip", 0).toInt();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Renderer"); qt_config->beginGroup("Renderer");
Settings::values.use_hw_renderer = qt_config->value("use_hw_renderer", false).toBool(); Settings::values.use_hw_renderer = qt_config->value("use_hw_renderer", false).toBool();
Settings::values.use_shader_jit = qt_config->value("use_shader_jit", true).toBool(); Settings::values.use_shader_jit = qt_config->value("use_shader_jit", true).toBool();
Settings::values.use_scaled_resolution = qt_config->value("use_scaled_resolution", false).toBool(); Settings::values.use_scaled_resolution = qt_config->value("use_scaled_resolution", false).toBool();
Settings::values.bg_red = qt_config->value("bg_red", 1.0).toFloat(); Settings::values.bg_red = qt_config->value("bg_red", 1.0).toFloat();
Settings::values.bg_green = qt_config->value("bg_green", 1.0).toFloat(); Settings::values.bg_green = qt_config->value("bg_green", 1.0).toFloat();
Settings::values.bg_blue = qt_config->value("bg_blue", 1.0).toFloat(); Settings::values.bg_blue = qt_config->value("bg_blue", 1.0).toFloat();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Audio"); qt_config->beginGroup("Audio");
Settings::values.sink_id = qt_config->value("output_engine", "auto").toString().toStdString(); Settings::values.sink_id = qt_config->value("output_engine", "auto").toString().toStdString();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Data Storage"); qt_config->beginGroup("Data Storage");
Settings::values.use_virtual_sd = qt_config->value("use_virtual_sd", true).toBool(); Settings::values.use_virtual_sd = qt_config->value("use_virtual_sd", true).toBool();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("System"); qt_config->beginGroup("System");
Settings::values.is_new_3ds = qt_config->value("is_new_3ds", false).toBool(); Settings::values.is_new_3ds = qt_config->value("is_new_3ds", false).toBool();
Settings::values.region_value = qt_config->value("region_value", 1).toInt(); Settings::values.region_value = qt_config->value("region_value", 1).toInt();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Miscellaneous"); qt_config->beginGroup("Miscellaneous");
Settings::values.log_filter = qt_config->value("log_filter", "*:Info").toString().toStdString(); Settings::values.log_filter = qt_config->value("log_filter", "*:Info").toString().toStdString();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Debugging"); qt_config->beginGroup("Debugging");
Settings::values.use_gdbstub = qt_config->value("use_gdbstub", false).toBool(); Settings::values.use_gdbstub = qt_config->value("use_gdbstub", false).toBool();
Settings::values.gdbstub_port = qt_config->value("gdbstub_port", 24689).toInt(); Settings::values.gdbstub_port = qt_config->value("gdbstub_port", 24689).toInt();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("UI"); qt_config->beginGroup("UI");
qt_config->beginGroup("UILayout"); qt_config->beginGroup("UILayout");
UISettings::values.geometry = qt_config->value("geometry").toByteArray(); UISettings::values.geometry = qt_config->value("geometry").toByteArray();
UISettings::values.state = qt_config->value("state").toByteArray(); UISettings::values.state = qt_config->value("state").toByteArray();
UISettings::values.renderwindow_geometry = qt_config->value("geometryRenderWindow").toByteArray(); UISettings::values.renderwindow_geometry = qt_config->value("geometryRenderWindow").toByteArray();
UISettings::values.gamelist_header_state = qt_config->value("gameListHeaderState").toByteArray(); UISettings::values.gamelist_header_state = qt_config->value("gameListHeaderState").toByteArray();
UISettings::values.microprofile_geometry = qt_config->value("microProfileDialogGeometry").toByteArray(); UISettings::values.microprofile_geometry = qt_config->value("microProfileDialogGeometry").toByteArray();
UISettings::values.microprofile_visible = qt_config->value("microProfileDialogVisible", false).toBool(); UISettings::values.microprofile_visible = qt_config->value("microProfileDialogVisible", false).toBool();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Paths"); qt_config->beginGroup("Paths");
UISettings::values.roms_path = qt_config->value("romsPath").toString(); UISettings::values.roms_path = qt_config->value("romsPath").toString();
UISettings::values.symbols_path = qt_config->value("symbolsPath").toString(); UISettings::values.symbols_path = qt_config->value("symbolsPath").toString();
UISettings::values.gamedir = qt_config->value("gameListRootDir", ".").toString(); UISettings::values.gamedir = qt_config->value("gameListRootDir", ".").toString();
UISettings::values.gamedir_deepscan = qt_config->value("gameListDeepScan", false).toBool(); UISettings::values.gamedir_deepscan = qt_config->value("gameListDeepScan", false).toBool();
UISettings::values.recent_files = qt_config->value("recentFiles").toStringList(); UISettings::values.recent_files = qt_config->value("recentFiles").toStringList();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Shortcuts"); qt_config->beginGroup("Shortcuts");
QStringList groups = qt_config->childGroups(); QStringList groups = qt_config->childGroups();
for (auto group : groups) { for (auto group : groups) {
qt_config->beginGroup(group); qt_config->beginGroup(group);
QStringList hotkeys = qt_config->childGroups(); QStringList hotkeys = qt_config->childGroups();
for (auto hotkey : hotkeys) { for (auto hotkey : hotkeys) {
qt_config->beginGroup(hotkey); qt_config->beginGroup(hotkey);
UISettings::values.shortcuts.emplace_back( UISettings::values.shortcuts.emplace_back(
UISettings::Shortcut(group + "/" + hotkey, UISettings::Shortcut(group + "/" + hotkey,
UISettings::ContextualShortcut(qt_config->value("KeySeq").toString(), UISettings::ContextualShortcut(qt_config->value("KeySeq").toString(),
qt_config->value("Context").toInt()))); qt_config->value("Context").toInt())));
qt_config->endGroup(); qt_config->endGroup();
} }
qt_config->endGroup(); qt_config->endGroup();
} }
qt_config->endGroup(); qt_config->endGroup();
UISettings::values.single_window_mode = qt_config->value("singleWindowMode", true).toBool(); UISettings::values.single_window_mode = qt_config->value("singleWindowMode", true).toBool();
UISettings::values.display_titlebar = qt_config->value("displayTitleBars", true).toBool(); UISettings::values.display_titlebar = qt_config->value("displayTitleBars", true).toBool();
UISettings::values.confirm_before_closing = qt_config->value("confirmClose",true).toBool(); UISettings::values.confirm_before_closing = qt_config->value("confirmClose", true).toBool();
UISettings::values.first_start = qt_config->value("firstStart", true).toBool(); UISettings::values.first_start = qt_config->value("firstStart", true).toBool();
qt_config->endGroup(); qt_config->endGroup();
} }
void Config::SaveValues() { void Config::SaveValues() {
qt_config->beginGroup("Controls"); qt_config->beginGroup("Controls");
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) { for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) {
qt_config->setValue(QString::fromStdString(Settings::NativeInput::Mapping[i]), qt_config->setValue(QString::fromStdString(Settings::NativeInput::Mapping[i]),
Settings::values.input_mappings[Settings::NativeInput::All[i]]); Settings::values.input_mappings[Settings::NativeInput::All[i]]);
} }
qt_config->setValue("pad_circle_modifier_scale", (double)Settings::values.pad_circle_modifier_scale); qt_config->setValue("pad_circle_modifier_scale", (double)Settings::values.pad_circle_modifier_scale);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Core"); qt_config->beginGroup("Core");
qt_config->setValue("frame_skip", Settings::values.frame_skip); qt_config->setValue("frame_skip", Settings::values.frame_skip);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Renderer"); qt_config->beginGroup("Renderer");
qt_config->setValue("use_hw_renderer", Settings::values.use_hw_renderer); qt_config->setValue("use_hw_renderer", Settings::values.use_hw_renderer);
qt_config->setValue("use_shader_jit", Settings::values.use_shader_jit); qt_config->setValue("use_shader_jit", Settings::values.use_shader_jit);
qt_config->setValue("use_scaled_resolution", Settings::values.use_scaled_resolution); qt_config->setValue("use_scaled_resolution", Settings::values.use_scaled_resolution);
// Cast to double because Qt's written float values are not human-readable // Cast to double because Qt's written float values are not human-readable
qt_config->setValue("bg_red", (double)Settings::values.bg_red); qt_config->setValue("bg_red", (double)Settings::values.bg_red);
qt_config->setValue("bg_green", (double)Settings::values.bg_green); qt_config->setValue("bg_green", (double)Settings::values.bg_green);
qt_config->setValue("bg_blue", (double)Settings::values.bg_blue); qt_config->setValue("bg_blue", (double)Settings::values.bg_blue);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Audio"); qt_config->beginGroup("Audio");
qt_config->setValue("output_engine", QString::fromStdString(Settings::values.sink_id)); qt_config->setValue("output_engine", QString::fromStdString(Settings::values.sink_id));
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Data Storage"); qt_config->beginGroup("Data Storage");
qt_config->setValue("use_virtual_sd", Settings::values.use_virtual_sd); qt_config->setValue("use_virtual_sd", Settings::values.use_virtual_sd);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("System"); qt_config->beginGroup("System");
qt_config->setValue("is_new_3ds", Settings::values.is_new_3ds); qt_config->setValue("is_new_3ds", Settings::values.is_new_3ds);
qt_config->setValue("region_value", Settings::values.region_value); qt_config->setValue("region_value", Settings::values.region_value);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Miscellaneous"); qt_config->beginGroup("Miscellaneous");
qt_config->setValue("log_filter", QString::fromStdString(Settings::values.log_filter)); qt_config->setValue("log_filter", QString::fromStdString(Settings::values.log_filter));
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Debugging"); qt_config->beginGroup("Debugging");
qt_config->setValue("use_gdbstub", Settings::values.use_gdbstub); qt_config->setValue("use_gdbstub", Settings::values.use_gdbstub);
qt_config->setValue("gdbstub_port", Settings::values.gdbstub_port); qt_config->setValue("gdbstub_port", Settings::values.gdbstub_port);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("UI"); qt_config->beginGroup("UI");
qt_config->beginGroup("UILayout"); qt_config->beginGroup("UILayout");
qt_config->setValue("geometry", UISettings::values.geometry); qt_config->setValue("geometry", UISettings::values.geometry);
qt_config->setValue("state", UISettings::values.state); qt_config->setValue("state", UISettings::values.state);
qt_config->setValue("geometryRenderWindow", UISettings::values.renderwindow_geometry); qt_config->setValue("geometryRenderWindow", UISettings::values.renderwindow_geometry);
qt_config->setValue("gameListHeaderState", UISettings::values.gamelist_header_state); qt_config->setValue("gameListHeaderState", UISettings::values.gamelist_header_state);
qt_config->setValue("microProfileDialogGeometry", UISettings::values.microprofile_geometry); qt_config->setValue("microProfileDialogGeometry", UISettings::values.microprofile_geometry);
qt_config->setValue("microProfileDialogVisible", UISettings::values.microprofile_visible); qt_config->setValue("microProfileDialogVisible", UISettings::values.microprofile_visible);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Paths"); qt_config->beginGroup("Paths");
qt_config->setValue("romsPath", UISettings::values.roms_path); qt_config->setValue("romsPath", UISettings::values.roms_path);
qt_config->setValue("symbolsPath", UISettings::values.symbols_path); qt_config->setValue("symbolsPath", UISettings::values.symbols_path);
qt_config->setValue("gameListRootDir", UISettings::values.gamedir); qt_config->setValue("gameListRootDir", UISettings::values.gamedir);
qt_config->setValue("gameListDeepScan", UISettings::values.gamedir_deepscan); qt_config->setValue("gameListDeepScan", UISettings::values.gamedir_deepscan);
qt_config->setValue("recentFiles", UISettings::values.recent_files); qt_config->setValue("recentFiles", UISettings::values.recent_files);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Shortcuts"); qt_config->beginGroup("Shortcuts");
for (auto shortcut : UISettings::values.shortcuts ) { for (auto shortcut : UISettings::values.shortcuts) {
qt_config->setValue(shortcut.first + "/KeySeq", shortcut.second.first); qt_config->setValue(shortcut.first + "/KeySeq", shortcut.second.first);
qt_config->setValue(shortcut.first + "/Context", shortcut.second.second); qt_config->setValue(shortcut.first + "/Context", shortcut.second.second);
} }
qt_config->endGroup(); qt_config->endGroup();
qt_config->setValue("singleWindowMode", UISettings::values.single_window_mode); qt_config->setValue("singleWindowMode", UISettings::values.single_window_mode);
qt_config->setValue("displayTitleBars", UISettings::values.display_titlebar); qt_config->setValue("displayTitleBars", UISettings::values.display_titlebar);
qt_config->setValue("confirmClose", UISettings::values.confirm_before_closing); qt_config->setValue("confirmClose", UISettings::values.confirm_before_closing);
qt_config->setValue("firstStart", UISettings::values.first_start); qt_config->setValue("firstStart", UISettings::values.first_start);
qt_config->endGroup(); qt_config->endGroup();
} }
void Config::Reload() { void Config::Reload() {
ReadValues(); ReadValues();
Settings::Apply(); Settings::Apply();
} }
void Config::Save() { void Config::Save() {
SaveValues(); SaveValues();
} }
Config::~Config() { Config::~Config() {
Save(); Save();
delete qt_config; delete qt_config;
} }

53
src/citra_qt/config.h
View File

@ -1,28 +1,25 @@
// Copyright 2014 Citra Emulator Project // Copyright 2014 Citra Emulator Project
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#pragma once #pragma once
#include <string> #include "core/settings.h"
#include "core/settings.h" #include <QVariant>
#include <QSettings>
#include <QString> class QSettings;
#include <QStringList>
class Config {
class QSettings; QSettings* qt_config;
std::string qt_config_loc;
class Config {
QSettings* qt_config; void ReadValues();
std::string qt_config_loc; void SaveValues();
public:
void ReadValues(); Config();
void SaveValues(); ~Config();
public:
Config(); void Reload();
~Config(); void Save();
};
void Reload(); extern const std::array<QVariant, Settings::NativeInput::NUM_INPUTS> defaults;
void Save();
};
extern const std::array<QVariant, Settings::NativeInput::NUM_INPUTS> defaults;

353
src/citra_qt/configure_input.cpp
View File

@ -1,178 +1,177 @@
// Copyright 2016 Citra Emulator Project // Copyright 2016 Citra Emulator Project
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "configure_input.h" #include "configure_input.h"
ConfigureInput::ConfigureInput(QWidget *parent) : ConfigureInput::ConfigureInput(QWidget* parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::ConfigureInput) ui(new Ui::ConfigureInput)
{ {
ui->setupUi(this); ui->setupUi(this);
//Initialize mapping of input enum to UI button. // Initialize mapping of input enum to UI button.
input_mapping = { input_mapping = {
{ std::make_pair(Settings::NativeInput::Values::A, ui->btnFaceA) }, { std::make_pair(Settings::NativeInput::Values::A, ui->btnFaceA) },
{ std::make_pair(Settings::NativeInput::Values::B, ui->btnFaceB) }, { std::make_pair(Settings::NativeInput::Values::B, ui->btnFaceB) },
{ std::make_pair(Settings::NativeInput::Values::X, ui->btnFaceX) }, { std::make_pair(Settings::NativeInput::Values::X, ui->btnFaceX) },
{ std::make_pair(Settings::NativeInput::Values::Y, ui->btnFaceY) }, { std::make_pair(Settings::NativeInput::Values::Y, ui->btnFaceY) },
{ std::make_pair(Settings::NativeInput::Values::L, ui->btnShdrL) }, { std::make_pair(Settings::NativeInput::Values::L, ui->btnShdrL) },
{ std::make_pair(Settings::NativeInput::Values::R, ui->btnShdrR) }, { std::make_pair(Settings::NativeInput::Values::R, ui->btnShdrR) },
{ std::make_pair(Settings::NativeInput::Values::ZL, ui->btnShdrZL) }, { std::make_pair(Settings::NativeInput::Values::ZL, ui->btnShdrZL) },
{ std::make_pair(Settings::NativeInput::Values::ZR, ui->btnShdrZR) }, { std::make_pair(Settings::NativeInput::Values::ZR, ui->btnShdrZR) },
{ std::make_pair(Settings::NativeInput::Values::START, ui->btnStart) }, { std::make_pair(Settings::NativeInput::Values::START, ui->btnStart) },
{ std::make_pair(Settings::NativeInput::Values::SELECT, ui->btnSelect) }, { std::make_pair(Settings::NativeInput::Values::SELECT, ui->btnSelect) },
{ std::make_pair(Settings::NativeInput::Values::HOME, ui->btnHome) }, { std::make_pair(Settings::NativeInput::Values::HOME, ui->btnHome) },
{ std::make_pair(Settings::NativeInput::Values::DUP, ui->btnDirUp) }, { std::make_pair(Settings::NativeInput::Values::DUP, ui->btnDirUp) },
{ std::make_pair(Settings::NativeInput::Values::DDOWN, ui->btnDirDown) }, { std::make_pair(Settings::NativeInput::Values::DDOWN, ui->btnDirDown) },
{ std::make_pair(Settings::NativeInput::Values::DLEFT, ui->btnDirLeft) }, { std::make_pair(Settings::NativeInput::Values::DLEFT, ui->btnDirLeft) },
{ std::make_pair(Settings::NativeInput::Values::DRIGHT, ui->btnDirRight) }, { std::make_pair(Settings::NativeInput::Values::DRIGHT, ui->btnDirRight) },
{ std::make_pair(Settings::NativeInput::Values::CUP, ui->btnStickUp) }, { std::make_pair(Settings::NativeInput::Values::CUP, ui->btnStickUp) },
{ std::make_pair(Settings::NativeInput::Values::CDOWN, ui->btnStickDown) }, { std::make_pair(Settings::NativeInput::Values::CDOWN, ui->btnStickDown) },
{ std::make_pair(Settings::NativeInput::Values::CLEFT, ui->btnStickLeft) }, { std::make_pair(Settings::NativeInput::Values::CLEFT, ui->btnStickLeft) },
{ std::make_pair(Settings::NativeInput::Values::CRIGHT, ui->btnStickRight) }, { std::make_pair(Settings::NativeInput::Values::CRIGHT, ui->btnStickRight) },
{ std::make_pair(Settings::NativeInput::Values::CIRCLE_UP, ui->btnCircleUp) }, { std::make_pair(Settings::NativeInput::Values::CIRCLE_UP, ui->btnCircleUp) },
{ std::make_pair(Settings::NativeInput::Values::CIRCLE_DOWN, ui->btnCircleDown) }, { std::make_pair(Settings::NativeInput::Values::CIRCLE_DOWN, ui->btnCircleDown) },
{ std::make_pair(Settings::NativeInput::Values::CIRCLE_LEFT, ui->btnCircleLeft) }, { std::make_pair(Settings::NativeInput::Values::CIRCLE_LEFT, ui->btnCircleLeft) },
{ std::make_pair(Settings::NativeInput::Values::CIRCLE_RIGHT, ui->btnCircleRight) }, { std::make_pair(Settings::NativeInput::Values::CIRCLE_RIGHT, ui->btnCircleRight) },
}; };
//Attach handle click method to each button click. // Attach handle click method to each button click.
for (auto &ent1 : input_mapping) { for (const auto& entry : input_mapping) {
connect(ent1.second, &QPushButton::released, this, &ConfigureInput::HandleClick); connect(entry.second, SIGNAL(released()), this, SLOT(handleClick()));
} }
connect(ui->btnRestoreDefaults, &QPushButton::released, this, &ConfigureInput::RestoreDefaults); connect(ui->btnRestoreDefaults, SIGNAL(released()), this, SLOT(restoreDefaults()));
setFocusPolicy(Qt::ClickFocus); setFocusPolicy(Qt::ClickFocus);
this->setConfiguration(); this->setConfiguration();
} }
ConfigureInput::~ConfigureInput() ConfigureInput::~ConfigureInput()
{ {
} }
///Event handler for all button released() event. /// Event handler for all button released() event.
void ConfigureInput::HandleClick() void ConfigureInput::handleClick()
{ {
QPushButton* sender = qobject_cast<QPushButton*>(QObject::sender()); QPushButton* sender = qobject_cast<QPushButton*>(QObject::sender());
sender->setText("[waiting]"); sender->setText(tr("[waiting]"));
sender->setFocus(); sender->setFocus();
grabKeyboard(); grabKeyboard();
grabMouse(); grabMouse();
changingButton = sender; changing_button = sender;
} }
///Save all button configurations to settings file /// Save all button configurations to settings file
void ConfigureInput::applyConfiguration() void ConfigureInput::applyConfiguration()
{ {
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) { for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) {
int value = GetKeyValue(input_mapping[Settings::NativeInput::Values(i)]->text()); int value = getKeyValue(input_mapping[Settings::NativeInput::Values(i)]->text());
Settings::values.input_mappings[Settings::NativeInput::All[i]] = value; Settings::values.input_mappings[Settings::NativeInput::All[i]] = value;
} }
Settings::Apply(); Settings::Apply();
} }
///Load configuration settings into button text /// Load configuration settings into button text
void ConfigureInput::setConfiguration() void ConfigureInput::setConfiguration()
{ {
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) { for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) {
QString keyValue = GetKeyName(Settings::values.input_mappings[i]); QString keyValue = getKeyName(Settings::values.input_mappings[i]);
input_mapping[Settings::NativeInput::Values(i)]->setText(keyValue); input_mapping[Settings::NativeInput::Values(i)]->setText(keyValue);
} }
} }
///Handle key press event for input tab when a button is 'waiting'. /// Handle key press event for input tab when a button is 'waiting'.
void ConfigureInput::keyPressEvent(QKeyEvent *event) void ConfigureInput::keyPressEvent(QKeyEvent* event)
{ {
if (changingButton != nullptr && event->key() > 0) if (changing_button != nullptr && event->key() != Qt::Key_unknown)
{ {
keysPressed.push_back(event->key()); keys_pressed.push_back(event->key());
//Can't save Modifier + Keys yet as input. Will re-enable after settings refactor // Can't save Modifier + Keys yet as input. Will re-enable after settings refactor
/*if (event->key() == Qt::Key_Shift) /*if (event->key() == Qt::Key_Shift)
return; return;
else if (event->key() == Qt::Key_Control) else if (event->key() == Qt::Key_Control)
return; return;
else if (event->key() == Qt::Key_Alt) else if (event->key() == Qt::Key_Alt)
return; return;
else if (event->key() == Qt::Key_Meta) else if (event->key() == Qt::Key_Meta)
return; return;
else*/ else*/
SetKey(); setKey();
} }
} }
///Set button text to name of key pressed. /// Set button text to name of key pressed.
void ConfigureInput::SetKey() void ConfigureInput::setKey()
{ {
QString keyValue = ""; QString key_value = "";
for (int i : keysPressed) // Will only contain one key until settings refactor for (int i : keys_pressed) // Will only contain one key until settings refactor
{ {
keyValue += GetKeyName(i); key_value += getKeyName(i);
} }
//RemoveDuplicates(keyValue); // RemoveDuplicates(keyValue);
changingButton->setText(keyValue); changing_button->setText(key_value);
keysPressed.clear(); keys_pressed.clear();
releaseKeyboard(); releaseKeyboard();
releaseMouse(); releaseMouse();
changingButton = nullptr; changing_button = nullptr;
} }
///Convert key ASCII value to its' letter/name /// Convert key ASCII value to its' letter/name
QString ConfigureInput::GetKeyName(int key_code) QString ConfigureInput::getKeyName(int key_code) const
{ {
if (key_code == Qt::Key_Shift) if (key_code == Qt::Key_Shift)
return tr("Shift"); return tr("Shift");
else if (key_code == Qt::Key_Control) if (key_code == Qt::Key_Control)
return tr("Ctrl"); return tr("Ctrl");
else if (key_code == Qt::Key_Alt) if (key_code == Qt::Key_Alt)
return tr("Alt"); return tr("Alt");
else if (key_code == Qt::Key_Meta) if (key_code == Qt::Key_Meta)
return ""; return "";
else if (key_code == -1) if (key_code == -1)
return ""; return "";
return QKeySequence(key_code).toString(); return QKeySequence(key_code).toString();
} }
///Convert letter/name of key to its ASCII value. /// Convert letter/name of key to its ASCII value.
int ConfigureInput::GetKeyValue(QString text) Qt::Key ConfigureInput::getKeyValue(const QString& text) const
{ {
if (text == "Shift") if (text == "Shift")
return Qt::Key_Shift; return Qt::Key_Shift;
else if (text == "Ctrl") if (text == "Ctrl")
return Qt::Key_Control; return Qt::Key_Control;
else if (text == "Alt") if (text == "Alt")
return Qt::Key_Alt; return Qt::Key_Alt;
else if (text == "Meta") if (text == "Meta")
return -1; return Qt::Key_unknown;
else if (text == "") if (text == "")
return -1; return Qt::Key_unknown;
return QKeySequence(text)[0]; return Qt::Key(QKeySequence(text)[0]);
} }
///Check all inputs for duplicate keys. Clears out any other button with same key as new button. /// Check all inputs for duplicate keys. Clears out any other button with same key as new button.
void ConfigureInput::RemoveDuplicates(QString newValue) void ConfigureInput::removeDuplicates(const QString& newValue)
{ {
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) { for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) {
if (changingButton != input_mapping[Settings::NativeInput::Values(i)]) { if (changing_button != input_mapping[Settings::NativeInput::Values(i)]) {
QString oldValue = input_mapping[Settings::NativeInput::Values(i)]->text(); QString oldValue = input_mapping[Settings::NativeInput::Values(i)]->text();
if (newValue == oldValue) if (newValue == oldValue)
input_mapping[Settings::NativeInput::Values(i)]->setText(""); input_mapping[Settings::NativeInput::Values(i)]->setText("");
} }
} }
} }
///Restore all buttons to their default values. /// Restore all buttons to their default values.
void ConfigureInput::RestoreDefaults() { void ConfigureInput::restoreDefaults() {
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) {
{ QString keyValue = getKeyName(defaults[i].toInt());
QString keyValue = GetKeyName(defaults[i].toInt()); input_mapping[Settings::NativeInput::Values(i)]->setText(keyValue);
input_mapping[Settings::NativeInput::Values(i)]->setText(keyValue); }
}
} }

91
src/citra_qt/configure_input.h
View File

@ -1,45 +1,46 @@
// Copyright 2016 Citra Emulator Project // Copyright 2016 Citra Emulator Project
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#pragma once
#include <memory> #pragma once
#include <memory>
#include <QKeyEvent> #include <QKeyEvent>
#include <QObject>
#include <QPushButton> #include "citra_qt/config.h"
#include <QSettings> #include "core/settings.h"
#include <QString> #include "ui_configure_input.h"
#include <QWidget>
class QObject;
#include "citra_qt/config.h" class QPushButton;
#include "core/settings.h" class QString;
#include "ui_configure_input.h" class QWidget;
namespace Ui { namespace Ui {
class ConfigureInput; class ConfigureInput;
} }
class ConfigureInput : public QWidget class ConfigureInput : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit ConfigureInput(QWidget *parent = 0); explicit ConfigureInput(QWidget* parent = nullptr);
~ConfigureInput(); ~ConfigureInput();
void applyConfiguration(); void applyConfiguration();
private: public Q_SLOTS:
std::unique_ptr<Ui::ConfigureInput> ui; void handleClick();
std::map<Settings::NativeInput::Values, QPushButton*> input_mapping; void restoreDefaults();
std::vector<int> keysPressed; private:
QPushButton* changingButton = nullptr; /// button currently waiting for key press. std::unique_ptr<Ui::ConfigureInput> ui;
std::map<Settings::NativeInput::Values, QPushButton*> input_mapping;
void HandleClick(); std::vector<int> keys_pressed;
void setConfiguration(); QPushButton* changing_button = nullptr; /// button currently waiting for key press.
void SetKey();
void RemoveDuplicates(QString newValue); void setConfiguration();
void RestoreDefaults(); void setKey();
virtual void keyPressEvent(QKeyEvent *event); void removeDuplicates(const QString& newValue);
QString GetKeyName(int key_code); void keyPressEvent(QKeyEvent* event) override;
int GetKeyValue(QString text); QString getKeyName(int key_code) const;
}; Qt::Key ConfigureInput::getKeyValue(const QString& text) const;
};

1979
src/citra_qt/configure_input.ui
View File

File diff suppressed because it is too large Load Diff