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. --- render.c | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) (limited to 'render.c') diff --git a/render.c b/render.c index 5dcd7035..950638ac 100644 --- a/render.c +++ b/render.c @@ -92,34 +92,26 @@ draw_strikeout(const struct terminal *term, cairo_t *cr, const struct font *font static bool coord_is_selected(const struct terminal *term, int col, int row) { - if (term->selection.start.col != -1 && term->selection.end.col != -1) { - const struct coord *start = &term->selection.start; - const struct coord *end = &term->selection.end; - - if (end->row < start->row || (end->row == start->row && end->col < start->col)) { - const struct coord *tmp = start; - start = end; - end = tmp; - } + if (term->selection.start.col == -1 || term->selection.end.col == -1) + return false; - assert(start->row <= end->row); + const struct coord *start = &term->selection.start; + const struct coord *end = &term->selection.end; - if (start->row == end->row) { - return (term->grid->view + row == start->row && - col >= start->col && - col <= end->col); - } else { - if (term->grid->view + row == start->row) - return col >= start->col; - else if (term->grid->view + row == end->row) - return col <= end->col; - else - return (term->grid->view + row >= start->row && - term->grid->view + row <= end->row); - } - } + assert(start->row <= end->row); - return false; + row += term->grid->view; + + if (start->row == end->row) { + return row == start->row && col >= start->col && col <= end->col; + } else { + if (row == start->row) + return col >= start->col; + else if (row == end->row) + return col <= end->col; + else + return row >= start->row && row <= end->row; + } } static void -- cgit v1.3