diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2024-04-27 07:38:55 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2024-04-27 07:38:55 +0000 |
| commit | a3debf7741d20826bdc6ab786f4ccf0ef7358619 (patch) | |
| tree | a138d1cb23448290ddd8a8110e54eb017bc63b1b /scripts | |
| parent | dcs: XTGETTCAP: handle empty request (diff) | |
dcs: xtgettcap: always reply with tigetstr(3) formatted "strings"
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
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/generate-builtin-terminfo.py | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/scripts/generate-builtin-terminfo.py b/scripts/generate-builtin-terminfo.py index acbf5279..61bd4a3c 100755 --- a/scripts/generate-builtin-terminfo.py +++ b/scripts/generate-builtin-terminfo.py @@ -50,27 +50,33 @@ class IntCapability(Capability): class StringCapability(Capability): def __init__(self, name: str, value: str): - # Expand \E to literal ESC in non-parameterized capabilities - if '%' not in value: - # Ensure e.g. \E7 doesn’t get translated to “\0337”, which - # would be interpreted as octal 337 by the C compiler - value = re.sub(r'\\E([0-7])', r'\\033" "\1', value) + # see terminfo(5) for valid escape sequences - # Replace \E with an actual escape - value = re.sub(r'\\E', r'\\033', value) + # Control characters + def translate_ctrl_chr(m): + ctrl = m.group(1) + if ctrl == '?': + return chr(0x7f) + return chr(ord(ctrl) - ord('@')) + value = re.sub('\^([@A-Z[\\\\\]^_?])', translate_ctrl_chr, value) - # Don’t escape ‘:’ - value = value.replace('\\:', ':') + # Ensure e.g. \E7 (or \e7) doesn’t get translated to “\0337”, + # which would be interpreted as octal 337 by the C compiler + value = re.sub(r'(\\E|\\e)([0-7])', r'\\033" "\2', value) - else: - value = value.replace("\\", "\\\\") - # # Need to double-escape backslashes. These only occur in - # # ‘\E\’ combos. Note that \E itself is updated below - # value = value.replace('\\E\\\\', '\\E\\\\\\\\') + # Replace \E and \e with ESC + value = re.sub(r'\\E|\\e', r'\\033', value) + + # Unescape ,:^ + value = re.sub(r'\\(,|:|\^)', r'\1', value) + + # Replace \s with space + value = value.replace('\\s', ' ') - # # Need to double-escape \E in C string literals - # value = value.replace('\\E', '\\\\E') + # Let \\, \n, \r, \t, \b and \f "fall through", to the C string literal + if re.search(r'\\l', value): + raise NotImplementedError('\\l escape sequence') super().__init__(name, value) |
