diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-03-24 19:46:51 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-03-25 08:38:51 +0000 |
| commit | 8111ff4be8335c73b93717ba6b948ee57395a740 (patch) | |
| tree | 6e210d7f6764894d645ccc98e8944a0bbb6fff35 /render.c | |
| parent | Merge branch 'per-seat-ime-state' (diff) | |
render: draw sixels before taking the render worker lock
This fixes a possible deadlock; render_sixels_images() may call
render_cell(), which may need to take the worker lock (when rendering
either a blinking cell, or a box drawing glyph that isn’t yet in the
glyph cache).
Diffstat (limited to 'render.c')
| -rw-r--r-- | render.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2090,6 +2090,8 @@ grid_render(struct terminal *term) cursor.row &= term->grid->num_rows - 1; } + render_sixel_images(term, buf->pix[0], &cursor); + if (term->render.workers.count > 0) { mtx_lock(&term->render.workers.lock); term->render.workers.buf = buf; @@ -2099,8 +2101,6 @@ grid_render(struct terminal *term) xassert(tll_length(term->render.workers.queue) == 0); } - render_sixel_images(term, buf->pix[0], &cursor); - int first_dirty_row = -1; for (int r = 0; r < term->rows; r++) { struct row *row = grid_row_in_view(term->grid, r); |
