wpf: use the new TSF implementation #18861
Merged
Conversation
This file contains hidden or 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
This fixes two issues in the WPF terminal control: - The emoji picker and other IME candidate windows didn't show up in the right place - Submitting an emoji via the emoji picker would result in two win32 input mode events with a VK of 65535 and the surrogate pair halves. I am not sure I did the right thing with the thread TSF handle...
lhecker
reviewed
May 2, 2025
Comment on lines
67
to
72
| fontSize = _terminal->_actualFont.GetSize(); | ||
| } | ||
| POINT ptSuggestion = { | ||
| .x = cursorPos.x * fontSize.width, | ||
| .y = cursorPos.y * fontSize.height, | ||
| }; |
There was a problem hiding this comment.
The _actualFont.GetSize() is in pixel?
Comment on lines
125
to
126
| Microsoft::Console::TSF::Handle _tsfHandle; | ||
| TsfDataProvider _tsfDataProvider; |
There was a problem hiding this comment.
The destruction order is wrong here. You need to destroy the Handle first, since the TsfDataProvider doesn't properly implement AddRef/Release. I think this is worth commenting as well.
There was a problem hiding this comment.
(Dustin showed me that Teardown does it in the right order.)
| @@ -171,7 +243,8 @@ HwndTerminal::HwndTerminal(HWND parentHwnd) noexcept : | |||
| _uiaProvider{ nullptr }, | |||
| _currentDpi{ USER_DEFAULT_SCREEN_DPI }, | |||
| _pfnWriteCallback{ nullptr }, | |||
| _multiClickTime{ 500 } // this will be overwritten by the windows system double-click time | |||
| _multiClickTime{ 500 }, // this will be overwritten by the windows system double-click time | |||
| _tsfDataProvider{ this } | |||
There was a problem hiding this comment.
FWIW I believe you can also use { this } in the header.
lhecker
reviewed
May 2, 2025
| @@ -242,6 +315,11 @@ try | |||
| { | |||
| // As a rule, detach resources from the Terminal before shutting them down. | |||
| // This ensures that teardown is reentrant. | |||
| if (_tsfHandle) | |||
| { | |||
| _tsfHandle.Unfocus(&_tsfDataProvider); | |||
There was a problem hiding this comment.
I believe you don't need to unfocus during teardown. Re-reading its implementation shows that it is primarily concerned with clearing the pending compositions out of the renderer.
lhecker
approved these changes
May 2, 2025
DHowett
added a commit
that referenced
this pull request
May 5, 2025
This fixes two issues in the WPF terminal control: - The emoji picker and other IME candidate windows didn't show up in the right place - Submitting an emoji via the emoji picker would result in two win32 input mode events with a VK of 65535 and the surrogate pair halves. I am not sure I did the right thing with the thread TSF handle... (cherry picked from commit 06f736b) Service-Card-Id: PVTI_lADOAF3p4s4AxadtzgZ-Sw0 Service-Version: 1.23
DHowett
added a commit
that referenced
this pull request
May 5, 2025
This fixes two issues in the WPF terminal control: - The emoji picker and other IME candidate windows didn't show up in the right place - Submitting an emoji via the emoji picker would result in two win32 input mode events with a VK of 65535 and the surrogate pair halves. I am not sure I did the right thing with the thread TSF handle... (cherry picked from commit 06f736b) Service-Card-Id: PVTI_lADOAF3p4s4AmhmQzgZ-Sw4 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.
This fixes two issues in the WPF terminal control:
I am not sure I did the right thing with the thread TSF handle...