aboutsummaryrefslogtreecommitdiff
path: root/sixel.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-08-25 16:54:21 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-08-25 16:54:21 +0000
commit777a2eac51d7355ec9f4107725dcb45070ad5be0 (patch)
tree5020a87e1e656e3b517c14150825888d649a9461 /sixel.c
parentMerge branch 'message-fix' into master (diff)
parentmeson/pkgbuild: bump tllist requirement to 1.0.4 (diff)
Merge branch 'pedantic' into master
Diffstat (limited to 'sixel.c')
-rw-r--r--sixel.c24
1 files changed, 18 insertions, 6 deletions
diff --git a/sixel.c b/sixel.c
index 13596088..c6fe1a10 100644
--- a/sixel.c
+++ b/sixel.c
@@ -227,11 +227,11 @@ sixel_overwrite(struct terminal *term, struct sixel *six,
assert(rel_right >= 0);
LOG_DBG("SPLIT: six (%p): %dx%d-%dx%d, %dx%d-%dx%d, rel: above=%d, below=%d, left=%d, right=%d",
- six, six->pos.row, six->pos.col, six->rows, six->cols,
+ (void *)six, six->pos.row, six->pos.col, six->rows, six->cols,
row, col, height, width,
rel_above, rel_below, rel_left, rel_right);
- struct sixel imgs[4] = {};
+ struct sixel imgs[4] = {0};
if (rel_above > 0) {
imgs[0] = (struct sixel){
@@ -668,7 +668,16 @@ decsixel(struct terminal *term, uint8_t c)
term->sixel.pos.col = 0;
break;
- case '?'...'~':
+ case '?': case '@': case 'A': case 'B': case 'C': case 'D': case 'E':
+ case 'F': case 'G': case 'H': case 'I': case 'J': case 'K': case 'L':
+ case 'M': case 'N': case 'O': 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 '^': case '_': case '`': case 'a':
+ case 'b': case 'c': case 'd': case 'e': case 'f': case 'g': case 'h':
+ case 'i': case 'j': case 'k': case 'l': case 'm': case 'n': case 'o':
+ 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);
break;
@@ -687,7 +696,8 @@ static void
decgra(struct terminal *term, uint8_t c)
{
switch (c) {
- case '0'...'9':
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
term->sixel.param *= 10;
term->sixel.param += c - '0';
break;
@@ -732,7 +742,8 @@ static void
decgri(struct terminal *term, uint8_t c)
{
switch (c) {
- case '0'...'9':
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
term->sixel.param *= 10;
term->sixel.param += c - '0';
break;
@@ -750,7 +761,8 @@ static void
decgci(struct terminal *term, uint8_t c)
{
switch (c) {
- case '0'...'9':
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
term->sixel.param *= 10;
term->sixel.param += c - '0';
break;