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

Merge branch 'sixel-deadlock'

Browse source
This commit is contained in:
Daniel Eklöf 2021-03-25 09:38:59 +01:00
commit 601f2ecef5
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -40,6 +40,7 @@
* Crash when compositor send `text-input-v3::enter` events without * Crash when compositor send `text-input-v3::enter` events without
first having sent a `keyboard::enter` event first having sent a `keyboard::enter` event
(https://codeberg.org/dnkl/foot/issues/411). (https://codeberg.org/dnkl/foot/issues/411).
* Deadlock when rendering sixel images.
### Security ### Security

4
render.c
View file

@ -2090,6 +2090,8 @@ grid_render(struct terminal *term)
cursor.row &= term->grid->num_rows - 1; cursor.row &= term->grid->num_rows - 1;
} }
render_sixel_images(term, buf->pix[0], &cursor);
if (term->render.workers.count > 0) { if (term->render.workers.count > 0) {
mtx_lock(&term->render.workers.lock); mtx_lock(&term->render.workers.lock);
term->render.workers.buf = buf; term->render.workers.buf = buf;
@ -2099,8 +2101,6 @@ grid_render(struct terminal *term)
xassert(tll_length(term->render.workers.queue) == 0); xassert(tll_length(term->render.workers.queue) == 0);
} }
render_sixel_images(term, buf->pix[0], &cursor);
int first_dirty_row = -1; int first_dirty_row = -1;
for (int r = 0; r < term->rows; r++) { for (int r = 0; r < term->rows; r++) {
struct row *row = grid_row_in_view(term->grid, r); struct row *row = grid_row_in_view(term->grid, r);