mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-locale: split virtual key code table in two, for extended keys

Browse Source
This commit is contained in:
Marc-André Moreau 2012-02-21 17:10:10 -05:00
parent 343630023f
commit 196490159b
2 changed files with 464 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libfreerdp-locale/keyboard.c
View File

@ -65,6 +65,8 @@ int freerdp_keyboard_load_map(uint32 keycode_to_vkcode[256], char* name)
char keymap_filename[256] = "";
char keycode_string[32] = "";
char vkcode_name[128] = "";
boolean found = false;
boolean extended = false;
VIRTUAL_KEY_CODE* vkcode;
beg = name;
@ -144,17 +146,41 @@ int freerdp_keyboard_load_map(uint32 keycode_to_vkcode[256], char* name)
/* Load this key mapping in the keyboard mapping */
i = 0;
found = false;
extended = false;
do
{
vkcode = (VIRTUAL_KEY_CODE*) &VIRTUAL_KEY_CODE_TABLE[i];
if (strcmp(vkcode_name, vkcode->name) == 0)
{
found = true;
extended = false;
keycode_to_vkcode[keycode] = vkcode->code;
}
i++;
}
while (vkcode->code != 0);
if (!found)
{
do
{
vkcode = (VIRTUAL_KEY_CODE*) &VIRTUAL_KEY_CODE_TABLE[i];
if (strcmp(vkcode_name, vkcode->name) == 0)
{
found = true;
extended = true;
keycode_to_vkcode[keycode] = vkcode->code;
}
i++;
}
while (vkcode->code != 0);
}
}
else if ((pch = strstr(buffer, ": extends")) != NULL)
{

597
libfreerdp-locale/keyboard_xkb.c
View File

@ -37,38 +37,298 @@ extern const RDP_SCANCODE VIRTUAL_KEY_CODE_TO_RDP_SCANCODE_TABLE[];
VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME_TABLE[] =
{
{ 0, "" },
{ VK_LBUTTON, "" },
{ VK_RBUTTON, "" },
{ VK_CANCEL, "" },
{ VK_MBUTTON, "" },
{ VK_XBUTTON1, "" },
{ VK_XBUTTON2, "" },
{ 0, "" }, /* VK_LBUTTON */
{ 0, "" }, /* VK_RBUTTON */
{ 0, "" }, /* VK_CANCEL */
{ 0, "" }, /* VK_MBUTTON */
{ 0, "" }, /* VK_XBUTTON1 */
{ 0, "" }, /* VK_XBUTTON2 */
{ 0, "" },
{ VK_BACK, "BKSP" }, /* VK_BACK */
{ VK_TAB, "TAB" }, /* VK_TAB */
{ 0, "" },
{ 0, "" },
{ 0, "" }, /* VK_CLEAR */
{ VK_RETURN, "RTRN" }, /* VK_RETURN */
{ 0, "" },
{ 0, "" },
{ VK_SHIFT, "LFSH" }, /* VK_SHIFT */
{ VK_CONTROL, "" }, /* VK_CONTROL */
{ VK_MENU, "LALT" }, /* VK_MENU */
{ 0, "" }, /* VK_PAUSE */
{ VK_CAPITAL, "CAPS" }, /* VK_CAPITAL */
{ 0, "" }, /* VK_KANA / VK_HANGUL */
{ 0, "" },
{ 0, "" }, /* VK_JUNJA */
{ 0, "" }, /* VK_FINAL */
{ 0, "" }, /* VK_HANJA / VK_KANJI */
{ 0, "" },
{ VK_ESCAPE, "ESC" }, /* VK_ESCAPE */
{ 0, "" }, /* VK_CONVERT */
{ 0, "" }, /* VK_NONCONVERT */
{ 0, "" }, /* VK_ACCEPT */
{ 0, "" }, /* VK_MODECHANGE */
{ VK_SPACE, "SPCE" }, /* VK_SPACE */
{ 0, "" }, /* VK_PRIOR */
{ 0, "" }, /* VK_NEXT */
{ 0, "" }, /* VK_END */
{ 0, "" }, /* VK_HOME */
{ 0, "" }, /* VK_LEFT */
{ 0, "" }, /* VK_UP */
{ 0, "" }, /* VK_RIGHT */
{ 0, "" }, /* VK_DOWN */
{ 0, "" }, /* VK_SELECT */
{ 0, "" }, /* VK_PRINT */
{ 0, "" }, /* VK_EXECUTE */
{ 0, "" }, /* VK_SNAPSHOT */
{ 0, "" }, /* VK_INSERT */
{ 0, "" }, /* VK_DELETE */
{ 0, "" }, /* VK_HELP */
{ VK_KEY_0, "AE10" }, /* VK_KEY_0 */
{ VK_KEY_1, "AE01" }, /* VK_KEY_1 */
{ VK_KEY_2, "AE02" }, /* VK_KEY_2 */
{ VK_KEY_3, "AE03" }, /* VK_KEY_3 */
{ VK_KEY_4, "AE04" }, /* VK_KEY_4 */
{ VK_KEY_5, "AE05" }, /* VK_KEY_5 */
{ VK_KEY_6, "AE06" }, /* VK_KEY_6 */
{ VK_KEY_7, "AE07" }, /* VK_KEY_7 */
{ VK_KEY_8, "AE08" }, /* VK_KEY_8 */
{ VK_KEY_9, "AE09" }, /* VK_KEY_9 */
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ VK_KEY_A, "AC01" }, /* VK_KEY_A */
{ VK_KEY_B, "AB05" }, /* VK_KEY_B */
{ VK_KEY_C, "AB03" }, /* VK_KEY_C */
{ VK_KEY_D, "AC03" }, /* VK_KEY_D */
{ VK_KEY_E, "AD03" }, /* VK_KEY_E */
{ VK_KEY_F, "AC04" }, /* VK_KEY_F */
{ VK_KEY_G, "AC05" }, /* VK_KEY_G */
{ VK_KEY_H, "AC06" }, /* VK_KEY_H */
{ VK_KEY_I, "AD08" }, /* VK_KEY_I */
{ VK_KEY_J, "AC07" }, /* VK_KEY_J */
{ VK_KEY_K, "AC08" }, /* VK_KEY_K */
{ VK_KEY_L, "AC09" }, /* VK_KEY_L */
{ VK_KEY_M, "AB07" }, /* VK_KEY_M */
{ VK_KEY_N, "AB06" }, /* VK_KEY_N */
{ VK_KEY_O, "AD09" }, /* VK_KEY_O */
{ VK_KEY_P, "AD10" }, /* VK_KEY_P */
{ VK_KEY_Q, "AD01" }, /* VK_KEY_Q */
{ VK_KEY_R, "AD04" }, /* VK_KEY_R */
{ VK_KEY_S, "AC02" }, /* VK_KEY_S */
{ VK_KEY_T, "AD05" }, /* VK_KEY_T */
{ VK_KEY_U, "AD07" }, /* VK_KEY_U */
{ VK_KEY_V, "AB04" }, /* VK_KEY_V */
{ VK_KEY_W, "AD02" }, /* VK_KEY_W */
{ VK_KEY_X, "AB02" }, /* VK_KEY_X */
{ VK_KEY_Y, "AD06" }, /* VK_KEY_Y */
{ VK_KEY_Z, "AB01" }, /* VK_KEY_Z */
{ 0, "" }, /* VK_LWIN */
{ 0, "" }, /* VK_RWIN */
{ 0, "" }, /* VK_APPS */
{ 0, "" },
{ 0, "" }, /* VK_SLEEP */
{ VK_NUMPAD0, "KP0" }, /* VK_NUMPAD0 */
{ VK_NUMPAD1, "KP1" }, /* VK_NUMPAD1 */
{ VK_NUMPAD2, "KP2" }, /* VK_NUMPAD2 */
{ VK_NUMPAD3, "KP3" }, /* VK_NUMPAD3 */
{ VK_NUMPAD4, "KP4" }, /* VK_NUMPAD4 */
{ VK_NUMPAD5, "KP5" }, /* VK_NUMPAD5 */
{ VK_NUMPAD6, "KP6" }, /* VK_NUMPAD6 */
{ VK_NUMPAD7, "KP7" }, /* VK_NUMPAD7 */
{ VK_NUMPAD8, "KP8" }, /* VK_NUMPAD8 */
{ VK_NUMPAD9, "KP9" }, /* VK_NUMPAD9 */
{ VK_MULTIPLY, "KPMU" }, /* VK_MULTIPLY */
{ VK_ADD, "KPAD" }, /* VK_ADD */
{ 0, "" }, /* VK_SEPARATOR */
{ VK_SUBTRACT, "KPSU" }, /* VK_SUBTRACT */
{ VK_DECIMAL, "KPDL" }, /* VK_DECIMAL */
{ VK_DIVIDE, "AB10" }, /* VK_DIVIDE */
{ VK_F1, "FK01" }, /* VK_F1 */
{ VK_F2, "FK02" }, /* VK_F2 */
{ VK_F3, "FK03" }, /* VK_F3 */
{ VK_F4, "FK04" }, /* VK_F4 */
{ VK_F5, "FK05" }, /* VK_F5 */
{ VK_F6, "FK06" }, /* VK_F6 */
{ VK_F7, "FK07" }, /* VK_F7 */
{ VK_F8, "FK08" }, /* VK_F8 */
{ VK_F9, "FK09" }, /* VK_F9 */
{ VK_F10, "FK10" }, /* VK_F10 */
{ VK_F11, "FK11" }, /* VK_F11 */
{ VK_F12, "FK12" }, /* VK_F12 */
{ 0, "" }, /* VK_F13 */
{ 0, "" }, /* VK_F14 */
{ 0, "" }, /* VK_F15 */
{ 0, "" }, /* VK_F16 */
{ 0, "" }, /* VK_F17 */
{ 0, "" }, /* VK_F18 */
{ 0, "" }, /* VK_F19 */
{ 0, "" }, /* VK_F20 */
{ 0, "" }, /* VK_F21 */
{ 0, "" }, /* VK_F22 */
{ 0, "" }, /* VK_F23 */
{ 0, "" }, /* VK_F24 */
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ VK_NUMLOCK, "NMLK" }, /* VK_NUMLOCK */
{ VK_SCROLL, "SCLK" }, /* VK_SCROLL */
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ VK_LSHIFT, "" }, /* VK_LSHIFT */
{ VK_RSHIFT, "RTSH" }, /* VK_RSHIFT */
{ VK_LCONTROL, "LCTL" }, /* VK_LCONTROL */
{ 0, "" }, /* VK_RCONTROL */
{ VK_LMENU, "" }, /* VK_LMENU */
{ 0, "" }, /* VK_RMENU */
{ 0, "" }, /* VK_BROWSER_BACK */
{ 0, "" }, /* VK_BROWSER_FORWARD */
{ 0, "" }, /* VK_BROWSER_REFRESH */
{ 0, "" }, /* VK_BROWSER_STOP */
{ 0, "" }, /* VK_BROWSER_SEARCH */
{ 0, "" }, /* VK_BROWSER_FAVORITES */
{ 0, "" }, /* VK_BROWSER_HOME */
{ 0, "" }, /* VK_VOLUME_MUTE */
{ 0, "" }, /* VK_VOLUME_DOWN */
{ 0, "" }, /* VK_VOLUME_UP */
{ 0, "" }, /* VK_MEDIA_NEXT_TRACK */
{ 0, "" }, /* VK_MEDIA_PREV_TRACK */
{ 0, "" }, /* VK_MEDIA_STOP */
{ 0, "" }, /* VK_MEDIA_PLAY_PAUSE */
{ 0, "" }, /* VK_LAUNCH_MAIL */
{ 0, "" }, /* VK_MEDIA_SELECT */
{ 0, "" }, /* VK_LAUNCH_APP1 */
{ 0, "" }, /* VK_LAUNCH_APP2 */
{ 0, "" },
{ 0, "" },
{ VK_OEM_1, "AC10" }, /* VK_OEM_1 */
{ VK_OEM_PLUS, "AE12" }, /* VK_OEM_PLUS */
{ VK_OEM_COMMA, "AB08" }, /* VK_OEM_COMMA */
{ VK_OEM_MINUS, "AE11" }, /* VK_OEM_MINUS */
{ VK_OEM_PERIOD, "AB09" }, /* VK_OEM_PERIOD */
{ VK_OEM_2, "AB10" }, /* VK_OEM_2 */
{ VK_OEM_3, "TLDE" }, /* VK_OEM_3 */
{ VK_ABNT_C1, "AB11" }, /* VK_ABNT_C1 */
{ VK_ABNT_C2, "I129" }, /* VK_ABNT_C2 */
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ VK_OEM_4, "AD11" }, /* VK_OEM_4 */
{ VK_OEM_5, "BKSL" }, /* VK_OEM_5 */
{ VK_OEM_6, "AD12" }, /* VK_OEM_6 */
{ VK_OEM_7, "AC11" }, /* VK_OEM_7 */
{ 0, "" }, /* VK_OEM_8 */
{ 0, "" },
{ 0, "" },
{ VK_OEM_102, "LSGT" }, /* VK_OEM_102 */
{ 0, "" },
{ 0, "" },
{ 0, "" }, /* VK_PROCESSKEY */
{ 0, "" },
{ 0, "" }, /* VK_PACKET */
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" }, /* VK_ATTN */
{ 0, "" }, /* VK_CRSEL */
{ 0, "" }, /* VK_EXSEL */
{ 0, "" }, /* VK_EREOF */
{ 0, "" }, /* VK_PLAY */
{ 0, "" }, /* VK_ZOOM */
{ 0, "" }, /* VK_NONAME */
{ 0, "" }, /* VK_PA1 */
{ 0, "" }, /* VK_OEM_CLEAR */
{ 0, "" }
};
VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME EXTENDED_VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME_TABLE[] =
{
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ VK_BACK, "BKSP" },
{ VK_TAB, "TAB" },
{ 0, "" },
{ 0, "" },
{ VK_CLEAR, "" },
{ VK_RETURN, "RTRN" },
{ 0, "" },
{ 0, "" },
{ VK_SHIFT, "LFSH" },
{ VK_CONTROL, "" },
{ VK_MENU, "LALT" },
{ VK_PAUSE, "PAUS" },
{ VK_CAPITAL, "CAPS" },
{ VK_KANA / VK_HANGUL, "" },
{ 0, "" },
{ VK_JUNJA, "" },
{ VK_FINAL, "" },
{ VK_HANJA / VK_KANJI, "" },
{ 0, "" },
{ VK_ESCAPE, "ESC" },
{ VK_CONVERT, "" },
{ VK_NONCONVERT, "" },
{ VK_ACCEPT, "" },
{ VK_MODECHANGE, "" },
{ VK_SPACE, "SPCE" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ VK_PRIOR, "PGUP" },
{ VK_NEXT, "PGDN" },
{ VK_END, "END" },
@ -77,23 +337,12 @@ VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME_TABLE[] =
{ VK_UP, "UP" },
{ VK_RIGHT, "RGHT" },
{ VK_DOWN, "DOWN" },
{ VK_SELECT, "" },
{ 0, "" },
{ VK_PRINT, "PRSC" },
{ VK_EXECUTE, "" },
{ VK_SNAPSHOT, "" },
{ VK_INSERT, "INS" },
{ VK_DELETE, "DELE" },
{ VK_HELP, "" },
{ VK_KEY_0, "AE10" },
{ VK_KEY_1, "AE01" },
{ VK_KEY_2, "AE02" },
{ VK_KEY_3, "AE03" },
{ VK_KEY_4, "AE04" },
{ VK_KEY_5, "AE05" },
{ VK_KEY_6, "AE06" },
{ VK_KEY_7, "AE07" },
{ VK_KEY_8, "AE08" },
{ VK_KEY_9, "AE09" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
@ -101,77 +350,88 @@ VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME_TABLE[] =
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ VK_KEY_A, "AC01" },
{ VK_KEY_B, "AB05" },
{ VK_KEY_C, "AB03" },
{ VK_KEY_D, "AC03" },
{ VK_KEY_E, "AD03" },
{ VK_KEY_F, "AC04" },
{ VK_KEY_G, "AC05" },
{ VK_KEY_H, "AC06" },
{ VK_KEY_I, "AD08" },
{ VK_KEY_J, "AC07" },
{ VK_KEY_K, "AC08" },
{ VK_KEY_L, "AC09" },
{ VK_KEY_M, "AB07" },
{ VK_KEY_N, "AB06" },
{ VK_KEY_O, "AD09" },
{ VK_KEY_P, "AD10" },
{ VK_KEY_Q, "AD01" },
{ VK_KEY_R, "AD04" },
{ VK_KEY_S, "AC02" },
{ VK_KEY_T, "AD05" },
{ VK_KEY_U, "AD07" },
{ VK_KEY_V, "AB04" },
{ VK_KEY_W, "AD02" },
{ VK_KEY_X, "AB02" },
{ VK_KEY_Y, "AD06" },
{ VK_KEY_Z, "AB01" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ VK_LWIN, "LWIN" },
{ VK_RWIN, "RWIN" },
{ VK_APPS, "COMP" },
{ 0, "" },
{ VK_SLEEP, "" },
{ VK_NUMPAD0, "KP0" },
{ VK_NUMPAD1, "KP1" },
{ VK_NUMPAD2, "KP2" },
{ VK_NUMPAD3, "KP3" },
{ VK_NUMPAD4, "KP4" },
{ VK_NUMPAD5, "KP5" },
{ VK_NUMPAD6, "KP6" },
{ VK_NUMPAD7, "KP7" },
{ VK_NUMPAD8, "KP8" },
{ VK_NUMPAD9, "KP9" },
{ VK_MULTIPLY, "KPMU" },
{ VK_ADD, "KPAD" },
{ VK_SEPARATOR, "" },
{ VK_SUBTRACT, "KPSU" },
{ VK_DECIMAL, "KPDL" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ VK_DIVIDE, "KPDV" },
{ VK_F1, "FK01" },
{ VK_F2, "FK02" },
{ VK_F3, "FK03" },
{ VK_F4, "FK04" },
{ VK_F5, "FK05" },
{ VK_F6, "FK06" },
{ VK_F7, "FK07" },
{ VK_F8, "FK08" },
{ VK_F9, "FK09" },
{ VK_F10, "FK10" },
{ VK_F11, "FK11" },
{ VK_F12, "FK12" },
{ VK_F13, "" },
{ VK_F14, "" },
{ VK_F15, "" },
{ VK_F16, "" },
{ VK_F17, "" },
{ VK_F18, "" },
{ VK_F19, "" },
{ VK_F20, "" },
{ VK_F21, "" },
{ VK_F22, "" },
{ VK_F23, "" },
{ VK_F24, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
@ -196,41 +456,12 @@ VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME_TABLE[] =
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ VK_LSHIFT, "" },
{ VK_RSHIFT, "RTSH" },
{ VK_LCONTROL, "LCTL" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ VK_RCONTROL, "RCTL" },
{ VK_LMENU, "" },
{ 0, "" },
{ VK_RMENU, "RALT" },
{ VK_BROWSER_BACK, "" },
{ VK_BROWSER_FORWARD, "" },
{ VK_BROWSER_REFRESH, "" },
{ VK_BROWSER_STOP, "" },
{ VK_BROWSER_SEARCH, "" },
{ VK_BROWSER_FAVORITES, "" },
{ VK_BROWSER_HOME, "" },
{ VK_VOLUME_MUTE, "" },
{ VK_VOLUME_DOWN, "" },
{ VK_VOLUME_UP, "" },
{ VK_MEDIA_NEXT_TRACK, "" },
{ VK_MEDIA_PREV_TRACK, "" },
{ VK_MEDIA_STOP, "" },
{ VK_MEDIA_PLAY_PAUSE, "" },
{ VK_LAUNCH_MAIL, "" },
{ VK_MEDIA_SELECT, "" },
{ VK_LAUNCH_APP1, "" },
{ VK_LAUNCH_APP2, "" },
{ 0, "" },
{ 0, "" },
{ VK_OEM_1, "AC10" },
{ VK_OEM_PLUS, "AE12" },
{ VK_OEM_COMMA, "AB08" },
{ VK_OEM_MINUS, "AE11" },
{ VK_OEM_PERIOD, "AB09" },
{ VK_OEM_2, "AB10" },
{ VK_OEM_3, "TLDE" },
{ VK_ABNT_C1, "AB11" },
{ VK_ABNT_C2, "I129" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
@ -255,19 +486,6 @@ VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME_TABLE[] =
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ VK_OEM_4, "AD11" },
{ VK_OEM_5, "BKSL" },
{ VK_OEM_6, "AD12" },
{ VK_OEM_7, "AC11" },
{ VK_OEM_8, "" },
{ 0, "" },
{ 0, "" },
{ VK_OEM_102, "LSGT" },
{ 0, "" },
{ 0, "" },
{ VK_PROCESSKEY, "" },
{ 0, "" },
{ VK_PACKET, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
@ -282,15 +500,57 @@ VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME_TABLE[] =
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ VK_ATTN, "" },
{ VK_CRSEL, "" },
{ VK_EXSEL, "" },
{ VK_EREOF, "" },
{ VK_PLAY, "" },
{ VK_ZOOM, "" },
{ VK_NONAME, "" },
{ VK_PA1, "" },
{ VK_OEM_CLEAR, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" },
{ 0, "" }
};
@ -409,6 +669,7 @@ int freerdp_keyboard_load_map_from_xkb(void* display)
int i, j;
boolean found;
XkbDescPtr xkb;
boolean extended;
boolean status = false;
if (display && (xkb = XkbGetMap(display, 0, XkbUseCoreKbd)))
@ -420,6 +681,7 @@ int freerdp_keyboard_load_map_from_xkb(void* display)
for (i = xkb->min_key_code; i <= xkb->max_key_code; i++)
{
found = false;
extended = false;
memcpy(xkb_keyname, xkb->names->keys[i].name, 4);
for (j = 0; j < 256; j++)
@ -428,20 +690,37 @@ int freerdp_keyboard_load_map_from_xkb(void* display)
{
if (!strcmp(xkb_keyname, VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME_TABLE[j].xkb_keyname))
{
extended = false;
found = true;
break;
}
}
}
if (!found)
{
for (j = 0; j < 256; j++)
{
if (EXTENDED_VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME_TABLE[j].xkb_keyname)
{
if (!strcmp(xkb_keyname, EXTENDED_VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME_TABLE[j].xkb_keyname))
{
extended = true;
found = true;
break;
}
}
}
}
if (found)
{
uint32 vkcode = VIRTUAL_KEY_CODE_TO_XKB_KEY_NAME_TABLE[j].vkcode;
X11_KEYCODE_TO_RDP_SCANCODE[i].code = VIRTUAL_KEY_CODE_TO_RDP_SCANCODE_TABLE[vkcode].code;
X11_KEYCODE_TO_RDP_SCANCODE[i].extended = VIRTUAL_KEY_CODE_TO_RDP_SCANCODE_TABLE[vkcode].extended;
X11_KEYCODE_TO_RDP_SCANCODE[i].extended = extended;
if (X11_KEYCODE_TO_RDP_SCANCODE[i].extended)
if (extended)
RDP_SCANCODE_TO_X11_KEYCODE[VIRTUAL_KEY_CODE_TO_RDP_SCANCODE_TABLE[vkcode].code][1] = i;
else
RDP_SCANCODE_TO_X11_KEYCODE[VIRTUAL_KEY_CODE_TO_RDP_SCANCODE_TABLE[vkcode].code][0] = i;