From e030a2ca08d92eb431e9b8e494c63affeeb8c0e1 Mon Sep 17 00:00:00 2001 From: Craig Barnes Date: Wed, 9 Jun 2021 09:51:48 +0100 Subject: terminal: add 'charset_designator' enum to make code more self-documenting This commit also renames the term_set_single_shift_ascii_printer() function to term_single_shift(), since the former is overly verbose and not really even accurate. --- vt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'vt.c') diff --git a/vt.c b/vt.c index 26affcd2..3bd831a8 100644 --- a/vt.c +++ b/vt.c @@ -196,13 +196,13 @@ action_execute(struct terminal *term, uint8_t c) case '\x0e': /* SO - shift out */ - term->charsets.selected = 1; /* G1 */ + term->charsets.selected = G1; term_update_ascii_printer(term); break; case '\x0f': /* SI - shift in */ - term->charsets.selected = 0; /* G0 */ + term->charsets.selected = G0; term_update_ascii_printer(term); break; @@ -390,13 +390,13 @@ action_esc_dispatch(struct terminal *term, uint8_t final) case 'n': /* LS2 - Locking Shift 2 */ - term->charsets.selected = 2; /* G2 */ + term->charsets.selected = G2; term_update_ascii_printer(term); break; case 'o': /* LS3 - Locking Shift 3 */ - term->charsets.selected = 3; /* G3 */ + term->charsets.selected = G3; term_update_ascii_printer(term); break; @@ -426,12 +426,12 @@ action_esc_dispatch(struct terminal *term, uint8_t final) case 'N': /* SS2 - Single Shift 2 */ - term_set_single_shift_ascii_printer(term, 2); /* G2 */ + term_single_shift(term, G2); break; case 'O': /* SS3 - Single Shift 3 */ - term_set_single_shift_ascii_printer(term, 3); /* G3 */ + term_single_shift(term, G3); break; case '\\': @@ -460,7 +460,7 @@ action_esc_dispatch(struct terminal *term, uint8_t final) switch (final) { case '0': { size_t idx = term->vt.private - '('; - xassert(idx <= 3); + xassert(idx <= G3); term->charsets.set[idx] = CHARSET_GRAPHIC; term_update_ascii_printer(term); break; @@ -468,7 +468,7 @@ action_esc_dispatch(struct terminal *term, uint8_t final) case 'B': { size_t idx = term->vt.private - '('; - xassert(idx <= 3); + xassert(idx <= G3); term->charsets.set[idx] = CHARSET_ASCII; term_update_ascii_printer(term); break; -- cgit v1.3