ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(RGUI) Make it possible to change overlays from RGUI

This commit is contained in:
twinaphex 2013-05-17 23:13:09 +02:00
parent ea8aab4c42
commit 04e884a213
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/menu/menu_common.h
View File

@ -164,6 +164,9 @@ typedef enum
RGUI_SETTINGS_RESUME_GAME, RGUI_SETTINGS_RESUME_GAME,
RGUI_SETTINGS_QUIT_RARCH, RGUI_SETTINGS_QUIT_RARCH,
#ifdef HAVE_OVERLAY
RGUI_SETTINGS_OVERLAY_PRESET,
#endif
RGUI_SETTINGS_BIND_PLAYER, RGUI_SETTINGS_BIND_PLAYER,
RGUI_SETTINGS_BIND_DEVICE, RGUI_SETTINGS_BIND_DEVICE,
RGUI_SETTINGS_BIND_DEVICE_TYPE, RGUI_SETTINGS_BIND_DEVICE_TYPE,

50
frontend/menu/rgui.c
View File

@ -638,6 +638,9 @@ static void render_text(rgui_handle_t *rgui)
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
case RGUI_SETTINGS_SHADER_OPTIONS: case RGUI_SETTINGS_SHADER_OPTIONS:
case RGUI_SETTINGS_SHADER_PRESET: case RGUI_SETTINGS_SHADER_PRESET:
#endif
#ifdef HAVE_OVERLAY
case RGUI_SETTINGS_OVERLAY_PRESET:
#endif #endif
case RGUI_SETTINGS_CORE: case RGUI_SETTINGS_CORE:
case RGUI_SETTINGS_DISK_APPEND: case RGUI_SETTINGS_DISK_APPEND:
@ -986,6 +989,27 @@ static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, r
return -1; return -1;
} }
break; break;
#ifdef HAVE_OVERLAY
case RGUI_SETTINGS_OVERLAY_PRESET:
switch (action)
{
case RGUI_ACTION_OK:
rgui_list_push(rgui->menu_stack, "", setting, rgui->selection_ptr);
rgui->selection_ptr = 0;
rgui->need_refresh = true;
break;
case RGUI_ACTION_START:
#ifndef __QNX__
driver.overlay = input_overlay_new(NULL);
#endif
break;
default:
break;
}
break;
#endif
// controllers // controllers
case RGUI_SETTINGS_BIND_PLAYER: case RGUI_SETTINGS_BIND_PLAYER:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)
@ -1731,6 +1755,9 @@ static void rgui_settings_path_populate_entries(rgui_handle_t *rgui)
static void rgui_settings_controller_populate_entries(rgui_handle_t *rgui) static void rgui_settings_controller_populate_entries(rgui_handle_t *rgui)
{ {
rgui_list_clear(rgui->selection_buf); rgui_list_clear(rgui->selection_buf);
#ifdef HAVE_OVERLAY
rgui_list_push(rgui->selection_buf, "Overlay Preset", RGUI_SETTINGS_OVERLAY_PRESET, 0);
#endif
rgui_list_push(rgui->selection_buf, "Player", RGUI_SETTINGS_BIND_PLAYER, 0); rgui_list_push(rgui->selection_buf, "Player", RGUI_SETTINGS_BIND_PLAYER, 0);
rgui_list_push(rgui->selection_buf, "Device", RGUI_SETTINGS_BIND_DEVICE, 0); rgui_list_push(rgui->selection_buf, "Device", RGUI_SETTINGS_BIND_DEVICE, 0);
rgui_list_push(rgui->selection_buf, "Device Type", RGUI_SETTINGS_BIND_DEVICE_TYPE, 0); rgui_list_push(rgui->selection_buf, "Device Type", RGUI_SETTINGS_BIND_DEVICE_TYPE, 0);
@ -2045,6 +2072,9 @@ static int rgui_settings_iterate(rgui_handle_t *rgui, rgui_action_t action)
if (rgui->need_refresh && !(menu_type == RGUI_FILE_DIRECTORY || if (rgui->need_refresh && !(menu_type == RGUI_FILE_DIRECTORY ||
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
menu_type_is_shader_browser(menu_type) || menu_type_is_shader_browser(menu_type) ||
#endif
#ifdef HAVE_OVERLAY
menu_type == RGUI_SETTINGS_OVERLAY_PRESET ||
#endif #endif
menu_type == RGUI_SETTINGS_CORE || menu_type == RGUI_SETTINGS_DISK_APPEND || menu_type == RGUI_SETTINGS_CORE || menu_type == RGUI_SETTINGS_DISK_APPEND ||
menu_type == RGUI_SETTINGS_OPEN_HISTORY)) menu_type == RGUI_SETTINGS_OPEN_HISTORY))
@ -2164,6 +2194,10 @@ static bool directory_parse(rgui_handle_t *rgui, const char *directory, unsigned
exts = "cgp|glslp"; exts = "cgp|glslp";
else if (menu_type_is_shader_browser(menu_type)) else if (menu_type_is_shader_browser(menu_type))
exts = "cg|glsl"; exts = "cg|glsl";
#endif
#ifdef HAVE_OVERLAY
else if (menu_type == RGUI_SETTINGS_OVERLAY_PRESET)
exts = "cfg";
#endif #endif
else if (rgui->info.valid_extensions) else if (rgui->info.valid_extensions)
{ {
@ -2294,6 +2328,9 @@ int rgui_iterate(rgui_handle_t *rgui)
if ( if (
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
menu_type_is_shader_browser(type) || menu_type_is_shader_browser(type) ||
#endif
#ifdef HAVE_OVERLAY
type == RGUI_SETTINGS_OVERLAY_PRESET ||
#endif #endif
type == RGUI_SETTINGS_CORE || type == RGUI_SETTINGS_CORE ||
type == RGUI_SETTINGS_DISK_APPEND || type == RGUI_SETTINGS_DISK_APPEND ||
@ -2372,6 +2409,16 @@ int rgui_iterate(rgui_handle_t *rgui)
rgui_flush_menu_stack(rgui); rgui_flush_menu_stack(rgui);
} }
#ifdef HAVE_OVERLAY
else if (menu_type == RGUI_SETTINGS_OVERLAY_PRESET)
{
fill_pathname_join(g_settings.input.overlay, dir, path, sizeof(g_settings.input.overlay));
driver.overlay = input_overlay_new(g_settings.input.overlay);
if (!driver.overlay)
RARCH_ERR("Failed to load overlay.\n");
}
#endif
else if (menu_type == RGUI_SETTINGS_DISK_APPEND) else if (menu_type == RGUI_SETTINGS_DISK_APPEND)
{ {
char image[PATH_MAX]; char image[PATH_MAX];
@ -2427,6 +2474,9 @@ int rgui_iterate(rgui_handle_t *rgui)
if (rgui->need_refresh && (menu_type == RGUI_FILE_DIRECTORY || if (rgui->need_refresh && (menu_type == RGUI_FILE_DIRECTORY ||
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
menu_type_is_shader_browser(menu_type) || menu_type_is_shader_browser(menu_type) ||
#endif
#ifdef HAVE_OVERLAY
menu_type == RGUI_SETTINGS_OVERLAY_PRESET ||
#endif #endif
menu_type == RGUI_SETTINGS_CORE || menu_type == RGUI_SETTINGS_CORE ||
menu_type == RGUI_SETTINGS_OPEN_HISTORY || menu_type == RGUI_SETTINGS_OPEN_HISTORY ||