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

render: don't render cursor if it is not in view

Browse source
This commit is contained in:
Daniel Eklöf 2019-07-10 09:51:42 +02:00
parent ed0fd2d442
commit 1bb5afeb0a
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

46
render.c
View file

@ -35,13 +35,8 @@ static struct glyph_sequence gseq;
static void static void
render_cell(struct terminal *term, struct buffer *buf, const struct cell *cell, render_cell(struct terminal *term, struct buffer *buf, const struct cell *cell,
int col, int row) int col, int row, bool has_cursor)
{ {
/* Cursor here? */
bool has_cursor
= (!term->hide_cursor &&
(term->cursor.col == col && term->cursor.row == row));
double width = term->cell_width; double width = term->cell_width;
double height = term->cell_height; double height = term->cell_height;
double x = col * width; double x = col * width;
@ -251,7 +246,7 @@ grid_render(struct terminal *term)
//LOG_WARN("rendering line: %d", r); //LOG_WARN("rendering line: %d", r);
for (int col = 0; col < term->cols; col++) for (int col = 0; col < term->cols; col++)
render_cell(term, buf, &row->cells[col], col, r); render_cell(term, buf, &row->cells[col], col, r, false);
row->dirty = false; row->dirty = false;
all_clean = false; all_clean = false;
@ -266,10 +261,10 @@ grid_render(struct terminal *term)
= (term->grid->offset + term->cursor.row) * term->cols + term->cursor.col; = (term->grid->offset + term->cursor.row) * term->cols + term->cursor.col;
if (last_cursor != cursor_as_linear) { if (last_cursor != cursor_as_linear) {
int row = last_cursor / term->cols - term->grid->view; int row = last_cursor / term->cols - term->grid->offset;
int col = last_cursor % term->cols; int col = last_cursor % term->cols;
if (row >= 0 && row < term->rows) { if (row >= 0 && row < term->rows) {
render_cell(term, buf, &grid_row_in_view(term->grid, row)->cells[col], col, row); render_cell(term, buf, &grid_row_in_view(term->grid, row)->cells[col], col, row, false);
all_clean = false; all_clean = false;
wl_surface_damage_buffer( wl_surface_damage_buffer(
@ -284,16 +279,31 @@ grid_render(struct terminal *term)
return; return;
} }
render_cell( bool cursor_is_visible = false;
term, buf, int view_end = (term->grid->view + term->rows - 1) % term->grid->num_rows;
&grid_row_in_view(term->grid, term->cursor.row)->cells[term->cursor.col], int cursor_row = (term->grid->offset + term->cursor.row) % term->grid->num_rows;
term->cursor.col, term->cursor.row); if (view_end >= term->grid->view) {
/* Not wrapped */
if (cursor_row >= term->grid->view && cursor_row <= view_end)
cursor_is_visible = true;
} else {
/* Wrapped */
if (cursor_row >= term->grid->view || cursor_row <= view_end)
cursor_is_visible = true;
}
wl_surface_damage_buffer( if (cursor_is_visible) {
term->wl.surface, render_cell(
term->cursor.col * term->cell_width, term, buf,
term->cursor.row * term->cell_height, &grid_row_in_view(term->grid, term->cursor.row)->cells[term->cursor.col],
term->cell_width, term->cell_height); term->cursor.col, term->cursor.row, true);
wl_surface_damage_buffer(
term->wl.surface,
term->cursor.col * term->cell_width,
term->cursor.row * term->cell_height,
term->cell_width, term->cell_height);
}
if (gseq.count > 0) { if (gseq.count > 0) {
cairo_set_scaled_font(buf->cairo, attrs_to_font(term, &gseq.attrs)); cairo_set_scaled_font(buf->cairo, attrs_to_font(term, &gseq.attrs));