aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-10-01 18:15:58 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-10-02 19:30:32 +0000
commit03cacaba86c0abb76760216c7327bd92ab1c3c05 (patch)
treed7fb0fac22b1d057a82842e785b9d058b991148b
parentterm: add private mode flag ‘’reverse-wrap’ (diff)
term: cursor-left: reverse-wrap when cursor is at the left margin
Assuming the private mode ‘reverse-wrap’ has been enabled.
-rw-r--r--terminal.c41
1 files changed, 38 insertions, 3 deletions
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;
}