Add support for LNM (Line Feed/New Line Mode) #15261
Merged
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
microsoft-github-policy-service
bot
added
Issue-Task
zadjii-msft
approved these changes
May 5, 2023
PKRoma
pushed a commit
to PKRoma/Terminal
that referenced
this pull request
May 12, 2023
|
Thanks for doing this! |
DHowett
approved these changes
May 12, 2023
DHowett
pushed a commit
that referenced
this pull request
May 15, 2023
This PR adds support for the ANSI Line Feed/New Line mode (`LNM`), which determines whether outputting a linefeed control should also trigger a carriage return, and whether the `Return` key should generate an `LF` in addition to `CR`. ## Detailed Description of the Pull Request / Additional comments In ConHost, there was already a console mode which handled the output side of things, but I've now also added a `TerminalInput` mode that controls the behavior of the `Return` key. When `LNM` is set, both the output and input modes are enabled, and when reset, they're disabled. If they're not already matching, then `LNM` has no effect, and will be reported as unknown when queried. This is the typical state for legacy console applications, which expect a linefeed to trigger a carriage return, but wouldn't want the `Return` key generating both `CR`+`LF`. As part of this PR, I've also refactored the `ITerminalApi` interface to consolidate what I'm now calling the "system" modes: bracketed paste, auto wrap, and the new line feed mode. This closes another gap between Terminal and ConHost, so both auto wrap, and line feed mode will now be supported for conpty pass through. ## Validation Steps Performed I've added an `LNM` test that checks the escape sequence is triggering both of the expected mode changes, and added an additional `DECRQM` test covering the currently implemented standard modes: the new `LNM`, and the existing `IRM` (which wasn't previously tested). I've also extended the `DECRQM` private mode test to cover `DECAWM` and Bracketed Paste (which we also weren't previously testing). I've manually tested `LNM` in Vttest to confirm the keyboard is working as expected. Closes #15167 (cherry picked from commit 3d73721) Service-Card-Id: 89180225 Service-Version: 1.18
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 PR adds support for the ANSI Line Feed/New Line mode (
LNM), whichdetermines whether outputting a linefeed control should also trigger a
carriage return, and whether the
Returnkey should generate anLFinaddition to
CR.Detailed Description of the Pull Request / Additional comments
In ConHost, there was already a console mode which handled the output
side of things, but I've now also added a
TerminalInputmode thatcontrols the behavior of the
Returnkey. WhenLNMis set, both theoutput and input modes are enabled, and when reset, they're disabled.
If they're not already matching, then
LNMhas no effect, and will bereported as unknown when queried. This is the typical state for legacy
console applications, which expect a linefeed to trigger a carriage
return, but wouldn't want the
Returnkey generating bothCR+LF.As part of this PR, I've also refactored the
ITerminalApiinterface toconsolidate what I'm now calling the "system" modes: bracketed paste,
auto wrap, and the new line feed mode. This closes another gap between
Terminal and ConHost, so both auto wrap, and line feed mode will now be
supported for conpty pass through.
Validation Steps Performed
I've added an
LNMtest that checks the escape sequence is triggeringboth of the expected mode changes, and added an additional
DECRQMtestcovering the currently implemented standard modes: the new
LNM, andthe existing
IRM(which wasn't previously tested). I've also extendedthe
DECRQMprivate mode test to coverDECAWMand Bracketed Paste(which we also weren't previously testing).
I've manually tested
LNMin Vttest to confirm the keyboard is workingas expected.
Closes #15167