morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

ptyfwd: reset tty when exiting

Browse Source 
Let's do a "soft" reset of the TTY when a ptyfwd session ends. This is a
good idea, in order to reset changes to the scrolling window that code
inside the session might have made. A "soft" reset will undo this.

While we are at it, make sure to output the ansi sequences for this
*after* terminating any half-written line, as that is still somewhat
contents of the session, even if it's augmented.
This commit is contained in:
Lennart Poettering
2025-09-19 14:50:53 +02:00
committed by Yu Watanabe
parent e6a05af50b
commit 3d97db8f3c
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/basic/terminal-util.c
View File

@@ -955,7 +955,7 @@ finish:
return r;
}
static int terminal_reset_ansi_seq(int fd) {
int terminal_reset_ansi_seq(int fd) {
int r, k;
assert(fd >= 0);

2
src/basic/terminal-util.h
View File

@@ -34,6 +34,8 @@
bool isatty_safe(int fd);
int terminal_reset_ansi_seq(int fd);
typedef enum TerminalResetFlags {
TERMINAL_RESET_SWITCH_TO_TEXT = 1 << 0,
TERMINAL_RESET_AVOID_ANSI_SEQ = 1 << 1,

14
src/shared/ptyfwd.c
View File

@@ -133,13 +133,6 @@ static void pty_forward_disconnect(PTYForward *f) {
/* STDIN/STDOUT should not be non-blocking normally, so let's reset it */
(void) fd_nonblock(f->output_fd, false);
if (colors_enabled()) {
(void) loop_write(f->output_fd, ANSI_NORMAL ANSI_ERASE_TO_END_OF_SCREEN, SIZE_MAX);
if (f->title)
(void) loop_write(f->output_fd, ANSI_WINDOW_TITLE_POP, SIZE_MAX);
}
if (f->last_char_set && f->last_char != '\n') {
const char *s;
@@ -153,6 +146,13 @@ static void pty_forward_disconnect(PTYForward *f) {
f->last_char = '\n';
}
if (colors_enabled()) {
if (f->title)
(void) loop_write(f->output_fd, ANSI_WINDOW_TITLE_POP, SIZE_MAX);
terminal_reset_ansi_seq(f->output_fd);
}
if (f->close_output_fd)
f->output_fd = safe_close(f->output_fd);
}