From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 19 Jan 2024 22:39:13 +0000 (+0100)
Subject: ptyfwd: when leaving a session with tinted background, clear to end of screen
X-Git-Tag: v256-rc1~1090
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4924fb0d1fa474f0c0874eefd872ad72626a76c;p=thirdparty%2Fsystemd.git

ptyfwd: when leaving a session with tinted background, clear to end of screen

So if we tint the background of a ptyfwd session with a color and the
session ends, then so far we reset the bg color and clear till the end
of line.

Let's instead clear till the end of the screen. This is nicer since it
means that any follow-up output will not be affected by the changed
background color anymore.
---

diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h
index ee60ff4840c..4822917f28f 100644
--- a/src/basic/terminal-util.h
+++ b/src/basic/terminal-util.h
@@ -80,6 +80,9 @@
 /* Erase characters until the end of the line */
 #define ANSI_ERASE_TO_END_OF_LINE "\x1B[K"
 
+/* Erase characters until end of screen */
+#define ANSI_ERASE_TO_END_OF_SCREEN "\x1B[J"
+
 /* Move cursor up one line */
 #define ANSI_REVERSE_LINEFEED "\x1BM"
 
diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
index 03660ad4178..c05ce794892 100644
--- a/src/shared/ptyfwd.c
+++ b/src/shared/ptyfwd.c
@@ -115,7 +115,7 @@ static void pty_forward_disconnect(PTYForward *f) {
                 (void) fd_nonblock(f->output_fd, false);
 
                 if (colors_enabled())
-                        (void) loop_write(f->output_fd, ANSI_NORMAL ANSI_ERASE_TO_END_OF_LINE, SIZE_MAX);
+                        (void) loop_write(f->output_fd, ANSI_NORMAL ANSI_ERASE_TO_END_OF_SCREEN, SIZE_MAX);
 
                 if (f->close_output_fd)
                         f->output_fd = safe_close(f->output_fd);