mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-03 01:40:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

selection: store cell 'selected' state in the cells' attributes

Browse source 
Instead of having the renderer calculate, for each cell, whether that
cell is currently selected or not, make selection_update() mark/unmark
the selected cells.

The renderer now only has to look at the cells' 'selected'
attribute. This makes the renderer both smaller and faster.
This commit is contained in:
Daniel Eklöf 2020-01-04 12:03:04 +01:00
parent cb9ae4f6a1
commit f12b1473fd
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 129 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

61
render.c
View file

@ -275,13 +275,14 @@ draw_strikeout(const struct terminal *term, pixman_image_t *pix,
static void
draw_cursor(const struct terminal *term, const struct cell *cell,
bool is_selected, const struct font *font,
pixman_image_t *pix, pixman_color_t *fg, const pixman_color_t *bg,
int x, int y, int cols)
const struct font *font, pixman_image_t *pix, pixman_color_t *fg,
const pixman_color_t *bg, int x, int y, int cols)
{
pixman_color_t cursor_color;
pixman_color_t text_color;
bool is_selected = cell->attrs.selected;
if (term->cursor_color.cursor >> 31) {
assert(term->cursor_color.text);
@ -331,51 +332,6 @@ draw_cursor(const struct terminal *term, const struct cell *cell,
}
}
static bool
coord_is_selected(const struct terminal *term, int col, int row)
{
if (term->selection.start.col == -1 || term->selection.end.col == -1)
return false;
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);
row += term->grid->view;
switch (term->selection.kind) {
case SELECTION_NORMAL:
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;
}
case SELECTION_BLOCK:
if (start->col <= end->col)
return row >= start->row && row <= end->row &&
col >= start->col && col <= end->col;
else
return row >= start->row && row <= end->row &&
col <= start->col && col >= end->col;
}
assert(false);
return false;
}
static int
render_cell(struct terminal *term, pixman_image_t *pix,
struct cell *cell, int col, int row, bool has_cursor)
@ -390,7 +346,8 @@ render_cell(struct terminal *term, pixman_image_t *pix,
int x = term->x_margin + col * width;
int y = term->y_margin + row * height;
bool is_selected = coord_is_selected(term, col, row);
//bool is_selected = coord_is_selected(term, col, row);
bool is_selected = cell->attrs.selected;
uint32_t _fg = 0;
uint32_t _bg = 0;
@ -430,10 +387,8 @@ render_cell(struct terminal *term, pixman_image_t *pix,
PIXMAN_OP_SRC, pix, &bg, 1,
&(pixman_rectangle16_t){x, y, cell_cols * width, height});
if (has_cursor) {
draw_cursor(
term, cell, is_selected, font, pix, &fg, &bg, x, y, cell_cols);
}
if (has_cursor)
draw_cursor(term, cell, font, pix, &fg, &bg, x, y, cell_cols);
if (cell->attrs.blink)
term_arm_blink_timer(term);