Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-01 07:38:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

screen: Make escape_code_length public

Browse source 
Uncached, but we don't want to keep this globally, I think?

This is useful for doing string pad/length without escapes.
This commit is contained in:
Fabian Homborg 2021-07-01 19:35:07 +02:00
parent fcbf303e05
commit 7ad855a844
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/screen.cpp
View file

@ -247,13 +247,11 @@ static bool is_visual_escape_seq(const wchar_t *code, size_t *resulting_length)
/// Returns the number of characters in the escape code starting at 'code'. We only handle sequences /// Returns the number of characters in the escape code starting at 'code'. We only handle sequences
/// that begin with \x1B. If it doesn't we return zero. We also return zero if we don't recognize /// that begin with \x1B. If it doesn't we return zero. We also return zero if we don't recognize
/// the escape sequence based on querying terminfo and other heuristics. /// the escape sequence based on querying terminfo and other heuristics.
size_t layout_cache_t::escape_code_length(const wchar_t *code) { maybe_t<size_t> escape_code_length(const wchar_t *code) {
assert(code != nullptr); assert(code != nullptr);
if (*code != L'\x1B') return 0; if (*code != L'\x1B') return 0;
size_t esc_seq_len = this->find_escape_code(code); size_t esc_seq_len = 0;
if (esc_seq_len) return esc_seq_len;
bool found = is_color_escape_seq(code, &esc_seq_len); bool found = is_color_escape_seq(code, &esc_seq_len);
if (!found) found = is_visual_escape_seq(code, &esc_seq_len); if (!found) found = is_visual_escape_seq(code, &esc_seq_len);
if (!found) found = is_screen_name_escape_seq(code, &esc_seq_len); if (!found) found = is_screen_name_escape_seq(code, &esc_seq_len);
@ -261,7 +259,21 @@ size_t layout_cache_t::escape_code_length(const wchar_t *code) {
if (!found) found = is_three_byte_escape_seq(code, &esc_seq_len); if (!found) found = is_three_byte_escape_seq(code, &esc_seq_len);
if (!found) found = is_csi_style_escape_seq(code, &esc_seq_len); if (!found) found = is_csi_style_escape_seq(code, &esc_seq_len);
if (!found) found = is_two_byte_escape_seq(code, &esc_seq_len); if (!found) found = is_two_byte_escape_seq(code, &esc_seq_len);
if (found) this->add_escape_code(wcstring(code, esc_seq_len)); return esc_seq_len;
}
size_t layout_cache_t::escape_code_length(const wchar_t *code) {
assert(code != nullptr);
if (*code != L'\x1B') return 0;
size_t esc_seq_len = this->find_escape_code(code);
if (esc_seq_len) return esc_seq_len;
auto found = ::escape_code_length(code);
if (found) {
this->add_escape_code(wcstring(code, *found));
esc_seq_len = *found;
}
return esc_seq_len; return esc_seq_len;
} }

1
src/screen.h
View file

@ -295,4 +295,5 @@ class layout_cache_t : noncopyable_t {
friend void test_layout_cache(); friend void test_layout_cache();
}; };
maybe_t<size_t> escape_code_length(const wchar_t *code);
#endif #endif