asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[HTML5] Add support for physical_keycode.

Browse source 
This uses the `event.code` value to retrieve the physical code, while
still using the extra logic to map the unicode value to our keylist,
when computing the `scancode` (supporting ASCII and Latin-1).
This commit is contained in:
Fabio Alessandrelli 2021-03-08 10:16:22 +01:00 committed by bruvzg
parent dab4cf3ed6
commit 8740e95f15
No known key found for this signature in database
GPG key ID: 009E1BFE42239B95
2 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
platform/javascript/dom_keys.inc
View file

@ -31,7 +31,7 @@
#include "core/os/keyboard.h" #include "core/os/keyboard.h"
// See https://w3c.github.io/uievents-code/#code-value-tables // See https://w3c.github.io/uievents-code/#code-value-tables
int dom_code2godot_scancode(EM_UTF8 const p_code[32], EM_UTF8 const p_key[32]) { int dom_code2godot_scancode(EM_UTF8 const p_code[32], EM_UTF8 const p_key[32], bool p_physical) {
#define DOM2GODOT(p_str, p_godot_code) \ #define DOM2GODOT(p_str, p_godot_code) \
if (memcmp((const void *)p_str, (void *)p_code, strlen(p_str) + 1) == 0) { \ if (memcmp((const void *)p_str, (void *)p_code, strlen(p_str) + 1) == 0) { \
return KEY_##p_godot_code; \ return KEY_##p_godot_code; \
@ -71,31 +71,33 @@ int dom_code2godot_scancode(EM_UTF8 const p_code[32], EM_UTF8 const p_key[32]) {
DOM2GODOT("NumpadSubtract", KP_SUBTRACT); DOM2GODOT("NumpadSubtract", KP_SUBTRACT);
// Printable ASCII. // Printable ASCII.
uint8_t b0 = (uint8_t)p_key[0]; if (!p_physical) {
uint8_t b1 = (uint8_t)p_key[1]; uint8_t b0 = (uint8_t)p_key[0];
uint8_t b2 = (uint8_t)p_key[2]; uint8_t b1 = (uint8_t)p_key[1];
if (b1 == 0 && b0 > 0x1F && b0 < 0x7F) { // ASCII. uint8_t b2 = (uint8_t)p_key[2];
if (b0 > 0x60 && b0 < 0x7B) { // Lowercase ASCII. if (b1 == 0 && b0 > 0x1F && b0 < 0x7F) { // ASCII.
b0 -= 32; if (b0 > 0x60 && b0 < 0x7B) { // Lowercase ASCII.
b0 -= 32;
}
return b0;
} }
return b0;
}
#define _U_2BYTES_MASK 0xE0 #define _U_2BYTES_MASK 0xE0
#define _U_2BYTES 0xC0 #define _U_2BYTES 0xC0
// Latin-1 codes. // Latin-1 codes.
if (b2 == 0 && (b0 & _U_2BYTES_MASK) == _U_2BYTES) { // 2-bytes utf8, only known latin. if (b2 == 0 && (b0 & _U_2BYTES_MASK) == _U_2BYTES) { // 2-bytes utf8, only known latin.
uint32_t key = ((b0 & ~_U_2BYTES_MASK) << 6) | (b1 & 0x3F); uint32_t key = ((b0 & ~_U_2BYTES_MASK) << 6) | (b1 & 0x3F);
if (key >= 0xA0 && key <= 0xDF) { if (key >= 0xA0 && key <= 0xDF) {
return key; return key;
}
if (key >= 0xE0 && key <= 0xFF) { // Lowercase known latin.
key -= 0x20;
return key;
}
} }
if (key >= 0xE0 && key <= 0xFF) { // Lowercase known latin.
key -= 0x20;
return key;
}
}
#undef _U_2BYTES_MASK #undef _U_2BYTES_MASK
#undef _U_2BYTES #undef _U_2BYTES
}
// Alphanumeric section. // Alphanumeric section.
DOM2GODOT("Backquote", QUOTELEFT); DOM2GODOT("Backquote", QUOTELEFT);

4
platform/javascript/os_javascript.cpp
View file

@ -240,8 +240,8 @@ static Ref<InputEventKey> setup_key_event(const EmscriptenKeyboardEvent *emscrip
ev.instance(); ev.instance();
ev->set_echo(emscripten_event->repeat); ev->set_echo(emscripten_event->repeat);
dom2godot_mod(emscripten_event, ev); dom2godot_mod(emscripten_event, ev);
ev->set_scancode(dom_code2godot_scancode(emscripten_event->code, emscripten_event->key)); ev->set_scancode(dom_code2godot_scancode(emscripten_event->code, emscripten_event->key, false));
ev->set_physical_scancode(dom_code2godot_scancode(emscripten_event->code, emscripten_event->key)); ev->set_physical_scancode(dom_code2godot_scancode(emscripten_event->code, emscripten_event->key, true));
String unicode = String::utf8(emscripten_event->key); String unicode = String::utf8(emscripten_event->key);
// Check if empty or multi-character (e.g. `CapsLock`). // Check if empty or multi-character (e.g. `CapsLock`).