RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

command: don't use OSD_ASS_0 when converting lists to strings 

When converting a list to string for show-text, since
05c398fb6c the OSD_ASS_0 escape hatch
is used. This usage is problematic because the same format string is
used for print-text, which results in these ASS escape sequences
being printed in the terminal.

Also since d6610a5b2f, the print-text
output to console.lua is no longer escaped if OSD_ASS_0 is present.
This results in abnormally formated text in the console output.

Fix this by not using ASS escape sequences for this. Instead, use the
circle symbols used by the OSC, which also results in the same width
for active and inactive items.
This commit is contained in:
nanahi 2024-04-09 10:32:46 -04:00 committed by Kacper Michajłow
parent ee6794225d
commit 14462dafe4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
player/command.c
View File

@ -159,12 +159,15 @@ struct load_action {
bool play;
};
// U+279C HEAVY ROUND-TIPPED RIGHTWARDS ARROW
// U+25CB WHITE CIRCLE
// U+25CF BLACK CIRCLE
// U+00A0 NO-BREAK SPACE
#define ARROW_SP "\342\236\234\302\240"
#define WHITECIRCLE "\xe2\x97\x8b"
#define BLACKCIRCLE "\xe2\x97\x8f"
#define NBSP "\xc2\xa0"
const char list_current[] = OSD_ASS_0 ARROW_SP OSD_ASS_1;
const char list_normal[] = OSD_ASS_0 "{\\alpha&HFF}" ARROW_SP "{\\r}" OSD_ASS_1;
const char list_current[] = BLACKCIRCLE NBSP;
const char list_normal[] = WHITECIRCLE NBSP;
static int edit_filters(struct MPContext *mpctx, struct mp_log *log,
enum stream_type mediatype,