From a680be4a125b66b6c007572e7b064314b6a75436 Mon Sep 17 00:00:00 2001
From: Mykola Mokhnach <mokhnach@gmail.com>
Date: Thu, 17 Jan 2019 17:09:58 +0100
Subject: [PATCH] Fix accidentally changed keys mapping

---
 OSXvnc-server/VNCServer.m | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/OSXvnc-server/VNCServer.m b/OSXvnc-server/VNCServer.m
index dd4c3a7..85910a9 100644
--- a/OSXvnc-server/VNCServer.m
+++ b/OSXvnc-server/VNCServer.m
@@ -87,9 +87,9 @@ - (void) loadKeyTable {
     if (1) {
         // Find the right keycodes base on the loaded keyboard
         keyCodeShift = keyTable[XK_Shift_L];
-        keyCodeOption = keyTable[XK_Meta_L];
+        keyCodeOption = keyTable[XK_Alt_L];
         keyCodeControl = keyTable[XK_Control_L];
-        keyCodeCommand = keyTable[XK_Alt_L];
+        keyCodeCommand = keyTable[XK_Meta_L];
     }
 
 
@@ -220,9 +220,9 @@ - (void) loadKeyboard: (TISInputSourceRef) inputSource {
     }
 
     keyCodeShift = keyTable[XK_Shift_L];
-    keyCodeOption = keyTable[XK_Meta_L];
+    keyCodeOption = keyTable[XK_Alt_L];
     keyCodeControl = keyTable[XK_Control_L];
-    keyCodeCommand = keyTable[XK_Alt_L];
+    keyCodeCommand = keyTable[XK_Meta_L];
 }
 
 void SyncSetKeyboardLayout (TISInputSourceRef inputSource) {
@@ -652,16 +652,16 @@ - (void) handleKeyboard:(Bool) down forSym: (KeySym) keySym forClient: (rfbClien
                 case XK_Meta_L:
                 case XK_Meta_R:
                     if (down)
-                        currentModifiers |= kCGEventFlagMaskAlternate;
+                        currentModifiers |= kCGEventFlagMaskCommand;
                     else
-                        currentModifiers &= ~kCGEventFlagMaskAlternate;
+                        currentModifiers &= ~kCGEventFlagMaskCommand;
                     break;
                 case XK_Alt_L:
                 case XK_Alt_R:
                     if (down)
-                        currentModifiers |= kCGEventFlagMaskCommand;
+                        currentModifiers |= kCGEventFlagMaskAlternate;
                     else
-                        currentModifiers &= ~kCGEventFlagMaskCommand;
+                        currentModifiers &= ~kCGEventFlagMaskAlternate;
                     break;
             }