diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-02-22 10:30:30 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-02-22 10:30:30 +0000 |
| commit | 762526485113ea711dcf322063b1f3c6dc3e753e (patch) | |
| tree | 2575576fa94c4fdfd9025a41dee48ce77ed0f25e | |
| parent | sixel: use a struct coord for current sixel position (diff) | |
sixel: clean up state machine
Use proper state names, and implement the state machine using switch
statements.
| -rw-r--r-- | sixel.c | 188 | ||||
| -rw-r--r-- | terminal.h | 11 |
2 files changed, 105 insertions, 94 deletions
@@ -7,7 +7,9 @@ #include "log.h" #include "render.h" +#define ALEN(v) (sizeof(v) / sizeof(v[0])) #define max(x, y) ((x) > (y) ? (x) : (y)) +#define min(x, y) ((x) < (y) ? (x) : (y)) static const size_t COLOR_COUNT = 1024; @@ -19,7 +21,7 @@ sixel_init(struct terminal *term) assert(term->sixel.palette == NULL); assert(term->sixel.image.data == NULL); - term->sixel.state = SIXEL_GROUND; + term->sixel.state = SIXEL_DECSIXEL; term->sixel.pos = (struct coord){0, 0}; term->sixel.color_idx = 0; term->sixel.max_col = 0; @@ -177,17 +179,23 @@ sixel_add(struct terminal *term, uint32_t color, uint8_t sixel) } static void -sixel_sixel(struct terminal *term, uint8_t c) +decsixel(struct terminal *term, uint8_t c) { switch (c) { case '"': - term->sixel.state = SIXEL_RASTER; + term->sixel.state = SIXEL_DECGRA; + term->sixel.param = 0; + term->sixel.param_idx = 0; + break; + + case '!': + term->sixel.state = SIXEL_DECGRI; term->sixel.param = 0; term->sixel.param_idx = 0; break; case '#': - term->sixel.state = SIXEL_COLOR; + term->sixel.state = SIXEL_DECGCI; term->sixel.color_idx = 0; term->sixel.param = 0; term->sixel.param_idx = 0; @@ -206,115 +214,118 @@ sixel_sixel(struct terminal *term, uint8_t c) term->sixel.pos.col = 0; break; - case '!': - term->sixel.state = SIXEL_REPEAT; - term->sixel.param = 0; - term->sixel.param_idx = 0; + case '?'...'~': + sixel_add(term, term->sixel.palette[term->sixel.color_idx], c - 63); break; - default: - if (c < '?' || c > '~') { - LOG_ERR("invalid sixel charactwer: '%c' at idx=%zu", c, count); - return; - } + case ' ': + case '\n': + case '\r': + break; - sixel_add(term, term->sixel.palette[term->sixel.color_idx], c - 63); + default: + LOG_WARN("invalid sixel charactwer: '%c' at idx=%zu", c, count); break; } } static void -sixel_repeat(struct terminal *term, uint8_t c) +decgra(struct terminal *term, uint8_t c) { - if (c >= '0' && c <= '9') { + switch (c) { + case '0'...'9': term->sixel.param *= 10; term->sixel.param += c - '0'; - } else { - //LOG_DBG("repeating '%c' %u times", c, term->sixel.param); + break; - term->sixel.state = SIXEL_GROUND; - for (unsigned i = 0; i < term->sixel.param; i++) - sixel_sixel(term, c); - } -} + case ';': + if (term->sixel.param_idx < ALEN(term->sixel.params)) + term->sixel.params[term->sixel.param_idx++] = term->sixel.param; + term->sixel.param = 0; + break; -static void -sixel_raster(struct terminal *term, uint8_t c) -{ - if (c >= '0' && c <= '9') { - term->sixel.param *= 10; - term->sixel.param += c - '0'; - } else { - if (term->sixel.param_idx < sizeof(term->sixel.params) / sizeof(term->sixel.params[0])) + default: { + if (term->sixel.param_idx < ALEN(term->sixel.params)) term->sixel.params[term->sixel.param_idx++] = term->sixel.param; - term->sixel.param = 0; + int nparams = term->sixel.param_idx; + unsigned pan = nparams > 0 ? term->sixel.params[0] : 0; + unsigned pad = nparams > 1 ? term->sixel.params[1] : 0; + unsigned ph = nparams > 2 ? term->sixel.params[2] : 0; + unsigned pv = nparams > 3 ? term->sixel.params[3] : 0; - if (c != ';') { - unsigned pan __attribute__((unused)) = term->sixel.params[0]; - unsigned pad __attribute__((unused)) = term->sixel.params[1]; - unsigned ph __attribute__((unused)) = term->sixel.params[2]; - unsigned pv __attribute__((unused)) = term->sixel.params[3]; + pan = pan > 0 ? pan : 1; + pad = pad > 0 ? pad : 1; - LOG_DBG("pan=%u, pad=%u (aspect ratio = %u), size=%ux%u", - pan, pad, pan / pad, ph, pv); + LOG_DBG("pan=%u, pad=%u (aspect ratio = %u), size=%ux%u", + pan, pad, pan / pad, ph, pv); - if (ph >= term->sixel.image.height && pv >= term->sixel.image.width) - resize(term, ph, pv); - } + if (ph >= term->sixel.image.height && pv >= term->sixel.image.width) + resize(term, ph, pv); - switch (c) { - case '#': term->sixel.state = SIXEL_COLOR; break; - case ';': term->sixel.state = SIXEL_RASTER; break; - default: term->sixel.state = SIXEL_GROUND; sixel_sixel(term, c); break; - } + term->sixel.state = SIXEL_DECSIXEL; + sixel_put(term, c); + break; + } } } static void -sixel_color(struct terminal *term, uint8_t c) +decgri(struct terminal *term, uint8_t c) { - if (c >= '0' && c <= '9') { + switch (c) { + case '0'...'9': term->sixel.param *= 10; term->sixel.param += c - '0'; - } else { - if (term->sixel.param < COLOR_COUNT) - term->sixel.color_idx = term->sixel.param; - else - term->sixel.color_idx = 0; - - term->sixel.param_idx = 0; - term->sixel.param = 0; + break; - switch (c) { - case '#': term->sixel.state = SIXEL_COLOR; break; - case ';': term->sixel.state = SIXEL_COLOR_SPEC; break; - default: term->sixel.state = SIXEL_GROUND; sixel_sixel(term, c); break; - } + default: + //LOG_DBG("repeating '%c' %u times", c, term->sixel.param); + for (unsigned i = 0; i < term->sixel.param; i++) + decsixel(term, c); + term->sixel.state = SIXEL_DECSIXEL; + break; } } static void -sixel_color_spec(struct terminal *term, uint8_t c) +decgci(struct terminal *term, uint8_t c) { - if (c >= '0' && c <= '9') { + switch (c) { + case '0'...'9': term->sixel.param *= 10; term->sixel.param += c - '0'; - } else { - if (term->sixel.param_idx < sizeof(term->sixel.params) / sizeof(term->sixel.params[0])) - term->sixel.params[term->sixel.param_idx++] = term->sixel.param; + break; + case ';': + if (term->sixel.param_idx < ALEN(term->sixel.params)) + term->sixel.params[term->sixel.param_idx++] = term->sixel.param; term->sixel.param = 0; + break; - if (c != ';') { - unsigned format = term->sixel.params[0]; - unsigned c1 = term->sixel.params[1]; - unsigned c2 = term->sixel.params[2]; - unsigned c3 = term->sixel.params[3]; + default: { + if (term->sixel.param_idx < ALEN(term->sixel.params)) + term->sixel.params[term->sixel.param_idx++] = term->sixel.param; + + int nparams = term->sixel.param_idx; + + if (nparams > 0) + term->sixel.color_idx = min(1 + term->sixel.params[0], COLOR_COUNT - 1); + + if (nparams > 4) { + unsigned format = term->sixel.params[1]; + unsigned c1 = term->sixel.params[2]; + unsigned c2 = term->sixel.params[3]; + unsigned c3 = term->sixel.params[4]; - if (format == 1) { + switch (format) { + case 1: { /* HLS */ + LOG_ERR("HLS color format not implemented"); assert(false && "HLS color format not implemented"); - } else { + break; + } + + case 2: { /* RGB */ uint8_t r = 255 * c1 / 100; uint8_t g = 255 * c2 / 100; uint8_t b = 255 * c3 / 100; @@ -323,32 +334,27 @@ sixel_color_spec(struct terminal *term, uint8_t c) term->sixel.color_idx, r, g, b); term->sixel.palette[term->sixel.color_idx] = r << 16 | g << 8 | b; + break; + } } } - switch (c) { - case '#': term->sixel.state = SIXEL_COLOR; break; - case ';': term->sixel.state = SIXEL_COLOR_SPEC; break; - default: term->sixel.state = SIXEL_GROUND; sixel_sixel(term, c); break; - } + term->sixel.state = SIXEL_DECSIXEL; + sixel_put(term, c); + break; + } } } void sixel_put(struct terminal *term, uint8_t c) { - count++; - switch (c) { - case ' ': return; - case '\n': return; - case '\r': return; - } - switch (term->sixel.state) { - case SIXEL_GROUND: sixel_sixel(term, c); break; - case SIXEL_REPEAT: sixel_repeat(term, c); break; - case SIXEL_RASTER: sixel_raster(term, c); break; - case SIXEL_COLOR: sixel_color(term, c); break; - case SIXEL_COLOR_SPEC: sixel_color_spec(term, c); break; + case SIXEL_DECSIXEL: decsixel(term, c); break; + case SIXEL_DECGRA: decgra(term, c); break; + case SIXEL_DECGRI: decgri(term, c); break; + case SIXEL_DECGCI: decgci(term, c); break; } + + count++; } @@ -355,7 +355,12 @@ struct terminal { } delayed_render_timer; struct { - enum { SIXEL_GROUND, SIXEL_REPEAT, SIXEL_RASTER, SIXEL_COLOR, SIXEL_COLOR_SPEC} state; + enum { + SIXEL_DECSIXEL, /* DECSIXEL body part ", $, -, ? ... ~ */ + SIXEL_DECGRA, /* DECGRA Set Raster Attributes " Pan; Pad; Ph; Pv */ + SIXEL_DECGRI, /* DECGRI Graphics Repeat Introducer ! Pn Ch */ + SIXEL_DECGCI, /* DECGCI Graphics Color Introducer # Pc; Pu; Px; Py; Pz */ + } state; struct coord pos; /* Current sixel coordinate */ int color_idx; /* Current palette index */ @@ -368,8 +373,8 @@ struct terminal { int height; /* Image height, in pixels */ } image; - unsigned params[4]; /* Collected parmaeters, for RASTER, COLOR_SPEC */ - unsigned int param; /* Currently collecting parameter, for RASTER, COLOR_SPEC and REPEAT */ + unsigned params[5]; /* Collected parmaeters, for RASTER, COLOR_SPEC */ + unsigned param; /* Currently collecting parameter, for RASTER, COLOR_SPEC and REPEAT */ unsigned param_idx; /* Parameters seen */ } sixel; |
