RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-24 15:52:25 +00:00
Code Issues Releases Wiki Activity

io/win32: move mp_attach_console to terminal-win.c

Browse Source 
Why didn't I put it there from the start?
This commit is contained in:
Martin Herkt 2014-01-16 11:25:52 +01:00
parent d5fce546a4
commit 26d6eb4a8a
4 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osdep/io.c
View File

@ -327,26 +327,4 @@ char *mp_getenv(const char *name)
return NULL;
}
void mp_attach_console(void)
{
if (AttachConsole(ATTACH_PARENT_PROCESS)) {
// We have been started by something with a console window.
// Redirect output streams to that console's low-level handles,
// so we can actually use WriteConsole later on.
int hConHandle;
intptr_t hStdio;
hStdio = (intptr_t)GetStdHandle(STD_OUTPUT_HANDLE);
hConHandle = _open_osfhandle(hStdio, _O_TEXT);
*stdout = *_fdopen(hConHandle, "w");
setvbuf(stdout, NULL, _IONBF, 0);
hStdio = (intptr_t)GetStdHandle(STD_ERROR_HANDLE);
hConHandle = _open_osfhandle(hStdio, _O_TEXT);
*stderr = *_fdopen(hConHandle, "w");
setvbuf(stderr, NULL, _IONBF, 0);
}
}
#endif // __MINGW32__

1
osdep/io.h
View File

@ -77,7 +77,6 @@ struct dirent *mp_readdir(DIR *dir);
int mp_closedir(DIR *dir);
int mp_mkdir(const char *path, int mode);
char *mp_getenv(const char *name);
void mp_attach_console(void);
// NOTE: stat is not overridden with mp_stat, because MinGW-w64 defines it as
// macro.

17
osdep/terminal-win.c
View File

@ -24,6 +24,7 @@
#include "config.h"
#include <fcntl.h>
#include <stdio.h>
#include <stdint.h>
#include <string.h>
@ -238,6 +239,22 @@ void terminal_set_foreground_color(FILE *stream, int c)
int terminal_init(void)
{
if (AttachConsole(ATTACH_PARENT_PROCESS)) {
// We have been started by something with a console window.
// Redirect output streams to that console's low-level handles,
// so we can actually use WriteConsole later on.
int hConHandle;
hConHandle = _open_osfhandle((intptr_t)hSTDOUT, _O_TEXT);
*stdout = *_fdopen(hConHandle, "w");
setvbuf(stdout, NULL, _IONBF, 0);
hConHandle = _open_osfhandle((intptr_t)hSTDERR, _O_TEXT);
*stderr = *_fdopen(hConHandle, "w");
setvbuf(stderr, NULL, _IONBF, 0);
}
CONSOLE_SCREEN_BUFFER_INFO cinfo;
DWORD cmode = 0;
GetConsoleMode(hSTDOUT, &cmode);

1
player/main.c
View File

@ -249,7 +249,6 @@ static void osdep_preinit(int *p_argc, char ***p_argv)
talloc_enable_leak_report();
#ifdef __MINGW32__
mp_attach_console();
mp_get_converted_argv(p_argc, p_argv);
#endif