mfreerdp-server: progress on keymap

diff --git a/server/Mac/mf_input.c b/server/Mac/mf_input.c
index 5a86036..c74db0e 100644 (file)
--- a/server/Mac/mf_input.c
+++ b/server/Mac/mf_input.c
@@ -29,271 +29,6 @@
 #include "mf_input.h"
 #include "mf_info.h"
 
-
-CGKeyCode test = kVK_ANSI_A;
-
-/*static const CGKeyCode keymap[256] =
- {
- 0xFF, //{ 0, "" },
- 0xFF, //{ VK_LBUTTON, "VK_LBUTTON" },
- 0xFF, //{ VK_RBUTTON, "VK_RBUTTON" },
- 0xFF, //{ VK_CANCEL, "VK_CANCEL" },
- 0xFF, //{ VK_MBUTTON, "VK_MBUTTON" },
- 0xFF, //{ VK_XBUTTON1, "VK_XBUTTON1" },
- 0xFF, //{ VK_XBUTTON2, "VK_XBUTTON2" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ VK_BACK, "VK_BACK" },
- 0xFF, //{ VK_TAB, "VK_TAB" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ VK_CLEAR, "VK_CLEAR" },
- 0xFF, //{ VK_RETURN, "VK_RETURN" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ VK_SHIFT, "VK_SHIFT" },
- 0xFF, //{ VK_CONTROL, "VK_CONTROL" },
- 0xFF, //{ VK_MENU, "VK_MENU" },
- 0xFF, //{ VK_PAUSE, "VK_PAUSE" },
- 0xFF, //{ VK_CAPITAL, "VK_CAPITAL" },
- 0xFF, //{ VK_KANA, "VK_KANA" }0xFF, // also VK_HANGUL
- 0xFF, //{ 0, "" },
- 0xFF, //{ VK_JUNJA, "VK_JUNJA" },
- 0xFF, //{ VK_FINAL, "VK_FINAL" },
- 0xFF, //{ VK_KANJI, "VK_KANJI" }0xFF, // also VK_HANJA
- 0xFF, //{ 0, "" },
- 0xFF, //{ VK_ESCAPE, "VK_ESCAPE" },
- 0xFF, //{ VK_CONVERT, "VK_CONVERT" },
- 0xFF, //{ VK_NONCONVERT, "VK_NONCONVERT" },
- 0xFF, //{ VK_ACCEPT, "VK_ACCEPT" },
- 0xFF, //{ VK_MODECHANGE, "VK_MODECHANGE" },
- 0xFF, //{ VK_SPACE, "VK_SPACE" },
- 0xFF, //{ VK_PRIOR, "VK_PRIOR" },
- 0xFF, //{ VK_NEXT, "VK_NEXT" },
- 0xFF, //{ VK_END, "VK_END" },
- 0xFF, //{ VK_HOME, "VK_HOME" },
- 0xFF, //{ VK_LEFT, "VK_LEFT" },
- 0xFF, //{ VK_UP, "VK_UP" },
- 0xFF, //{ VK_RIGHT, "VK_RIGHT" },
- 0xFF, //{ VK_DOWN, "VK_DOWN" },
- 0xFF, //{ VK_SELECT, "VK_SELECT" },
- 0xFF, //{ VK_PRINT, "VK_PRINT" },
- 0xFF, //{ VK_EXECUTE, "VK_EXECUTE" },
- 0xFF, //{ VK_SNAPSHOT, "VK_SNAPSHOT" },
- 0xFF, //{ VK_INSERT, "VK_INSERT" },
- 0xFF, //{ VK_DELETE, "VK_DELETE" },
- 0xFF, //{ VK_HELP, "VK_HELP" },
- 0x0B, //{ VK_KEY_0, "VK_KEY_0" },
- 0x02, //{ VK_KEY_1, "VK_KEY_1" },
- 0x03, //{ VK_KEY_2, "VK_KEY_2" },
- 0x04, //{ VK_KEY_3, "VK_KEY_3" },
- 0x05, //{ VK_KEY_4, "VK_KEY_4" },
- 0x06, //{ VK_KEY_5, "VK_KEY_5" },
- 0x07, //{ VK_KEY_6, "VK_KEY_6" },
- 0x08, //{ VK_KEY_7, "VK_KEY_7" },
- 0x09, //{ VK_KEY_8, "VK_KEY_8" },
- 0x0A, //{ VK_KEY_9, "VK_KEY_9" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0x1E, //{ VK_KEY_A, "VK_KEY_A" },
- 0xFF, //{ VK_KEY_B, "VK_KEY_B" },
- 0xFF, //{ VK_KEY_C, "VK_KEY_C" },
- 0x20, //{ VK_KEY_D, "VK_KEY_D" },
- 0xFF, //{ VK_KEY_E, "VK_KEY_E" },
- 0xFF, //{ VK_KEY_F, "VK_KEY_F" },
- 0xFF, //{ VK_KEY_G, "VK_KEY_G" },
- 0xFF, //{ VK_KEY_H, "VK_KEY_H" },
- 0xFF, //{ VK_KEY_I, "VK_KEY_I" },
- 0xFF, //{ VK_KEY_J, "VK_KEY_J" },
- 0xFF, //{ VK_KEY_K, "VK_KEY_K" },
- 0xFF, //{ VK_KEY_L, "VK_KEY_L" },
- 0xFF, //{ VK_KEY_M, "VK_KEY_M" },
- 0xFF, //{ VK_KEY_N, "VK_KEY_N" },
- 0xFF, //{ VK_KEY_O, "VK_KEY_O" },
- 0xFF, //{ VK_KEY_P, "VK_KEY_P" },
- 0xFF, //{ VK_KEY_Q, "VK_KEY_Q" },
- 0xFF, //{ VK_KEY_R, "VK_KEY_R" },
- 0x1F, //{ VK_KEY_S, "VK_KEY_S" },
- 0xFF, //{ VK_KEY_T, "VK_KEY_T" },
- 0xFF, //{ VK_KEY_U, "VK_KEY_U" },
- 0xFF, //{ VK_KEY_V, "VK_KEY_V" },
- 0xFF, //{ VK_KEY_W, "VK_KEY_W" },
- 0xFF, //{ VK_KEY_X, "VK_KEY_X" },
- 0xFF, //{ VK_KEY_Y, "VK_KEY_Y" },
- 0xFF, //{ VK_KEY_Z, "VK_KEY_Z" },
- 0xFF, //{ VK_LWIN, "VK_LWIN" },
- 0xFF, //{ VK_RWIN, "VK_RWIN" },
- 0xFF, //{ VK_APPS, "VK_APPS" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ VK_SLEEP, "VK_SLEEP" },
- 0xFF, //{ VK_NUMPAD0, "VK_NUMPAD0" },
- 0xFF, //{ VK_NUMPAD1, "VK_NUMPAD1" },
- 0xFF, //{ VK_NUMPAD2, "VK_NUMPAD2" },
- 0xFF, //{ VK_NUMPAD3, "VK_NUMPAD3" },
- 0xFF, //{ VK_NUMPAD4, "VK_NUMPAD4" },
- 0xFF, //{ VK_NUMPAD5, "VK_NUMPAD5" },
- 0xFF, //{ VK_NUMPAD6, "VK_NUMPAD6" },
- 0xFF, //{ VK_NUMPAD7, "VK_NUMPAD7" },
- 0xFF, //{ VK_NUMPAD8, "VK_NUMPAD8" },
- 0xFF, //{ VK_NUMPAD9, "VK_NUMPAD9" },
- 0xFF, //{ VK_MULTIPLY, "VK_MULTIPLY" },
- 0xFF, //{ VK_ADD, "VK_ADD" },
- 0xFF, //{ VK_SEPARATOR, "VK_SEPARATOR" },
- 0xFF, //{ VK_SUBTRACT, "VK_SUBTRACT" },
- 0xFF, //{ VK_DECIMAL, "VK_DECIMAL" },
- 0xFF, //{ VK_DIVIDE, "VK_DIVIDE" },
- 0xFF, //{ VK_F1, "VK_F1" },
- 0xFF, //{ VK_F2, "VK_F2" },
- 0xFF, //{ VK_F3, "VK_F3" },
- 0xFF, //{ VK_F4, "VK_F4" },
- 0xFF, //{ VK_F5, "VK_F5" },
- 0xFF, //{ VK_F6, "VK_F6" },
- 0xFF, //{ VK_F7, "VK_F7" },
- 0xFF, //{ VK_F8, "VK_F8" },
- 0xFF, //{ VK_F9, "VK_F9" },
- 0xFF, //{ VK_F10, "VK_F10" },
- 0xFF, //{ VK_F11, "VK_F11" },
- 0xFF, //{ VK_F12, "VK_F12" },
- 0xFF, //{ VK_F13, "VK_F13" },
- 0xFF, //{ VK_F14, "VK_F14" },
- 0xFF, //{ VK_F15, "VK_F15" },
- 0xFF, //{ VK_F16, "VK_F16" },
- 0xFF, //{ VK_F17, "VK_F17" },
- 0xFF, //{ VK_F18, "VK_F18" },
- 0xFF, //{ VK_F19, "VK_F19" },
- 0xFF, //{ VK_F20, "VK_F20" },
- 0xFF, //{ VK_F21, "VK_F21" },
- 0xFF, //{ VK_F22, "VK_F22" },
- 0xFF, //{ VK_F23, "VK_F23" },
- 0xFF, //{ VK_F24, "VK_F24" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ VK_NUMLOCK, "VK_NUMLOCK" },
- 0xFF, //{ VK_SCROLL, "VK_SCROLL" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ VK_LSHIFT, "VK_LSHIFT" },
- 0xFF, //{ VK_RSHIFT, "VK_RSHIFT" },
- 0xFF, //{ VK_LCONTROL, "VK_LCONTROL" },
- 0xFF, //{ VK_RCONTROL, "VK_RCONTROL" },
- 0xFF, //{ VK_LMENU, "VK_LMENU" },
- 0xFF, //{ VK_RMENU, "VK_RMENU" },
- 0xFF, //{ VK_BROWSER_BACK, "VK_BROWSER_BACK" },
- 0xFF, //{ VK_BROWSER_FORWARD, "VK_BROWSER_FORWARD" },
- 0xFF, //{ VK_BROWSER_REFRESH, "VK_BROWSER_REFRESH" },
- 0xFF, //{ VK_BROWSER_STOP, "VK_BROWSER_STOP" },
- 0xFF, //{ VK_BROWSER_SEARCH, "VK_BROWSER_SEARCH" },
- 0xFF, //{ VK_BROWSER_FAVORITES, "VK_BROWSER_FAVORITES" },
- 0xFF, //{ VK_BROWSER_HOME, "VK_BROWSER_HOME" },
- 0xFF, //{ VK_VOLUME_MUTE, "VK_VOLUME_MUTE" },
- 0xFF, //{ VK_VOLUME_DOWN, "VK_VOLUME_DOWN" },
- 0xFF, //{ VK_VOLUME_UP, "VK_VOLUME_UP" },
- 0xFF, //{ VK_MEDIA_NEXT_TRACK, "VK_MEDIA_NEXT_TRACK" },
- 0xFF, //{ VK_MEDIA_PREV_TRACK, "VK_MEDIA_PREV_TRACK" },
- 0xFF, //{ VK_MEDIA_STOP, "VK_MEDIA_STOP" },
- 0xFF, //{ VK_MEDIA_PLAY_PAUSE, "VK_MEDIA_PLAY_PAUSE" },
- 0xFF, //{ VK_LAUNCH_MAIL, "VK_LAUNCH_MAIL" },
- 0xFF, //{ VK_MEDIA_SELECT, "VK_MEDIA_SELECT" },
- 0xFF, //{ VK_LAUNCH_APP1, "VK_LAUNCH_APP1" },
- 0xFF, //{ VK_LAUNCH_APP2, "VK_LAUNCH_APP2" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ VK_OEM_1, "VK_OEM_1" },
- 0xFF, //{ VK_OEM_PLUS, "VK_OEM_PLUS" },
- 0xFF, //{ VK_OEM_COMMA, "VK_OEM_COMMA" },
- 0xFF, //{ VK_OEM_MINUS, "VK_OEM_MINUS" },
- 0xFF, //{ VK_OEM_PERIOD, "VK_OEM_PERIOD" },
- 0xFF, //{ VK_OEM_2, "VK_OEM_2" },
- 0xFF, //{ VK_OEM_3, "VK_OEM_3" },
- 0xFF, //{ VK_ABNT_C1, "VK_ABNT_C1" },
- 0xFF, //{ VK_ABNT_C2, "VK_ABNT_C2" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ VK_OEM_4, "VK_OEM_4" },
- 0xFF, //{ VK_OEM_5, "VK_OEM_5" },
- 0xFF, //{ VK_OEM_6, "VK_OEM_6" },
- 0xFF, //{ VK_OEM_7, "VK_OEM_7" },
- 0xFF, //{ VK_OEM_8, "VK_OEM_8" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ VK_OEM_102, "VK_OEM_102" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ VK_PROCESSKEY, "VK_PROCESSKEY" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ VK_PACKET, "VK_PACKET" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ 0, "" },
- 0xFF, //{ VK_ATTN, "VK_ATTN" },
- 0xFF, //{ VK_CRSEL, "VK_CRSEL" },
- 0xFF, //{ VK_EXSEL, "VK_EXSEL" },
- 0xFF, //{ VK_EREOF, "VK_EREOF" },
- 0xFF, //{ VK_PLAY, "VK_PLAY" },
- 0xFF, //{ VK_ZOOM, "VK_ZOOM" },
- 0xFF, //{ VK_NONAME, "VK_NONAME" },
- 0xFF, //{ VK_PA1, "VK_PA1" },
- 0xFF, //{ VK_OEM_CLEAR, "VK_OEM_CLEAR" },
- 0xFF //{ 0, "" }
- };
- 
- */
-
 static const CGKeyCode keymap[256] = {
        0xFF, //0x0
        0xFF, //0x1
@@ -309,7 +44,7 @@ static const CGKeyCode keymap[256] = {
        kVK_ANSI_0, //0xb
        0xFF, //0xc
        0xFF, //0xd
-       0xFF, //0xe
+       kVK_Delete, //0xe
        0xFF, //0xf
        kVK_ANSI_Q, //0x10
        kVK_ANSI_W, //0x11
@@ -329,16 +64,16 @@ static const CGKeyCode keymap[256] = {
        kVK_ANSI_S, //0x1f
        kVK_ANSI_D, //0x20
        kVK_ANSI_F, //0x21
-       0xFF, //0x22
-       0xFF, //0x23
-       0xFF, //0x24
-       0xFF, //0x25
-       0xFF, //0x26
-       0xFF, //0x27
-       0xFF, //0x28
-       0xFF, //0x29
+       kVK_ANSI_G, //0x22
+       kVK_ANSI_H, //0x23
+       kVK_ANSI_J, //0x24
+       kVK_ANSI_K, //0x25
+       kVK_ANSI_L, //0x26
+       kVK_ANSI_Semicolon, //0x27
+       kVK_ANSI_Quote, //0x28
+       kVK_ANSI_Grave, //0x29
        0xFF, //0x2a
-       0xFF, //0x2b
+       kVK_ANSI_Backslash, //0x2b
        0xFF, //0x2c
        0xFF, //0x2d
        0xFF, //0x2e