diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-08-05 18:15:18 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-08-05 18:15:18 +0000 |
| commit | 1e08d93528dd8c8feacbb2f58106588903f60a22 (patch) | |
| tree | 8be5a3ce9ab100b4a90f3c2e96f8190aa4d31744 /selection.c | |
| parent | input: use a timer fd to handle keyboard key repeat (diff) | |
selection: ensure start < end in finalize
When the selection is finalized, swap start/end if necessary, to make
sure start <= end.
Diffstat (limited to 'selection.c')
| -rw-r--r-- | selection.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/selection.c b/selection.c index 92beafe5..fe4f4297 100644 --- a/selection.c +++ b/selection.c @@ -30,12 +30,6 @@ extract_selection(const struct terminal *term) const struct coord *start = &term->selection.start; const struct coord *end = &term->selection.end; - if (start->row > end->row || (start->row == end->row && start->col > end->col)) { - const struct coord *tmp = start; - start = end; - end = tmp; - } - assert(start->row <= end->row); size_t max_cells = 0; @@ -159,6 +153,17 @@ selection_finalize(struct terminal *term, uint32_t serial) assert(term->selection.start.row != -1); assert(term->selection.end.row != -1); + if (term->selection.start.row > term->selection.end.row || + (term->selection.start.row == term->selection.end.row && + term->selection.start.col > term->selection.end.col)) + { + struct coord tmp = term->selection.start; + term->selection.start = term->selection.end; + term->selection.end = tmp; + } + + assert(term->selection.start.row <= term->selection.end.row); + /* TODO: somehow share code with the clipboard equivalent */ if (term->selection.primary.data_source != NULL) { /* Kill previous data source */ |
