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. --- csi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 647d5052..9e3b8675 100644 --- a/csi.c +++ b/csi.c @@ -280,7 +280,7 @@ csi_dispatch(struct terminal *term, uint8_t final) i == term->vt.params.idx - 1 ? "" : ";"); } - c += snprintf(&log[c], sizeof(log) - c, "%c (%zu parameters)", + c += snprintf(&log[c], sizeof(log) - c, "%c (%d parameters)", final, term->vt.params.idx); LOG_DBG("%s", log); #endif -- cgit v1.3 From b45b492f4149ce58f01bdec6cf648f30c87bba28 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 1 Jul 2019 19:13:45 +0200 Subject: csi: DECSTBM: move cursor to top left corner of scrolling region --- csi.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 9e3b8675..22efbeab 100644 --- a/csi.c +++ b/csi.c @@ -481,6 +481,8 @@ csi_dispatch(struct terminal *term, uint8_t final) term->scroll_region.start = start - 1; term->scroll_region.end = end; + term_cursor_to(term, (start - 1) * term->cols, 0); + LOG_INFO("scroll region: %d-%d", term->scroll_region.start, term->scroll_region.end); -- cgit v1.3 From ee476a7e5a2983a832856c2206f1a1b7fe2365c1 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 1 Jul 2019 19:23:31 +0200 Subject: csi: erase alt screen when enabling it --- csi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 22efbeab..95ba81a5 100644 --- a/csi.c +++ b/csi.c @@ -586,7 +586,7 @@ csi_dispatch(struct terminal *term, uint8_t final) if (term->grid != &term->alt) { term->grid = &term->alt; term->saved_cursor = term->cursor; - term_damage_all(term); + term_erase(term, 0, term->rows * term->cols); } break; -- cgit v1.3 From 7e4dd2de9a14cda63114ebc5a37c6ef10cd91172 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 1 Jul 2019 19:25:04 +0200 Subject: csi: clear all existing alt damage when switch alt <--> normal --- csi.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 95ba81a5..2cb5e7a5 100644 --- a/csi.c +++ b/csi.c @@ -586,6 +586,9 @@ csi_dispatch(struct terminal *term, uint8_t final) if (term->grid != &term->alt) { term->grid = &term->alt; term->saved_cursor = term->cursor; + + tll_free(term->alt.damage); + tll_free(term->alt.scroll_damage); term_erase(term, 0, term->rows * term->cols); } break; @@ -645,6 +648,9 @@ csi_dispatch(struct terminal *term, uint8_t final) term->scroll_region.start = 0; term->scroll_region.end = term->rows; + tll_free(term->alt.damage); + tll_free(term->alt.scroll_damage); + term_damage_all(term); } break; -- cgit v1.3 From cc2931007c9313db46871e1341f55dea358d4b70 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 2 Jul 2019 22:19:43 +0200 Subject: csi: repair DCH (delete character) The logic was simply broken. This fixes it, and also converts it to use the new "current line" pointer. --- csi.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 2cb5e7a5..def01848 100644 --- a/csi.c +++ b/csi.c @@ -452,24 +452,24 @@ csi_dispatch(struct terminal *term, uint8_t final) case 'P': { /* DCH: Delete character */ - int count = param_get(term, 0, 1); - /* Only delete up to the right margin */ - const int max_end = term_cursor_linear( - term, term->cursor.row, term->cols); - - int start = term->cursor.linear; - int end = min(start + count, max_end); + /* Number of characters to delete */ + int count = min( + param_get(term, 0, 1), term->cols - term->cursor.col); - /* Erase the requested number of characters */ - term_erase(term, start, end); + /* Number of characters left after deletion (on current line) */ + int remaining = term->cols - (term->cursor.col + count); - /* Move remaining (up til the right margin) characters */ - int remaining = max_end - end; - memmove(&term->grid->cells[start], - &term->grid->cells[end], - remaining * sizeof(term->grid->cells[0])); + /* 'Delete' characters by moving the remaining ones */ + memmove(&term->grid->cur_line[term->cursor.col], + &term->grid->cur_line[term->cursor.col + count], + remaining * sizeof(term->grid->cur_line[0])); term_damage_update(term, term->cursor.linear, remaining); + + /* Erase the remainder of the line */ + term_erase( + term, term->cursor.linear + remaining, + term->cursor.linear + remaining + count); break; } -- cgit v1.3 From 8ed723945802c2e2bbe18bb5653c6025ed14cc6b Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 2 Jul 2019 22:23:54 +0200 Subject: csi: re-set cursor when switching between alt and normal screen This forces a refresh of the "current line" pointer. --- csi.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'csi.c') diff --git a/csi.c b/csi.c index def01848..931ff36a 100644 --- a/csi.c +++ b/csi.c @@ -587,6 +587,8 @@ csi_dispatch(struct terminal *term, uint8_t final) term->grid = &term->alt; term->saved_cursor = term->cursor; + term_cursor_to(term, term->cursor.row, term->cursor.col); + tll_free(term->alt.damage); tll_free(term->alt.scroll_damage); term_erase(term, 0, term->rows * term->cols); @@ -644,6 +646,8 @@ csi_dispatch(struct terminal *term, uint8_t final) term->cursor = term->saved_cursor; + term_cursor_to(term, term->cursor.row, term->cursor.col); + /* Should these be restored from saved values? */ term->scroll_region.start = 0; term->scroll_region.end = term->rows; -- cgit v1.3 From 0fef48c1fd7f2751ead2b1c619d56ea7fa3c72b1 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 08:37:16 +0200 Subject: csi: up to application to restore scroll region on alt switch? --- csi.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 931ff36a..dd292b79 100644 --- a/csi.c +++ b/csi.c @@ -645,13 +645,8 @@ csi_dispatch(struct terminal *term, uint8_t final) term->grid = &term->normal; term->cursor = term->saved_cursor; - term_cursor_to(term, term->cursor.row, term->cursor.col); - /* Should these be restored from saved values? */ - term->scroll_region.start = 0; - term->scroll_region.end = term->rows; - tll_free(term->alt.damage); tll_free(term->alt.scroll_damage); -- cgit v1.3 From 5e8c75aa38ee0fc394556e0759b42b1713948412 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 14:14:46 +0200 Subject: csi: implement 'civis' (show/hide cursor) --- csi.c | 4 ++-- main.c | 3 ++- terminal.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'csi.c') diff --git a/csi.c b/csi.c index dd292b79..57da1c06 100644 --- a/csi.c +++ b/csi.c @@ -567,7 +567,7 @@ csi_dispatch(struct terminal *term, uint8_t final) break; case 25: - LOG_WARN("unimplemented: civis"); + term->hide_cursor = false; break; case 1000: @@ -625,7 +625,7 @@ csi_dispatch(struct terminal *term, uint8_t final) break; case 25: - LOG_WARN("unimplemented: civis"); + term->hide_cursor = true; break; case 1000: diff --git a/main.c b/main.c index 460f36e4..a29f5d8c 100644 --- a/main.c +++ b/main.c @@ -134,7 +134,8 @@ grid_render_update(struct context *c, struct buffer *buf, const struct damage *d /* Cursor here? */ bool has_cursor - = c->term.cursor.linear == linear_cursor - c->term.grid->offset; + = (!c->term.hide_cursor && + (c->term.cursor.linear == linear_cursor - c->term.grid->offset)); int x = col * c->term.cell_width; int y = row * c->term.cell_height; diff --git a/terminal.h b/terminal.h index 66f6bde0..a96b1b70 100644 --- a/terminal.h +++ b/terminal.h @@ -131,6 +131,7 @@ struct terminal { pid_t slave; int ptmx; + bool hide_cursor; enum decckm decckm; enum keypad_mode keypad_mode; bool bracketed_paste; -- cgit v1.3 From 2fad8138e1aee775825ce85f29dcd98d994e33f0 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 14:24:46 +0200 Subject: csi: scroll region changes are now logged as debug again, rather than info --- csi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 57da1c06..c849ed0d 100644 --- a/csi.c +++ b/csi.c @@ -483,9 +483,9 @@ csi_dispatch(struct terminal *term, uint8_t final) term_cursor_to(term, (start - 1) * term->cols, 0); - LOG_INFO("scroll region: %d-%d", - term->scroll_region.start, - term->scroll_region.end); + LOG_DBG("scroll region: %d-%d", + term->scroll_region.start, + term->scroll_region.end); break; } -- cgit v1.3 From 92f0d642795f3aa5dbe644f2fed0bd532418eba1 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 14:47:01 +0200 Subject: csi: add untested implementation of "horizontal index" --- csi.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'csi.c') diff --git a/csi.c b/csi.c index c849ed0d..56a4a83d 100644 --- a/csi.c +++ b/csi.c @@ -473,6 +473,17 @@ csi_dispatch(struct terminal *term, uint8_t final) break; } + case 'l': { + /* Horizontal index */ + assert(false && "untested"); + int param = param_get(term, 0, 1); + int col = term->cursor.col; + + col = (col + param * 8) / 8 * 8; + term_cursor_right(term, col - term->cursor.col); + break; + } + case 'r': { int start = param_get(term, 0, 1); int end = param_get(term, 1, term->rows); -- cgit v1.3 From a0602aedb5fd5fffb42d44c1ed48b74e4a056917 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 14:47:34 +0200 Subject: csi: recognize 'smam', but log unimplemented --- csi.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 56a4a83d..98055c5b 100644 --- a/csi.c +++ b/csi.c @@ -573,6 +573,10 @@ csi_dispatch(struct terminal *term, uint8_t final) LOG_WARN("unimplemented: flash"); break; + case 7: + LOG_WARN("unimplemented: smam (automatic margins)"); + break; + case 12: LOG_WARN("unimplemented: cursor blinking"); break; @@ -631,6 +635,10 @@ csi_dispatch(struct terminal *term, uint8_t final) LOG_WARN("unimplemented: flash"); break; + case 7: + LOG_WARN("unimplemented: smam (automatic margins)"); + break; + case 12: LOG_WARN("unimplemented: cursor blinking"); break; -- cgit v1.3 From 66033b9b1a80a393b19c6ffffcc25462a2012910 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 15:58:49 +0200 Subject: csi: implement 'erase characters' (CSI X) --- csi.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 98055c5b..a9de94b2 100644 --- a/csi.c +++ b/csi.c @@ -473,6 +473,17 @@ csi_dispatch(struct terminal *term, uint8_t final) break; } + case 'X': { + /* Erase chars */ + int count = min( + param_get(term, 0, 1), term->cols - term->cursor.col); + + memset(&term->grid->cur_line[term->cursor.col], + 0, count * sizeof(term->grid->cur_line[0])); + term_damage_erase(term, term->cursor.linear, count); + break; + } + case 'l': { /* Horizontal index */ assert(false && "untested"); -- cgit v1.3 From f4c334338242d60f52f0ef48f748bc1b4fce313a Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 15:59:28 +0200 Subject: csi: fix cursor positioning --- csi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'csi.c') diff --git a/csi.c b/csi.c index a9de94b2..28c6baa1 100644 --- a/csi.c +++ b/csi.c @@ -503,7 +503,7 @@ csi_dispatch(struct terminal *term, uint8_t final) term->scroll_region.start = start - 1; term->scroll_region.end = end; - term_cursor_to(term, (start - 1) * term->cols, 0); + term_cursor_to(term, start - 1, 0); LOG_DBG("scroll region: %d-%d", term->scroll_region.start, -- cgit v1.3 From 43045a98e2e14e42572f5a89ac897bf8b06609ec Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 16:00:06 +0200 Subject: csi: recognize ?1005 and ?1015 private CSIs --- csi.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 28c6baa1..e1a5b540 100644 --- a/csi.c +++ b/csi.c @@ -604,10 +604,18 @@ csi_dispatch(struct terminal *term, uint8_t final) LOG_WARN("unimplemented: report cell mouse motion"); break; + case 1005: + LOG_WARN("unimplemented: UTF-8 mouse"); + break; + case 1006: LOG_WARN("unimplemented: SGR mouse"); break; + case 1015: + LOG_WARN("unimplemented: URXVT mosue"); + break; + case 1049: if (term->grid != &term->alt) { term->grid = &term->alt; @@ -666,10 +674,18 @@ csi_dispatch(struct terminal *term, uint8_t final) LOG_WARN("unimplemented: report cell mouse motion"); break; + case 1005: + LOG_WARN("unimplemented: UTF-8 mouse"); + break; + case 1006: LOG_WARN("unimplemented: SGR mouse"); break; + case 1015: + LOG_WARN("unimplemented: URXVT mosue"); + break; + case 1049: if (term->grid == &term->alt) { term->grid = &term->normal; -- cgit v1.3 From b5dccf28839f99c85727feecbadda56f65becde3 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 16:00:27 +0200 Subject: csi: add unknown private escapes 's' and 'r', seen with ncmpcpp --- csi.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'csi.c') diff --git a/csi.c b/csi.c index e1a5b540..530a494c 100644 --- a/csi.c +++ b/csi.c @@ -714,6 +714,13 @@ csi_dispatch(struct terminal *term, uint8_t final) break; } + case 's': + case 'r': + /* ??? */ + /* Seen with ncmpcpp */ + LOG_WARN("unimplemented: CSI ?%c", final); + break; + default: LOG_ERR("CSI: intermediate '?': unimplemented final: %c", final); abort(); -- 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 'csi.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 'csi.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 'csi.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 From 3d58d24963645125f23316be01f936932f88ee4a Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 21:33:23 +0200 Subject: csi: ?r and ?s are like ?h and ?l; they save/restore things Assuming ncmpcpp is correct, ?1001s and ?1001r saves and restores the 'highlight mouse tracking' mode. --- csi.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) (limited to 'csi.c') diff --git a/csi.c b/csi.c index bb805134..170cbf6d 100644 --- a/csi.c +++ b/csi.c @@ -715,14 +715,39 @@ csi_dispatch(struct terminal *term, uint8_t final) } case 's': + for (size_t i = 0; i < term->vt.params.idx; i++) { + switch (term->vt.params.v[i].value) { + case 1001: /* save old highlight mouse tracking mode? */ + LOG_WARN( + "unimplemented: CSI ?1001s " + "(save 'highlight mouse tracking' mode)"); + break; + + default: + LOG_ERR("unimplemented: CSI ?%ds", term->vt.params.v[i].value); + abort(); + } + } + break; + case 'r': - /* ??? */ - /* Seen with ncmpcpp */ - LOG_WARN("unimplemented: CSI ?%c", final); + for (size_t i = 0; i < term->vt.params.idx; i++) { + switch (term->vt.params.v[i].value) { + case 1001: /* restore old highlight mouse tracking mode? */ + LOG_WARN( + "unimplemented: CSI ?1001r " + "(restore 'highlight mouse tracking' mode)"); + break; + + default: + LOG_ERR("unimplemented: CSI ?%dr", term->vt.params.v[i].value); + abort(); + } + } break; default: - LOG_ERR("CSI: intermediate '?': unimplemented final: %c", final); + LOG_ERR("unimplemented: CSI: ?%c", final); abort(); } -- cgit v1.3 From 2f3f4ac56f9cb6df445df1f91aa1913dd21c1b3b Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 22:21:23 +0200 Subject: csi: cleanup --- csi.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 170cbf6d..681d31f0 100644 --- a/csi.c +++ b/csi.c @@ -57,10 +57,6 @@ initialize_colors256(void) b * 51 / 255.0, 1.0, }; -#if 0 - colors256[16 + r * 6 * 6 + g * 6 + b] = - (51 * r) << 24 | (51 * g) << 16 | (51 * b) << 8 | 0xff; -#endif } } } @@ -72,7 +68,6 @@ initialize_colors256(void) i * 11 / 255.0, 1.0 }; - //(11 * i) << 24 | (11 * i) << 16 | (11 * i) << 8 | 0xff; } } @@ -292,11 +287,7 @@ csi_dispatch(struct terminal *term, uint8_t final) case 'd': { /* VPA - vertical line position absolute */ - int row = param_get(term, 0, 1); - - if (row > term->rows) - row = term->rows; - + int row = min(param_get(term, 0, 1), term->rows); term_cursor_to(term, row - 1, term->cursor.col); break; } @@ -334,14 +325,8 @@ csi_dispatch(struct terminal *term, uint8_t final) case 'H': { /* Move cursor */ - int row = param_get(term, 0, 1); - int col = param_get(term, 1, 1); - - if (row > term->rows) - row = term->rows; - if (col > term->cols) - col = term->cols; - + int row = min(param_get(term, 0, 1), term->rows); + int col = min(param_get(term, 1, 1), term->cols); term_cursor_to(term, row - 1, col - 1); break; } -- cgit v1.3 From 35d5035f614493196e3b93e2b60d6f88df75e067 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 22:21:44 +0200 Subject: csi: fix bug: cursor horizontal absolute ( Pn G) was off-by-one --- csi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 681d31f0..4b545d31 100644 --- a/csi.c +++ b/csi.c @@ -314,12 +314,8 @@ csi_dispatch(struct terminal *term, uint8_t final) case 'G': { /* Cursor horizontal absolute */ - int col = param_get(term, 0, 1); - - if (col > term->cols) - col = term->cols; - - term_cursor_to(term, term->cursor.row, col); + int col = min(param_get(term, 0, 1), term->cols); + term_cursor_to(term, term->cursor.row, col - 1); break; } -- cgit v1.3