Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[Win32, keyboard] Fix dead key events that don't have the dead key mask #30004

Merged
merged 5 commits into from
Dec 1, 2021
Merged

[Win32, keyboard] Fix dead key events that don't have the dead key mask #30004

merged 5 commits into from
Dec 1, 2021

Conversation

@dkwingsmt
Copy link
Contributor

@dkwingsmt dkwingsmt commented Nov 30, 2021 •
edited
Loading

This PR fixes flutter/flutter#92654, a rare case where dead key events are not properly handled.

In this rare case, the WM_DEADCHAR message carries a character that is mapped to a normal character, instead of a dead char (one with 0x80000000 set), which confused our logic. This PR fixes it by applying this mask on dead char messages whatsoever.

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See testing the engine for instructions on
    writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.
@google-cla google-cla bot added the cla: yes label Nov 30, 2021
gspencergoog
gspencergoog approved these changes Nov 30, 2021
View reviewed changes
Copy link
Contributor

@gspencergoog gspencergoog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

32384589-a60f0e74-c078-11e7-9bc1-e5b5287aea9d
@dkwingsmt dkwingsmt merged commit 0a6098b into flutter:main Dec 1, 2021
@dkwingsmt dkwingsmt deleted the fix-deadkey-without-mask branch December 1, 2021 08:49
@aam aam mentioned this pull request Dec 1, 2021
Closed
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 1, 2021
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 1, 2021
@engine-flutter-autoroll
0a6098b [Win32, keyboard] Fix dead key events that don't have the dea…
a522b0d 
…d key mask (flutter/engine#30004)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 1, 2021
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 1, 2021
@engine-flutter-autoroll
0a6098b [Win32, keyboard] Fix dead key events that don't have the dea…
16116c4 
…d key mask (flutter/engine#30004)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 1, 2021
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 1, 2021
@engine-flutter-autoroll
0a6098b [Win32, keyboard] Fix dead key events that don't have the dea…
1d9cb23 
…d key mask (flutter/engine#30004)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 1, 2021
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 1, 2021
@engine-flutter-autoroll
0a6098b [Win32, keyboard] Fix dead key events that don't have the dea…
201fd90 
…d key mask (flutter/engine#30004)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 2, 2021
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 2, 2021
@engine-flutter-autoroll
0a6098b [Win32, keyboard] Fix dead key events that don't have the dea…
67fcecf 
…d key mask (flutter/engine#30004)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 2, 2021
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 2, 2021
@engine-flutter-autoroll
0a6098b [Win32, keyboard] Fix dead key events that don't have the dea…
dd9bf0d 
…d key mask (flutter/engine#30004)
zanderso pushed a commit to flutter/flutter that referenced this pull request Dec 2, 2021
@engine-flutter-autoroll
Roll Engine from c2fcade to 62113c4 (13 revisions) (#94519)
956015a 
* 9b200e1 Roll Dart SDK from 9f61c2487bbd to 3a963ff14181 (7 revisions) (flutter/engine#30011) * fada035 Use WindowInfoTracker.Companion.getOrCreate instead of the short version (flutter/engine#30012) * d280475 Non painting platform views (flutter/engine#30003) * b420c16 [macOS] MacOS Keyboard properly handles multi-char characters (flutter/engine#30005) * 0a6098b [Win32, keyboard] Fix dead key events that don't have the dead key mask (flutter/engine#30004) * 8ac9366 Fix sceneElement analysis error (flutter/engine#30038) * 5ad06c2 Share the io_manager between parent and spawn engine (flutter/engine#29915) * 69be405 Run Dart VM tasks on the engine's ConcurrentMessageLoop instead the VM's separate thread pool. (flutter/engine#29819) * c85a129 Roll Dart SDK from 3a963ff14181 to 8bb2e56ec900 (4 revisions) (flutter/engine#30045) * abf6c34 Eliminate hardcoded scale factor in a11y scroll (flutter/engine#30013) * d184d9b Roll Skia from fa183572bfd3 to d3399178196e (17 revisions) (flutter/engine#30047) * 476ed30 Roll web_installers simulators package (flutter/engine#30035) * 62113c4 Revert dart to 9f61c2487bbd (flutter/engine#30056)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

affects: text input cla: yes platform-windows

2 participants

@dkwingsmt @gspencergoog