aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-03-06 18:49:04 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-03-11 16:32:55 +0000
commit869743060ec57133ac8c13ec7484d8c9b237f02a (patch)
treec06d7fccbd773cf9338e36cf4f25ff490e6ed8ab
parentsixel: ignore invalid sixel characters in DECGRI (repeat) (diff)
sixel: pre-calculate color before calling sixel_add()
This improves performance of DECGRI, since we now only need to calculate the color once for the entire repeat sequence.
-rw-r--r--sixel.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/sixel.c b/sixel.c
index f37c5c92..6fd74a86 100644
--- a/sixel.c
+++ b/sixel.c
@@ -926,7 +926,7 @@ sixel_add(struct terminal *term, uint32_t color, uint8_t sixel)
for (int i = 0; i < 6; i++, sixel >>= 1) {
if (sixel & 1)
- term->sixel.image.data[ofs] = color_with_alpha(term, color);
+ term->sixel.image.data[ofs] = color;
ofs += term->sixel.image.width;
}
@@ -980,7 +980,11 @@ decsixel(struct terminal *term, uint8_t c)
case 'p': case 'q': case 'r': case 's': case 't': case 'u': case 'v':
case 'w': case 'x': case 'y': case 'z': case '{': case '|': case '}':
case '~':
- sixel_add(term, term->sixel.palette[term->sixel.color_idx], c - 63);
+ sixel_add(
+ term,
+ color_with_alpha(
+ term, term->sixel.palette[term->sixel.color_idx]),
+ c - 63);
break;
case ' ':
@@ -1060,8 +1064,12 @@ decgri(struct terminal *term, uint8_t c)
case 'w': case 'x': case 'y': case 'z': case '{': case '|': case '}':
case '~': {
//LOG_DBG("repeating '%c' %u times", c, term->sixel.param);
+ uint32_t color = color_with_alpha(
+ term, term->sixel.palette[term->sixel.color_idx]);
+
for (unsigned i = 0; i < term->sixel.param; i++)
- decsixel(term, c);
+ sixel_add(term, color, c - 63);
+
term->sixel.state = SIXEL_DECSIXEL;
break;
}