Skip to content

Fix accidentally changed key mappings #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mykola-mokhnach wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix accidentally changed key mappings #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions OSXvnc-server/VNCServer.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Comment on lines 89 to +92
}


Expand Down Expand Up @@ -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];
Comment on lines 222 to +225
}

void SyncSetKeyboardLayout (TISInputSourceRef inputSource) {
Expand Down Expand Up @@ -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;
Comment on lines 654 to +657
break;
case XK_Alt_L:
case XK_Alt_R:
if (down)
currentModifiers |= kCGEventFlagMaskCommand;
currentModifiers |= kCGEventFlagMaskAlternate;
else
currentModifiers &= ~kCGEventFlagMaskCommand;
currentModifiers &= ~kCGEventFlagMaskAlternate;
Comment on lines 661 to +664
break;
}

Expand Down