Rename `scancode` to `keycode`.

Add `physical_keycode` (keyboard layout independent keycodes) to InputEventKey and InputMap.
Fix non-latin keyboard layout keycodes on Linux/X11 (fallback to physical keycodes).

3 files changed, 171 insertions, 3 deletions

diff --git a/platform/windows/key_mapping_windows.cpp b/platform/windows/key_mapping_windows.cpp
index c76b31ca9c..da63e92622 100644
--- a/platform/windows/key_mapping_windows.cpp
+++ b/platform/windows/key_mapping_windows.cpp
@@ -238,6 +238,104 @@ VK_PA1 (0xFD)
 VK_OEM_CLEAR (0xFE)
 */
 
+static _WinTranslatePair _scancode_to_keycode[] = {
+
+	{ KEY_ESCAPE, 0x01 },
+	{ KEY_1, 0x02 },
+	{ KEY_2, 0x03 },
+	{ KEY_3, 0x04 },
+	{ KEY_4, 0x05 },
+	{ KEY_5, 0x06 },
+	{ KEY_6, 0x07 },
+	{ KEY_7, 0x08 },
+	{ KEY_8, 0x09 },
+	{ KEY_9, 0x0A },
+	{ KEY_0, 0x0B },
+	{ KEY_MINUS, 0x0C },
+	{ KEY_EQUAL, 0x0D },
+	{ KEY_BACKSPACE, 0x0E },
+	{ KEY_TAB, 0x0F },
+	{ KEY_Q, 0x10 },
+	{ KEY_W, 0x11 },
+	{ KEY_E, 0x12 },
+	{ KEY_R, 0x13 },
+	{ KEY_T, 0x14 },
+	{ KEY_Y, 0x15 },
+	{ KEY_U, 0x16 },
+	{ KEY_I, 0x17 },
+	{ KEY_O, 0x18 },
+	{ KEY_P, 0x19 },
+	{ KEY_BRACELEFT, 0x1A },
+	{ KEY_BRACERIGHT, 0x1B },
+	{ KEY_ENTER, 0x1C },
+	{ KEY_CONTROL, 0x1D },
+	{ KEY_A, 0x1E },
+	{ KEY_S, 0x1F },
+	{ KEY_D, 0x20 },
+	{ KEY_F, 0x21 },
+	{ KEY_G, 0x22 },
+	{ KEY_H, 0x23 },
+	{ KEY_J, 0x24 },
+	{ KEY_K, 0x25 },
+	{ KEY_L, 0x26 },
+	{ KEY_SEMICOLON, 0x27 },
+	{ KEY_APOSTROPHE, 0x28 },
+	{ KEY_QUOTELEFT, 0x29 },
+	{ KEY_SHIFT, 0x2A },
+	{ KEY_BACKSLASH, 0x2B },
+	{ KEY_Z, 0x2C },
+	{ KEY_X, 0x2D },
+	{ KEY_C, 0x2E },
+	{ KEY_V, 0x2F },
+	{ KEY_B, 0x30 },
+	{ KEY_N, 0x31 },
+	{ KEY_M, 0x32 },
+	{ KEY_COMMA, 0x33 },
+	{ KEY_PERIOD, 0x34 },
+	{ KEY_SLASH, 0x35 },
+	{ KEY_SHIFT, 0x36 },
+	{ KEY_PRINT, 0x37 },
+	{ KEY_ALT, 0x38 },
+	{ KEY_SPACE, 0x39 },
+	{ KEY_CAPSLOCK, 0x3A },
+	{ KEY_F1, 0x3B },
+	{ KEY_F2, 0x3C },
+	{ KEY_F3, 0x3D },
+	{ KEY_F4, 0x3E },
+	{ KEY_F5, 0x3F },
+	{ KEY_F6, 0x40 },
+	{ KEY_F7, 0x41 },
+	{ KEY_F8, 0x42 },
+	{ KEY_F9, 0x43 },
+	{ KEY_F10, 0x44 },
+	{ KEY_NUMLOCK, 0x45 },
+	{ KEY_SCROLLLOCK, 0x46 },
+	{ KEY_HOME, 0x47 },
+	{ KEY_UP, 0x48 },
+	{ KEY_PAGEUP, 0x49 },
+	{ KEY_KP_SUBTRACT, 0x4A },
+	{ KEY_LEFT, 0x4B },
+	{ KEY_KP_5, 0x4C },
+	{ KEY_RIGHT, 0x4D },
+	{ KEY_KP_ADD, 0x4E },
+	{ KEY_END, 0x4F },
+	{ KEY_DOWN, 0x50 },
+	{ KEY_PAGEDOWN, 0x51 },
+	{ KEY_INSERT, 0x52 },
+	{ KEY_DELETE, 0x53 },
+	//{ KEY_???, 0x56 }, //NON US BACKSLASH
+	{ KEY_F11, 0x57 },
+	{ KEY_F12, 0x58 },
+	{ KEY_META, 0x5B },
+	{ KEY_META, 0x5C },
+	{ KEY_MENU, 0x5D },
+	{ KEY_F13, 0x64 },
+	{ KEY_F14, 0x65 },
+	{ KEY_F15, 0x66 },
+	{ KEY_F16, 0x67 },
+	{ KEY_UNKNOWN, 0 }
+};
+
 unsigned int KeyMappingWindows::get_keysym(unsigned int p_code) {
 
 	for (int i = 0; _vk_to_keycode[i].keysym != KEY_UNKNOWN; i++) {
@@ -251,3 +349,69 @@ unsigned int KeyMappingWindows::get_keysym(unsigned int p_code) {
 
 	return KEY_UNKNOWN;
 }
+
+unsigned int KeyMappingWindows::get_scansym(unsigned int p_code, bool p_extended) {
+	unsigned int keycode = KEY_UNKNOWN;
+	for (int i = 0; _scancode_to_keycode[i].keysym != KEY_UNKNOWN; i++) {
+
+		if (_scancode_to_keycode[i].keycode == p_code) {
+			keycode = _scancode_to_keycode[i].keysym;
+			break;
+		}
+	}
+
+	if (p_extended) {
+		switch (keycode) {
+			case KEY_ENTER: {
+				keycode = KEY_KP_ENTER;
+			} break;
+			case KEY_SLASH: {
+				keycode = KEY_KP_DIVIDE;
+			} break;
+			case KEY_CAPSLOCK: {
+				keycode = KEY_KP_ADD;
+			} break;
+		}
+	} else {
+		switch (keycode) {
+			case KEY_NUMLOCK: {
+				keycode = KEY_PAUSE;
+			} break;
+			case KEY_HOME: {
+				keycode = KEY_KP_7;
+			} break;
+			case KEY_UP: {
+				keycode = KEY_KP_8;
+			} break;
+			case KEY_PAGEUP: {
+				keycode = KEY_KP_9;
+			} break;
+			case KEY_LEFT: {
+				keycode = KEY_KP_4;
+			} break;
+			case KEY_RIGHT: {
+				keycode = KEY_KP_6;
+			} break;
+			case KEY_END: {
+				keycode = KEY_KP_1;
+			} break;
+			case KEY_DOWN: {
+				keycode = KEY_KP_2;
+			} break;
+			case KEY_PAGEDOWN: {
+				keycode = KEY_KP_3;
+			} break;
+			case KEY_INSERT: {
+				keycode = KEY_KP_0;
+			} break;
+			case KEY_DELETE: {
+				keycode = KEY_KP_PERIOD;
+			} break;
+			case KEY_PRINT: {
+				keycode = KEY_KP_MULTIPLY;
+			} break;
+		}
+	}
+
+	return keycode;
+}
diff --git a/platform/windows/key_mapping_windows.h b/platform/windows/key_mapping_windows.h
index 0f9bdecde1..3361ad397f 100644
--- a/platform/windows/key_mapping_windows.h
+++ b/platform/windows/key_mapping_windows.h
@@ -43,6 +43,7 @@ class KeyMappingWindows {
 
 public:
 	static unsigned int get_keysym(unsigned int p_code);
+	static unsigned int get_scansym(unsigned int p_code, bool p_extended);
 };
 
 #endif // KEY_MAPPING_WINDOWS_H
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 716a637993..afd95c3e36 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -1135,7 +1135,8 @@ void OS_Windows::process_key_events() {
 					k->set_control(ke.control);
 					k->set_metakey(ke.meta);
 					k->set_pressed(true);
-					k->set_scancode(KeyMappingWindows::get_keysym(ke.wParam));
+					k->set_keycode(KeyMappingWindows::get_keysym(ke.wParam));
+					k->set_physical_keycode(KeyMappingWindows::get_scansym((ke.lParam >> 16) & 0xFF, ke.lParam & (1 << 24)));
 					k->set_unicode(ke.wParam);
 					if (k->get_unicode() && gr_mem) {
 						k->set_alt(false);
@@ -1165,11 +1166,13 @@ void OS_Windows::process_key_events() {
 
 				if ((ke.lParam & (1 << 24)) && (ke.wParam == VK_RETURN)) {
 					// Special case for Numpad Enter key
-					k->set_scancode(KEY_KP_ENTER);
+					k->set_keycode(KEY_KP_ENTER);
 				} else {
-					k->set_scancode(KeyMappingWindows::get_keysym(ke.wParam));
+					k->set_keycode(KeyMappingWindows::get_keysym(ke.wParam));
 				}
 
+				k->set_physical_keycode(KeyMappingWindows::get_scansym((ke.lParam >> 16) & 0xFF, ke.lParam & (1 << 24)));
+
 				if (i + 1 < key_event_pos && key_event_buffer[i + 1].uMsg == WM_CHAR) {
 					k->set_unicode(key_event_buffer[i + 1].wParam);
 				}