Merge pull request #6662 from akallabeth/kbd_detect

Fixed keyboard layout detection for windows
This commit is contained in:
Martin Fleisz
2020-12-11 13:24:09 +01:00
committed by GitHub

View File

@@ -47,6 +47,10 @@ DWORD X11_KEYCODE_TO_VIRTUAL_SCANCODE[256];
int freerdp_detect_keyboard(DWORD* keyboardLayoutId)
{
#if defined(_WIN32)
*keyboardLayoutId = (DWORD)GetKeyboardLayout(0) & 0x0000FFFF;
#endif
#ifdef WITH_X11
if (*keyboardLayoutId == 0)
freerdp_detect_keyboard_layout_from_xkb(keyboardLayoutId);