mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix disable-rgui

Browse Source
This commit is contained in:
twinaphex 2019-01-06 17:04:28 +01:00
parent ad3e66dcb0
commit 2686cf1498
5 changed files with 98 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Makefile.common
View File

@ -778,9 +778,12 @@ ifeq ($(HAVE_MENU_COMMON), 1)
menu/cbs/menu_cbs_contentlist_switch.o \ menu/cbs/menu_cbs_contentlist_switch.o \
menu/menu_displaylist.o \ menu/menu_displaylist.o \
menu/menu_animation.o \ menu/menu_animation.o \
menu/drivers_display/menu_display_null.o \
menu/drivers/menu_generic.o \ menu/drivers/menu_generic.o \
menu/drivers/null.o menu/drivers/null.o
ifeq ($(HAVE_MENU_COMMON),1)
OBJ += menu/drivers_display/menu_display_null.o
endif
endif endif
ifeq ($(HAVE_OVERLAY), 1) ifeq ($(HAVE_OVERLAY), 1)
@ -830,7 +833,7 @@ ifeq ($(HAVE_VITA2D), 1)
$(DEPS_DIR)/libvita2d/shader/texture_f_gxp.o \ $(DEPS_DIR)/libvita2d/shader/texture_f_gxp.o \
$(DEPS_DIR)/libvita2d/shader/texture_tint_f_gxp.o $(DEPS_DIR)/libvita2d/shader/texture_tint_f_gxp.o
ifeq ($(HAVE_MENU),1) ifeq ($(HAVE_MENU_COMMON),1)
OBJ += menu/drivers_display/menu_display_vita2d.o OBJ += menu/drivers_display/menu_display_vita2d.o
endif endif
@ -1114,8 +1117,10 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
gfx/common/metal/MenuDisplay.o \ gfx/common/metal/MenuDisplay.o \
gfx/common/metal_common.o \ gfx/common/metal_common.o \
gfx/drivers/metal.o \ gfx/drivers/metal.o \
menu/drivers_display/menu_display_metal.o \
gfx/drivers_font/metal_raster_font.o gfx/drivers_font/metal_raster_font.o
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/menu_display_metal.o
endif
endif endif
ifeq ($(HAVE_MPV), 1) ifeq ($(HAVE_MPV), 1)
@ -1297,16 +1302,20 @@ endif
ifeq ($(HAVE_D3D10), 1) ifeq ($(HAVE_D3D10), 1)
OBJ += gfx/drivers/d3d10.o \ OBJ += gfx/drivers/d3d10.o \
gfx/common/d3d10_common.o \ gfx/common/d3d10_common.o \
gfx/drivers_font/d3d10_font.o \ gfx/drivers_font/d3d10_font.o
menu/drivers_display/menu_display_d3d10.o ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/menu_display_d3d10.o
endif
DEFINES += -DHAVE_D3D10 DEFINES += -DHAVE_D3D10
endif endif
ifeq ($(HAVE_D3D11), 1) ifeq ($(HAVE_D3D11), 1)
OBJ += gfx/drivers/d3d11.o \ OBJ += gfx/drivers/d3d11.o \
gfx/common/d3d11_common.o \ gfx/common/d3d11_common.o \
gfx/drivers_font/d3d11_font.o \ gfx/drivers_font/d3d11_font.o
menu/drivers_display/menu_display_d3d11.o ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/menu_display_d3d11.o
endif
DEFINES += -DHAVE_D3D11 DEFINES += -DHAVE_D3D11
HAVE_SLANG = 1 HAVE_SLANG = 1
HAVE_GLSLANG = 1 HAVE_GLSLANG = 1
@ -1316,8 +1325,10 @@ endif
ifeq ($(HAVE_D3D12), 1) ifeq ($(HAVE_D3D12), 1)
OBJ += gfx/drivers/d3d12.o \ OBJ += gfx/drivers/d3d12.o \
gfx/common/d3d12_common.o \ gfx/common/d3d12_common.o \
gfx/drivers_font/d3d12_font.o \ gfx/drivers_font/d3d12_font.o
menu/drivers_display/menu_display_d3d12.o ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/menu_display_d3d12.o
endif
DEFINES += -DHAVE_D3D12 DEFINES += -DHAVE_D3D12
HAVE_SLANG = 1 HAVE_SLANG = 1
HAVE_GLSLANG = 1 HAVE_GLSLANG = 1
@ -1757,9 +1768,11 @@ ifneq ($(findstring Win32,$(OS)),)
OBJ += gfx/drivers/gdi_gfx.o \ OBJ += gfx/drivers/gdi_gfx.o \
gfx/drivers_context/gdi_ctx.o \ gfx/drivers_context/gdi_ctx.o \
gfx/drivers_font/gdi_font.o \ gfx/drivers_font/gdi_font.o \
gfx/display_servers/dispserv_win32.o \ gfx/display_servers/dispserv_win32.o
menu/drivers_display/menu_display_gdi.o
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/menu_display_gdi.o
endif
LIBS += -lmsimg32 -lhid -lsetupapi LIBS += -lmsimg32 -lhid -lsetupapi
endif endif

