CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-03-04 09:27:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add frontend_driver_attach_console/frontend_driver_detach_console

Browse Source
This commit is contained in:
twinaphex 2016-10-09 17:15:50 +02:00
parent 940fbcd4fa
commit 2a139b7d72
17 changed files with 76 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/drivers/platform_bsd.c
View File

@ -80,5 +80,7 @@ frontend_ctx_driver_t frontend_ctx_bsd = {
frontend_bsd_get_signal_handler_state,
frontend_bsd_set_signal_handler_state,
frontend_bsd_destroy_signal_handler_state,
NULL, /* attach_console */
NULL, /* detach_console */
"bsd",
};

2
frontend/drivers/platform_ctr.c
View File

@ -422,5 +422,7 @@ frontend_ctx_driver_t frontend_ctx_ctr = {
NULL, /* get_signal_handler_state */
NULL, /* set_signal_handler_state */
NULL, /* destroy_signal_handler_state */
NULL, /* attach_console */
NULL, /* detach_console */
"ctr",
};

2
frontend/drivers/platform_darwin.m
View File

@ -714,5 +714,7 @@ frontend_ctx_driver_t frontend_ctx_darwin = {
NULL, /* get_sighandler_state */
NULL, /* set_sighandler_state */
NULL, /* destroy_signal_handler_state */
NULL, /* attach_console */
NULL, /* detach_console */
"darwin",
};

2
frontend/drivers/platform_emscripten.c
View File

@ -206,5 +206,7 @@ frontend_ctx_driver_t frontend_ctx_emscripten = {
NULL, /* get_signal_handler_state */
NULL, /* set_signal_handler_state */
NULL, /* destroy_signal_handler_state */
NULL, /* attach_console */
NULL, /* detach_console */
"emscripten"
};

2
frontend/drivers/platform_gx.c
View File

@ -536,5 +536,7 @@ frontend_ctx_driver_t frontend_ctx_gx = {
NULL, /* get_sighandler_state */
NULL, /* set_sighandler_state */
NULL, /* destroy_signal_handler_state */
NULL, /* attach_console */
NULL, /* detach_console */
"gx",
};

2
frontend/drivers/platform_linux.c
View File

