diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-08-13 16:32:56 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-08-13 16:32:56 +0000 |
| commit | 3816a3b460704c1576e558701e780bdeaeb802a3 (patch) | |
| tree | 4d4ef1fd6071d94e5bc357c2906164d453e39f43 /selection.c | |
| parent | changelog: cancelling -> canceling (diff) | |
selection: handle multi-column characters when reversing selection direction
Diffstat (limited to 'selection.c')
| -rw-r--r-- | selection.c | 46 |
1 files changed, 30 insertions, 16 deletions
diff --git a/selection.c b/selection.c index ef1269fa..605e4cf5 100644 --- a/selection.c +++ b/selection.c @@ -320,6 +320,11 @@ selection_update(struct terminal *term, int col, int row) struct coord new_start = term->selection.start; struct coord new_end = {col, term->grid->view + row}; + size_t start_row_idx = new_start.row & (term->grid->num_rows - 1); + size_t end_row_idx = new_end.row & (term->grid->num_rows - 1); + const struct row *row_start = term->grid->rows[start_row_idx]; + const struct row *row_end = term->grid->rows[end_row_idx]; + /* Adjust start point if the selection has changed 'direction' */ if (!(new_end.row == new_start.row && new_end.col == new_start.col)) { enum selection_direction new_direction; @@ -327,26 +332,41 @@ selection_update(struct terminal *term, int col, int row) if (new_end.row > new_start.row || (new_end.row == new_start.row && new_end.col > new_start.col)) { - /* New end point is before the start point */ + /* New end point is after the start point */ new_direction = SELECTION_RIGHT; } else { - /* The new end point is after the start point */ + /* The new end point is before the start point */ new_direction = SELECTION_LEFT; } if (term->selection.direction != new_direction) { if (term->selection.direction != SELECTION_UNDIR) { if (new_direction == SELECTION_LEFT) { - new_start.col--; - if (new_start.col < 0) { - new_start.col = term->cols - 1; - new_start.row--; + bool keep_going = true; + while (keep_going) { + const wchar_t wc = row_start->cells[new_start.col].wc; + keep_going = wc == CELL_MULT_COL_SPACER; + + new_start.col--; + if (new_start.col < 0) { + new_start.col = term->cols - 1; + new_start.row--; + } } } else { - new_start.col++; - if (new_start.col >= term->cols) { - new_start.col = 0; - new_start.row++; + bool keep_going = true; + while (keep_going) { + const wchar_t wc = new_start.col < term->cols - 1 + ? row_start->cells[new_start.col + 1].wc + : 0; + + keep_going = wc == CELL_MULT_COL_SPACER; + + new_start.col++; + if (new_start.col >= term->cols) { + new_start.col = 0; + new_start.row++; + } } } } @@ -355,12 +375,6 @@ selection_update(struct terminal *term, int col, int row) } } - size_t start_row_idx = new_start.row & (term->grid->num_rows - 1); - size_t end_row_idx = new_end.row & (term->grid->num_rows - 1); - const struct row *row_start = term->grid->rows[start_row_idx]; - const struct row *row_end = term->grid->rows[end_row_idx]; - - /* Handle double-width characters */ if (new_start.row < new_end.row || (new_start.row == new_end.row && new_start.col <= new_end.col)) |
