From 632790d5d8686be00ce3e0134b940992c99f0df4 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 10 Jul 2019 20:57:09 +0200 Subject: selection: selections can be made, and are rendered * Start selection on mouse button down * Update selection on motion * Button release cancels selection if there were no motion after start * Renderer detects cells inside the selection and inverts their colors --- render.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'render.c') diff --git a/render.c b/render.c index a97e53cb..b651f99c 100644 --- a/render.c +++ b/render.c @@ -42,6 +42,32 @@ render_cell(struct terminal *term, struct buffer *buf, const struct cell *cell, double x = col * width; double y = row * height; + bool is_selected = false; + 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; + } + + assert(start->row <= end->row); + + if (start->row == end->row) { + is_selected + = term->grid->view + row == start->row && col >= start->col && col <= end->col; + } else { + if (term->grid->view + row == start->row) + is_selected = col >= start->col; + else if (term->grid->view + row == end->row) + is_selected = col <= end->col; + else + is_selected = term->grid->view + row >= start->row && term->grid->view + row <= end->row; + } + } + const struct rgb *foreground = cell->attrs.have_foreground ? &cell->attrs.foreground : !term->reverse ? &term->foreground : &term->background; @@ -50,7 +76,7 @@ render_cell(struct terminal *term, struct buffer *buf, const struct cell *cell, : !term->reverse ? &term->background : &term->foreground; /* If *one* is set, we reverse */ - if (has_cursor ^ cell->attrs.reverse) { + if (has_cursor ^ cell->attrs.reverse ^ is_selected) { const struct rgb *swap = foreground; foreground = background; background = swap; -- cgit v1.3