From 03cacaba86c0abb76760216c7327bd92ab1c3c05 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Thu, 1 Oct 2020 20:15:58 +0200 Subject: term: cursor-left: reverse-wrap when cursor is at the left margin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Assuming the private mode ‘reverse-wrap’ has been enabled. --- terminal.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) (limited to 'terminal.c') diff --git a/terminal.c b/terminal.c index 0840a45c..e8a3173b 100644 --- a/terminal.c +++ b/terminal.c @@ -1728,9 +1728,44 @@ term_cursor_home(struct terminal *term) void term_cursor_left(struct terminal *term, int count) { - int move_amount = min(term->grid->cursor.point.col, count); - term->grid->cursor.point.col -= move_amount; - assert(term->grid->cursor.point.col >= 0); + assert(count >= 0); + int new_col = term->grid->cursor.point.col - count; + + /* Reverse wrap */ + if (unlikely(new_col < 0)) { + if (unlikely(term->reverse_wrap)) { + + /* Number of rows to reverse wrap through */ + int row_count = (abs(new_col) - 1) / term->cols + 1; + + /* Row number cursor will end up on */ + int new_row_no = term->grid->cursor.point.row - row_count; + + /* New column number */ + new_col = term->cols - ((abs(new_col) - 1) % term->cols + 1); + assert(new_col >= 0 && new_col < term->cols); + + /* Don't back up past the scroll region */ + /* TODO: should this be allowed? */ + if (new_row_no < term->scroll_region.start) { + new_row_no = term->scroll_region.start; + new_col = 0; + } + + struct row *new_row = grid_row(term->grid, new_row_no); + term->grid->cursor.point.col = new_col; + term->grid->cursor.point.row = new_row_no; + term->grid->cursor.lcf = false; + term->grid->cur_row = new_row; + return; + } + + /* Reverse wrap disabled - don't let cursor move past first column */ + new_col = 0; + } + + assert(new_col >= 0); + term->grid->cursor.point.col = new_col; term->grid->cursor.lcf = false; } -- cgit v1.3 From 97e07c1ea11edf22e8a2f5a860fe6f32f511593b Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sat, 3 Oct 2020 10:50:28 +0200 Subject: term: cursor-left: don’t do reverse-wrapping unless auto-margins are enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This matches XTerm’s behavior. --- terminal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'terminal.c') diff --git a/terminal.c b/terminal.c index e8a3173b..5c94e5aa 100644 --- a/terminal.c +++ b/terminal.c @@ -1733,7 +1733,7 @@ term_cursor_left(struct terminal *term, int count) /* Reverse wrap */ if (unlikely(new_col < 0)) { - if (unlikely(term->reverse_wrap)) { + if (unlikely(term->reverse_wrap && term->auto_margin)) { /* Number of rows to reverse wrap through */ int row_count = (abs(new_col) - 1) / term->cols + 1; -- cgit v1.3 From 207b24538d2ea3d2a98787487923ac2a6fb1e131 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 6 Oct 2020 18:42:26 +0200 Subject: term: enable reverse wrap-around by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since we’re now doing reverse auto-wrapping by default, we add ‘bw’ (‘auto_left_margin’)to terminfo. --- CHANGELOG.md | 5 +++-- foot.info | 1 + terminal.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'terminal.c') diff --git a/CHANGELOG.md b/CHANGELOG.md index 179195b9..7b247ec9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,8 +17,9 @@ ## Unreleased ### Added -* Implement reverse auto-wrap. This mode can be enabled/disabled with - `CSI ? 45 h` and `CSI `45 l`. It is disabled by default +* Implement reverse auto-wrap (_auto\_left\_margin_, _bw_, in + terminfo). This mode can be enabled/disabled with `CSI ? 45 h` and + `CSI `45 l`. It is **enabled** by default (https://codeberg.org/dnkl/foot/issues/150). diff --git a/foot.info b/foot.info index 62eb2beb..c7a05653 100644 --- a/foot.info +++ b/foot.info @@ -14,6 +14,7 @@ foot-direct|foot with direct color indexing, foot+base|foot base fragment, am, bce, + bw, ccc, km, mir, diff --git a/terminal.c b/terminal.c index 5c94e5aa..a171b182 100644 --- a/terminal.c +++ b/terminal.c @@ -904,6 +904,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper, : FCFT_SUBPIXEL_NONE), .cursor_keys_mode = CURSOR_KEYS_NORMAL, .keypad_keys_mode = KEYPAD_NUMERICAL, + .reverse_wrap = true, .auto_margin = true, .window_title_stack = tll_init(), .scale = 1, @@ -1394,6 +1395,7 @@ term_reset(struct terminal *term, bool hard) term->keypad_keys_mode = KEYPAD_NUMERICAL; term->reverse = false; term->hide_cursor = false; + term->reverse_wrap = true; term->auto_margin = true; term->insert_mode = false; term->bracketed_paste = false; -- cgit v1.3