From 1e08d93528dd8c8feacbb2f58106588903f60a22 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 5 Aug 2019 20:15:18 +0200 Subject: selection: ensure start < end in finalize When the selection is finalized, swap start/end if necessary, to make sure start <= end. --- selection.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'selection.c') 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 */ -- cgit v1.3