During Alt+Numpad composition, stash keys in case we bail out #17774
Conversation
This file contains 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
We were erroneously eating Alt followed by VK_ADD. This change makes sure we cache key presses and releases that happen once a numpad composition is active so that we can send them when you release Alt. Right now, we only send them when you release Alt after composing Alt and VK_ADD (entering hex mode) and only if you haven't inserted an actual hex numpad code. This does mean that `Alt VK_ADD 0 0 H I` will result in an input of "+hi". That... seems like a small price to pay for Alt VK_ADD working again. Closes #17762
microsoft-github-policy-service
bot
added
Issue-Bug
DHowett
commented
Aug 22, 2024
| s.encoding = AltNumpadEncoding::Unicode; | ||
| s.accumulator = 0; | ||
| s.active = true; | ||
| if (keyDown) |
There was a problem hiding this comment.
I had to move keyDown into these places so we could stash the keyUp event in case composition was active.
This makes ALTdown KP+down KP+up ALTup work.
There was a problem hiding this comment.
This may be easier to read if the if (keyDown) was outside the if/else chain instead of inside it.
DHowett
commented
Aug 22, 2024
| } | ||
| // Send the alt keyup we are currently processing | ||
| h = h && _TrySendKeyEvent(vkey, scanCode, modifiers, keyDown); | ||
| // do not accumulate into the buffer |
There was a problem hiding this comment.
oh we should probably return h somewhere...
zadjii-msft
reviewed
Aug 22, 2024
lhecker
approved these changes
Aug 23, 2024
| @@ -262,6 +262,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation | |||
| // The state can be active, while the accumulator is 0, if the user pressed Alt+Numpad0 which enabled | |||
| // the OEM encoding mode (= active), and then pressed Numpad0 again (= accumulator is still 0). | |||
| bool active = false; | |||
| til::small_vector<std::tuple<WORD, WORD, ::Microsoft::Terminal::Core::ControlKeyStates, bool>, 4> cachedKeyEvents; | |||
There was a problem hiding this comment.
I'd introduce a struct for this to make it more descriptive.
| s.encoding = AltNumpadEncoding::Unicode; | ||
| s.accumulator = 0; | ||
| s.active = true; | ||
| if (keyDown) |
There was a problem hiding this comment.
This may be easier to read if the if (keyDown) was outside the if/else chain instead of inside it.
lhecker
approved these changes
Aug 23, 2024
DHowett
added a commit
that referenced
this pull request
Aug 23, 2024
We were erroneously eating Alt followed by VK_ADD. This change makes sure we cache key presses and releases that happen once a numpad composition is active so that we can send them when you release Alt. Right now, we only send them when you release Alt after composing Alt and VK_ADD (entering hex mode) and only if you haven't inserted an actual hex numpad code. This does mean that `Alt VK_ADD 0 0 H I` will result in an input of "+hi". That... seems like a small price to pay for Alt VK_ADD working again. Closes #17762 (cherry picked from commit e006f75) Service-Card-Id: PVTI_lADOAF3p4s4AmhmszgSF50M Service-Version: 1.21
DHowett
pushed a commit
that referenced
this pull request
Sep 24, 2024
This just adds a quick registry check for `EnableHexNumpad`. Depends on #17774 Closes #17762 (again) ## Validation Steps Performed * Alt + NumpadAdd + 221E doesn't do anything ✅ * Set the `EnableHexNumpad` registry key * Restart * Alt + NumpadAdd + 221E inserts ∞ ✅ (cherry picked from commit b520da2) Service-Card-Id: PVTI_lADOAF3p4s4AmhmszgTQsd8 Service-Version: 1.21
DHowett
pushed a commit
that referenced
this pull request
Sep 24, 2024
This just adds a quick registry check for `EnableHexNumpad`. Depends on #17774 Closes #17762 (again) ## Validation Steps Performed * Alt + NumpadAdd + 221E doesn't do anything ✅ * Set the `EnableHexNumpad` registry key * Restart * Alt + NumpadAdd + 221E inserts ∞ ✅ (cherry picked from commit b520da2) Service-Card-Id: PVTI_lADOAF3p4s4AmhmQzgTQseA Service-Version: 1.22
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.
We were erroneously eating Alt followed by VK_ADD. This change makes sure we cache key presses and releases that happen once a numpad composition is active so that we can send them when you release Alt.
Right now, we only send them when you release Alt after composing Alt and VK_ADD (entering hex mode) and only if you haven't inserted an actual hex numpad code. This does mean that
Alt VK_ADD 0 0 H Iwill result in an input of "+hi". That... seems like a small price to pay for Alt VK_ADD working again.Closes #17762