Skip to content

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

Merged
ReenigneArcher merged 2 commits into
LizardByte:masterfrom
martona:macos-input-clean
May 14, 2026
Merged

fix(macos): preserve modifier state in input events#5102
ReenigneArcher merged 2 commits into
LizardByte:masterfrom
martona:macos-input-clean

Conversation

@martona
Copy link
Copy Markdown
Contributor

@martona martona commented May 12, 2026

Description

Fix macOS keyboard event handling so modifier state is preserved reliably across keyboard and mouse input.

macOS input handling was reusing a mutable CGEventRef for keyboard events. That could leave stale event state behind and caused modifier combinations such as Shift+Enter or Cmd+Tab to be replayed inconsistently.

This change creates fresh keyboard events for each input update:

  • Modifier keys use a fresh generic CGEventCreate(...) event with kCGEventFlagsChanged.
  • Non-modifier keys use CGEventCreateKeyboardEvent(...) for key up/down events.
  • The tracked modifier flags are applied to all keyboard events before posting.
  • Mouse events also receive the tracked modifier flags so combinations such as Shift+Click are preserved.

Tested manually on macOS via Moonlight/Sunshine input replay:

  • Releasing Shift no longer emits an extra key that was pressed before it; previously, it was prone to do that on occasion.
  • Cmd+Tab app cycling works; previously Tab key-up could be lost while Cmd was held.
  • Shift+Click preserves modifier state; previously modifier keys did not work with mouse clicks.

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

@codecov
Copy link
Copy Markdown

codecov Bot commented May 13, 2026

Bundle Report

Bundle size has no change ✅

@ReenigneArcher
Copy link
Copy Markdown
Member

@martona thank you for the PR!

Could you correct the lint error?

@martona
Copy link
Copy Markdown
Contributor Author

martona commented May 13, 2026

Yup, for sure. I thought I would wait for all checks to complete before pushing changes. Already done on #5107 though.

@martona
Copy link
Copy Markdown
Contributor Author

martona commented May 14, 2026

Done!

@sonarqubecloud
Copy link
Copy Markdown

@codecov
Copy link
Copy Markdown

codecov Bot commented May 14, 2026

Codecov Report

❌ Patch coverage is 25.00000% with 9 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.83%. Comparing base (f9d1aca) to head (9feeff8).
✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
src/platform/macos/input.cpp 25.00% 9 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5102      +/-   ##
==========================================
- Coverage   17.86%   17.83%   -0.04%     
==========================================
  Files         111      111              
  Lines       24005    24009       +4     
  Branches    10619    10620       +1     
==========================================
- Hits         4289     4281       -8     
- Misses      14579    15502     +923     
+ Partials     5137     4226     -911     
Flag Coverage Δ
Archlinux 11.23% <ø> (ø)
FreeBSD-14.3-aarch64 ?
FreeBSD-14.3-amd64 13.37% <ø> (+<0.01%) ⬆️
Homebrew-ubuntu-22.04 13.58% <ø> (ø)
Linux-AppImage 12.16% <ø> (ø)
Windows-AMD64 14.84% <ø> (ø)
Windows-ARM64 13.24% <ø> (ø)
macOS-arm64 19.01% <25.00%> (-0.02%) ⬇️
macOS-x86_64 18.37% <9.09%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
src/platform/macos/input.cpp 36.76% <25.00%> (-1.24%) ⬇️

... and 40 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f9d1aca...9feeff8. Read the comment docs.

@ReenigneArcher ReenigneArcher merged commit 44cca9a into LizardByte:master May 14, 2026
127 of 129 checks passed
fatebugs added a commit to fatebugs/Sunshine that referenced this pull request May 14, 2026
Bug fixes:
- Delay g_vdd_indices.push_back() and persist_display_count() until the new
  display is confirmed visible; roll back VddRemoveDisplay on failure without
  leaving stale index/persist state.
- Free SP_DEVICE_INTERFACE_DETAIL_DATA before break in OpenDeviceHandle to
  avoid memory leak.
- Remove duplicate and misspelled VDD_IOCTL_UNKONWN (same value as
  VDD_IOCTL_UPDATE).

Robustness:
- Replace DXGI-based enumerate_dxgi_outputs with EnumDisplayDevices-based
  enumerate_displays; DXGI_OUTPUT_DESC::DeviceName uses \\.\DISPLAYx
  format which never contains "PSCCDD0", making the old VDD-detection
  logic dead.
- Rewrite persist_display_count to update only the vdd_display_count line
  in-place, preserving comments, blank lines, and config file ordering.
- Use compare_exchange_strong in start_keepalive to prevent multiple
  threads (tray + HTTP + startup) from racing on thread creation.

Security:
- Add check_content_type + validate_csrf_token to addVddDisplay and
  removeVddDisplay POST endpoints.
- Add validate_csrf_token to removeAllVddDisplays.
- Fix addVddDisplay to set status=false when add_display fails.
- Fix removeVddDisplay status to reflect actual result.
- Add vdd::is_initialized check to removeAllVddDisplays; return proper
  error when driver is not available.

Cleanup:
- Remove unused $tp import from VirtualDisplay.vue.
- Remove extra </table> tag in docs/configuration.md.

fix(macos): preserve modifier state in input events (LizardByte#5102)
build(macos): configure C++ standard and ICU root (LizardByte#5101)
build(deps): Add SUNSHINE_SYSTEM_VULKAN_HEADERS option (LizardByte#5103)

Signed-off-by: James Le Cuirot <chewi@gentoo.org>
ci: remove moonlight discord release announcement (LizardByte#5099)
build(deps): bump packaging/linux/flatpak/deps/shared-modules from `2dfad85` to `8c3f3cf` (LizardByte#5098)

build(deps): bump packaging/linux/flatpak/deps/shared-modules

Bumps [packaging/linux/flatpak/deps/shared-modules](https://github.com/flathub/shared-modules) from `2dfad85` to `8c3f3cf`.
- [Commits](flathub/shared-modules@2dfad85...8c3f3cf)

---
updated-dependencies:
- dependency-name: packaging/linux/flatpak/deps/shared-modules
  dependency-version: 8c3f3cfa5a4af9a696ff0bfb3ed0eba404faaf5d
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
build(deps): bump third-party/build-deps from `cd7d45a` to `d8b1d18` (LizardByte#5097)

Bumps [third-party/build-deps](https://github.com/LizardByte/build-deps) from `cd7d45a` to `d8b1d18`.
- [Release notes](https://github.com/LizardByte/build-deps/releases)
- [Commits](LizardByte/build-deps@cd7d45a...d8b1d18)

---
updated-dependencies:
- dependency-name: third-party/build-deps
  dependency-version: d8b1d18b7e82f8ee396bdd05e226896fa523b0df
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
fix: building without the system tray enabled (LizardByte#5092)
@martona martona deleted the macos-input-clean branch May 14, 2026 10:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants