From a354e93eea5ad238b7033e8125ca55eee8d31899 Mon Sep 17 00:00:00 2001 From: Mark Nudelman Date: Sat, 22 Oct 2022 10:48:23 -0700 Subject: [PATCH 35/48] lesstest: Remove unnecessary exit_all_modes field from terminfo. --- lesstest/display.c | 3 +-- lesstest/lesstest.h | 1 - lesstest/term.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lesstest/display.c b/lesstest/display.c index 4c5af01..ad239f0 100644 --- a/lesstest/display.c +++ b/lesstest/display.c @@ -4,7 +4,7 @@ extern TermInfo terminfo; static void display_attr_color(Attr attr, Color fg_color, Color bg_color) { - printf("%s", terminfo.exit_all_modes); + printf("\33[m"); if (fg_color != NULL_COLOR) printf("\33[%dm", fg_color); if (bg_color != NULL_COLOR) @@ -100,7 +100,6 @@ void display_screen_debug(const byte* img, int imglen, int screen_width, int scr case LTS_CHAR_FG_COLOR: case LTS_CHAR_BG_COLOR: x -= 3; // don't count LTS_CHAR or following 2 bytes - literal = 1; break; case LTS_CHAR_CURSOR: x -= 1; // don't count LTS_CHAR diff --git a/lesstest/lesstest.h b/lesstest/lesstest.h index dab0fa8..93bbed3 100644 --- a/lesstest/lesstest.h +++ b/lesstest/lesstest.h @@ -44,7 +44,6 @@ typedef struct TermInfo { char* exit_blink; char* enter_standout; char* exit_standout; - char* exit_all_modes; char* clear_screen; char* cursor_move; char* key_right; diff --git a/lesstest/term.c b/lesstest/term.c index bb073d8..5653d00 100644 --- a/lesstest/term.c +++ b/lesstest/term.c @@ -56,7 +56,6 @@ int setup_term(void) { setup_mode("us", "ue", &terminfo.enter_underline, &terminfo.exit_underline, &sp); setup_mode("md", "me", &terminfo.enter_bold, &terminfo.exit_bold, &sp); setup_mode("mb", "me", &terminfo.enter_blink, &terminfo.exit_blink, &sp); - terminfo.exit_all_modes = terminfo.exit_bold; char* bs = ltgetstr("kb", &sp); terminfo.backspace_key = (strlen(bs) == 1) ? *bs : '\b'; -- 2.27.0