aboutsummaryrefslogtreecommitdiff
path: root/sixel.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-02-16 18:37:49 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-02-23 08:40:22 +0000
commit4aa980a6a2ce3c3dde0df99438b88969deed3e36 (patch)
tree3dbc2b270000abe2832873d6b596aa65d5cd8dab /sixel.c
parentMerge branch 'document-control-sequences' (diff)
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
Diffstat (limited to 'sixel.c')
-rw-r--r--sixel.c32
1 files changed, 26 insertions, 6 deletions
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