From 69e0e454fa20b7f80b2012c27cc9edc40f659360 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sat, 16 Nov 2019 10:55:14 +0100 Subject: vt: remove commented out code --- vt.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'vt.c') diff --git a/vt.c b/vt.c index e7336dc6..564c14e3 100644 --- a/vt.c +++ b/vt.c @@ -608,43 +608,6 @@ esc_dispatch(struct terminal *term, uint8_t final) term_reset(term, true); break; -#if 0 - case '0': { - /* Configure G0-G3 to use special chars + line drawing */ - char param = term->vt.private[0] != 0 ? term->vt.private[0] : 0; - - switch (param) { - case '(': term->charset[0] = CHARSET_GRAPHIC; break; - case ')': term->charset[1] = CHARSET_GRAPHIC; break; - case '*': term->charset[2] = CHARSET_GRAPHIC; break; - case '+': term->charset[3] = CHARSET_GRAPHIC; break; - case 0: break; - - default: - UNHANDLED(); - break; - } - break; - } - - case 'B': { - /* Configure G0-G3 to use ASCII */ - char param = term->vt.private[0] != 0 ? term->vt.private[0] : 0; - - switch (param) { - case '(': term->charset[0] = CHARSET_ASCII; break; - case ')': term->charset[1] = CHARSET_ASCII; break; - case '*': term->charset[2] = CHARSET_ASCII; break; - case '+': term->charset[3] = CHARSET_ASCII; break; - case 0: break; - - default: - UNHANDLED(); - break; - } - break; - } -#endif case 'D': term_linefeed(term); break; -- cgit v1.3 From 9ff48c2015c6bcd7fce8a4e64a51db593b28884c Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sat, 16 Nov 2019 10:57:11 +0100 Subject: vt: implement ESC H - set tab stop at current column --- vt.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'vt.c') diff --git a/vt.c b/vt.c index 564c14e3..73bc6262 100644 --- a/vt.c +++ b/vt.c @@ -617,6 +617,17 @@ esc_dispatch(struct terminal *term, uint8_t final) term_cursor_left(term, term->cursor.col); break; + case 'H': + tll_foreach(term->tab_stops, it) { + if (it->item >= term->cursor.col) { + tll_insert_before(term->tab_stops, it, term->cursor.col); + break; + } + } + + tll_push_back(term->tab_stops, term->cursor.col); + break; + case 'M': term_reverse_index(term); break; -- cgit v1.3 From 65ff3656f70735f6fcaee05c652004f1d4c717e8 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sat, 16 Nov 2019 10:57:39 +0100 Subject: vt: execute: \t: use tab stops from tab stop list Instead of assuming hardcoded 8-width tab stops, use the tab stops from the tab stop list. --- vt.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'vt.c') diff --git a/vt.c b/vt.c index 73bc6262..79e9871e 100644 --- a/vt.c +++ b/vt.c @@ -866,9 +866,14 @@ action(struct terminal *term, enum action _action, uint8_t c) case '\x09': { /* HT - horizontal tab */ - int col = term->cursor.col; - col = (col + 8) / 8 * 8; - term_cursor_right(term, col - term->cursor.col); + int new_col = term->cursor.col; + tll_foreach(term->tab_stops, it) { + if (it->item >= term->cursor.col) { + new_col = it->item; + break; + } + } + term_cursor_right(term, new_col - term->cursor.col); break; } -- cgit v1.3