@ -2089,6 +2089,8 @@ frontend_ctx_driver_t frontend_ctx_linux = {
frontend_linux_get_signal_handler_state,
frontend_linux_set_signal_handler_state,
frontend_linux_destroy_signal_handler_state,
NULL, /* attach_console */
NULL, /* detach_console */
#ifdef ANDROID
"android"
#else

2
frontend/drivers/platform_null.c
View File

@ -40,5 +40,7 @@ frontend_ctx_driver_t frontend_ctx_null = {
NULL, /* get_sighandler_state */
NULL, /* set_sighandler_state */
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
"null",
};

2
frontend/drivers/platform_ps3.c
View File

@ -568,5 +568,7 @@ frontend_ctx_driver_t frontend_ctx_ps3 = {
NULL, /* get_sighandler_state */
NULL, /* set_sighandler_state */
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
"ps3",
};

2
frontend/drivers/platform_psp.c
View File

@ -506,6 +506,8 @@ frontend_ctx_driver_t frontend_ctx_psp = {
NULL, /* get_sighandler_state */
NULL, /* set_sighandler_state */
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
#ifdef VITA
"vita",
#else

2
frontend/drivers/platform_qnx.c
View File

@ -90,5 +90,7 @@ frontend_ctx_driver_t frontend_ctx_qnx = {
NULL, /* get_sighandler_state */
NULL, /* set_sighandler_state */
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
"qnx",
};

21
frontend/drivers/platform_win32.c
View File

@ -320,6 +320,25 @@ static uint64_t frontend_win32_get_mem_used(void)
return ((frontend_win32_get_mem_total() - mem_info.ullAvailPhys));
}
static void frontend_win32_attach_console(void)
{
#ifdef _WIN32
AllocConsole();
AttachConsole( GetCurrentProcessId()) ;
freopen( "CON", "w", stdout );
freopen( "CON", "w", stderr );
#endif
}
static void frontend_win32_detach_console(void)
{
#if defined(_WIN32) && !defined(_XBOX)
HWND wnd = GetConsoleWindow();
FreeConsole();
PostMessage(wnd, WM_CLOSE, 0, 0);
#endif
}
frontend_ctx_driver_t frontend_ctx_win32 = {
frontend_win32_environment_get,
frontend_win32_init,
@ -342,5 +361,7 @@ frontend_ctx_driver_t frontend_ctx_win32 = {
NULL, /* get_sighandler_state */
NULL, /* set_sighandler_state */
NULL, /* destroy_sighandler_state */
frontend_win32_attach_console, /* attach_console */
frontend_win32_detach_console, /* detach_console */
"win32"
};

2
frontend/drivers/platform_xdk.cpp
View File

@ -1413,5 +1413,7 @@ frontend_ctx_driver_t frontend_ctx_xdk = {
NULL, /* get_sighandler_state */
NULL, /* set_sighandler_state */
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
"xdk",
};

2
frontend/drivers/platform_xenon.c
View File

@ -89,5 +89,7 @@ frontend_ctx_driver_t frontend_ctx_qnx = {
NULL, /* get_sighandler_state */
NULL, /* set_sighandler_state */
NULL, /* destroy_sighandler_state */
NULL, /* attach_console */
NULL, /* detach_console */
"xenon",
};

16
frontend/frontend_driver.c
View File

@ -361,6 +361,22 @@ void frontend_driver_set_signal_handler_state(int value)
frontend->set_signal_handler_state(value);
}
void frontend_driver_attach_console(void)
{
frontend_ctx_driver_t *frontend = frontend_get_ptr();
if (!frontend || !frontend->attach_console)
return;
frontend->attach_console();
}
void frontend_driver_detach_console(void)
{
frontend_ctx_driver_t *frontend = frontend_get_ptr();
if (!frontend || !frontend->detach_console)
return;
frontend->detach_console();
}
void frontend_driver_destroy_signal_handler_state(void)
{
frontend_ctx_driver_t *frontend = frontend_get_ptr();

6
frontend/frontend_driver.h
View File

@ -82,6 +82,8 @@ typedef struct frontend_ctx_driver
int (*get_signal_handler_state)(void);
void (*set_signal_handler_state)(int value);
void (*destroy_signal_handler_state)(void);
void (*attach_console)(void);
void (*detach_console)(void);
const char *ident;
@ -169,6 +171,10 @@ void frontend_driver_set_signal_handler_state(int value);
void frontend_driver_destroy_signal_handler_state(void);
void frontend_driver_attach_console(void);
void frontend_driver_detach_console(void);
RETRO_END_DECLS
#endif

4
retroarch.c
View File

@ -766,9 +766,7 @@ static void retroarch_parse_input(int argc, char *argv[])
break;
case 'D':
#if defined(_WIN32) && !defined(_XBOX)
FreeConsole();
#endif
frontend_driver_detach_console();
break;
case RA_OPT_MENU:

17
verbosity.c
View File

@ -43,6 +43,10 @@
#include "config.h"
#endif
#ifdef RARCH_INTERNAL
#include "frontend/frontend_driver.h"
#endif
#include "file_path_special.h"
#include "verbosity.h"
@ -54,21 +58,16 @@ static bool main_verbosity = false;
void verbosity_enable(void)
{
main_verbosity = true;
#ifdef _WIN32
AllocConsole();
AttachConsole( GetCurrentProcessId()) ;
freopen( "CON", "w", stdout );
freopen( "CON", "w", stderr );
#ifdef RARCH_INTERNAL
frontend_driver_attach_console();
#endif
}
void verbosity_disable(void)
{
main_verbosity = false;
#ifdef _WIN32
HWND wnd = GetConsoleWindow();
FreeConsole();
PostMessage(wnd, WM_CLOSE, 0, 0);
#ifdef RARCH_INTERNAL
frontend_driver_detach_console();
#endif
}