ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update QtKeyCodes.cpp 

This addresses an issue present in EQOA where SHIFT only worked on alpha characters. SHIFT now is detected and works to produce symbols as well.
This commit is contained in:
Joe Wagner 2024-09-18 08:44:59 -07:00 committed by GitHub
parent 1d449e9675
commit 0d37ea42f9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pcsx2-qt/QtKeyCodes.cpp
View File

@ -13,6 +13,31 @@
#include <QtGui/QKeyEvent>
uint8_t map_text_to_keycode(const QString& text) {
if (text == "!") return Qt::Key_1;
if (text == "@") return Qt::Key_2;
if (text == "#") return Qt::Key_3;
if (text == "$") return Qt::Key_4;
if (text == "%") return Qt::Key_5;
if (text == "^") return Qt::Key_6;
if (text == "&") return Qt::Key_7;
if (text == "*") return Qt::Key_8;
if (text == "(") return Qt::Key_9;
if (text == ")") return Qt::Key_0;
if (text == "_") return Qt::Key_Minus;
if (text == "+") return Qt::Key_Equal;
if (text == "?") return Qt::Key_Slash;
if (text == ":") return Qt::Key_Semicolon;
if (text == "\"") return Qt::Key_Apostrophe;
if (text == "~") return Qt::Key_QuoteLeft;
if (text == "<") return Qt::Key_Comma;
if (text == ">") return Qt::Key_Period;
if (text == "|") return Qt::Key_Backslash;
if (text == "{") return Qt::Key_BracketLeft;
if (text == "}") return Qt::Key_BracketRight;
return 0; // No remapping
}
struct KeyCodeName
{
int code;
@ -517,10 +542,16 @@ const char* InputManager::ConvertHostKeyboardCodeToIcon(u32 code)
return nullptr;
}
u32 QtUtils::KeyEventToCode(const QKeyEvent* ev)
{
int key = ev->key();
Qt::KeyboardModifiers modifiers = ev->modifiers();
u32 QtUtils::KeyEventToCode(const QKeyEvent* ev) {
QString text = ev->text();
uint8_t keycode = map_text_to_keycode(text); // Map special text symbols to keycodes
int key = ev->key();
if (keycode != 0) {
key = keycode; // Override key if mapped
}
Qt::KeyboardModifiers modifiers = ev->modifiers();
#ifdef __APPLE__
// On macOS, Qt applies the Keypad modifier regardless of whether the arrow keys, or numpad was pressed.
@ -536,5 +567,5 @@ u32 QtUtils::KeyEventToCode(const QKeyEvent* ev)
}
#endif
return static_cast<u32>(key) | (static_cast<u32>(modifiers) & static_cast<u32>(Qt::KeypadModifier));
return static_cast<u32>(key) | (static_cast<u32>(modifiers) & static_cast<u32>(Qt::KeypadModifier));
}