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

terminal: don't print escape sequence if not tty

This commit is contained in:
Kacper Michajłow 2024-01-04 21:01:01 +01:00 committed by sfan5
parent ab60ad8619
commit 13ed292ab0
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/msg.c
View File

@ -257,7 +257,9 @@ void mp_msg_flush_status_line(struct mp_log *log, bool clear)
goto done; goto done;
if (!clear) { if (!clear) {
fprintf(stderr, TERM_ESC_RESTORE_CURSOR "\n"); if (log->root->isatty[STDERR_FILENO])
fprintf(stderr, TERM_ESC_RESTORE_CURSOR);
fprintf(stderr, "\n");
log->root->blank_lines = 0; log->root->blank_lines = 0;
log->root->status_lines = 0; log->root->status_lines = 0;
goto done; goto done;

6
osdep/terminal-unix.c
View File

@ -424,8 +424,10 @@ static MP_THREAD_VOID terminal_thread(void *ptr)
(void)read(stop_cont_pipe[0], &c, 1); (void)read(stop_cont_pipe[0], &c, 1);
if (c == PIPE_STOP) { if (c == PIPE_STOP) {
do_deactivate_getch2(); do_deactivate_getch2();
(void)write(STDERR_FILENO, TERM_ESC_RESTORE_CURSOR, if (isatty(STDERR_FILENO)) {
sizeof(TERM_ESC_RESTORE_CURSOR) - 1); (void)write(STDERR_FILENO, TERM_ESC_RESTORE_CURSOR,
sizeof(TERM_ESC_RESTORE_CURSOR) - 1);
}
// trying to reset SIGTSTP handler to default and raise it will // trying to reset SIGTSTP handler to default and raise it will
// result in a race and there's no other way to invoke the // result in a race and there's no other way to invoke the
// default handler. so just invoke SIGSTOP since it's // default handler. so just invoke SIGSTOP since it's