Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows input: Fix wrong OEM key, add missing keys #56514

Merged
merged 1 commit into from
Jan 7, 2022

Conversation

mhilbrunner
Copy link
Member

@mhilbrunner mhilbrunner commented Jan 5, 2022

This cleans up Windows key input mapping, fixes the braces/brackets mixup for the OEM keys, adds additional missing keys and mappings from WinUser.h and adds more docs/comments.

Added mappings:

VK_SEPARATOR -> PERIOD
VK_MEDIA_PLAY_PAUSE -> MEDIAPLAY
VK_OEM_CLEAR -> CLEAR
VK_PLAY -> MEDIAPLAY
VK_CRSEL -> TAB
VK_ATTN -> ESCAPE
VK_ICO_CLEAR -> CLEAR
VK_ICO_HELP -> HELP
VK_OEM_NEC_EQUAL -> EQUAL

Fixed mappings:

VK_OEM_4 -> BRACKETLEFT (was BRACELEFT)
VK_OEM_6 -> BRACKETRIGHT (was BRACERIGHT)

Documented:
All reserved/unassigned/missing values
Missing IME mappings
The following values:

VK_PROCESSKEY
VK_PACKET
VK_EXSEL
VK_EREOF
VK_ZOOM
VK_NONAME
VK_PA1
VK_OEM_102

Should fix #54958
Supersedes #55016

Thanks to Mozilla's docs for helping me figure out this stuff. :)

@akien-mga akien-mga merged commit 7cb0f9d into godotengine:master Jan 7, 2022
@akien-mga
Copy link
Member

Thanks!

@akien-mga
Copy link
Member

Might be worth backporting to 3.x to fix the issue there too.
And for 3.4 I guess maybe just the fix for the wrong bracket/brace mappings? Or the full blown changes too?

@mhilbrunner mhilbrunner deleted the windows-missing-inputs branch January 7, 2022 09:50
@mhilbrunner
Copy link
Member Author

mhilbrunner commented Jan 7, 2022

I'd tend to just backport the bracket fix to 3.x, the others are mostly esoteric.

Will do a separate PR :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

KEY_BRACKETLEFT and KEY_BRACELEFT are mixed up on Windows
3 participants