mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-04 04:06:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

dcs: xtgettcap: always reply with tigetstr(3) formatted "strings"

Browse source 
That is, instead of sometimes replying with a "source" encoded
string (where e.g. '\E' are returned just like that, and not as an
actual ESC), always unescape all string values.

This also includes \n \r \t \b \f \s, \^ \\ \ \:, as well as ^x-styled
escapes.

Closes #1701
This commit is contained in:
Daniel Eklöf 2024-04-27 09:38:55 +02:00
parent 4d4ef5eed5
commit a3debf7741
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 60 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

28
utils/xtgettcap.c
View file

@ -103,7 +103,7 @@ main(int argc, const char *const *argv)
if (isprint(buf[i]))
printf("%c", buf[i]);
else if (buf[i] == '\033')
printf("\033[1;31m\\E\033[m");
printf("\033[1;31m<ESC>\033[m");
else
printf("%02x", (uint8_t)buf[i]);
}
@ -158,12 +158,30 @@ main(int argc, const char *const *argv)
printf(" \033[%dm", color);
for (size_t i = 0 ; i < len; i++) {
if (isprint(decoded[i]))
if (isprint(decoded[i])) {
/* All printable characters */
printf("%c", decoded[i]);
else if (decoded[i] == '\033')
printf("\033[1;31m\\E\033[22;%dm", color);
else
}
else if (decoded[i] == '\033') {
/* ESC */
printf("\033[1;31m<ESC>\033[22;%dm", color);
}
else if (decoded[i] >= '\x00' && decoded[i] <= '\x5f') {
/* Control characters, e.g. ^G etc */
printf("\033[1m^%c\033[22m", decoded[i] + '@');
}
else if (decoded[i] == '\x7f') {
/* Control character ^? */
printf("\033[1m^?\033[22m");
}
else {
/* Unknown: print hex representation */
printf("\033[1m%02x\033[22m", (uint8_t)decoded[i]);
}
}
printf("\033[m\r\n");
replies++;