aiden
/
yuzu
mirror of https://github.com/yuzu-mirror/yuzu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure_input: Modernize and cleanup input configuration tab

Browse Source 
* Removed use of raw QTimer* pointer.
* Update to use type-safe QObject::connect.
* getKeyName can be a static local function.
* Prefer to use function arguments instead of member variables.
* Store Qt::Key instead of converting string back into keycode.
pull/8/head
MerryMage 9 years ago committed by linkmauve
parent 42edd7911e
commit a2d474386c
2 changed files with 101 additions and 115 deletions
Show Stats Download Patch File Download Diff File

169
src/citra_qt/configure_input.cpp
Unescape Escape View File

@ -5,15 +5,33 @@
#include <memory> #include <memory>
#include <utility> #include <utility>
#include <QTimer> #include <QTimer>
#include "citra_qt/config.h"
#include "citra_qt/configure_input.h" #include "citra_qt/configure_input.h"
static QString getKeyName(Qt::Key key_code) {
switch (key_code) {
case Qt::Key_Shift:
return QObject::tr("Shift");
case Qt::Key_Control:
return QObject::tr("Ctrl");
case Qt::Key_Alt:
return QObject::tr("Alt");
case Qt::Key_Meta:
case -1:
return "";
default:
return QKeySequence(key_code).toString();
}
}
ConfigureInput::ConfigureInput(QWidget* parent) ConfigureInput::ConfigureInput(QWidget* parent)
: QWidget(parent), ui(std::make_unique<Ui::ConfigureInput>()) { : QWidget(parent), ui(std::make_unique<Ui::ConfigureInput>()),
timer(std::make_unique<QTimer>()) {
ui->setupUi(this); ui->setupUi(this);
setFocusPolicy(Qt::ClickFocus);
// Initialize mapping of input enum to UI button. button_map = {
input_mapping = {
{Settings::NativeInput::Values::A, ui->buttonA}, {Settings::NativeInput::Values::A, ui->buttonA},
{Settings::NativeInput::Values::B, ui->buttonB}, {Settings::NativeInput::Values::B, ui->buttonB},
{Settings::NativeInput::Values::X, ui->buttonX}, {Settings::NativeInput::Values::X, ui->buttonX},
@ -40,114 +58,89 @@ ConfigureInput::ConfigureInput(QWidget* parent)
{Settings::NativeInput::Values::CIRCLE_MODIFIER, ui->buttonCircleMod}, {Settings::NativeInput::Values::CIRCLE_MODIFIER, ui->buttonCircleMod},
}; };
// Attach handle click method to each button click. for (const auto& entry : button_map) {
for (const auto& entry : input_mapping) { const Settings::NativeInput::Values input_id = entry.first;
connect(entry.second, SIGNAL(released()), this, SLOT(handleClick())); connect(entry.second, &QPushButton::released,
[this, input_id]() { handleClick(input_id); });
} }
connect(ui->buttonRestoreDefaults, SIGNAL(released()), this, SLOT(restoreDefaults()));
setFocusPolicy(Qt::ClickFocus); connect(ui->buttonRestoreDefaults, &QPushButton::released, [this]() { restoreDefaults(); });
timer = new QTimer(this);
timer->setSingleShot(true); timer->setSingleShot(true);
connect(timer, &QTimer::timeout, this, [&]() { connect(timer.get(), &QTimer::timeout, [this]() {
key_pressed = Qt::Key_Escape; releaseKeyboard();
setKey(); releaseMouse();
current_input_id = boost::none;
updateButtonLabels();
}); });
this->setConfiguration();
}
void ConfigureInput::handleClick() { this->loadConfiguration();
QPushButton* sender = qobject_cast<QPushButton*>(QObject::sender());
previous_mapping = sender->text();
sender->setText(tr("[waiting]"));
sender->setFocus();
grabKeyboard();
grabMouse();
changing_button = sender;
timer->start(5000); // Cancel after 5 seconds
} }
void ConfigureInput::applyConfiguration() { void ConfigureInput::applyConfiguration() {
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) { for (const auto& input_id : Settings::NativeInput::All) {
int value = getKeyValue(input_mapping[Settings::NativeInput::Values(i)]->text()); const size_t index = static_cast<size_t>(input_id);
Settings::values.input_mappings[Settings::NativeInput::All[i]] = value; Settings::values.input_mappings[index] = static_cast<int>(key_map[input_id]);
} }
Settings::Apply(); Settings::Apply();
} }
void ConfigureInput::setConfiguration() { void ConfigureInput::loadConfiguration() {
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) { for (const auto& input_id : Settings::NativeInput::All) {
QString keyValue = getKeyName(Settings::values.input_mappings[i]); const size_t index = static_cast<size_t>(input_id);
input_mapping[Settings::NativeInput::Values(i)]->setText(keyValue); key_map[input_id] = static_cast<Qt::Key>(Settings::values.input_mappings[index]);
} }
updateButtonLabels();
} }
void ConfigureInput::keyPressEvent(QKeyEvent* event) { void ConfigureInput::restoreDefaults() {
if (!changing_button) for (const auto& input_id : Settings::NativeInput::All) {
return; const size_t index = static_cast<size_t>(input_id);
if (!event || event->key() == Qt::Key_unknown) key_map[input_id] = static_cast<Qt::Key>(Config::defaults[index].toInt());
return; }
key_pressed = event->key(); updateButtonLabels();
timer->stop(); applyConfiguration();
setKey();
} }
void ConfigureInput::setKey() { void ConfigureInput::updateButtonLabels() {
const QString key_value = getKeyName(key_pressed); for (const auto& input_id : Settings::NativeInput::All) {
if (key_pressed == Qt::Key_Escape) button_map[input_id]->setText(getKeyName(key_map[input_id]));
changing_button->setText(previous_mapping); }
else
changing_button->setText(key_value);
removeDuplicates(key_value);
key_pressed = Qt::Key_unknown;
releaseKeyboard();
releaseMouse();
changing_button = nullptr;
previous_mapping = nullptr;
} }
QString ConfigureInput::getKeyName(int key_code) const { void ConfigureInput::handleClick(Settings::NativeInput::Values input_id) {
if (key_code == Qt::Key_Shift) QPushButton* button = button_map[input_id];
return tr("Shift"); button->setText(tr("[press key]"));
if (key_code == Qt::Key_Control) button->setFocus();
return tr("Ctrl");
if (key_code == Qt::Key_Alt)
return tr("Alt");
if (key_code == Qt::Key_Meta)
return "";
if (key_code == -1)
return "";
return QKeySequence(key_code).toString(); current_input_id = input_id;
}
Qt::Key ConfigureInput::getKeyValue(const QString& text) const { grabKeyboard();
if (text == "Shift") grabMouse();
return Qt::Key_Shift; timer->start(5000); // Cancel after 5 seconds
if (text == "Ctrl")
return Qt::Key_Control;
if (text == "Alt")
return Qt::Key_Alt;
if (text == "Meta")
return Qt::Key_unknown;
if (text == "")
return Qt::Key_unknown;
return Qt::Key(QKeySequence(text)[0]);
} }
void ConfigureInput::removeDuplicates(const QString& newValue) { void ConfigureInput::keyPressEvent(QKeyEvent* event) {
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) { releaseKeyboard();
if (changing_button != input_mapping[Settings::NativeInput::Values(i)]) { releaseMouse();
const QString oldValue = input_mapping[Settings::NativeInput::Values(i)]->text();
if (newValue == oldValue) if (!current_input_id || !event)
input_mapping[Settings::NativeInput::Values(i)]->setText(""); return;
}
} if (event->key() != Qt::Key_Escape)
setInput(*current_input_id, static_cast<Qt::Key>(event->key()));
updateButtonLabels();
current_input_id = boost::none;
timer->stop();
} }
void ConfigureInput::restoreDefaults() { void ConfigureInput::setInput(Settings::NativeInput::Values input_id, Qt::Key key_pressed) {
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) { // Remove duplicates
const QString keyValue = getKeyName(Config::defaults[i].toInt()); for (auto& pair : key_map) {
input_mapping[Settings::NativeInput::Values(i)]->setText(keyValue); if (pair.second == key_pressed)
pair.second = Qt::Key_unknown;
} }
key_map[input_id] = key_pressed;
} }

