mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Make list passing to menu_entries.c possible

Browse Source
This commit is contained in:
twinaphex 2014-09-02 15:15:05 +02:00
parent 040b3523c4
commit ab49946c29
4 changed files with 253 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/menu/backend/menu_common_backend.c
View File

@ -1480,7 +1480,8 @@ static int menu_settings_iterate(unsigned action)
if (driver.menu->need_refresh && (menu_parse_check(label, menu_type) == -1))
{
driver.menu->need_refresh = false;
menu_entries_push_list(driver.menu, path, label, menu_type);
menu_entries_push_list(driver.menu,
driver.menu->selection_buf, path, label, menu_type);
}
if (driver.menu_ctx && driver.menu_ctx->render)
@ -2179,7 +2180,7 @@ static int menu_common_iterate(unsigned action)
if (driver.menu->need_refresh)
{
if (menu_parse_and_resolve() == 0)
if (menu_parse_and_resolve(driver.menu->selection_buf) == 0)
driver.menu->need_refresh = false;
}

3
frontend/menu/menu_common.c
View File

@ -274,7 +274,8 @@ void *menu_init(const void *data)
menu->push_start_screen = g_settings.menu_show_start_screen;
g_settings.menu_show_start_screen = false;
menu_entries_push_list(menu, "", "mainmenu", 0);
menu_entries_push_list(menu, menu->selection_buf,
"", "mainmenu", 0);
menu->trigger_state = 0;
menu->old_input_state = 0;

484
frontend/menu/menu_entries.c
View File