40
discord/discord.c
View File

@ -77,7 +77,7 @@ char* discord_get_own_avatar(void)
return user_avatar; return user_avatar;
} }
bool discord_avatar_is_ready() bool discord_avatar_is_ready(void)
{ {
return discord_avatar_ready; return discord_avatar_ready;
} }
@ -87,12 +87,14 @@ void discord_avatar_set_ready(bool ready)
discord_avatar_ready = ready; discord_avatar_ready = ready;
} }
bool discord_is_ready() bool discord_is_ready(void)
{ {
return discord_ready; return discord_ready;
} }
static bool discord_download_avatar(const char* user_id, const char* avatar_id) #ifdef HAVE_MENU
static bool discord_download_avatar(
const char* user_id, const char* avatar_id)
{ {
static char url[PATH_MAX_LENGTH]; static char url[PATH_MAX_LENGTH];
static char url_encoded[PATH_MAX_LENGTH]; static char url_encoded[PATH_MAX_LENGTH];
@ -110,8 +112,7 @@ static bool discord_download_avatar(const char* user_id, const char* avatar_id)
if(filestream_exists(full_path)) if(filestream_exists(full_path))
return true; return true;
else
{
snprintf(url, sizeof(url), "%s/%s/%s.png", cdn_url, user_id, avatar_id); snprintf(url, sizeof(url), "%s/%s/%s.png", cdn_url, user_id, avatar_id);
net_http_urlencode_full(url_encoded, url, sizeof(url_encoded)); net_http_urlencode_full(url_encoded, url, sizeof(url_encoded));
snprintf(buf, sizeof(buf), "%s.png", avatar_id); snprintf(buf, sizeof(buf), "%s.png", avatar_id);
@ -125,7 +126,7 @@ static bool discord_download_avatar(const char* user_id, const char* avatar_id)
return false; return false;
} }
} #endif
static void handle_discord_ready(const DiscordUser* connectedUser) static void handle_discord_ready(const DiscordUser* connectedUser)
{ {
@ -134,7 +135,9 @@ static void handle_discord_ready(const DiscordUser* connectedUser)
connectedUser->username, connectedUser->username,
connectedUser->discriminator, connectedUser->discriminator,
connectedUser->userId); connectedUser->userId);
#ifdef HAVE_MENU
discord_download_avatar(connectedUser->userId, connectedUser->avatar); discord_download_avatar(connectedUser->userId, connectedUser->avatar);
#endif
} }
static void handle_discord_disconnected(int errcode, const char* message) static void handle_discord_disconnected(int errcode, const char* message)
@ -149,11 +152,12 @@ static void handle_discord_error(int errcode, const char* message)
static void handle_discord_join(const char* secret) static void handle_discord_join(const char* secret)
{ {
RARCH_LOG("[Discord] join (%s)\n", secret); char tmp_hostname[32];
static struct string_list *list = NULL; static struct string_list *list = NULL;
RARCH_LOG("[Discord] join (%s)\n", secret);
list = string_split(secret, "|"); list = string_split(secret, "|");
char tmp_hostname[32];
snprintf(tmp_hostname, snprintf(tmp_hostname,
sizeof(tmp_hostname), sizeof(tmp_hostname),
"%s|%s", list->elems[0].data, list->elems[1].data); "%s|%s", list->elems[0].data, list->elems[1].data);
@ -193,6 +197,9 @@ static void handle_discord_join_request(const DiscordUser* request)
static char url_encoded[PATH_MAX_LENGTH]; static char url_encoded[PATH_MAX_LENGTH];
static char filename[PATH_MAX_LENGTH]; static char filename[PATH_MAX_LENGTH];
char buf[PATH_MAX_LENGTH]; char buf[PATH_MAX_LENGTH];
#ifdef HAVE_MENU
menu_input_ctx_line_t line;
#endif
RARCH_LOG("[Discord] join request from %s#%s - %s %s\n", RARCH_LOG("[Discord] join request from %s#%s - %s %s\n",
request->username, request->username,
@ -200,10 +207,8 @@ static void handle_discord_join_request(const DiscordUser* request)
request->userId, request->userId,
request->avatar); request->avatar);
discord_download_avatar(request->userId, request->avatar);
#ifdef HAVE_MENU #ifdef HAVE_MENU
menu_input_ctx_line_t line; discord_download_avatar(request->userId, request->avatar);
/* To-Do: needs in-game widgets /* To-Do: needs in-game widgets
rarch_menu_running(); rarch_menu_running();
*/ */
@ -257,8 +262,8 @@ void discord_update(enum discord_presence presence)
case DISCORD_PRESENCE_GAME: case DISCORD_PRESENCE_GAME:
if (core_info) if (core_info)
{ {
const char *system_id = core_info->system_id ? core_info->system_id : "core"; const char *system_id = core_info->system_id
? core_info->system_id : "core";
char *label = NULL; char *label = NULL;
playlist_t *current_playlist = playlist_get_cached(); playlist_t *current_playlist = playlist_get_cached();
@ -303,9 +308,10 @@ void discord_update(enum discord_presence presence)
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_address : room->address, room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_address : room->address,
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_port : room->port); room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_port : room->port);
{
char party_id[128]; char party_id[128];
snprintf(party_id, sizeof(party_id), "%d|%s", room->id, room->nickname);
char join_secret[128]; char join_secret[128];
snprintf(party_id, sizeof(party_id), "%d|%s", room->id, room->nickname);
snprintf(join_secret, sizeof(join_secret), "%s|%d|%s|%u|%s", snprintf(join_secret, sizeof(join_secret), "%s|%d|%s|%u|%s",
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_address : room->address, room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_address : room->address,
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_port : room->port, room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_port : room->port,
@ -317,6 +323,7 @@ void discord_update(enum discord_presence presence)
discord_presence.partyMax = 0; discord_presence.partyMax = 0;
discord_presence.partySize = 0; discord_presence.partySize = 0;
RARCH_LOG("[Discord] joining: \n Secret: %s\n Party: %s\n", discord_presence.joinSecret, discord_presence.partyId); RARCH_LOG("[Discord] joining: \n Secret: %s\n Party: %s\n", discord_presence.joinSecret, discord_presence.partyId);
}
break; break;
case DISCORD_PRESENCE_NETPLAY_HOSTING_STOPPED: case DISCORD_PRESENCE_NETPLAY_HOSTING_STOPPED:
case DISCORD_PRESENCE_NETPLAY_CLIENT: case DISCORD_PRESENCE_NETPLAY_CLIENT:
@ -333,7 +340,9 @@ void discord_update(enum discord_presence presence)
void discord_init(void) void discord_init(void)
{ {
char command[PATH_MAX_LENGTH];
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
DiscordEventHandlers handlers; DiscordEventHandlers handlers;
RARCH_LOG("[Discord] initializing ..\n"); RARCH_LOG("[Discord] initializing ..\n");
@ -349,7 +358,6 @@ void discord_init(void)
Discord_Initialize(settings->arrays.discord_app_id, &handlers, 0, NULL); Discord_Initialize(settings->arrays.discord_app_id, &handlers, 0, NULL);
char command[PATH_MAX_LENGTH];
strlcpy(command, get_retroarch_launch_arguments(), sizeof(command)); strlcpy(command, get_retroarch_launch_arguments(), sizeof(command));
RARCH_LOG("[Discord] registering startup command: %s\n", command); RARCH_LOG("[Discord] registering startup command: %s\n", command);
@ -365,7 +373,7 @@ void discord_shutdown(void)
discord_ready = false; discord_ready = false;
} }
void discord_run_callbacks() void discord_run_callbacks(void)
{ {
Discord_RunCallbacks(); Discord_RunCallbacks();
} }

5
gfx/drivers/d3d11.c
View File

@ -1402,13 +1402,16 @@ static bool d3d11_gfx_frame(
d3d11->sprites.enabled = true; d3d11->sprites.enabled = true;
#ifdef HAVE_MENU
if (d3d11->menu.enabled) if (d3d11->menu.enabled)
{ {
D3D11SetViewports(context, 1, &d3d11->viewport); D3D11SetViewports(context, 1, &d3d11->viewport);
D3D11SetVertexBuffer(context, 0, d3d11->sprites.vbo, sizeof(d3d11_sprite_t), 0); D3D11SetVertexBuffer(context, 0, d3d11->sprites.vbo, sizeof(d3d11_sprite_t), 0);
menu_driver_frame(video_info); menu_driver_frame(video_info);
} }
else if (video_info->statistics_show) else
#endif
if (video_info->statistics_show)
{ {
struct font_params* osd_params = (struct font_params*)&video_info->osd_stat_params; struct font_params* osd_params = (struct font_params*)&video_info->osd_stat_params;

5
gfx/drivers/d3d12.c
View File

@ -1470,6 +1470,7 @@ static bool d3d12_gfx_frame(
d3d12->sprites.enabled = true; d3d12->sprites.enabled = true;
#ifdef HAVE_MENU
if (d3d12->menu.enabled) if (d3d12->menu.enabled)
{ {
D3D12RSSetViewports(d3d12->queue.cmd, 1, &d3d12->chain.viewport); D3D12RSSetViewports(d3d12->queue.cmd, 1, &d3d12->chain.viewport);
@ -1477,7 +1478,9 @@ static bool d3d12_gfx_frame(
D3D12IASetVertexBuffers(d3d12->queue.cmd, 0, 1, &d3d12->sprites.vbo_view); D3D12IASetVertexBuffers(d3d12->queue.cmd, 0, 1, &d3d12->sprites.vbo_view);
menu_driver_frame(video_info); menu_driver_frame(video_info);
} }
else if (video_info->statistics_show) else
#endif
if (video_info->statistics_show)
{ {
struct font_params *osd_params = (struct font_params*) struct font_params *osd_params = (struct font_params*)
&video_info->osd_stat_params; &video_info->osd_stat_params;

2
retroarch.c
View File

@ -2590,10 +2590,10 @@ static enum runloop_state runloop_check_state(
bool focused = true; bool focused = true;
bool pause_nonactive = settings->bools.pause_nonactive; bool pause_nonactive = settings->bools.pause_nonactive;
bool fs_toggle_triggered = false; bool fs_toggle_triggered = false;
static uint64_t seq = 0;
#ifdef HAVE_MENU #ifdef HAVE_MENU
bool menu_driver_binding_state = menu_driver_is_binding_state(); bool menu_driver_binding_state = menu_driver_is_binding_state();
bool menu_is_alive = menu_driver_is_alive(); bool menu_is_alive = menu_driver_is_alive();
static uint64_t seq = 0;
#endif #endif
#ifdef HAVE_LIBNX #ifdef HAVE_LIBNX