From d70956da08c987af639fd8e03e669ca59c4c542b Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 1 Jul 2019 12:23:38 +0200 Subject: wip: use a sliding window instead of memmove() to scroll Instead of memmoving a large amount of data on every scroll, use a sliding window. That is, each time we scroll, we offset origin. --- vt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'vt.c') diff --git a/vt.c b/vt.c index c7e75a94..f52b6d0f 100644 --- a/vt.c +++ b/vt.c @@ -678,7 +678,11 @@ action(struct terminal *term, enum action action, uint8_t c) term_cursor_to(term, term->cursor.row + 1, 0); } - struct cell *cell = &term->grid->cells[term->cursor.linear]; + size_t cell_count = 1; + struct cell *cell = grid_get_range( + term->grid, term->cursor.linear, &cell_count); + assert(cell_count == 1); + term_damage_update(term, term->cursor.linear, 1); if (term->vt.utf8.idx > 0) { -- cgit v1.3 From 0954ffdf223c277811776cb1097c85570c8a39d8 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 1 Jul 2019 21:14:07 +0200 Subject: vt: no need to clear temporary utf8 buffer after printing it --- vt.c | 1 - 1 file changed, 1 deletion(-) (limited to 'vt.c') diff --git a/vt.c b/vt.c index f52b6d0f..8328b330 100644 --- a/vt.c +++ b/vt.c @@ -689,7 +689,6 @@ action(struct terminal *term, enum action action, uint8_t c) //LOG_DBG("print: UTF8: %.*s", (int)term->vt.utf8.idx, term->vt.utf8.data); memcpy(cell->c, term->vt.utf8.data, term->vt.utf8.idx); cell->c[term->vt.utf8.idx] = '\0'; - memset(&term->vt.utf8, 0, sizeof(term->vt.utf8)); } else { //LOG_DBG("print: ASCII: %c", c); cell->c[0] = c; -- cgit v1.3 From ed68eafdf037516b4a20b3efbd2510fe6facfbae Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 2 Jul 2019 21:44:58 +0200 Subject: vt: simplify CLEAR action; don't memset() more than necessary --- vt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vt.c') diff --git a/vt.c b/vt.c index 8328b330..5d04008b 100644 --- a/vt.c +++ b/vt.c @@ -664,9 +664,9 @@ action(struct terminal *term, enum action action, uint8_t c) case ACTION_CLEAR: memset(&term->vt.params, 0, sizeof(term->vt.params)); - memset(&term->vt.intermediates, 0, sizeof(term->vt.intermediates)); - memset(&term->vt.osc, 0, sizeof(term->vt.osc)); - memset(&term->vt.utf8, 0, sizeof(term->vt.utf8)); + term->vt.intermediates.idx = 0; + term->vt.osc.idx = 0; + term->vt.utf8.idx = 0; break; case ACTION_PRINT: { -- cgit v1.3 From 9682e15deb2037b4da2b9796be81bd3f80e1a153 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 2 Jul 2019 22:18:25 +0200 Subject: term: "cache" pointer to current line This adds a pointer to the first cell on the current line. This pointer must be updated every time the row changes. The advantage is mainly that PRINT doesn't have to call grid_get_range(), which is fairly expensive. --- terminal.c | 12 ++++++++++++ terminal.h | 1 + vt.c | 6 +----- 3 files changed, 14 insertions(+), 5 deletions(-) (limited to 'vt.c') diff --git a/terminal.c b/terminal.c index f11ddad6..25e1246e 100644 --- a/terminal.c +++ b/terminal.c @@ -169,6 +169,12 @@ term_cursor_to(struct terminal *term, int row, int col) term->cursor.linear = new_linear; term->cursor.col = col; term->cursor.row = row; + + size_t len = term->cols; + term->grid->cur_line = grid_get_range( + term->grid, term->cursor.linear - col, &len); + + assert(len == (size_t)term->cols); } void @@ -253,6 +259,12 @@ term_scroll_partial(struct terminal *term, struct scroll_region region, int rows max(0, region.end - rows) * term->cols, 0, rows * term->cols); term_damage_scroll(term, DAMAGE_SCROLL, region, rows); + + size_t len = term->cols; + term->grid->cur_line = grid_get_range( + term->grid, term->cursor.linear - term->cursor.col, &len); + + assert(len == (size_t)term->cols); } void diff --git a/terminal.h b/terminal.h index 4efaab9f..66f6bde0 100644 --- a/terminal.h +++ b/terminal.h @@ -66,6 +66,7 @@ struct grid { int offset; struct cell *cells; + struct cell *cur_line; tll(struct damage) damage; tll(struct damage) scroll_damage; diff --git a/vt.c b/vt.c index 5d04008b..f2d85d4b 100644 --- a/vt.c +++ b/vt.c @@ -678,11 +678,7 @@ action(struct terminal *term, enum action action, uint8_t c) term_cursor_to(term, term->cursor.row + 1, 0); } - size_t cell_count = 1; - struct cell *cell = grid_get_range( - term->grid, term->cursor.linear, &cell_count); - assert(cell_count == 1); - + struct cell *cell = &term->grid->cur_line[term->cursor.col]; term_damage_update(term, term->cursor.linear, 1); if (term->vt.utf8.idx > 0) { -- cgit v1.3 From cfd39c09674e24de18500a2de9d1cb2a0a8c9692 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 16:20:28 +0200 Subject: vt: fix logging of ESC intermediates and parameters --- vt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vt.c') diff --git a/vt.c b/vt.c index f2d85d4b..ca461a40 100644 --- a/vt.c +++ b/vt.c @@ -555,7 +555,7 @@ static const enum action exit_actions[] = { static bool esc_dispatch(struct terminal *term, uint8_t final) { -#if defined(_DEBUG) && defined(LOG_ENABLE_DBG) && LOG_ENABLED_DBG +#if defined(_DEBUG) && defined(LOG_ENABLE_DBG) && LOG_ENABLE_DBG char log[1024]; int c = snprintf(log, sizeof(log), "ESC: "); -- cgit v1.3 From bf7815015720077cf2e2c93276c43adae1391100 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 16:21:09 +0200 Subject: vt: always log unimplemented as warnings, not errors --- vt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'vt.c') diff --git a/vt.c b/vt.c index ca461a40..ea9bbcde 100644 --- a/vt.c +++ b/vt.c @@ -568,6 +568,7 @@ esc_dispatch(struct terminal *term, uint8_t final) switch (final) { case 'B': { + /* Configure G0-G3 to use ASCII */ char param = term->vt.params.idx > 0 ? term->vt.params.v[0].value : '('; switch (param) { @@ -578,11 +579,11 @@ esc_dispatch(struct terminal *term, uint8_t final) case ')': case '*': case '+': - LOG_ERR("unimplemented: character charset: %c", param); + LOG_WARN("unimplemented: charset %c uses ASCII", param); return false; default: - LOG_ERR("ESC B: invalid charset identifier: %c", param); + LOG_ERR("%cB: invalid charset identifier", param); return false; } break; -- cgit v1.3 From df5be1061dc8819c802bc96e026253b4fb8b78a7 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 16:21:26 +0200 Subject: vt: recognize ESC(0 - switch character set --- vt.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'vt.c') diff --git a/vt.c b/vt.c index ea9bbcde..b2cc07fa 100644 --- a/vt.c +++ b/vt.c @@ -589,6 +589,25 @@ esc_dispatch(struct terminal *term, uint8_t final) break; } + case '0': { + /* Configure G0-G3 to use special chars + line drawing */ + char param = term->vt.params.idx > 0 ? term->vt.params.v[0].value : '('; + + switch (param) { + case '(': + case ')': + case '*': + case '+': + LOG_WARN("unimplemented: charset %c uses special characters and line drawings", param); + break; + + default: + LOG_ERR("%c0: invalid charset identifier", param); + return false; + } + break; + } + case 'M': /* ri - reverse index (scroll reverse) */ term_scroll_reverse(term, 1); -- cgit v1.3 From 1373d18dbc7b04141347a20a58867c1c79cf6daf Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 20:21:03 +0200 Subject: logging: disable debug logging by default --- csi.c | 2 +- grid.c | 2 +- input.c | 2 +- main.c | 2 +- osc.c | 2 +- slave.c | 2 +- terminal.c | 2 +- vt.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'vt.c') diff --git a/csi.c b/csi.c index 530a494c..4be35c60 100644 --- a/csi.c +++ b/csi.c @@ -10,7 +10,7 @@ #endif #define LOG_MODULE "csi" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" #include "grid.h" diff --git a/grid.c b/grid.c index 99e66665..178883e4 100644 --- a/grid.c +++ b/grid.c @@ -4,7 +4,7 @@ #include #define LOG_MODULE "grid" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" struct cell * diff --git a/input.c b/input.c index 5e61d49b..319de914 100644 --- a/input.c +++ b/input.c @@ -10,7 +10,7 @@ #include #define LOG_MODULE "input" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" #include "terminal.h" diff --git a/main.c b/main.c index 133880ee..b69f42de 100644 --- a/main.c +++ b/main.c @@ -17,7 +17,7 @@ #include #define LOG_MODULE "main" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" #include "font.h" diff --git a/osc.c b/osc.c index 5f71287e..2882d546 100644 --- a/osc.c +++ b/osc.c @@ -1,7 +1,7 @@ #include "osc.h" #define LOG_MODULE "osc" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" bool diff --git a/slave.c b/slave.c index edb5e9c6..676d4ce2 100644 --- a/slave.c +++ b/slave.c @@ -9,7 +9,7 @@ #include #define LOG_MODULE "slave" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" void diff --git a/terminal.c b/terminal.c index 7ba0aa13..4de5a1a8 100644 --- a/terminal.c +++ b/terminal.c @@ -4,7 +4,7 @@ #include #define LOG_MODULE "terminal" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" #include "grid.h" diff --git a/vt.c b/vt.c index b2cc07fa..c5786b2f 100644 --- a/vt.c +++ b/vt.c @@ -5,7 +5,7 @@ #include #define LOG_MODULE "vt" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" #include "csi.h" #include "osc.h" -- cgit v1.3 From 90dadfcc228d890fb95cc7c210b24cd024f096ac Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 21:16:41 +0200 Subject: vt: implement (untested!) insert mode \E4l is not horizontal index, but disable INSERT mode --- csi.c | 14 +++++++------- terminal.h | 4 +++- vt.c | 9 +++++++++ 3 files changed, 19 insertions(+), 8 deletions(-) (limited to 'vt.c') diff --git a/csi.c b/csi.c index 4be35c60..6fca2c24 100644 --- a/csi.c +++ b/csi.c @@ -484,16 +484,16 @@ csi_dispatch(struct terminal *term, uint8_t final) break; } - case 'l': { - /* Horizontal index */ + case 'h': + /* smir - insert mode enable */ assert(false && "untested"); - int param = param_get(term, 0, 1); - int col = term->cursor.col; + term->insert_mode = true; + break; - col = (col + param * 8) / 8 * 8; - term_cursor_right(term, col - term->cursor.col); + case 'l': + /* rmir - insert mode disable */ + term->insert_mode = false; break; - } case 'r': { int start = param_get(term, 0, 1); diff --git a/terminal.h b/terminal.h index a96b1b70..f48158e5 100644 --- a/terminal.h +++ b/terminal.h @@ -131,9 +131,11 @@ struct terminal { pid_t slave; int ptmx; - bool hide_cursor; enum decckm decckm; enum keypad_mode keypad_mode; + bool hide_cursor; + bool auto_margin; + bool insert_mode; bool bracketed_paste; struct vt vt; diff --git a/vt.c b/vt.c index c5786b2f..b00b840d 100644 --- a/vt.c +++ b/vt.c @@ -701,6 +701,15 @@ action(struct terminal *term, enum action action, uint8_t c) struct cell *cell = &term->grid->cur_line[term->cursor.col]; term_damage_update(term, term->cursor.linear, 1); + if (term->insert_mode) { + assert(false && "untested"); + grid_memmove( + term->grid, term->cursor.linear + 1, term->cursor.linear, + term->cols - term->cursor.col - 1); + term_damage_update( + term, term->cursor.linear + 1, term->cols - term->cursor.col - 1); + } + if (term->vt.utf8.idx > 0) { //LOG_DBG("print: UTF8: %.*s", (int)term->vt.utf8.idx, term->vt.utf8.data); memcpy(cell->c, term->vt.utf8.data, term->vt.utf8.idx); -- cgit v1.3 From 3c67628c57b03f6faabe61d04b13297eac80bb6a Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 21:18:06 +0200 Subject: vt: implement (untested!) smam and rmam (auto margins) Default is auto-margins enabled (scroll when cursor reaches right margin). --- csi.c | 4 ++-- main.c | 1 + vt.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'vt.c') diff --git a/csi.c b/csi.c index 6fca2c24..bb805134 100644 --- a/csi.c +++ b/csi.c @@ -585,7 +585,7 @@ csi_dispatch(struct terminal *term, uint8_t final) break; case 7: - LOG_WARN("unimplemented: smam (automatic margins)"); + term->auto_margin = true; break; case 12: @@ -655,7 +655,7 @@ csi_dispatch(struct terminal *term, uint8_t final) break; case 7: - LOG_WARN("unimplemented: smam (automatic margins)"); + term->auto_margin = false; break; case 12: diff --git a/main.c b/main.c index b69f42de..a87598c4 100644 --- a/main.c +++ b/main.c @@ -864,6 +864,7 @@ main(int argc, char *const *argv) .ptmx = posix_openpt(O_RDWR | O_NOCTTY), .decckm = DECCKM_CSI, .keypad_mode = KEYPAD_NUMERICAL, /* TODO: verify */ + .auto_margin = true, .vt = { .state = 1, /* STATE_GROUND */ }, diff --git a/vt.c b/vt.c index b00b840d..8f1db921 100644 --- a/vt.c +++ b/vt.c @@ -690,7 +690,7 @@ action(struct terminal *term, enum action action, uint8_t c) break; case ACTION_PRINT: { - if (term->print_needs_wrap) { + if (term->auto_margin && term->print_needs_wrap) { if (term->cursor.row == term->scroll_region.end - 1) { term_scroll(term, 1); term_cursor_to(term, term->cursor.row, 0); -- cgit v1.3