T-Gander/Sunshine
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(macos): preserve modifier state in input events (#5102)

Browse Source
This commit is contained in:
martona
2026-05-13 23:10:16 -04:00
committed by GitHub
parent f9d1aca72e
commit 44cca9a523
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/platform/macos/input.cpp
View File

@@ -36,7 +36,6 @@ namespace platf {
CGEventSourceRef source {}; CGEventSourceRef source {};
// keyboard related stuff // keyboard related stuff
CGEventRef kb_event {};
CGEventFlags kb_flags {}; CGEventFlags kb_flags {};
// mouse related stuff // mouse related stuff
@@ -256,12 +255,19 @@ const KeyCodeMap kKeyCodesMap[] = {
} }
auto macos_input = ((macos_input_t *) input.get()); auto macos_input = ((macos_input_t *) input.get());
auto event = macos_input->kb_event; CGEventRef event = nullptr;
if (key == kVK_Shift || key == kVK_RightShift || if (key == kVK_Shift || key == kVK_RightShift ||
key == kVK_Command || key == kVK_RightCommand || key == kVK_Command || key == kVK_RightCommand ||
key == kVK_Option || key == kVK_RightOption || key == kVK_Option || key == kVK_RightOption ||
key == kVK_Control || key == kVK_RightControl) { key == kVK_Control || key == kVK_RightControl) {
event = CGEventCreate(macos_input->source);
if (!event) {
return;
}
CGEventSetIntegerValueField(event, kCGKeyboardEventKeycode, key);
CGEventFlags mask; CGEventFlags mask;
switch (key) { switch (key) {
@@ -285,13 +291,18 @@ const KeyCodeMap kKeyCodesMap[] = {
macos_input->kb_flags = release ? macos_input->kb_flags & ~mask : macos_input->kb_flags | mask; macos_input->kb_flags = release ? macos_input->kb_flags & ~mask : macos_input->kb_flags | mask;
CGEventSetType(event, kCGEventFlagsChanged); CGEventSetType(event, kCGEventFlagsChanged);
CGEventSetFlags(event, macos_input->kb_flags);
} else { } else {
CGEventSetIntegerValueField(event, kCGKeyboardEventKeycode, key); event = CGEventCreateKeyboardEvent(macos_input->source, key, !release);
if (!event) {
return;
}
CGEventSetType(event, release ? kCGEventKeyUp : kCGEventKeyDown); CGEventSetType(event, release ? kCGEventKeyUp : kCGEventKeyDown);
} }
CGEventSetFlags(event, macos_input->kb_flags);
CGEventPost(kCGHIDEventTap, event); CGEventPost(kCGHIDEventTap, event);
CFRelease(event);
} }
void unicode(input_t &input, char *utf8, int size) { void unicode(input_t &input, char *utf8, int size) {
@@ -358,6 +369,8 @@ const KeyCodeMap kKeyCodesMap[] = {
CGEventSetDoubleValueField(event, kCGMouseEventDeltaX, deltaX); CGEventSetDoubleValueField(event, kCGMouseEventDeltaX, deltaX);
CGEventSetDoubleValueField(event, kCGMouseEventDeltaY, deltaY); CGEventSetDoubleValueField(event, kCGMouseEventDeltaY, deltaY);
// Inject modifier flags into mouse events so that shift+click and similar combinations work correctly.
CGEventSetFlags(event, macos_input->kb_flags);
CGEventPost(kCGHIDEventTap, event); CGEventPost(kCGHIDEventTap, event);
// For why this is here, see: // For why this is here, see:
// https://stackoverflow.com/questions/15194409/simulated-mouseevent-not-working-properly-osx // https://stackoverflow.com/questions/15194409/simulated-mouseevent-not-working-properly-osx
@@ -555,7 +568,6 @@ const KeyCodeMap kKeyCodesMap[] = {
macos_input->source = CGEventSourceCreate(kCGEventSourceStateHIDSystemState); macos_input->source = CGEventSourceCreate(kCGEventSourceStateHIDSystemState);
macos_input->kb_event = CGEventCreate(macos_input->source);
macos_input->kb_flags = 0; macos_input->kb_flags = 0;
macos_input->mouse_event = CGEventCreate(macos_input->source); macos_input->mouse_event = CGEventCreate(macos_input->source);
@@ -572,7 +584,6 @@ const KeyCodeMap kKeyCodesMap[] = {
const auto *input = static_cast<macos_input_t *>(p); const auto *input = static_cast<macos_input_t *>(p);
CFRelease(input->source); CFRelease(input->source);
CFRelease(input->kb_event);
CFRelease(input->mouse_event); CFRelease(input->mouse_event);
delete input; delete input;