aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-03-25 08:38:59 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-03-25 08:38:59 +0000
commit601f2ecef59a3ea115dbc22063e4ea8e8911505a (patch)
tree6e210d7f6764894d645ccc98e8944a0bbb6fff35 /render.c
parentMerge branch 'per-seat-ime-state' (diff)
parentrender: draw sixels before taking the render worker lock (diff)
Merge branch 'sixel-deadlock'
Diffstat (limited to 'render.c')
-rw-r--r--render.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/render.c b/render.c
index dd8070e0..d8e1a009 100644
--- a/render.c
+++ b/render.c
@@ -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);