Merged
Conversation
…viously_ that's gonna blow this diff up.
…s-foreground # Conflicts: # src/host/outputStream.cpp # src/host/outputStream.hpp # src/terminal/adapter/conGetSet.hpp
…h huge parts of console and terminal
…f/11682-vt-focus-events
…988-focus-fg-with-owner
…f/11682-vt-focus-events
ghost
added
Area-Input
This comment was marked as resolved.
This comment was marked as resolved.
3 tasks
lhecker
approved these changes
Apr 13, 2022
Member
lhecker
left a comment
lhecker
left a comment
There was a problem hiding this comment.
I can't review this from a architectural POV unfortunately.
…988-focus-fg-with-owner
…f/11682-vt-focus-events
DHowett
reviewed
Apr 18, 2022
| // it's focused or not, as to match the end-terminal's state. | ||
| // - Used to call ConsoleControl(ConsoleSetForeground,...). | ||
| // - Full support for this sequence is tracked in GH#11682. | ||
| // - Full support for this sequence was added in GH#11682. |
Member
There was a problem hiding this comment.
We can just kill this line. Otherwise we're gonna litter our code with historical artifacts pointing to GitHub issues that we could relegate to git blame :)
| // Theoretically, this could be propagated as a focus event as well, to the | ||
| // input buffer. That should be considered when implementing GH#11682. | ||
|
|
||
| return true; |
Member
There was a problem hiding this comment.
we should make sure that a VT Input client on the far receiving end doesn't get two events each focus change. I was wondering if it would because:
- we might pass one through (original one)
- we add a
FOCUS_EVENTto the input buffer, which TerminalInput later converts into another focus VT sequence
Member
Author
There was a problem hiding this comment.
WHOOPS IT DOES THE OPPOSITE.
Terminal doesn't send any focus events to the client. It sets the terminal into focus mode, it sends the focus in, InteractDispatch then enables CONSOLE_FOREGROUND, and then returns and never writes the focus event to the buffer.
…f/11682-vt-focus-events
…f/11682-vt-focus-events
zadjii-msft
added
the
AutoMerge
|
Hello @zadjii-msft! Because this pull request has the p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (
|
DHowett
removed
the
AutoMerge
Member
|
I did unmark automerge if you wanted to think about HandleFocusEvent; it's optional of course |
DHowett
added
the
AutoMerge
ghost
merged commit
|
🎉 Handy links: |
ghost
mentioned this pull request
This was referenced Jun 6, 2022
ghost
pushed a commit
that referenced
this pull request
Jun 10, 2022
As described in #13238. libuv sends a focus event to jiggle the handle. Now that we support focus events as VT input (#12900), we'd translate those focus events to VT input as well. That combination of things caused exiting neovim to emit a `\x1b[O` to the input line of the shell when exited. To fix this, we're going to secretly filter out any focus events that came from the API, before translating to VT. We're fortunate here, the `FOCUS_EVENT_RECORD` version of the ctor is only called by the API. * [x] Closes #13238
DHowett
pushed a commit
that referenced
this pull request
Jun 30, 2022
As described in #13238. libuv sends a focus event to jiggle the handle. Now that we support focus events as VT input (#12900), we'd translate those focus events to VT input as well. That combination of things caused exiting neovim to emit a `\x1b[O` to the input line of the shell when exited. To fix this, we're going to secretly filter out any focus events that came from the API, before translating to VT. We're fortunate here, the `FOCUS_EVENT_RECORD` version of the ctor is only called by the API. * [x] Closes #13238 (cherry picked from commit b22684e) Service-Card-Id: 83027721 Service-Version: 1.14
This pull request was closed.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Further builds on #12799. #12799 assumes that the connection is prepared to receive FocusIn/FocusOut events as input. For ConPTY we can be relatively sure of that, but that's not technically correct. In the hypothetical world where the connection is not a ConPTY connection, then the other side might not be expecting those sequences.
This remedies the issue by
TerminalDispatchandControlCoreare hooked up now to only send focus events when the Terminal is in focus event mode (which will be always for conpty)terminalInput.cppto add support for focus events to conhost as well.checklist
GetConsoleWindow) #2988 as well, but we can do that manually.