Hard Coded and Keymap codes fixed for OS X

fixed right menu and both left and right windows keycodes

diff --git a/keymaps/macosx b/keymaps/macosx
index 5312d4c..4f55dd7 100644 (file)
--- a/keymaps/macosx
+++ b/keymaps/macosx
@@ -58,11 +58,11 @@ keyboard "macosx"
        VK_OEM_2        <52>
        VK_SPACE        <57>
         VK_LWIN         <63>
-        VK_RWIN         <69>
+        VK_RWIN         <71>
        VK_LCONTROL     <67>
        VK_LMENU        <66>
        VK_LSHIFT       <64>
-       VK_RMENU        <71>
+       VK_RMENU        <69>
        VK_RSHIFT       <68>
        VK_F1           <130>
        VK_F2           <128>

diff --git a/libfreerdp/locale/keyboard_x11.c b/libfreerdp/locale/keyboard_x11.c
index e606af1..da7f28a 100644 (file)
--- a/libfreerdp/locale/keyboard_x11.c
+++ b/libfreerdp/locale/keyboard_x11.c
@@ -283,9 +283,9 @@ const UINT32 KEYCODE_TO_VKCODE_MACOSX[256] =
        VK_LMENU, /* 66 */
        VK_LCONTROL, /* 67 */
        VK_RSHIFT, /* 68 */
-       0, /* 69 */
+       VK_RMENU, /* 69 */
        0, /* 70 */
-       VK_RMENU, /* 71 */
+       VK_RWIN, /* 71 */
        0, /* 72 */
        VK_DECIMAL, /* 73 */
        0, /* 74 */