Fix non-ASCII keyboard input#3199
Conversation
|
|
I updated this to also use the convertUnicodeToLoco function. This allows the user to also type Polish characters such as Łłżńść. It also means that characters that are not supported will become "?" instead of simply being ignored by TextInput.cpp's handleInput function, resulting in a more responsive user experience (in the case of someone mistakenly using a keyboard layout with unsupported characters). (This is different from original Locomotion (Steam) behaviour, where typing Greek letters instead results in mojibake). |
src/OpenLoco/src/Input/Keyboard.cpp
Outdated
| } | ||
|
|
||
| uint32_t index = _keyQueueLastWrite; | ||
| _keyQueue[index].charCode = Localisation::convertUnicodeToLoco(Localisation::readCodePoint((unsigned char**)&text)); |
There was a problem hiding this comment.
we don't use c style casts in this code base. readCodePoint should be taking a const utf8_t** (but its not so please correct that) so that this call becomes readCodePoint(static_cast<utf8_t**>(&text))
There was a problem hiding this comment.
static_cast does not work here, I think because of the conversion from signed to unsigned. Using reinterpret_cast works, but I decided to still use unsigned char in my new changes, as I am not sure if it would be best practise to reinterpret directly to utf8_t? Thank you for your patience.
src/OpenLoco/src/Input/Keyboard.cpp
Outdated
| } | ||
|
|
||
| uint32_t index = _keyQueueLastWrite; | ||
| auto unsignedText = reinterpret_cast<const unsigned char*>(text); |
There was a problem hiding this comment.
can you at least use uint8_t instead of unsigned char since that is what we use throughout the codebase.
Fixes #3198
It feels kind of stupid, both to be using a module named localization here,
as well as the crazy cast,but it works.Previously the behaviour was bugged such that
äwould become{keyCode=228 charCode=4294967235}instead of{keyCode=228 charCode=228}.