aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c43
1 files changed, 40 insertions, 3 deletions
diff --git a/terminal.c b/terminal.c
index 0840a45c..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;
@@ -1728,9 +1730,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 && term->auto_margin)) {
+
+ /* 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;
}