RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-18 21:31:13 +00:00
Code Issues Releases Wiki Activity

msg: improve term_disp_width to support unicode

Browse Source 
All characters are assumed to be single-width. This is consistent with
the rest of the code and documentation.

Fixes: #13150
This commit is contained in:
Kacper Michajłow 2023-12-23 20:09:06 +01:00 committed by Dudemanguy
parent 687372e2a2
commit 5864b72d1a
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
common/msg.c
View File

@ -336,31 +336,30 @@ static bool test_terminal_level(struct mp_log *log, int lev)
} }
// This is very basic way to infer needed width for a string. // This is very basic way to infer needed width for a string.
static int term_disp_width(bstr str, size_t start, size_t end) static int term_disp_width(bstr str)
{ {
int width = 0; int width = 0;
bool escape = false;
const char *line = str.start; while (str.len) {
for (size_t i = start; i < end && i < str.len; ++i) { if (bstr_eatstart0(&str, "\033[")) {
if (escape) { while (str.len && !((*str.start >= '@' && *str.start <= '~') || *str.start == 'm'))
escape = !(line[i] >= '@' && line[i] <= '~'); str = bstr_cut(str, 1);
str = bstr_cut(str, 1);
continue; continue;
} }
if (line[i] == '\033' && line[i + 1] == '[') { bstr code = bstr_split_utf8(str, &str);
escape = true; if (code.len == 0)
++i;
continue;
}
if (line[i] == '\n')
continue; continue;
if (code.len == 1 && *code.start == '\n')
continue;
// Only single-width characters are supported
width++; width++;
// Assume that everything before \r should be discarded for simplicity // Assume that everything before \r should be discarded for simplicity
if (line[i] == '\r') if (code.len == 1 && *code.start == '\r')
width = 0; width = 0;
} }
@ -389,7 +388,7 @@ static void append_terminal_line(struct mp_log *log, int lev,
bstr_xappend(root, term_msg, text); bstr_xappend(root, term_msg, text);
*line_w = root->isatty[term_msg_fileno(root, lev)] *line_w = root->isatty[term_msg_fileno(root, lev)]
? term_disp_width(*term_msg, start, term_msg->len) : 0; ? term_disp_width(bstr_splice(*term_msg, start, term_msg->len)) : 0;
} }
static struct mp_log_buffer_entry *log_buffer_read(struct mp_log_buffer *buffer) static struct mp_log_buffer_entry *log_buffer_read(struct mp_log_buffer *buffer)