Fix accidentally changed key mappings#33
Open
mykola-mokhnach wants to merge 1 commit into
Open
Conversation
Owner
|
Thank you. I'll test it soon and then merge your contribution. |
Contributor
Author
|
@stweil Thanks. Maybe such mapping was done for a reason, because I see LeftCmdKey=Alt_L in RealVNC client options (and only in this one). |
There was a problem hiding this comment.
Pull request overview
This PR aims to correct macOS Command vs Option (Alt/Meta) key handling so that pressing Cmd is identified and forwarded correctly (e.g., as observed via keycode.info).
Changes:
- Swaps which X11 keysyms (XK_Alt_* vs XK_Meta_*) are treated as Option vs Command when initializing modifier keycodes.
- Swaps which CGEvent modifier flags (kCGEventFlagMaskAlternate vs kCGEventFlagMaskCommand) are applied when handling XK_Alt_* vs XK_Meta_* key events.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
89
to
+92
| 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
| 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
654
to
+657
| if (down) | ||
| currentModifiers |= kCGEventFlagMaskAlternate; | ||
| currentModifiers |= kCGEventFlagMaskCommand; | ||
| else | ||
| currentModifiers &= ~kCGEventFlagMaskAlternate; | ||
| currentModifiers &= ~kCGEventFlagMaskCommand; |
Comment on lines
661
to
+664
| if (down) | ||
| currentModifiers |= kCGEventFlagMaskCommand; | ||
| currentModifiers |= kCGEventFlagMaskAlternate; | ||
| else | ||
| currentModifiers &= ~kCGEventFlagMaskCommand; | ||
| currentModifiers &= ~kCGEventFlagMaskAlternate; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I was wondering why https://keycode.info/ returns the keycode for Alt instead of Command if the Cmd key is pressed on Mac keyboard. This change should address this problem.