aboutsummaryrefslogtreecommitdiff
path: root/sixel.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-06-27 13:39:11 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-06-29 13:40:00 +0000
commit75f9bed6b6fc7bc97927d70e9e7df75dcea621c4 (patch)
treed3243cfcf8b080d62b58f1e567b93a7e69e34fa1 /sixel.c
parentsixel: special case parsing of images with an aspect ratio of 1:1 (diff)
sixel: refactor: shorten very verbose switch case statements
Diffstat (limited to 'sixel.c')
-rw-r--r--sixel.c67
1 files changed, 14 insertions, 53 deletions
diff --git a/sixel.c b/sixel.c
index e454032c..ec0cbc5a 100644
--- a/sixel.c
+++ b/sixel.c
@@ -1416,6 +1416,8 @@ sixel_add_many_ar_11(struct terminal *term, uint8_t c, unsigned count)
term->sixel.pos.col = col;
}
+IGNORE_WARNING("-Wpedantic")
+
static void
decsixel_generic(struct terminal *term, uint8_t c)
{
@@ -1463,16 +1465,7 @@ decsixel_generic(struct terminal *term, uint8_t c)
}
break;
- 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 '~':
+ case '?' ... '~':
sixel_add_many_generic(term, c - 63, 1);
break;
@@ -1487,27 +1480,15 @@ decsixel_generic(struct terminal *term, uint8_t c)
}
}
+UNIGNORE_WARNINGS
+
static void
decsixel_ar_11(struct terminal *term, uint8_t c)
{
- switch (c) {
- 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 '~':
+ if (likely(c >= '?' && c <= '~'))
sixel_add_many_ar_11(term, c - 63, 1);
- break;
-
- default:
+ else
decsixel_generic(term, c);
- break;
- }
}
static void
@@ -1571,6 +1552,8 @@ decgra(struct terminal *term, uint8_t c)
}
}
+IGNORE_WARNING("-Wpedantic")
+
static void
decgri_generic(struct terminal *term, uint8_t c)
{
@@ -1584,16 +1567,7 @@ decgri_generic(struct terminal *term, uint8_t c)
break;
}
- 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 '~': {
+ case '?' ... '~': {
const unsigned count = term->sixel.repeat_count;
sixel_add_many_generic(term, c - 63, count);
term->sixel.state = SIXEL_DECSIXEL;
@@ -1607,30 +1581,17 @@ decgri_generic(struct terminal *term, uint8_t c)
}
}
+UNIGNORE_WARNINGS
+
static void
decgri_ar_11(struct terminal *term, uint8_t c)
{
- switch (c) {
- 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 '~': {
+ if (likely(c >= '?' && c <= '~')) {
const unsigned count = term->sixel.repeat_count;
sixel_add_many_ar_11(term, c - 63, count);
term->sixel.state = SIXEL_DECSIXEL;
- break;
- }
-
- default:
+ } else
decgri_generic(term, c);
- break;
- }
}
static void