@ -19,17 +19,16 @@
#include "../../settings_data.h"
#include "../../file_ext.h"
static void entries_refresh(void)
static void entries_refresh(file_list_t *list)
{
/* Before a refresh, we could have deleted a file on disk, causing
* selection_ptr to suddendly be out of range.
* Ensure it doesn't overflow. */
if (driver.menu->selection_ptr >= file_list_get_size(
driver.menu->selection_buf) &&
file_list_get_size(driver.menu->selection_buf))
menu_set_navigation(driver.menu, file_list_get_size(driver.menu->selection_buf) - 1);
else if (!file_list_get_size(driver.menu->selection_buf))
if (driver.menu->selection_ptr >= file_list_get_size(list)
&& file_list_get_size(list))
menu_set_navigation(driver.menu, file_list_get_size(list) - 1);
else if (!file_list_get_size(list))
menu_clear_navigation(driver.menu);
}
@ -45,6 +44,7 @@ static inline struct gfx_shader *shader_manager_get_current_shader(
}
static void add_setting_entry(menu_handle_t *menu,
file_list_t *list,
const char *label, unsigned id,
rarch_setting_t *settings)
{
@ -52,11 +52,12 @@ static void add_setting_entry(menu_handle_t *menu,
setting_data_find_setting(settings, label);
if (setting)
file_list_push(menu->selection_buf, setting->short_description,
file_list_push(list, setting->short_description,
setting->name, id, 0);
}
void menu_entries_push_perfcounter(menu_handle_t *menu,
file_list_t *list,
const struct retro_perf_counter **counters,
unsigned num, unsigned id)
{
@ -66,7 +67,7 @@ void menu_entries_push_perfcounter(menu_handle_t *menu,
for (i = 0; i < num; i++)
if (counters[i] && counters[i]->ident)
file_list_push(menu->selection_buf, counters[i]->ident, "",
file_list_push(list, counters[i]->ident, "",
id + i, 0);
}
@ -80,6 +81,7 @@ void menu_entries_pop(void)
}
int menu_entries_push_list(menu_handle_t *menu,
file_list_t *list,
const char *path, const char *label,
unsigned menu_type)
{
@ -99,55 +101,55 @@ int menu_entries_push_list(menu_handle_t *menu,
if (!strcmp(label, "mainmenu"))
{
setting_data = (rarch_setting_t *)setting_data_get_mainmenu(true);
file_list_clear(menu->selection_buf);
add_setting_entry(menu,"core_list", MENU_SETTINGS_CORE, setting_data);
add_setting_entry(menu,"history_list", MENU_SETTINGS_OPEN_HISTORY, setting_data);
add_setting_entry(menu,"detect_core_list", 0, setting_data);
add_setting_entry(menu,"load_content", 0, setting_data);
add_setting_entry(menu,"core_options", MENU_SETTINGS_CORE_OPTIONS, setting_data);
add_setting_entry(menu,"core_information", MENU_SETTINGS_CORE_INFO, setting_data);
add_setting_entry(menu,"settings", MENU_SETTINGS_OPTIONS, setting_data);
add_setting_entry(menu,"performance_counters", MENU_SETTINGS_PERFORMANCE_COUNTERS, setting_data);
add_setting_entry(menu,"savestate", 0, setting_data);
add_setting_entry(menu,"loadstate", 0, setting_data);
add_setting_entry(menu,"take_screenshot", 0, setting_data);
add_setting_entry(menu,"resume_content", 0, setting_data);
add_setting_entry(menu,"restart_content", 0, setting_data);
add_setting_entry(menu,"restart_retroarch", 0, setting_data);
add_setting_entry(menu,"configurations", MENU_SETTINGS_CONFIG, setting_data);
add_setting_entry(menu,"save_new_config", 0, setting_data);
add_setting_entry(menu,"help", 0, setting_data);
add_setting_entry(menu,"quit_retroarch", 0, setting_data);
file_list_clear(list);
add_setting_entry(menu,list,"core_list", MENU_SETTINGS_CORE, setting_data);
add_setting_entry(menu,list,"history_list", MENU_SETTINGS_OPEN_HISTORY, setting_data);
add_setting_entry(menu,list,"detect_core_list", 0, setting_data);
add_setting_entry(menu,list,"load_content", 0, setting_data);
add_setting_entry(menu,list,"core_options", MENU_SETTINGS_CORE_OPTIONS, setting_data);
add_setting_entry(menu,list,"core_information", MENU_SETTINGS_CORE_INFO, setting_data);
add_setting_entry(menu,list,"settings", MENU_SETTINGS_OPTIONS, setting_data);
add_setting_entry(menu,list,"performance_counters", MENU_SETTINGS_PERFORMANCE_COUNTERS, setting_data);
add_setting_entry(menu,list,"savestate", 0, setting_data);
add_setting_entry(menu,list,"loadstate", 0, setting_data);
add_setting_entry(menu,list,"take_screenshot", 0, setting_data);
add_setting_entry(menu,list,"resume_content", 0, setting_data);
add_setting_entry(menu,list,"restart_content", 0, setting_data);
add_setting_entry(menu,list,"restart_retroarch", 0, setting_data);
add_setting_entry(menu,list,"configurations", MENU_SETTINGS_CONFIG, setting_data);
add_setting_entry(menu,list,"save_new_config", 0, setting_data);
add_setting_entry(menu,list,"help", 0, setting_data);
add_setting_entry(menu,list,"quit_retroarch", 0, setting_data);
}
else if (!strcmp(path, "General Options"))
{
file_list_clear(menu->selection_buf);
add_setting_entry(menu,"libretro_log_level", 0, setting_data);
add_setting_entry(menu,"log_verbosity", 0, setting_data);
add_setting_entry(menu,"perfcnt_enable", 0, setting_data);
add_setting_entry(menu,"game_history_size", 0, setting_data);
add_setting_entry(menu,"config_save_on_exit", 0, setting_data);
add_setting_entry(menu,"core_specific_config", 0, setting_data);
add_setting_entry(menu,"video_gpu_screenshot", 0, setting_data);
add_setting_entry(menu,"dummy_on_core_shutdown", 0, setting_data);
add_setting_entry(menu,"fps_show", 0, setting_data);
add_setting_entry(menu,"fastforward_ratio", 0, setting_data);
add_setting_entry(menu,"slowmotion_ratio", 0, setting_data);
add_setting_entry(menu,"rewind_enable", 0, setting_data);
add_setting_entry(menu,"rewind_granularity", 0, setting_data);
add_setting_entry(menu,"block_sram_overwrite", 0, setting_data);
add_setting_entry(menu,"autosave_interval", 0, setting_data);
add_setting_entry(menu,"video_disable_composition", 0, setting_data);
add_setting_entry(menu,"pause_nonactive", 0, setting_data);
add_setting_entry(menu,"savestate_auto_save", 0, setting_data);
add_setting_entry(menu,"savestate_auto_load", 0, setting_data);
file_list_clear(list);
add_setting_entry(menu,list,"libretro_log_level", 0, setting_data);
add_setting_entry(menu,list,"log_verbosity", 0, setting_data);
add_setting_entry(menu,list,"perfcnt_enable", 0, setting_data);
add_setting_entry(menu,list,"game_history_size", 0, setting_data);
add_setting_entry(menu,list,"config_save_on_exit", 0, setting_data);
add_setting_entry(menu,list,"core_specific_config", 0, setting_data);
add_setting_entry(menu,list,"video_gpu_screenshot", 0, setting_data);
add_setting_entry(menu,list,"dummy_on_core_shutdown", 0, setting_data);
add_setting_entry(menu,list,"fps_show", 0, setting_data);
add_setting_entry(menu,list,"fastforward_ratio", 0, setting_data);
add_setting_entry(menu,list,"slowmotion_ratio", 0, setting_data);
add_setting_entry(menu,list,"rewind_enable", 0, setting_data);
add_setting_entry(menu,list,"rewind_granularity", 0, setting_data);
add_setting_entry(menu,list,"block_sram_overwrite", 0, setting_data);
add_setting_entry(menu,list,"autosave_interval", 0, setting_data);
add_setting_entry(menu,list,"video_disable_composition", 0, setting_data);
add_setting_entry(menu,list,"pause_nonactive", 0, setting_data);
add_setting_entry(menu,list,"savestate_auto_save", 0, setting_data);
add_setting_entry(menu,list,"savestate_auto_load", 0, setting_data);
}
else
{
switch (menu_type)
{
case MENU_SETTINGS_OPEN_HISTORY:
file_list_clear(driver.menu->selection_buf);
file_list_clear(list);
list_size = content_playlist_size(g_extern.history);
for (i = 0; i < list_size; i++)
@ -170,7 +172,7 @@ int menu_entries_push_list(menu_handle_t *menu,
path_short, core_name);
}
file_list_push(driver.menu->selection_buf, fill_buf, "",
file_list_push(list, fill_buf, "",
MENU_FILE_PLAIN, 0);
do_action = true;
@ -179,17 +181,17 @@ int menu_entries_push_list(menu_handle_t *menu,
case MENU_SETTINGS_DEFERRED_CORE:
{
const core_info_t *info = NULL;
file_list_clear(driver.menu->selection_buf);
file_list_clear(list);
core_info_list_get_supported_cores(driver.menu->core_info,
driver.menu->deferred_path, &info, &list_size);
for (i = 0; i < list_size; i++)
{
file_list_push(driver.menu->selection_buf, info[i].path, "",
file_list_push(list, info[i].path, "",
MENU_FILE_PLAIN, 0);
file_list_set_alt_at_offset(driver.menu->selection_buf, i,
file_list_set_alt_at_offset(list, i,
info[i].display_name);
}
file_list_sort_on_alt(driver.menu->selection_buf);
file_list_sort_on_alt(list);
do_action = true;
}
@ -197,14 +199,14 @@ int menu_entries_push_list(menu_handle_t *menu,
case MENU_SETTINGS_SHADER_PARAMETERS:
case MENU_SETTINGS_SHADER_PRESET_PARAMETERS:
{
file_list_clear(menu->selection_buf);
file_list_clear(list);
struct gfx_shader *shader = (struct gfx_shader*)
shader_manager_get_current_shader(menu, menu_type);
if (shader)
for (i = 0; i < shader->num_parameters; i++)
file_list_push(menu->selection_buf,
file_list_push(list,
shader->parameters[i].desc, "",
MENU_SETTINGS_SHADER_PARAMETER_0 + i, 0);
menu->parameter_shader = shader;
@ -217,20 +219,20 @@ int menu_entries_push_list(menu_handle_t *menu,
if (!shader)
return -1;
file_list_clear(menu->selection_buf);
file_list_push(menu->selection_buf, "Apply Shader Changes", "",
file_list_clear(list);
file_list_push(list, "Apply Shader Changes", "",
MENU_SETTINGS_SHADER_APPLY, 0);
file_list_push(menu->selection_buf, "Default Filter", "",
file_list_push(list, "Default Filter", "",
MENU_SETTINGS_SHADER_FILTER, 0);
file_list_push(menu->selection_buf, "Load Shader Preset", "",
file_list_push(list, "Load Shader Preset", "",
MENU_SETTINGS_SHADER_PRESET, 0);
file_list_push(menu->selection_buf, "Save As Shader Preset", "",
file_list_push(list, "Save As Shader Preset", "",
MENU_SETTINGS_SHADER_PRESET_SAVE, 0);
file_list_push(menu->selection_buf, "Parameters (Current)", "",
file_list_push(list, "Parameters (Current)", "",
MENU_SETTINGS_SHADER_PARAMETERS, 0);
file_list_push(menu->selection_buf, "Parameters (Menu)", "",
file_list_push(list, "Parameters (Menu)", "",
MENU_SETTINGS_SHADER_PRESET_PARAMETERS, 0);
file_list_push(menu->selection_buf, "Shader Passes", "",
file_list_push(list, "Shader Passes", "",
MENU_SETTINGS_SHADER_PASSES, 0);
for (i = 0; i < shader->passes; i++)
@ -238,61 +240,61 @@ int menu_entries_push_list(menu_handle_t *menu,
char buf[64];
snprintf(buf, sizeof(buf), "Shader #%u", i);
file_list_push(menu->selection_buf, buf, "",
file_list_push(list, buf, "",
MENU_SETTINGS_SHADER_0 + 3 * i, 0);
snprintf(buf, sizeof(buf), "Shader #%u Filter", i);
file_list_push(menu->selection_buf, buf, "",
file_list_push(list, buf, "",
MENU_SETTINGS_SHADER_0_FILTER + 3 * i, 0);
snprintf(buf, sizeof(buf), "Shader #%u Scale", i);
file_list_push(menu->selection_buf, buf, "",
file_list_push(list, buf, "",
MENU_SETTINGS_SHADER_0_SCALE + 3 * i, 0);
}
}
break;
case MENU_SETTINGS_VIDEO_OPTIONS:
file_list_clear(menu->selection_buf);
add_setting_entry(menu,"video_shared_context", 0, setting_data);
file_list_clear(list);
add_setting_entry(menu,list,"video_shared_context", 0, setting_data);
#if defined(GEKKO) || defined(__CELLOS_LV2__)
file_list_push(menu->selection_buf, "Screen Resolution", "",
file_list_push(list, "Screen Resolution", "",
MENU_SETTINGS_VIDEO_RESOLUTION, 0);
#endif
add_setting_entry(menu,"video_viwidth", 0, setting_data);
add_setting_entry(menu,"video_filter", MENU_SETTINGS_VIDEO_SOFTFILTER, setting_data);
add_setting_entry(menu, "pal60_enable", 0, setting_data);
add_setting_entry(menu,"video_smooth", 0, setting_data);
add_setting_entry(menu, "soft_filter", 0, setting_data);
add_setting_entry(menu,"video_gamma", 0, setting_data);
add_setting_entry(menu,"video_filter_flicker", 0,
add_setting_entry(menu,list,"video_viwidth", 0, setting_data);
add_setting_entry(menu,list,"video_filter", MENU_SETTINGS_VIDEO_SOFTFILTER, setting_data);
add_setting_entry(menu,list, "pal60_enable", 0, setting_data);
add_setting_entry(menu,list,"video_smooth", 0, setting_data);
add_setting_entry(menu,list, "soft_filter", 0, setting_data);
add_setting_entry(menu,list,"video_gamma", 0, setting_data);
add_setting_entry(menu,list,"video_filter_flicker", 0,
setting_data);
add_setting_entry(menu,"video_scale_integer", 0, setting_data);
add_setting_entry(menu,"aspect_ratio_index", 0, setting_data);
file_list_push(menu->selection_buf, "Custom Ratio", "",
add_setting_entry(menu,list,"video_scale_integer", 0, setting_data);
add_setting_entry(menu,list,"aspect_ratio_index", 0, setting_data);
file_list_push(list, "Custom Ratio", "",
MENU_SETTINGS_CUSTOM_VIEWPORT, 0);
add_setting_entry(menu,"video_fullscreen", 0, setting_data);
add_setting_entry(menu,"video_windowed_fullscreen", 0, setting_data);
add_setting_entry(menu,"video_rotation", 0, setting_data);
add_setting_entry(menu,"video_vsync", 0, setting_data);
add_setting_entry(menu,"video_hard_sync", 0, setting_data);
add_setting_entry(menu,"video_hard_sync_frames", 0, setting_data);
add_setting_entry(menu,"video_frame_delay", 0, setting_data);
add_setting_entry(menu,"video_black_frame_insertion", 0, setting_data);
add_setting_entry(menu,"video_swap_interval", 0, setting_data);
add_setting_entry(menu,"video_threaded", 0, setting_data);
add_setting_entry(menu,"video_scale", 0, setting_data);
add_setting_entry(menu,"video_crop_overscan", 0, setting_data);
add_setting_entry(menu,"video_monitor_index", 0, setting_data);
add_setting_entry(menu,"video_refresh_rate", 0, setting_data);
add_setting_entry(menu,"video_refresh_rate_auto", 0, setting_data);
add_setting_entry(menu,list,"video_fullscreen", 0, setting_data);
add_setting_entry(menu,list,"video_windowed_fullscreen", 0, setting_data);
add_setting_entry(menu,list,"video_rotation", 0, setting_data);
add_setting_entry(menu,list,"video_vsync", 0, setting_data);
add_setting_entry(menu,list,"video_hard_sync", 0, setting_data);
add_setting_entry(menu,list,"video_hard_sync_frames", 0, setting_data);
add_setting_entry(menu,list,"video_frame_delay", 0, setting_data);
add_setting_entry(menu,list,"video_black_frame_insertion", 0, setting_data);
add_setting_entry(menu,list,"video_swap_interval", 0, setting_data);
add_setting_entry(menu,list,"video_threaded", 0, setting_data);
add_setting_entry(menu,list,"video_scale", 0, setting_data);
add_setting_entry(menu,list,"video_crop_overscan", 0, setting_data);
add_setting_entry(menu,list,"video_monitor_index", 0, setting_data);
add_setting_entry(menu,list,"video_refresh_rate", 0, setting_data);
add_setting_entry(menu,list,"video_refresh_rate_auto", 0, setting_data);
break;
case MENU_SETTINGS_FONT_OPTIONS:
file_list_clear(menu->selection_buf);
add_setting_entry(menu,"video_font_enable", 0, setting_data);
add_setting_entry(menu,"video_font_size", 0, setting_data);
file_list_clear(list);
add_setting_entry(menu,list,"video_font_enable", 0, setting_data);
add_setting_entry(menu,list,"video_font_size", 0, setting_data);
break;
case MENU_SETTINGS_CORE_OPTIONS:
file_list_clear(menu->selection_buf);
file_list_clear(list);
if (g_extern.system.core_options)
{
@ -300,24 +302,24 @@ int menu_entries_push_list(menu_handle_t *menu,
opts = core_option_size(g_extern.system.core_options);
for (i = 0; i < opts; i++)
file_list_push(menu->selection_buf,
file_list_push(list,
core_option_get_desc(g_extern.system.core_options, i), "",
MENU_SETTINGS_CORE_OPTION_START + i, 0);
}
else
file_list_push(menu->selection_buf, "No options available.", "",
file_list_push(list, "No options available.", "",
MENU_SETTINGS_CORE_OPTION_NONE, 0);
break;
case MENU_SETTINGS_CORE_INFO:
{
core_info_t *info = (core_info_t*)menu->core_info_current;
file_list_clear(menu->selection_buf);
file_list_clear(list);
if (info->data)
{
snprintf(tmp, sizeof(tmp), "Core name: %s",
info->display_name ? info->display_name : "");
file_list_push(menu->selection_buf, tmp, "",
file_list_push(list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0);
if (info->authors_list)
@ -325,7 +327,7 @@ int menu_entries_push_list(menu_handle_t *menu,
strlcpy(tmp, "Authors: ", sizeof(tmp));
string_list_join_concat(tmp, sizeof(tmp),
info->authors_list, ", ");
file_list_push(menu->selection_buf, tmp, "",
file_list_push(list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0);
}
@ -334,7 +336,7 @@ int menu_entries_push_list(menu_handle_t *menu,
strlcpy(tmp, "Permissions: ", sizeof(tmp));
string_list_join_concat(tmp, sizeof(tmp),
info->permissions_list, ", ");
file_list_push(menu->selection_buf, tmp, "",
file_list_push(list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0);
}
@ -343,7 +345,7 @@ int menu_entries_push_list(menu_handle_t *menu,
strlcpy(tmp, "Supported extensions: ", sizeof(tmp));
string_list_join_concat(tmp, sizeof(tmp),
info->supported_extensions_list, ", ");
file_list_push(menu->selection_buf, tmp, "",
file_list_push(list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0);
}
@ -352,7 +354,7 @@ int menu_entries_push_list(menu_handle_t *menu,
core_info_list_update_missing_firmware(menu->core_info, info->path,
g_settings.system_directory);
file_list_push(menu->selection_buf, "Firmware: ", "",
file_list_push(list, "Firmware: ", "",
MENU_SETTINGS_CORE_INFO_NONE, 0);
for (i = 0; i < info->firmware_count; i++)
{
@ -360,7 +362,7 @@ int menu_entries_push_list(menu_handle_t *menu,
{
snprintf(tmp, sizeof(tmp), " name: %s",
info->firmware[i].desc ? info->firmware[i].desc : "");
file_list_push(menu->selection_buf, tmp, "",
file_list_push(list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0);
snprintf(tmp, sizeof(tmp), " status: %s, %s",
@ -368,7 +370,7 @@ int menu_entries_push_list(menu_handle_t *menu,
"missing" : "present",
info->firmware[i].optional ?
"optional" : "required");
file_list_push(menu->selection_buf, tmp, "",
file_list_push(list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0);
}
}
@ -377,175 +379,175 @@ int menu_entries_push_list(menu_handle_t *menu,
if (info->notes)
{
snprintf(tmp, sizeof(tmp), "Core notes: ");
file_list_push(menu->selection_buf, tmp, "",
file_list_push(list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0);
for (i = 0; i < info->note_list->size; i++)
{
snprintf(tmp, sizeof(tmp), " %s",
info->note_list->elems[i].data);
file_list_push(menu->selection_buf, tmp, "",
file_list_push(list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0);
}
}
}
else
file_list_push(menu->selection_buf,
file_list_push(list,
"No information available.", "",
MENU_SETTINGS_CORE_OPTION_NONE, 0);
}
break;
case MENU_SETTINGS_OPTIONS:
file_list_clear(menu->selection_buf);
add_setting_entry(menu,"Driver Options", MENU_SETTINGS_DRIVERS, setting_data);
add_setting_entry(menu,"General Options", MENU_SETTINGS_GENERAL_OPTIONS, setting_data);
add_setting_entry(menu,"Video Options", MENU_SETTINGS_VIDEO_OPTIONS, setting_data);
add_setting_entry(menu,"Shader Options", MENU_SETTINGS_SHADER_OPTIONS, setting_data);
add_setting_entry(menu,"Font Options", MENU_SETTINGS_FONT_OPTIONS, setting_data);
add_setting_entry(menu,"Audio Options", MENU_SETTINGS_AUDIO_OPTIONS, setting_data);
add_setting_entry(menu,"Input Options", MENU_SETTINGS_INPUT_OPTIONS, setting_data);
add_setting_entry(menu,"Overlay Options", MENU_SETTINGS_OVERLAY_OPTIONS,
file_list_clear(list);
add_setting_entry(menu,list,"Driver Options", MENU_SETTINGS_DRIVERS, setting_data);
add_setting_entry(menu,list,"General Options", MENU_SETTINGS_GENERAL_OPTIONS, setting_data);
add_setting_entry(menu,list,"Video Options", MENU_SETTINGS_VIDEO_OPTIONS, setting_data);
add_setting_entry(menu,list,"Shader Options", MENU_SETTINGS_SHADER_OPTIONS, setting_data);
add_setting_entry(menu,list,"Font Options", MENU_SETTINGS_FONT_OPTIONS, setting_data);
add_setting_entry(menu,list,"Audio Options", MENU_SETTINGS_AUDIO_OPTIONS, setting_data);
add_setting_entry(menu,list,"Input Options", MENU_SETTINGS_INPUT_OPTIONS, setting_data);
add_setting_entry(menu,list,"Overlay Options", MENU_SETTINGS_OVERLAY_OPTIONS,
setting_data);
add_setting_entry(menu,"User Options", MENU_SETTINGS_USER_OPTIONS, setting_data);
add_setting_entry(menu,"Netplay Options", MENU_SETTINGS_NETPLAY_OPTIONS,
add_setting_entry(menu,list,"User Options", MENU_SETTINGS_USER_OPTIONS, setting_data);
add_setting_entry(menu,list,"Netplay Options", MENU_SETTINGS_NETPLAY_OPTIONS,
setting_data);
add_setting_entry(menu,"Path Options", MENU_SETTINGS_PATH_OPTIONS, setting_data);
add_setting_entry(menu,list,"Path Options", MENU_SETTINGS_PATH_OPTIONS, setting_data);
if (g_extern.main_is_init && !g_extern.libretro_dummy)
{
if (g_extern.system.disk_control.get_num_images)
file_list_push(menu->selection_buf, "Disk Options", "",
file_list_push(list, "Disk Options", "",
MENU_SETTINGS_DISK_OPTIONS, 0);
}
add_setting_entry(menu,"Privacy Options", MENU_SETTINGS_PRIVACY_OPTIONS,
add_setting_entry(menu,list,"Privacy Options", MENU_SETTINGS_PRIVACY_OPTIONS,
setting_data);
break;
case MENU_SETTINGS_PRIVACY_OPTIONS:
file_list_clear(menu->selection_buf);
add_setting_entry(menu,"camera_allow", 0, setting_data);
add_setting_entry(menu,"location_allow", 0, setting_data);
file_list_clear(list);
add_setting_entry(menu,list,"camera_allow", 0, setting_data);
add_setting_entry(menu,list,"location_allow", 0, setting_data);
break;
case MENU_SETTINGS_DISK_OPTIONS:
file_list_clear(menu->selection_buf);
file_list_push(menu->selection_buf, "Disk Index", "",
file_list_clear(list);
file_list_push(list, "Disk Index", "",
MENU_SETTINGS_DISK_INDEX, 0);
file_list_push(menu->selection_buf, "Disk Image Append", "",
file_list_push(list, "Disk Image Append", "",
MENU_SETTINGS_DISK_APPEND, 0);
break;
case MENU_SETTINGS_OVERLAY_OPTIONS:
file_list_clear(menu->selection_buf);
add_setting_entry(menu,"input_overlay", MENU_SETTINGS_OVERLAY_PRESET,
file_list_clear(list);
add_setting_entry(menu,list,"input_overlay", MENU_SETTINGS_OVERLAY_PRESET,
setting_data);
add_setting_entry(menu,"input_overlay_opacity", 0, setting_data);
add_setting_entry(menu,"input_overlay_scale", 0, setting_data);
add_setting_entry(menu,list,"input_overlay_opacity", 0, setting_data);
add_setting_entry(menu,list,"input_overlay_scale", 0, setting_data);
break;
case MENU_SETTINGS_USER_OPTIONS:
file_list_clear(menu->selection_buf);
add_setting_entry(menu,"netplay_nickname", 0, setting_data);
add_setting_entry(menu,"user_language", 0, setting_data);
file_list_clear(list);
add_setting_entry(menu,list,"netplay_nickname", 0, setting_data);
add_setting_entry(menu,list,"user_language", 0, setting_data);
break;
case MENU_SETTINGS_NETPLAY_OPTIONS:
file_list_clear(menu->selection_buf);
add_setting_entry(menu,"netplay_enable", 0, setting_data);
add_setting_entry(menu,"netplay_mode", 0, setting_data);
add_setting_entry(menu,"netplay_spectator_mode_enable", 0, setting_data);
add_setting_entry(menu,"netplay_ip_address", 0, setting_data);
add_setting_entry(menu,"netplay_tcp_udp_port", 0, setting_data);
add_setting_entry(menu,"netplay_delay_frames", 0, setting_data);
file_list_clear(list);
add_setting_entry(menu,list,"netplay_enable", 0, setting_data);
add_setting_entry(menu,list,"netplay_mode", 0, setting_data);
add_setting_entry(menu,list,"netplay_spectator_mode_enable", 0, setting_data);
add_setting_entry(menu,list,"netplay_ip_address", 0, setting_data);
add_setting_entry(menu,list,"netplay_tcp_udp_port", 0, setting_data);
add_setting_entry(menu,list,"netplay_delay_frames", 0, setting_data);
break;
case MENU_SETTINGS_PATH_OPTIONS:
file_list_clear(menu->selection_buf);
add_setting_entry(menu,"rgui_browser_directory",
file_list_clear(list);
add_setting_entry(menu,list,"rgui_browser_directory",
MENU_BROWSER_DIR_PATH, setting_data);
add_setting_entry(menu,"content_directory",
add_setting_entry(menu,list,"content_directory",
MENU_CONTENT_DIR_PATH, setting_data);
add_setting_entry(menu,"assets_directory",
add_setting_entry(menu,list,"assets_directory",
MENU_ASSETS_DIR_PATH, setting_data);
add_setting_entry(menu,"rgui_config_directory",
add_setting_entry(menu,list,"rgui_config_directory",
MENU_CONFIG_DIR_PATH, setting_data);
add_setting_entry(menu,"libretro_dir_path",
add_setting_entry(menu,list,"libretro_dir_path",
MENU_LIBRETRO_DIR_PATH, setting_data);
add_setting_entry(menu,"libretro_info_path",
add_setting_entry(menu,list,"libretro_info_path",
MENU_LIBRETRO_INFO_DIR_PATH, setting_data);
add_setting_entry(menu,"game_history_path",
add_setting_entry(menu,list,"game_history_path",
MENU_CONTENT_HISTORY_PATH, setting_data);
add_setting_entry(menu,"video_filter_dir",
add_setting_entry(menu,list,"video_filter_dir",
MENU_FILTER_DIR_PATH, setting_data);
add_setting_entry(menu,"audio_filter_dir",
add_setting_entry(menu,list,"audio_filter_dir",
MENU_DSP_FILTER_DIR_PATH, setting_data);
add_setting_entry(menu,"video_shader_dir", MENU_SHADER_DIR_PATH, setting_data);
add_setting_entry(menu,"savestate_directory", MENU_SAVESTATE_DIR_PATH,
add_setting_entry(menu,list,"video_shader_dir", MENU_SHADER_DIR_PATH, setting_data);
add_setting_entry(menu,list,"savestate_directory", MENU_SAVESTATE_DIR_PATH,
setting_data);
add_setting_entry(menu,"savefile_directory", MENU_SAVEFILE_DIR_PATH, setting_data);
add_setting_entry(menu,"overlay_directory", MENU_OVERLAY_DIR_PATH, setting_data);
add_setting_entry(menu,"system_directory", MENU_SYSTEM_DIR_PATH, setting_data);
add_setting_entry(menu,"screenshot_directory", MENU_SCREENSHOT_DIR_PATH,
add_setting_entry(menu,list,"savefile_directory", MENU_SAVEFILE_DIR_PATH, setting_data);
add_setting_entry(menu,list,"overlay_directory", MENU_OVERLAY_DIR_PATH, setting_data);
add_setting_entry(menu,list,"system_directory", MENU_SYSTEM_DIR_PATH, setting_data);
add_setting_entry(menu,list,"screenshot_directory", MENU_SCREENSHOT_DIR_PATH,
setting_data);
add_setting_entry(menu,"joypad_autoconfig_dir", MENU_AUTOCONFIG_DIR_PATH,
add_setting_entry(menu,list,"joypad_autoconfig_dir", MENU_AUTOCONFIG_DIR_PATH,
setting_data);
add_setting_entry(menu,"extraction_directory", MENU_EXTRACTION_DIR_PATH,
add_setting_entry(menu,list,"extraction_directory", MENU_EXTRACTION_DIR_PATH,
setting_data);
break;
case MENU_SETTINGS_INPUT_OPTIONS:
file_list_clear(menu->selection_buf);
file_list_push(menu->selection_buf, "Player", "",
file_list_clear(list);
file_list_push(list, "Player", "",
MENU_SETTINGS_BIND_PLAYER, 0);
file_list_push(menu->selection_buf, "Device", "",
file_list_push(list, "Device", "",
MENU_SETTINGS_BIND_DEVICE, 0);
file_list_push(menu->selection_buf, "Device Type", "",
file_list_push(list, "Device Type", "",
MENU_SETTINGS_BIND_DEVICE_TYPE, 0);
file_list_push(menu->selection_buf, "Analog D-pad Mode", "",
file_list_push(list, "Analog D-pad Mode", "",
MENU_SETTINGS_BIND_ANALOG_MODE, 0);
add_setting_entry(menu,"input_axis_threshold", 0, setting_data);
add_setting_entry(menu,"input_autodetect_enable", 0, setting_data);
file_list_push(menu->selection_buf, "Bind Mode", "",
add_setting_entry(menu,list,"input_axis_threshold", 0, setting_data);
add_setting_entry(menu,list,"input_autodetect_enable", 0, setting_data);
file_list_push(list, "Bind Mode", "",
MENU_SETTINGS_CUSTOM_BIND_MODE, 0);
file_list_push(menu->selection_buf, "Configure All (RetroPad)", "",
file_list_push(list, "Configure All (RetroPad)", "",
MENU_SETTINGS_CUSTOM_BIND_ALL, 0);
file_list_push(menu->selection_buf, "Default All (RetroPad)", "",
file_list_push(list, "Default All (RetroPad)", "",
MENU_SETTINGS_CUSTOM_BIND_DEFAULT_ALL, 0);
add_setting_entry(menu,"osk_enable", 0, setting_data);
add_setting_entry(menu,list,"osk_enable", 0, setting_data);
for (i = MENU_SETTINGS_BIND_BEGIN; i <= MENU_SETTINGS_BIND_ALL_LAST; i++)
file_list_push(menu->selection_buf,
file_list_push(list,
input_config_bind_map[i - MENU_SETTINGS_BIND_BEGIN].desc,
"", i, 0);
break;
case MENU_SETTINGS_AUDIO_OPTIONS:
file_list_clear(menu->selection_buf);
add_setting_entry(menu,"audio_dsp_plugin", MENU_SETTINGS_AUDIO_DSP_FILTER, setting_data);
add_setting_entry(menu,"audio_enable", 0, setting_data);
add_setting_entry(menu,"audio_mute", 0, setting_data);
add_setting_entry(menu,"audio_latency", 0, setting_data);
add_setting_entry(menu,"audio_sync", 0, setting_data);
add_setting_entry(menu,"audio_rate_control_delta", 0, setting_data);
add_setting_entry(menu,"system_bgm_enable", 0, setting_data);
add_setting_entry(menu,"audio_volume", 0, setting_data);
add_setting_entry(menu,"audio_device", 0, setting_data);
file_list_clear(list);
add_setting_entry(menu,list,"audio_dsp_plugin", MENU_SETTINGS_AUDIO_DSP_FILTER, setting_data);
add_setting_entry(menu,list,"audio_enable", 0, setting_data);
add_setting_entry(menu,list,"audio_mute", 0, setting_data);
add_setting_entry(menu,list,"audio_latency", 0, setting_data);
add_setting_entry(menu,list,"audio_sync", 0, setting_data);
add_setting_entry(menu,list,"audio_rate_control_delta", 0, setting_data);
add_setting_entry(menu,list,"system_bgm_enable", 0, setting_data);
add_setting_entry(menu,list,"audio_volume", 0, setting_data);
add_setting_entry(menu,list,"audio_device", 0, setting_data);
break;
case MENU_SETTINGS_DRIVERS:
file_list_clear(menu->selection_buf);
add_setting_entry(menu,"video_driver", 0, setting_data);
add_setting_entry(menu,"audio_driver", 0, setting_data);
add_setting_entry(menu,"audio_resampler_driver", 0, setting_data);
add_setting_entry(menu,"input_driver", 0, setting_data);
add_setting_entry(menu,"camera_driver", 0, setting_data);
add_setting_entry(menu,"location_driver", 0, setting_data);
add_setting_entry(menu,"menu_driver", 0, setting_data);
file_list_clear(list);
add_setting_entry(menu,list,"video_driver", 0, setting_data);
add_setting_entry(menu,list,"audio_driver", 0, setting_data);
add_setting_entry(menu,list,"audio_resampler_driver", 0, setting_data);
add_setting_entry(menu,list,"input_driver", 0, setting_data);
add_setting_entry(menu,list,"camera_driver", 0, setting_data);
add_setting_entry(menu,list,"location_driver", 0, setting_data);
add_setting_entry(menu,list,"menu_driver", 0, setting_data);
break;
case MENU_SETTINGS_PERFORMANCE_COUNTERS:
file_list_clear(menu->selection_buf);
file_list_push(menu->selection_buf, "Frontend Counters", "",
file_list_clear(list);
file_list_push(list, "Frontend Counters", "",
MENU_SETTINGS_PERFORMANCE_COUNTERS_FRONTEND, 0);
file_list_push(menu->selection_buf, "Core Counters", "",
file_list_push(list, "Core Counters", "",
MENU_SETTINGS_PERFORMANCE_COUNTERS_LIBRETRO, 0);
break;
case MENU_SETTINGS_PERFORMANCE_COUNTERS_LIBRETRO:
file_list_clear(menu->selection_buf);
menu_entries_push_perfcounter(menu, perf_counters_libretro,
file_list_clear(list);
menu_entries_push_perfcounter(menu, list, perf_counters_libretro,
perf_ptr_libretro, MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN);
break;
case MENU_SETTINGS_PERFORMANCE_COUNTERS_FRONTEND:
file_list_clear(menu->selection_buf);
menu_entries_push_perfcounter(menu, perf_counters_rarch,
file_list_clear(list);
menu_entries_push_perfcounter(menu, list, perf_counters_rarch,
perf_ptr_rarch, MENU_SETTINGS_PERF_COUNTERS_BEGIN);
break;
}
@ -555,9 +557,9 @@ int menu_entries_push_list(menu_handle_t *menu,
{
driver.menu->scroll_indices_size = 0;
if (menu_type != MENU_SETTINGS_OPEN_HISTORY)
menu_build_scroll_indices(driver.menu->selection_buf);
menu_build_scroll_indices(list);
entries_refresh();
entries_refresh(list);
}
if (driver.menu_ctx && driver.menu_ctx->populate_entries)
@ -582,7 +584,7 @@ int menu_parse_check(const char *label, unsigned menu_type)
return 0;
}
int menu_parse_and_resolve(void)
int menu_parse_and_resolve(file_list_t *list)
{
size_t i, list_size;
unsigned menu_type = 0;
@ -596,39 +598,39 @@ int menu_parse_and_resolve(void)
menu_type == MENU_SETTINGS_DEFERRED_CORE ||
menu_type == MENU_SETTINGS_OPEN_HISTORY
)
return menu_entries_push_list(driver.menu, dir, label, menu_type);
return menu_entries_push_list(driver.menu, list, dir, label, menu_type);
if (menu_parse_check(label, menu_type) == -1)
return - 1;
file_list_clear(driver.menu->selection_buf);
file_list_clear(list);
if (!*dir)
{
#if defined(GEKKO)
#ifdef HW_RVL
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"sd:/", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"usb:/", "", menu_type, 0);
#endif
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"carda:/", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"cardb:/", "", menu_type, 0);
#elif defined(_XBOX1)
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"C:", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"D:", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"E:", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"F:", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"G:", "", menu_type, 0);
#elif defined(_XBOX360)
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"game:", "", menu_type, 0);
#elif defined(_WIN32)
unsigned drives = GetLogicalDrives();
@ -637,48 +639,48 @@ int menu_parse_and_resolve(void)
{
drive[0] = 'A' + i;
if (drives & (1 << i))
file_list_push(driver.menu->selection_buf,
file_list_push(list,
drive, "", menu_type, 0);
}
#elif defined(__CELLOS_LV2__)
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"/app_home/", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"/dev_hdd0/", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"/dev_hdd1/", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"/host_root/", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"/dev_usb000/", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"/dev_usb001/", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"/dev_usb002/", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"/dev_usb003/", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"/dev_usb004/", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"/dev_usb005/", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"/dev_usb006/", "", menu_type, 0);
#elif defined(PSP)
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"ms0:/", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"ef0:/", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"host0:/", "", menu_type, 0);
#elif defined(IOS)
file_list_push(driver.menu->selection_buf,
file_list_push(list,
"/var/mobile/", "", menu_type, 0);
file_list_push(driver.menu->selection_buf,
file_list_push(list,
g_defaults.core_dir, "",menu_type, 0);
file_list_push(driver.menu->selection_buf, "/", "",
file_list_push(list, "/", "",
menu_type, 0);
#else
file_list_push(driver.menu->selection_buf, "/", "",
file_list_push(list, "/", "",
menu_type, 0);
#endif
return 0;
@ -736,7 +738,7 @@ int menu_parse_and_resolve(void)
dir_list_sort(str_list, true);
if (menu_common_type_is(menu_type) == MENU_FILE_DIRECTORY)
file_list_push(driver.menu->selection_buf, "<Use this directory>", "",
file_list_push(list, "<Use this directory>", "",
MENU_FILE_USE_DIRECTORY, 0);
list_size = str_list->size;
@ -760,18 +762,18 @@ int menu_parse_and_resolve(void)
/* Push menu_type further down in the chain.
* Needed for shader manager currently. */
file_list_push(driver.menu->selection_buf, path, "",
file_list_push(list, path, "",
is_dir ? menu_type : MENU_FILE_PLAIN, 0);
}
menu_entries_push_list(driver.menu, dir, label, menu_type);
menu_entries_push_list(driver.menu, list,
dir, label, menu_type);
string_list_free(str_list);
switch (menu_type)
{
case MENU_SETTINGS_CORE:
{
file_list_t *list = (file_list_t*)driver.menu->selection_buf;
file_list_get_last(driver.menu->menu_stack, &dir, NULL,
&menu_type);
list_size = file_list_get_size(list);
@ -793,16 +795,16 @@ int menu_parse_and_resolve(void)
core_path, display_name, sizeof(display_name)))
file_list_set_alt_at_offset(list, i, display_name);
}
file_list_sort_on_alt(driver.menu->selection_buf);
file_list_sort_on_alt(list);
}
break;
}
driver.menu->scroll_indices_size = 0;
if (menu_type != MENU_SETTINGS_OPEN_HISTORY)
menu_build_scroll_indices(driver.menu->selection_buf);
menu_build_scroll_indices(list);
entries_refresh();
entries_refresh(list);
return 0;
}

7
frontend/menu/menu_entries.h
View File

@ -17,18 +17,21 @@
#ifndef MENU_ENTRIES_H__
#define MENU_ENTRIES_H__
#include <stdlib.h>
#include "menu_common.h"
#include "../../file_list.h"
void menu_entries_push(file_list_t *list,
const char *path, const char *label, unsigned type,
size_t directory_ptr);
int menu_entries_push_list(menu_handle_t *menu, const char *path,
int menu_entries_push_list(menu_handle_t *menu,
file_list_t *list, const char *path,
const char *label, unsigned menu_type);
int menu_parse_check(const char *label, unsigned menu_type);
int menu_parse_and_resolve(void);
int menu_parse_and_resolve(file_list_t *list);
void menu_entries_pop(void);