Fix incorrect key mapping on macOS with vanilla ctrl detector#4808
Merged
Conversation
gustovafing
approved these changes
Apr 28, 2026
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.
What
On macOS,
command⌘ is used asCtrl, but the key code ofcommand⌘ is different. Instead,control⌃ has the same key code asCtrl.So for those classes using
GTUtil, users should presscontrol⌃ to representCtrl, which is weird.This PR reuse vanilla MC's
hasControlDownmethod to deal with "Ctrl" on different platforms, letting macOS users to presscommand⌘ forCtrl.Implementation Details
Vanilla MC's
hasControllDownchecks platform, if on macOS, then treatGLFW_KEY_LEFT_SUPER(which iscommandon macOS) as "Controll":Since the vanilla MC has such an interface, I think there's no need for us to implement another one using the underlying GLFW interface.
So I replace the logic of
isShiftDownisCtrlDownisAltDownwith vanilla'shasShiftDownhasControlDownhasAltDownto make the code cleaner and more robust.And unfortunately, ldlib also use GLFW's interface to check these keys in
ClickDataand no checks of platforms. So I write a new mixin to change the value ofisCtrlClickto make sure the packet sent from client is correct.Outcome
On macOS, users will use
commandasCtrl. And on other platforms, there is no changes.How Was This Tested
I have run
runClientto ensure this works well on MacBook keyboard.