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

[HID] Improved WinKey GetKeystroke code 

Seems the double-keypress issue was because of XINPUT_KEYSTROKE_REPEAT: Xenia would add that to keyup events, but seems REPEAT is only meant for keydown (well SR1 treats it as a keydown event at least)
This commit is contained in:
emoose 2020-01-15 07:04:03 +00:00 committed by illusion
parent 2351d56512
commit cfcf0e70c5
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/xenia/hid/winkey/winkey_input_driver.cc
View File

@ -383,33 +383,24 @@ X_RESULT WinKeyInputDriver::GetKeystroke(uint32_t user_index, uint32_t flags,
} }
} }
if (!cvars::keyboard_passthru) { if (virtual_key != 0) {
if (virtual_key != 0) { if (evt.transition == true) {
if (evt.transition == true) { keystroke_flags |= 0x0001; // XINPUT_KEYSTROKE_KEYDOWN
keystroke_flags |= 0x0001; // XINPUT_KEYSTROKE_KEYDOWN
} else if (evt.transition == false) {
keystroke_flags |= 0x0002; // XINPUT_KEYSTROKE_KEYUP
}
if (evt.prev_state == evt.transition) { if (evt.prev_state == evt.transition) {
keystroke_flags |= 0x0004; // XINPUT_KEYSTROKE_REPEAT keystroke_flags |= 0x0004; // XINPUT_KEYSTROKE_REPEAT
} }
} else if (evt.transition == false) {
result = X_ERROR_SUCCESS;
}
} else {
// Handle keydown & keyup:
if (evt.transition == false) {
keystroke_flags |= 0x0002; // XINPUT_KEYSTROKE_KEYUP keystroke_flags |= 0x0002; // XINPUT_KEYSTROKE_KEYUP
} else if (evt.transition == true) {
keystroke_flags |= 0x0001; // XINPUT_KEYSTROKE_KEYDOWN
} }
if (keystroke_flags != 0) { if (cvars::keyboard_passthru) {
WCHAR buf; WCHAR buf;
if (ToUnicode(virtual_key, 0, key_map_, &buf, 1, 0) == 1) { if (ToUnicode(virtual_key, 0, key_map_, &buf, 1, 0) == 1) {
unicode = buf; unicode = buf;
} }
}
if (keystroke_flags) {
result = X_ERROR_SUCCESS; result = X_ERROR_SUCCESS;
} }
} }