morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11315 from akallabeth/xfreerdp-apple

Browse Source 
[client,x11] add apple keyboard fallback
This commit is contained in:
akallabeth
2025-03-10 15:35:45 +01:00
committed by GitHub
parent e6a12326f4 de240cfb75
commit 30626cc3ec
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/X11/xf_keyboard.c
View File

@@ -488,13 +488,21 @@ static int load_map_from_xkbfile(xfContext* xfc)
strncpy(xkb_keyname, xkb->names->keys[i].name, XkbKeyNameLength);
WLog_Print(xfc->log, WLOG_TRACE, "KeyCode %" PRIuz " -> %s", i, xkb_keyname);
if (strnlen(xkb_keyname, ARRAYSIZE(xkb_keyname)) < 1)
continue;
found = try_add(xfc, i, xkb_keyname);
if (strnlen(xkb_keyname, ARRAYSIZE(xkb_keyname)) >= 1)
found = try_add(xfc, i, xkb_keyname);
if (!found)
{
#if defined(__APPLE__)
const DWORD vkcode =
GetVirtualKeyCodeFromKeycode((UINT32)i - 8u, WINPR_KEYCODE_TYPE_APPLE);
xfc->X11_KEYCODE_TO_VIRTUAL_SCANCODE[i] =
GetVirtualScanCodeFromVirtualKeyCode(vkcode, WINPR_KBD_TYPE_IBM_ENHANCED);
found = TRUE;
#endif
}
if (!found)
{
WLog_Print(xfc->log, WLOG_WARN, "%4s: keycode: 0x%02X -> no RDP scancode found",
xkb_keyname, i);
}