Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add implicit CR and implicit LF for serial terminal similar to putty #9307

Merged
merged 2 commits into from
Dec 6, 2023
Merged

add implicit CR and implicit LF for serial terminal similar to putty #9307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8ef596
add implicit cr and implicit lf for serial terminal similar to putty
kimbob13 Dec 6, 2023
2437dc5
edit suggested by linter
kimbob13 Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions locale/ko-KR.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,14 @@ msgstr "CRLF 강제"
msgid "Force LF"
msgstr "LF 강제"

#: tabby-terminal/src/components/streamProcessingSettings.component.ts:56
msgid "Implicit CR in every LF"
msgstr "LF에만 CR 추가"

#: tabby-terminal/src/components/streamProcessingSettings.component.ts:57
msgid "Implicit LF in every CR"
msgstr "CR에만 LF 추가"

#: locale/tmp-html/tabby-ssh/src/components/sshSettingsTab.component.html:25
msgid "Forces a specific SSH agent connection type."
msgstr "특정 SSH 에이전트로 연결 유형 강제"
Expand Down
2 changes: 2 additions & 0 deletions tabby-terminal/src/components/streamProcessingSettings.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ export class StreamProcessingSettingsComponent {
{ key: 'cr', name: _('Force CR') },
{ key: 'lf', name: _('Force LF') },
{ key: 'crlf', name: _('Force CRLF') },
{ key: 'implicit_cr', name: _('Implicit CR in every LF') },
{ key: 'implicit_lf', name: _('Implicit LF in every CR') },
]

getInputModeName (key) {
Expand Down
7 changes: 6 additions & 1 deletion tabby-terminal/src/middleware/streamProcessing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { SessionMiddleware } from '../api/middleware'

export type InputMode = null | 'local-echo' | 'readline' | 'readline-hex'
export type OutputMode = null | 'hex'
export type NewlineMode = null | 'cr' | 'lf' | 'crlf'
export type NewlineMode = null | 'cr' | 'lf' | 'crlf' | 'implicit_cr' | 'implicit_lf'

export interface StreamProcessingOptions {
inputMode?: InputMode
Expand Down Expand Up @@ -133,7 +133,12 @@ export class TerminalStreamProcessor extends SessionMiddleware {
private replaceNewlines (data: Buffer, mode?: NewlineMode): Buffer {
if (!mode) {
return data
} else if (mode === 'implicit_cr') {
return bufferReplace(data, '\n', '\r\n')
} else if (mode === 'implicit_lf') {
return bufferReplace(data, '\r', '\r\n')
}

data = bufferReplace(data, '\r\n', '\n')
data = bufferReplace(data, '\r', '\n')
const replacement = {
Expand Down