From 4aa980a6a2ce3c3dde0df99438b88969deed3e36 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 16 Feb 2021 19:37:49 +0100 Subject: sixel: implement private mode 1070 - private color palette When enabled (the default), sixels use private color registers. That is, the color palette from the last sixel is *not* re-used. When disabled, sixels share (i.e. re-use) the same color palette. Closes #362 --- sixel.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) (limited to 'sixel.c') diff --git a/sixel.c b/sixel.c index 4a71f9ee..dede6e10 100644 --- a/sixel.c +++ b/sixel.c @@ -18,7 +18,8 @@ static size_t count; void sixel_fini(struct terminal *term) { - free(term->sixel.palette); + free(term->sixel.private_palette); + free(term->sixel.shared_palette); } static uint32_t @@ -46,17 +47,36 @@ sixel_init(struct terminal *term) term->sixel.image.height = 6; term->sixel.image.autosize = true; - if (term->sixel.palette == NULL) { - term->sixel.palette = xcalloc( - term->sixel.palette_size, sizeof(term->sixel.palette[0])); + /* TODO: default palette */ + + if (term->sixel.use_private_palette) { + if (term->sixel.private_palette == NULL) { + term->sixel.private_palette = xcalloc( + term->sixel.palette_size, sizeof(term->sixel.private_palette[0])); + } else { + /* Private palette - i.e. each sixel starts with a clean palette */ + memset( + term->sixel.private_palette, + 0, + term->sixel.palette_size * sizeof(term->sixel.private_palette[0])); + } + + term->sixel.palette = term->sixel.private_palette; + } else { + if (term->sixel.shared_palette == NULL) { + term->sixel.shared_palette = xcalloc( + term->sixel.palette_size, sizeof(term->sixel.shared_palette[0])); + } else { + /* Shared palette - do *not* reset palette for new sixels */ + } + + term->sixel.palette = term->sixel.shared_palette; } for (size_t i = 0; i < 1 * 6; i++) term->sixel.image.data[i] = color_with_alpha(term, term->colors.bg); count = 0; - - /* TODO: default palette */ } void -- cgit v1.3 From 8c44b63938684cbd485fec9965f15f1146e32081 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 17 Feb 2021 21:58:36 +0100 Subject: sixel: free private color registers on unhook --- sixel.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'sixel.c') diff --git a/sixel.c b/sixel.c index dede6e10..63ce493b 100644 --- a/sixel.c +++ b/sixel.c @@ -50,17 +50,9 @@ sixel_init(struct terminal *term) /* TODO: default palette */ if (term->sixel.use_private_palette) { - if (term->sixel.private_palette == NULL) { - term->sixel.private_palette = xcalloc( - term->sixel.palette_size, sizeof(term->sixel.private_palette[0])); - } else { - /* Private palette - i.e. each sixel starts with a clean palette */ - memset( - term->sixel.private_palette, - 0, - term->sixel.palette_size * sizeof(term->sixel.private_palette[0])); - } - + xassert(term->sixel.private_palette == NULL); + term->sixel.private_palette = xcalloc( + term->sixel.palette_size, sizeof(term->sixel.private_palette[0])); term->sixel.palette = term->sixel.private_palette; } else { if (term->sixel.shared_palette == NULL) { @@ -794,6 +786,9 @@ sixel_unhook(struct terminal *term) term->sixel.max_col = 0; term->sixel.pos = (struct coord){0, 0}; + free(term->sixel.private_palette); + term->sixel.private_palette = NULL; + LOG_DBG("you now have %zu sixels in current grid", tll_length(term->grid->sixel_images)); -- cgit v1.3