47
src/citra_qt/configure_input.h
Unescape Escape View File

@ -7,7 +7,7 @@
#include <memory> #include <memory>
#include <QKeyEvent> #include <QKeyEvent>
#include <QWidget> #include <QWidget>
#include "citra_qt/config.h" #include <boost/optional.hpp>
#include "core/settings.h" #include "core/settings.h"
#include "ui_configure_input.h" #include "ui_configure_input.h"
@ -30,35 +30,28 @@ public:
private: private:
std::unique_ptr<Ui::ConfigureInput> ui; std::unique_ptr<Ui::ConfigureInput> ui;
std::map<Settings::NativeInput::Values, QPushButton*> input_mapping;
int key_pressed;
QPushButton* changing_button = nullptr; ///< button currently waiting for key press.
QString previous_mapping;
QTimer* timer;
/// Load configuration settings into button text /// This input is currently awaiting configuration.
void setConfiguration(); /// (i.e.: its corresponding QPushButton has been pressed.)
boost::optional<Settings::NativeInput::Values> current_input_id;
std::unique_ptr<QTimer> timer;
/// Check all inputs for duplicate keys. Clears out any other button with the same value as this /// Each input is represented by a QPushButton.
/// button's new value. std::map<Settings::NativeInput::Values, QPushButton*> button_map;
void removeDuplicates(const QString& newValue); /// Each input is configured to respond to the press of a Qt::Key.
std::map<Settings::NativeInput::Values, Qt::Key> key_map;
/// Handle key press event for input tab when a button is 'waiting'.
void keyPressEvent(QKeyEvent* event) override;
/// Convert key ASCII value to its' letter/name
QString getKeyName(int key_code) const;
/// Convert letter/name of key to its ASCII value.
Qt::Key getKeyValue(const QString& text) const;
/// Set button text to name of key pressed.
void setKey();
private slots:
/// Event handler for all button released() event.
void handleClick();
/// Load configuration settings.
void loadConfiguration();
/// Restore all buttons to their default values. /// Restore all buttons to their default values.
void restoreDefaults(); void restoreDefaults();
/// Update UI to reflect current configuration.
void updateButtonLabels();
/// Called when the button corresponding to input_id was pressed.
void handleClick(Settings::NativeInput::Values input_id);
/// Handle key press events.
void keyPressEvent(QKeyEvent* event) override;
/// Configure input input_id to respond to key key_pressed.
void setInput(Settings::NativeInput::Values input_id, Qt::Key key_pressed);
}; };

Write Preview
Loading…
Cancel
Save