mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 03:52:22 +02:00
6759941fca
The terminal OSD code includes the handling of the terminal status line, showing player OSD messages on the terminal, and showing subtitles on terminal (the latter two only if there is no video window, or if terminal OSD is forced). This didn't handle some corner cases correctly. For example, showing an OSD message on the terminal always cleared the previous line, even if the line was an important message (or even just the command prompt, if most other messages were silenced). Attempt to handle this correctly by keeping track of how many lines the terminal OSD currently consists of. Since there could be race conditions with other messages being printed, implement this in msg.c. Now msg.c expects that MSGL_STATUS messages rewrite the status line, so the caller is forced to use a single mp_msg() call to set the status line. Instead of littering print_status() all over the place, update the status only once per playloop iteration in update_osd_msg(). In audio- only mode, the status line might now be a little bit off, but it's perhaps ok. Print the status line only if it has changed, or if another message was printed. This might help with extremely slow terminals, although in audio+video mode, it'll still be updated very often (A-V sync display changes on every frame). Instead of hardcoding the terminal sequences, use terminfo/termcap to get the sequences. Remove the --term-osd-esc option, which allowed to override the hardcoded escapes - it's useless now. The fallback for terminals with no escape sequences for moving the cursor and clearing a line is removed. This somewhat breaks status line display on these terminals, including the MS Windows console: instead of querying the terminal size and clearing the line manually by padding the output with spaces, the line is simply not cleared. I don't expect this to be a problem on UNIX, and on MS Windows we could emulate escape sequences. Note that terminal OSD (other than the status line) was broken anyway on these terminals. In osd.c, the function get_term_width() is not used anymore, so remove it. To remind us that the MS Windows console apparently adds a line break when writint the last column, adjust screen_width in terminal- win.c accordingly.
66 lines
2.0 KiB
C
66 lines
2.0 KiB
C
/*
|
|
* GyS-TermIO v2.0 (for GySmail v3)
|
|
* a very small replacement of ncurses library
|
|
*
|
|
* copyright (C) 1999 A'rpi/ESP-team
|
|
*
|
|
* This file is part of MPlayer.
|
|
*
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef MPLAYER_GETCH2_H
|
|
#define MPLAYER_GETCH2_H
|
|
|
|
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
|
|
struct input_ctx;
|
|
|
|
/* Screen size. Initialized by load_termcap() and get_screen_size() */
|
|
extern int screen_width;
|
|
extern int screen_height;
|
|
|
|
extern char *terminal_erase_to_end_of_line;
|
|
extern char *terminal_cursor_up;
|
|
|
|
/* Global initialization for terminal output. */
|
|
int terminal_init(void);
|
|
|
|
/* Setup ictx to read input commands from stdin (slave mode) */
|
|
void terminal_setup_stdin_cmd_input(struct input_ctx *ictx);
|
|
|
|
/* Setup ictx to read keys from the terminal */
|
|
void terminal_setup_getch(struct input_ctx *ictx);
|
|
|
|
/* Return whether the process has been backgrounded. */
|
|
bool terminal_in_background(void);
|
|
|
|
/* Set ANSI text foreground color. c is [-1, 7], where 0-7 are colors, and
|
|
* -1 means reset to default. stream is either stdout or stderr. */
|
|
void terminal_set_foreground_color(FILE *stream, int c);
|
|
|
|
/* Get screen-size using IOCTL call. */
|
|
void get_screen_size(void);
|
|
|
|
/* Initialize getch2 */
|
|
void getch2_enable(void);
|
|
void getch2_disable(void);
|
|
|
|
/* Enable and disable STDIN line-buffering */
|
|
void getch2_poll(void);
|
|
|
|
#endif /* MPLAYER_GETCH2_H */
|