From d482bf0a304b8224499bf9de9e0781518106ec7c Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Fri, 13 Mar 2020 18:44:23 +0100 Subject: sixel: improve handling of images when reflowing the grids Update the sixels' 'row' attribute when re-flowing a grid, to ensure it is rendered at the correct place. This should work in most cases, but will break when the cell size has changed (e.g. font size increase/decrease, or a DPI change). This patch also moves the sixel image list from the terminal struct into the grid struct. The sixels are per-grid after all. --- render.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'render.c') diff --git a/render.c b/render.c index fdb156ea..2c00a513 100644 --- a/render.c +++ b/render.c @@ -531,9 +531,6 @@ static void render_sixel(struct terminal *term, pixman_image_t *pix, const struct sixel *sixel) { - if (sixel->grid != term->grid) - return; - int view_end = (term->grid->view + term->rows - 1) & (term->grid->num_rows - 1); int first_visible_row = -1; @@ -599,7 +596,7 @@ render_sixel(struct terminal *term, pixman_image_t *pix, static void render_sixel_images(struct terminal *term, pixman_image_t *pix) { - tll_foreach(term->sixel_images, it) + tll_foreach(term->grid->sixel_images, it) render_sixel(term, pix, &it->item); } -- cgit v1.3