mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-30 11:10:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

render: fix cursor not always being rendered

Browse source 
In case the only difference between this and the last frame was cursor
movement, the cursor was not rendered.
This commit is contained in:
Daniel Eklöf 2019-07-02 12:51:43 +02:00
parent 9392cfbbf3
commit 607df23a92
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
main.c
View file

@ -369,18 +369,27 @@ grid_render_scroll_reverse(struct context *c, struct buffer *buf,
static void static void
grid_render(struct context *c) grid_render(struct context *c)
{ {
struct buffer *buf = shm_get_buffer(c->wl.shm, c->width, c->height); static struct cursor last_cursor = {.linear = 0, .col = 0, .row = 0};
cairo_set_operator(buf->cairo, CAIRO_OPERATOR_SOURCE);
if (tll_length(c->term.grid->damage) == 0 && if (tll_length(c->term.grid->damage) == 0 &&
tll_length(c->term.grid->scroll_damage) == 0) tll_length(c->term.grid->scroll_damage) == 0 &&
last_cursor.linear == c->term.cursor.linear)
{ {
goto render_cursor; return;
} }
assert(c->width > 0); assert(c->width > 0);
assert(c->height > 0); assert(c->height > 0);
struct buffer *buf = shm_get_buffer(c->wl.shm, c->width, c->height);
cairo_set_operator(buf->cairo, CAIRO_OPERATOR_SOURCE);
static struct buffer *last_buf = NULL;
if (last_buf != buf) {
if (last_buf != NULL)
LOG_WARN("new buffer");
last_buf = buf;
}
tll_foreach(c->term.grid->scroll_damage, it) { tll_foreach(c->term.grid->scroll_damage, it) {
@ -416,12 +425,8 @@ grid_render(struct context *c)
tll_remove(c->term.grid->damage, it); tll_remove(c->term.grid->damage, it);
} }
render_cursor:
;
/* TODO: break out to function */ /* TODO: break out to function */
/* Re-render last cursor cell and current cursor cell */ /* Re-render last cursor cell and current cursor cell */
static struct cursor last_cursor = {.linear = 0, .col = 0, .row = 0};
if (last_cursor.linear != c->term.cursor.linear) { if (last_cursor.linear != c->term.cursor.linear) {
struct damage prev_cursor = { struct damage prev_cursor = {