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

onepad: Fix binding `A` on macOS 

The key value 0 (which was being used to indicate esc) was already in use as the A key on macOS
This commit is contained in:
Tellow Krinkle 2020-07-27 18:41:29 -05:00 committed by tellowkrinkle
parent 7fa6740710
commit 34425d892c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/onepad/keyboard.cpp
View File

@ -99,7 +99,7 @@ bool PollForNewKeyboardKeys(u32 &pkey) {
// keys that aren't being recognized, bump this number up!
for (int key = 0; key < 0x80; key++) {
if (CGEventSourceKeyState(kCGEventSourceStateHIDSystemState, key)) {
pkey = key == kVK_Escape ? 0 : key;
pkey = key == kVK_Escape ? UINT32_MAX : key;
return true;
}
}
@ -282,7 +282,7 @@ bool PollForNewKeyboardKeys(u32 &pkey)
if (ev != NULL) {
if (ev->type == GDK_KEY_PRESS) {
pkey = ev->key.keyval != GDK_KEY_Escape ? ev->key.keyval : 0;
pkey = ev->key.keyval != GDK_KEY_Escape ? ev->key.keyval : UINT32_MAX;
return true;
} else if (ev->type == GDK_BUTTON_PRESS) {
pkey = ev->button.button;

4
plugins/onepad/wx_dialog/dialog.cpp
View File

@ -577,8 +577,8 @@ void Dialog::config_key(int pad, int key)
while (!captured) {
if (PollForNewKeyboardKeys(key_pressed)) {
// special case for keyboard/mouse to handle multiple keys
// Note: key_pressed == 0 when ESC is hit to abort the capture
if (key_pressed > 0) {
// Note: key_pressed == UINT32_MAX when ESC is hit to abort the capture
if (key_pressed != UINT32_MAX) {
clear_key(pad, key);
set_keyboard_key(pad, key_pressed, key);
m_simulatedKeys[pad][key] = key_pressed;