jaseg/lolcat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extend escape sequence parser to support various ST-terminated sequences

Browse source 
This improves interactions with programs using them to set the terminal
window title or display images among other things.

Closes #42.
This commit is contained in:
jaseg 2022-11-19 17:31:34 +01:00
parent 4d7a6c3bba
commit 8241091f59
1 changed files with 48 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

58
lolcat.c
View file

@ -102,15 +102,53 @@ void rgb_interpolate(union rgb_c *start, union rgb_c *end, union rgb_c *out, dou
out->b = start->b + (end->b - start->b)*f; out->b = start->b + (end->b - start->b)*f;
} }
static void find_escape_sequences(wint_t c, int* state) enum esc_st {
ST_NONE=0,
ST_ESC_BEGIN,
ST_ESC_STRING,
ST_ESC_CSI,
ST_ESC_STRING_TERM,
ST_ESC_CSI_TERM,
ST_ESC_TERM,
};
static enum esc_st find_escape_sequences(wint_t c, enum esc_st st)
{ {
if (c == '\033') { /* Escape sequence YAY */ if (st == ST_NONE && c == '\033') { /* Escape sequence YAY */
*state = 1; return ST_ESC_BEGIN;
} else if (*state == 1) {
if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')) } else if (st == ST_ESC_BEGIN) {
*state = 2; if (c == '[') {
return ST_ESC_CSI;
} else if (c == 'P' || c == ']' || c == 'X' || c == '^' || c == '_') {
return ST_ESC_STRING;
} else {
return ST_ESC_TERM;
}
} else if (st == ST_ESC_CSI) {
if (0x40 <= c && c <= 0x7e) {
return ST_ESC_CSI_TERM;
} else {
return st;
}
} else if (st == ST_ESC_STRING) {
if (c == '\033') {
return ST_ESC_STRING_TERM;
} else {
return st;
}
} else if (st == ST_ESC_STRING_TERM) {
if (c == '\\') {
return ST_ESC_TERM;
} else {
return ST_ESC_STRING;
}
} else { } else {
*state = 0; return ST_NONE;
} }
} }
@ -296,7 +334,7 @@ int main(int argc, char** argv)
for (char** filename = inputs; filename < inputs_end; filename++) { for (char** filename = inputs; filename < inputs_end; filename++) {
wint_t (*this_file_read_wchar)(FILE*); /* Used for --help because fmemopen is universally broken when used with fgetwc */ wint_t (*this_file_read_wchar)(FILE*); /* Used for --help because fmemopen is universally broken when used with fgetwc */
FILE* f; FILE* f;
int escape_state = 0; int escape_state = ST_NONE;
if (!strcmp(*filename, "--help")) { if (!strcmp(*filename, "--help")) {
this_file_read_wchar = &helpstr_hack; this_file_read_wchar = &helpstr_hack;
@ -317,7 +355,7 @@ int main(int argc, char** argv)
while ((c = this_file_read_wchar(f)) != WEOF) { while ((c = this_file_read_wchar(f)) != WEOF) {
if (colors) { if (colors) {
find_escape_sequences(c, &escape_state); escape_state = find_escape_sequences(c, escape_state);
if (!escape_state) { if (!escape_state) {
if (c == '\n') { if (c == '\n') {
@ -377,7 +415,7 @@ int main(int argc, char** argv)
putwchar(c); putwchar(c);
if (escape_state == 2) { /* implies "colors" */ if (escape_state == ST_ESC_CSI_TERM) { /* implies "colors" */
wprintf(L"\033[38;5;%hhum", codes[(rand_offset + start_color + cc) % ARRAY_SIZE(codes)]); wprintf(L"\033[38;5;%hhum", codes[(rand_offset + start_color + cc) % ARRAY_SIZE(codes)]);
} }
} }