From eaff98dbb3da3c7524a504abb1cdd5daa3480dda Mon Sep 17 00:00:00 2001 From: muemart Date: Wed, 6 Dec 2017 05:26:29 +0100 Subject: Adding meumart's Citra SDL Joystick support. Citra PR #3116 --- src/yuzu/configuration/configure_input.cpp | 139 +++++++++----- src/yuzu/configuration/configure_input.h | 31 ++- src/yuzu/configuration/configure_input.ui | 296 +++++++++++++++-------------- 3 files changed, 276 insertions(+), 190 deletions(-) (limited to 'src/yuzu') diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp index d92a1fed9..cd7520f29 100644 --- a/src/yuzu/configuration/configure_input.cpp +++ b/src/yuzu/configuration/configure_input.cpp @@ -5,13 +5,13 @@ #include #include #include +#include #include #include "common/param_package.h" #include "input_common/main.h" #include "yuzu/configuration/config.h" #include "yuzu/configuration/configure_input.h" - const std::array ConfigureInput::analog_sub_buttons{{ "up", "down", "left", "right", "modifier", @@ -32,23 +32,19 @@ static QString getKeyName(int key_code) { } } -static void SetButtonKey(int key, Common::ParamPackage& button_param) { - button_param = Common::ParamPackage{InputCommon::GenerateKeyboardParam(key)}; -} - -static void SetAnalogKey(int key, Common::ParamPackage& analog_param, - const std::string& button_name) { +static void SetAnalogButton(const Common::ParamPackage& input_param, + Common::ParamPackage& analog_param, const std::string& button_name) { if (analog_param.Get("engine", "") != "analog_from_button") { analog_param = { {"engine", "analog_from_button"}, {"modifier_scale", "0.5"}, }; } - analog_param.Set(button_name, InputCommon::GenerateKeyboardParam(key)); + analog_param.Set(button_name, input_param.Serialize()); } ConfigureInput::ConfigureInput(QWidget* parent) : QWidget(parent), ui(std::make_unique()), - timer(std::make_unique()) { + timeout_timer(std::make_unique()), poll_timer(std::make_unique()) { ui->setupUi(this); setFocusPolicy(Qt::ClickFocus); @@ -63,7 +59,7 @@ ConfigureInput::ConfigureInput(QWidget* parent) ui->buttonSL, ui->buttonSR, ui->buttonHome, ui->buttonScreenshot, }; - analog_map = {{ + analog_map_buttons = {{ { ui->buttonLStickUp, ui->buttonLStickDown, ui->buttonLStickLeft, ui->buttonLStickRight, ui->buttonLStickMod, @@ -74,35 +70,57 @@ ConfigureInput::ConfigureInput(QWidget* parent) }, }}; + analog_map_stick = {ui->buttonLStickAnalog, ui->buttonRStickAnalog}; + for (int button_id = 0; button_id < Settings::NativeButton::NumButtons; button_id++) { if (button_map[button_id]) connect(button_map[button_id], &QPushButton::released, [=]() { - handleClick(button_map[button_id], - [=](int key) { SetButtonKey(key, buttons_param[button_id]); }); + handleClick( + button_map[button_id], + [=](const Common::ParamPackage& params) { buttons_param[button_id] = params; }, + InputCommon::Polling::DeviceType::Button); }); } for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs; analog_id++) { for (int sub_button_id = 0; sub_button_id < ANALOG_SUB_BUTTONS_NUM; sub_button_id++) { - if (analog_map[analog_id][sub_button_id] != nullptr) { - connect(analog_map[analog_id][sub_button_id], &QPushButton::released, [=]() { - handleClick(analog_map[analog_id][sub_button_id], [=](int key) { - SetAnalogKey(key, analogs_param[analog_id], - analog_sub_buttons[sub_button_id]); - }); - }); + if (analog_map_buttons[analog_id][sub_button_id] != nullptr) { + connect(analog_map_buttons[analog_id][sub_button_id], &QPushButton::released, + [=]() { + handleClick(analog_map_buttons[analog_id][sub_button_id], + [=](const Common::ParamPackage& params) { + SetAnalogButton(params, analogs_param[analog_id], + analog_sub_buttons[sub_button_id]); + }, + InputCommon::Polling::DeviceType::Button); + }); } } + connect(analog_map_stick[analog_id], &QPushButton::released, [=]() { + QMessageBox::information( + this, "Information", + "After pressing OK, first move your joystick horizontally, and then vertically."); + handleClick( + analog_map_stick[analog_id], + [=](const Common::ParamPackage& params) { analogs_param[analog_id] = params; }, + InputCommon::Polling::DeviceType::Analog); + }); } connect(ui->buttonRestoreDefaults, &QPushButton::released, [this]() { restoreDefaults(); }); - timer->setSingleShot(true); - connect(timer.get(), &QTimer::timeout, [this]() { - releaseKeyboard(); - releaseMouse(); - key_setter = boost::none; - updateButtonLabels(); + timeout_timer->setSingleShot(true); + connect(timeout_timer.get(), &QTimer::timeout, [this]() { setPollingResult({}, true); }); + + connect(poll_timer.get(), &QTimer::timeout, [this]() { + Common::ParamPackage params; + for (auto& poller : device_pollers) { + params = poller->GetNextInput(); + if (params.Has("engine")) { + setPollingResult(params, false); + return; + } + } }); this->loadConfiguration(); @@ -132,13 +150,15 @@ void ConfigureInput::loadConfiguration() { void ConfigureInput::restoreDefaults() { for (int button_id = 0; button_id < Settings::NativeButton::NumButtons; button_id++) { - SetButtonKey(Config::default_buttons[button_id], buttons_param[button_id]); + buttons_param[button_id] = Common::ParamPackage{ + InputCommon::GenerateKeyboardParam(Config::default_buttons[button_id])}; } for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs; analog_id++) { for (int sub_button_id = 0; sub_button_id < ANALOG_SUB_BUTTONS_NUM; sub_button_id++) { - SetAnalogKey(Config::default_analogs[analog_id][sub_button_id], - analogs_param[analog_id], analog_sub_buttons[sub_button_id]); + Common::ParamPackage params{InputCommon::GenerateKeyboardParam( + Config::default_analogs[analog_id][sub_button_id])}; + SetAnalogButton(params, analogs_param[analog_id], analog_sub_buttons[sub_button_id]); } } updateButtonLabels(); @@ -149,7 +169,9 @@ void ConfigureInput::updateButtonLabels() { QString non_keyboard(tr("[non-keyboard]")); auto KeyToText = [&non_keyboard](const Common::ParamPackage& param) { - if (param.Get("engine", "") != "keyboard") { + if (!param.Has("engine")) { + return QString("[not set]"); + } else if (param.Get("engine", "") != "keyboard") { return non_keyboard; } else { return getKeyName(param.Get("code", 0)); @@ -162,7 +184,7 @@ void ConfigureInput::updateButtonLabels() { for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs; analog_id++) { if (analogs_param[analog_id].Get("engine", "") != "analog_from_button") { - for (QPushButton* button : analog_map[analog_id]) { + for (QPushButton* button : analog_map_buttons[analog_id]) { if (button) button->setText(non_keyboard); } @@ -170,35 +192,66 @@ void ConfigureInput::updateButtonLabels() { for (int sub_button_id = 0; sub_button_id < ANALOG_SUB_BUTTONS_NUM; sub_button_id++) { Common::ParamPackage param( analogs_param[analog_id].Get(analog_sub_buttons[sub_button_id], "")); - if (analog_map[analog_id][sub_button_id]) - analog_map[analog_id][sub_button_id]->setText(KeyToText(param)); + if (analog_map_buttons[analog_id][sub_button_id]) + analog_map_buttons[analog_id][sub_button_id]->setText(KeyToText(param)); } } + analog_map_stick[analog_id]->setText("Set Analog Stick"); } } -void ConfigureInput::handleClick(QPushButton* button, std::function new_key_setter) { +void ConfigureInput::handleClick(QPushButton* button, + std::function new_input_setter, + InputCommon::Polling::DeviceType type) { button->setText(tr("[press key]")); button->setFocus(); - key_setter = new_key_setter; + input_setter = new_input_setter; + + device_pollers = InputCommon::Polling::GetPollers(type); + + // Keyboard keys can only be used as button devices + want_keyboard_keys = type == InputCommon::Polling::DeviceType::Button; + + for (auto& poller : device_pollers) { + poller->Start(); + } grabKeyboard(); grabMouse(); - timer->start(5000); // Cancel after 5 seconds + timeout_timer->start(5000); // Cancel after 5 seconds + poll_timer->start(200); // Check for new inputs every 200ms } -void ConfigureInput::keyPressEvent(QKeyEvent* event) { +void ConfigureInput::setPollingResult(const Common::ParamPackage& params, bool abort) { releaseKeyboard(); releaseMouse(); + timeout_timer->stop(); + poll_timer->stop(); + for (auto& poller : device_pollers) { + poller->Stop(); + } - if (!key_setter || !event) - return; - - if (event->key() != Qt::Key_Escape) - (*key_setter)(event->key()); + if (!abort) { + (*input_setter)(params); + } updateButtonLabels(); - key_setter = boost::none; - timer->stop(); + input_setter = boost::none; +} + +void ConfigureInput::keyPressEvent(QKeyEvent* event) { + if (!input_setter || !event) + return; + + if (event->key() != Qt::Key_Escape) { + if (want_keyboard_keys) { + setPollingResult(Common::ParamPackage{InputCommon::GenerateKeyboardParam(event->key())}, + false); + } else { + // Escape key wasn't pressed and we don't want any keyboard keys, so don't stop polling + return; + } + } + setPollingResult({}, true); } diff --git a/src/yuzu/configuration/configure_input.h b/src/yuzu/configuration/configure_input.h index c950fbcb4..a0bef86d5 100644 --- a/src/yuzu/configuration/configure_input.h +++ b/src/yuzu/configuration/configure_input.h @@ -8,11 +8,13 @@ #include #include #include +#include #include #include #include #include "common/param_package.h" #include "core/settings.h" +#include "input_common/main.h" #include "ui_configure_input.h" class QPushButton; @@ -35,10 +37,11 @@ public: private: std::unique_ptr ui; - std::unique_ptr timer; + std::unique_ptr timeout_timer; + std::unique_ptr poll_timer; /// This will be the the setting function when an input is awaiting configuration. - boost::optional> key_setter; + boost::optional> input_setter; std::array buttons_param; std::array analogs_param; @@ -48,13 +51,23 @@ private: /// Each button input is represented by a QPushButton. std::array button_map; - /// Each analog input is represented by five QPushButtons which represents up, down, left, right - /// and modifier + /// A group of five QPushButtons represent one analog input. The buttons each represent up, + /// down, left, right, and modifier, respectively. std::array, Settings::NativeAnalog::NumAnalogs> - analog_map; + analog_map_buttons; + + /// Analog inputs are also represented each with a single button, used to configure with an + /// actual analog stick + std::array analog_map_stick; static const std::array analog_sub_buttons; + std::vector> device_pollers; + + /// A flag to indicate if keyboard keys are okay when configuring an input. If this is false, + /// keyboard events are ignored. + bool want_keyboard_keys = false; + /// Load configuration settings. void loadConfiguration(); /// Restore all buttons to their default values. @@ -63,7 +76,13 @@ private: void updateButtonLabels(); /// Called when the button was pressed. - void handleClick(QPushButton* button, std::function new_key_setter); + void handleClick(QPushButton* button, + std::function new_input_setter, + InputCommon::Polling::DeviceType type); + + /// Finish polling and configure input using the input_setter + void setPollingResult(const Common::ParamPackage& params, bool abort); + /// Handle key press events. void keyPressEvent(QKeyEvent* event) override; }; diff --git a/src/yuzu/configuration/configure_input.ui b/src/yuzu/configuration/configure_input.ui index 5143c9d72..c162ca02c 100644 --- a/src/yuzu/configuration/configure_input.ui +++ b/src/yuzu/configuration/configure_input.ui @@ -7,7 +7,7 @@ 0 0 343 - 665 + 677 @@ -16,10 +16,10 @@ - - + + - Face Buttons + Misc. false @@ -27,18 +27,18 @@ false - + - + - + - A: + Plus: - + @@ -47,16 +47,16 @@ - + - + - B: + Minus: - + @@ -65,16 +65,16 @@ - + - + - X: + Home: - + @@ -83,16 +83,17 @@ - + - + - Y: + Screen +Capture: - + @@ -100,13 +101,26 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + - - + + - Directional Pad + Face Buttons false @@ -114,18 +128,18 @@ false - - - + + + - + - Up: + A: - + @@ -133,17 +147,17 @@ - - + + - + - Down: + B: - + @@ -151,17 +165,17 @@ - - + + - + - Left: + X: - + @@ -169,17 +183,17 @@ - - + + - + - Right: + Y: - + @@ -190,10 +204,10 @@ - - + + - Misc. + Directional Pad false @@ -201,18 +215,18 @@ false - - - + + + - + - Plus: + Up: - + @@ -220,17 +234,17 @@ - - + + - + - Minus: + Down: - + @@ -238,17 +252,17 @@ - - + + - + - Home: + Left: - + @@ -256,18 +270,17 @@ - - + + - + - Screen -Capture: + Right: - + @@ -275,19 +288,6 @@ Capture: - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -414,10 +414,13 @@ Capture: - - + + - Left Stick + Right Stick + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter false @@ -425,18 +428,18 @@ Capture: false - - - + + + - + - Left: + Down: - + @@ -445,16 +448,16 @@ Capture: - + - + Right: - + @@ -462,17 +465,24 @@ Capture: + + + + Set Analog Stick + + + - + - + - Up: + Left: - + @@ -480,17 +490,17 @@ Capture: - - + + - + - Down: + Up: - + @@ -499,16 +509,16 @@ Capture: - + - + Pressed: - + @@ -517,16 +527,16 @@ Capture: - + - + Modifier: - + @@ -537,13 +547,10 @@ Capture: - - + + - Right Stick - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Left Stick false @@ -551,18 +558,18 @@ Capture: false - + - + - + Down: - + @@ -570,17 +577,24 @@ Capture: + + + + Set Analog Stick + + + - + - + Right: - + @@ -588,17 +602,17 @@ Capture: - - + + - + - Up: + Left: - + @@ -606,17 +620,17 @@ Capture: - - + + - + - Left: + Up: - + @@ -624,17 +638,17 @@ Capture: - - + + - + Modifier: - + @@ -642,17 +656,17 @@ Capture: - - + + - + Pressed: - + -- cgit v1.2.3