Skip to content

Report Cmd+key combos in _KEYHIT (macOS) #803

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

Merged
a740g merged 2 commits into from
Nov 2, 2026
Merged

Report Cmd+key combos in _KEYHIT (macOS) #803

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c3f129
Report Cmd+key combos in _KEYHIT (macOS)
FellippeHeitor Oct 31, 2026
a693349
Merge branch 'main' into macos-cmd-keyhit-fix
a740g Nov 2, 2026
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
5 changes: 4 additions & 1 deletion internal/c/libqb/src/keyboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2425,7 +2425,10 @@ void GLUT_KEYBOARD_BUTTON_FUNC(GLUTEmu_KeyboardKey key, int scancode, GLUTEmu_Bu

const bool isNumLock = bool(modifiers & GLUTEmu_KeyboardKeyModifier::NumLock);
const bool isShift = bool(modifiers & GLUTEmu_KeyboardKeyModifier::Shift);
const bool isControl = bool(modifiers & GLUTEmu_KeyboardKeyModifier::Control);
// Super (Command on macOS) is treated like Ctrl here: the OS does not produce a character
// for Super+key (macOS treats Cmd+key as a shortcut, not text), so waiting for a character
// callback would silently drop the key. Use the base key value instead, just like Ctrl+key.
const bool isControl = bool(modifiers & (GLUTEmu_KeyboardKeyModifier::Control | GLUTEmu_KeyboardKeyModifier::Super));
const bool isAlt = bool(modifiers & GLUTEmu_KeyboardKeyModifier::Alt);
const bool isCapsLock = bool(modifiers & GLUTEmu_KeyboardKeyModifier::CapsLock);
const bool useKeypadNumber = isNumLock && !isShift;
Expand Down