From 68ea0ad933488166b8f6a9f8f2ea0287436cea25 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 16 Sep 2024 20:19:48 +0200 Subject: Adding upstream version 256.4. Signed-off-by: Daniel Baumann --- src/basic/meson.build | 2 +- src/basic/terminal-util.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/basic') diff --git a/src/basic/meson.build b/src/basic/meson.build index 9a21457..b538775 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -274,7 +274,7 @@ filesystem_switch_case_h = custom_target( basic_sources += [filesystem_list_h, filesystem_switch_case_h, filesystems_gperf_h] -libbasic = static_library( +libbasic_static = static_library( 'basic', basic_sources, fundamental_sources, diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index dda5920..3a1b7b2 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -584,8 +584,9 @@ int vt_disallocate(const char *name) { (void) loop_write(fd2, "\033[r" /* clear scrolling region */ "\033[H" /* move home */ - "\033[3J", /* clear screen including scrollback, requires Linux 2.6.40 */ - 10); + "\033[3J" /* clear screen including scrollback, requires Linux 2.6.40 */ + "\033c", /* reset to initial state */ + SIZE_MAX); return 0; } @@ -1558,7 +1559,6 @@ int terminal_reset_ansi_seq(int fd) { return log_debug_errno(r, "Failed to set terminal to non-blocking mode: %m"); k = loop_write_full(fd, - "\033c" /* reset to initial state */ "\033[!p" /* soft terminal reset */ "\033]104\007" /* reset colors */ "\033[?7h", /* enable line-wrapping */ -- cgit v1.2.3