diff --git a/Makefile b/Makefile index 196482e778..e956bdc9e0 100644 --- a/Makefile +++ b/Makefile @@ -125,7 +125,11 @@ endif OBJ += playlist.o ifeq ($(HAVE_MENU_COMMON), 1) - OBJ += frontend/menu/backend/menu_common_backend.o frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o + OBJ += frontend/menu/backend/menu_common_backend.o \ + frontend/menu/menu_input_line_cb.o \ + frontend/menu/menu_common.o \ + frontend/menu/menu_navigation.o \ + frontend/menu/menu_entries.o endif ifeq ($(HAVE_THREADS), 1) diff --git a/Makefile.emscripten b/Makefile.emscripten index 09f4f703d1..f11ecbcc22 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -4,7 +4,6 @@ OBJ = frontend/platform/platform_emscripten.o \ frontend/platform/platform_null.o \ frontend/frontend.o \ frontend/frontend_context.o \ - frontend/menu/menu_input_line_cb.o \ retroarch.o \ file.o \ file_list.o \ @@ -89,7 +88,11 @@ endif OBJ += playlist.o ifeq ($(HAVE_MENU_COMMON), 1) - OBJ += frontend/menu/backend/menu_common_backend.o frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o + OBJ += frontend/menu/backend/menu_common_backend.o \ + frontend/menu/menu_input_line_cb.o \ + frontend/menu/menu_common.o \ + frontend/menu/menu_navigation.o \ + frontend/menu/menu_entries.o endif ifeq ($(HAVE_SDL), 1) diff --git a/Makefile.win b/Makefile.win index d35dd6efda..58359b62dc 100644 --- a/Makefile.win +++ b/Makefile.win @@ -134,7 +134,11 @@ endif OBJ += playlist.o ifeq ($(HAVE_MENU_COMMON), 1) - OBJ += frontend/menu/backend/menu_common_backend.o frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o + OBJ += frontend/menu/backend/menu_common_backend.o \ + frontend/menu/menu_input_line_cb.o \ + frontend/menu/menu_common.o \ + frontend/menu/menu_navigation.o \ + frontend/menu/menu_entries.o endif ifeq ($(HAVE_SDL2), 1) diff --git a/driver_menu.h b/driver_menu.h index 1f377d49d7..ab38659fcd 100644 --- a/driver_menu.h +++ b/driver_menu.h @@ -131,7 +131,6 @@ typedef struct typedef struct menu_ctx_driver_backend { - void (*entries_init)(menu_handle_t *, unsigned); int (*iterate)(unsigned); void (*shader_manager_init)(menu_handle_t *); void (*shader_manager_get_str)(struct gfx_shader *, char *, size_t, unsigned); diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index d38179112f..731b38ffb7 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -21,6 +21,7 @@ #include #include #include "menu_common_backend.h" +#include "../menu_entries.h" #include "../menu_navigation.h" #include "../menu_input_line_cb.h" @@ -34,460 +35,6 @@ #include "../../../settings_data.h" -static inline struct gfx_shader *shader_manager_get_current_shader(menu_handle_t *menu, unsigned type) -{ - if (type == MENU_SETTINGS_SHADER_PRESET_PARAMETERS) - return menu->shader; - else if (driver.video_poke && driver.video_data && driver.video_poke->get_current_shader) - return driver.video_poke->get_current_shader(driver.video_data); - - return NULL; -} - -static void add_setting_entry(menu_handle_t *menu, const char *label, unsigned id, - rarch_setting_t *settings) -{ - rarch_setting_t *setting = (rarch_setting_t*) - setting_data_find_setting(settings, label); - - if (setting) - file_list_push(menu->selection_buf, setting->short_description, setting->name, - id, 0); -} - -static void menu_common_entries_init(menu_handle_t *menu, unsigned menu_type) -{ - unsigned i; - char tmp[256]; - rarch_setting_t *setting_data = (rarch_setting_t *)setting_data_get_list(); - - switch (menu_type) - { - case MENU_SETTINGS_SHADER_PARAMETERS: - case MENU_SETTINGS_SHADER_PRESET_PARAMETERS: - { - file_list_clear(menu->selection_buf); - - 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, - shader->parameters[i].desc, "", - MENU_SETTINGS_SHADER_PARAMETER_0 + i, 0); - menu->parameter_shader = shader; - break; - } - case MENU_SETTINGS_SHADER_OPTIONS: - { - struct gfx_shader *shader = (struct gfx_shader*)menu->shader; - - if (!shader) - return; - - file_list_clear(menu->selection_buf); - file_list_push(menu->selection_buf, "Apply Shader Changes", "", - MENU_SETTINGS_SHADER_APPLY, 0); - file_list_push(menu->selection_buf, "Default Filter", "", - MENU_SETTINGS_SHADER_FILTER, 0); - file_list_push(menu->selection_buf, "Load Shader Preset", "", - MENU_SETTINGS_SHADER_PRESET, 0); - file_list_push(menu->selection_buf, "Save As Shader Preset", "", - MENU_SETTINGS_SHADER_PRESET_SAVE, 0); - file_list_push(menu->selection_buf, "Parameters (Current)", "", - MENU_SETTINGS_SHADER_PARAMETERS, 0); - file_list_push(menu->selection_buf, "Parameters (Menu)", "", - MENU_SETTINGS_SHADER_PRESET_PARAMETERS, 0); - file_list_push(menu->selection_buf, "Shader Passes", "", - MENU_SETTINGS_SHADER_PASSES, 0); - - for (i = 0; i < shader->passes; i++) - { - char buf[64]; - - snprintf(buf, sizeof(buf), "Shader #%u", i); - file_list_push(menu->selection_buf, buf, "", - MENU_SETTINGS_SHADER_0 + 3 * i, 0); - - snprintf(buf, sizeof(buf), "Shader #%u Filter", i); - file_list_push(menu->selection_buf, buf, "", - MENU_SETTINGS_SHADER_0_FILTER + 3 * i, 0); - - snprintf(buf, sizeof(buf), "Shader #%u Scale", i); - file_list_push(menu->selection_buf, buf, "", - MENU_SETTINGS_SHADER_0_SCALE + 3 * i, 0); - } - } - break; - case MENU_SETTINGS_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); - break; - case MENU_SETTINGS_VIDEO_OPTIONS: - file_list_clear(menu->selection_buf); - add_setting_entry(menu,"video_shared_context", 0, setting_data); -#if defined(GEKKO) || defined(__CELLOS_LV2__) - file_list_push(menu->selection_buf, "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, - 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", "", - 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); - 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); - break; - case MENU_SETTINGS_CORE_OPTIONS: - file_list_clear(menu->selection_buf); - - if (g_extern.system.core_options) - { - size_t i, opts; - - opts = core_option_size(g_extern.system.core_options); - for (i = 0; i < opts; i++) - file_list_push(menu->selection_buf, - 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.", "", - 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); - - if (info->data) - { - snprintf(tmp, sizeof(tmp), "Core name: %s", - info->display_name ? info->display_name : ""); - file_list_push(menu->selection_buf, tmp, "", - MENU_SETTINGS_CORE_INFO_NONE, 0); - - if (info->authors_list) - { - strlcpy(tmp, "Authors: ", sizeof(tmp)); - string_list_join_concat(tmp, sizeof(tmp), - info->authors_list, ", "); - file_list_push(menu->selection_buf, tmp, "", - MENU_SETTINGS_CORE_INFO_NONE, 0); - } - - if (info->permissions_list) - { - strlcpy(tmp, "Permissions: ", sizeof(tmp)); - string_list_join_concat(tmp, sizeof(tmp), - info->permissions_list, ", "); - file_list_push(menu->selection_buf, tmp, "", - MENU_SETTINGS_CORE_INFO_NONE, 0); - } - - if (info->supported_extensions_list) - { - strlcpy(tmp, "Supported extensions: ", sizeof(tmp)); - string_list_join_concat(tmp, sizeof(tmp), - info->supported_extensions_list, ", "); - file_list_push(menu->selection_buf, tmp, "", - MENU_SETTINGS_CORE_INFO_NONE, 0); - } - - if (info->firmware_count > 0) - { - core_info_list_update_missing_firmware(menu->core_info, info->path, - g_settings.system_directory); - - file_list_push(menu->selection_buf, "Firmware: ", "", - MENU_SETTINGS_CORE_INFO_NONE, 0); - for (i = 0; i < info->firmware_count; i++) - { - if (info->firmware[i].desc) - { - snprintf(tmp, sizeof(tmp), " name: %s", - info->firmware[i].desc ? info->firmware[i].desc : ""); - file_list_push(menu->selection_buf, tmp, "", - MENU_SETTINGS_CORE_INFO_NONE, 0); - - snprintf(tmp, sizeof(tmp), " status: %s, %s", - info->firmware[i].missing ? - "missing" : "present", - info->firmware[i].optional ? - "optional" : "required"); - file_list_push(menu->selection_buf, tmp, "", - MENU_SETTINGS_CORE_INFO_NONE, 0); - } - } - } - - if (info->notes) - { - snprintf(tmp, sizeof(tmp), "Core notes: "); - file_list_push(menu->selection_buf, 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, "", - MENU_SETTINGS_CORE_INFO_NONE, 0); - } - } - } - else - file_list_push(menu->selection_buf, - "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, - setting_data); - add_setting_entry(menu,"User Options", MENU_SETTINGS_USER_OPTIONS, setting_data); - add_setting_entry(menu,"Netplay Options", MENU_SETTINGS_NETPLAY_OPTIONS, - setting_data); - add_setting_entry(menu,"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", "", - MENU_SETTINGS_DISK_OPTIONS, 0); - } - add_setting_entry(menu,"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); - break; - case MENU_SETTINGS_DISK_OPTIONS: - file_list_clear(menu->selection_buf); - file_list_push(menu->selection_buf, "Disk Index", "", - MENU_SETTINGS_DISK_INDEX, 0); - file_list_push(menu->selection_buf, "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, - setting_data); - add_setting_entry(menu,"input_overlay_opacity", 0, setting_data); - add_setting_entry(menu,"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); - 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); - break; - case MENU_SETTINGS_PATH_OPTIONS: - file_list_clear(menu->selection_buf); - add_setting_entry(menu,"rgui_browser_directory", - MENU_BROWSER_DIR_PATH, setting_data); - add_setting_entry(menu,"content_directory", - MENU_CONTENT_DIR_PATH, setting_data); - add_setting_entry(menu,"assets_directory", - MENU_ASSETS_DIR_PATH, setting_data); - add_setting_entry(menu,"rgui_config_directory", - MENU_CONFIG_DIR_PATH, setting_data); - add_setting_entry(menu,"libretro_dir_path", - MENU_LIBRETRO_DIR_PATH, setting_data); - add_setting_entry(menu,"libretro_info_path", - MENU_LIBRETRO_INFO_DIR_PATH, setting_data); - add_setting_entry(menu,"game_history_path", - MENU_CONTENT_HISTORY_PATH, setting_data); - add_setting_entry(menu,"video_filter_dir", - MENU_FILTER_DIR_PATH, setting_data); - add_setting_entry(menu,"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, - 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, - setting_data); - add_setting_entry(menu,"joypad_autoconfig_dir", MENU_AUTOCONFIG_DIR_PATH, - setting_data); - add_setting_entry(menu,"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", "", - MENU_SETTINGS_BIND_PLAYER, 0); - file_list_push(menu->selection_buf, "Device", "", - MENU_SETTINGS_BIND_DEVICE, 0); - file_list_push(menu->selection_buf, "Device Type", "", - MENU_SETTINGS_BIND_DEVICE_TYPE, 0); - file_list_push(menu->selection_buf, "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", "", - MENU_SETTINGS_CUSTOM_BIND_MODE, 0); - file_list_push(menu->selection_buf, "Configure All (RetroPad)", "", - MENU_SETTINGS_CUSTOM_BIND_ALL, 0); - file_list_push(menu->selection_buf, "Default All (RetroPad)", "", - MENU_SETTINGS_CUSTOM_BIND_DEFAULT_ALL, 0); - add_setting_entry(menu,"osk_enable", MENU_SETTINGS_ONSCREEN_KEYBOARD_ENABLE, - setting_data); - for (i = MENU_SETTINGS_BIND_BEGIN; i <= MENU_SETTINGS_BIND_ALL_LAST; i++) - file_list_push(menu->selection_buf, - 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); - 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); - break; - case MENU_SETTINGS_PERFORMANCE_COUNTERS: - file_list_clear(menu->selection_buf); - file_list_push(menu->selection_buf, "Frontend Counters", "", - MENU_SETTINGS_PERFORMANCE_COUNTERS_FRONTEND, 0); - file_list_push(menu->selection_buf, "Core Counters", "", - MENU_SETTINGS_PERFORMANCE_COUNTERS_LIBRETRO, 0); - break; - case MENU_SETTINGS_PERFORMANCE_COUNTERS_LIBRETRO: - file_list_clear(menu->selection_buf); - { - const struct retro_perf_counter **counters = (const struct retro_perf_counter**)perf_counters_libretro; - unsigned num = perf_ptr_libretro; - - if (!counters || num == 0) - break; - - for (i = 0; i < num; i++) - if (counters[i] && counters[i]->ident) - file_list_push(menu->selection_buf, counters[i]->ident, "", - MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN + i, 0); - } - break; - case MENU_SETTINGS_PERFORMANCE_COUNTERS_FRONTEND: - file_list_clear(menu->selection_buf); - { - const struct retro_perf_counter **counters = (const struct retro_perf_counter**)perf_counters_rarch; - unsigned num = perf_ptr_rarch; - - if (!counters || num == 0) - break; - - for (i = 0; i < num; i++) - if (counters[i] && counters[i]->ident) - file_list_push(menu->selection_buf, counters[i]->ident, "", - MENU_SETTINGS_PERF_COUNTERS_BEGIN + i, 0); - } - break; - case MENU_SETTINGS: - 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", MENU_SETTINGS_OPEN_FILEBROWSER_DEFERRED_CORE, setting_data); - add_setting_entry(menu,"load_content", MENU_SETTINGS_OPEN_FILEBROWSER, 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", MENU_SETTINGS_SAVESTATE_SAVE, setting_data); - add_setting_entry(menu,"loadstate", MENU_SETTINGS_SAVESTATE_LOAD, 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); - break; - } - - if (driver.menu_ctx && driver.menu_ctx->populate_entries) - driver.menu_ctx->populate_entries(menu, menu_type); -} - static void *get_last_setting(const file_list_t *list, int index, rarch_setting_t *settings) { @@ -1934,11 +1481,9 @@ static int menu_settings_iterate(unsigned action) menu_type == MENU_SETTINGS_DISK_APPEND || menu_type == MENU_SETTINGS_OPEN_HISTORY)) { + bool ret = (menu_common_type_is(menu_type) == MENU_SETTINGS); driver.menu->need_refresh = false; - if (menu_common_type_is(menu_type) == MENU_SETTINGS) - menu_common_entries_init(driver.menu, menu_type); - else - menu_common_entries_init(driver.menu, MENU_SETTINGS); + menu_entries_push(driver.menu, ret ? menu_type : MENU_SETTINGS); } if (driver.menu_ctx && driver.menu_ctx->render) @@ -2343,9 +1888,7 @@ static void menu_parse_and_resolve(unsigned menu_type) is_dir ? menu_type : MENU_FILE_PLAIN, 0); } - if (driver.menu_ctx && driver.menu_ctx->backend->entries_init) - driver.menu_ctx->backend->entries_init(driver.menu, menu_type); - + menu_entries_push(driver.menu, menu_type); string_list_free(list); } } @@ -3683,7 +3226,6 @@ static void menu_common_setting_set_label(char *type_str, } const menu_ctx_driver_backend_t menu_ctx_backend_common = { - menu_common_entries_init, menu_common_iterate, menu_common_shader_manager_init, menu_common_shader_manager_get_str, diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index a7c9c97aa3..fa4e41ef5c 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -15,6 +15,7 @@ */ #include "menu_common.h" +#include "menu_entries.h" #include "../frontend.h" void menu_update_system_info(menu_handle_t *menu, bool *load_no_content) @@ -264,8 +265,7 @@ void *menu_init(const void *data) menu->push_start_screen = g_settings.menu_show_start_screen; g_settings.menu_show_start_screen = false; - if (menu_ctx && menu_ctx->backend && menu_ctx->backend->entries_init) - menu_ctx->backend->entries_init(menu, MENU_SETTINGS); + menu_entries_push(menu, MENU_SETTINGS); menu->trigger_state = 0; menu->old_input_state = 0; diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c new file mode 100644 index 0000000000..bf81626fe0 --- /dev/null +++ b/frontend/menu/menu_entries.c @@ -0,0 +1,473 @@ +/* RetroArch - A frontend for libretro. + * Copyright (C) 2010-2014 - Hans-Kristian Arntzen + * Copyright (C) 2011-2014 - Daniel De Matteis + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#include "menu_common.h" +#include "backend/menu_common_backend.h" +#include "../../settings_data.h" + +static inline struct gfx_shader *shader_manager_get_current_shader(menu_handle_t *menu, unsigned type) +{ + if (type == MENU_SETTINGS_SHADER_PRESET_PARAMETERS) + return menu->shader; + else if (driver.video_poke && driver.video_data && driver.video_poke->get_current_shader) + return driver.video_poke->get_current_shader(driver.video_data); + + return NULL; +} + +static void add_setting_entry(menu_handle_t *menu, const char *label, unsigned id, + rarch_setting_t *settings) +{ + rarch_setting_t *setting = (rarch_setting_t*) + setting_data_find_setting(settings, label); + + if (setting) + file_list_push(menu->selection_buf, setting->short_description, setting->name, + id, 0); +} + +void menu_entries_push(menu_handle_t *menu, unsigned menu_type) +{ + unsigned i; + char tmp[256]; + rarch_setting_t *setting_data = (rarch_setting_t *)setting_data_get_list(); + + switch (menu_type) + { + case MENU_SETTINGS_SHADER_PARAMETERS: + case MENU_SETTINGS_SHADER_PRESET_PARAMETERS: + { + file_list_clear(menu->selection_buf); + + 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, + shader->parameters[i].desc, "", + MENU_SETTINGS_SHADER_PARAMETER_0 + i, 0); + menu->parameter_shader = shader; + break; + } + case MENU_SETTINGS_SHADER_OPTIONS: + { + struct gfx_shader *shader = (struct gfx_shader*)menu->shader; + + if (!shader) + return; + + file_list_clear(menu->selection_buf); + file_list_push(menu->selection_buf, "Apply Shader Changes", "", + MENU_SETTINGS_SHADER_APPLY, 0); + file_list_push(menu->selection_buf, "Default Filter", "", + MENU_SETTINGS_SHADER_FILTER, 0); + file_list_push(menu->selection_buf, "Load Shader Preset", "", + MENU_SETTINGS_SHADER_PRESET, 0); + file_list_push(menu->selection_buf, "Save As Shader Preset", "", + MENU_SETTINGS_SHADER_PRESET_SAVE, 0); + file_list_push(menu->selection_buf, "Parameters (Current)", "", + MENU_SETTINGS_SHADER_PARAMETERS, 0); + file_list_push(menu->selection_buf, "Parameters (Menu)", "", + MENU_SETTINGS_SHADER_PRESET_PARAMETERS, 0); + file_list_push(menu->selection_buf, "Shader Passes", "", + MENU_SETTINGS_SHADER_PASSES, 0); + + for (i = 0; i < shader->passes; i++) + { + char buf[64]; + + snprintf(buf, sizeof(buf), "Shader #%u", i); + file_list_push(menu->selection_buf, buf, "", + MENU_SETTINGS_SHADER_0 + 3 * i, 0); + + snprintf(buf, sizeof(buf), "Shader #%u Filter", i); + file_list_push(menu->selection_buf, buf, "", + MENU_SETTINGS_SHADER_0_FILTER + 3 * i, 0); + + snprintf(buf, sizeof(buf), "Shader #%u Scale", i); + file_list_push(menu->selection_buf, buf, "", + MENU_SETTINGS_SHADER_0_SCALE + 3 * i, 0); + } + } + break; + case MENU_SETTINGS_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); + break; + case MENU_SETTINGS_VIDEO_OPTIONS: + file_list_clear(menu->selection_buf); + add_setting_entry(menu,"video_shared_context", 0, setting_data); +#if defined(GEKKO) || defined(__CELLOS_LV2__) + file_list_push(menu->selection_buf, "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, + 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", "", + 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); + 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); + break; + case MENU_SETTINGS_CORE_OPTIONS: + file_list_clear(menu->selection_buf); + + if (g_extern.system.core_options) + { + size_t i, opts; + + opts = core_option_size(g_extern.system.core_options); + for (i = 0; i < opts; i++) + file_list_push(menu->selection_buf, + 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.", "", + 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); + + if (info->data) + { + snprintf(tmp, sizeof(tmp), "Core name: %s", + info->display_name ? info->display_name : ""); + file_list_push(menu->selection_buf, tmp, "", + MENU_SETTINGS_CORE_INFO_NONE, 0); + + if (info->authors_list) + { + strlcpy(tmp, "Authors: ", sizeof(tmp)); + string_list_join_concat(tmp, sizeof(tmp), + info->authors_list, ", "); + file_list_push(menu->selection_buf, tmp, "", + MENU_SETTINGS_CORE_INFO_NONE, 0); + } + + if (info->permissions_list) + { + strlcpy(tmp, "Permissions: ", sizeof(tmp)); + string_list_join_concat(tmp, sizeof(tmp), + info->permissions_list, ", "); + file_list_push(menu->selection_buf, tmp, "", + MENU_SETTINGS_CORE_INFO_NONE, 0); + } + + if (info->supported_extensions_list) + { + strlcpy(tmp, "Supported extensions: ", sizeof(tmp)); + string_list_join_concat(tmp, sizeof(tmp), + info->supported_extensions_list, ", "); + file_list_push(menu->selection_buf, tmp, "", + MENU_SETTINGS_CORE_INFO_NONE, 0); + } + + if (info->firmware_count > 0) + { + core_info_list_update_missing_firmware(menu->core_info, info->path, + g_settings.system_directory); + + file_list_push(menu->selection_buf, "Firmware: ", "", + MENU_SETTINGS_CORE_INFO_NONE, 0); + for (i = 0; i < info->firmware_count; i++) + { + if (info->firmware[i].desc) + { + snprintf(tmp, sizeof(tmp), " name: %s", + info->firmware[i].desc ? info->firmware[i].desc : ""); + file_list_push(menu->selection_buf, tmp, "", + MENU_SETTINGS_CORE_INFO_NONE, 0); + + snprintf(tmp, sizeof(tmp), " status: %s, %s", + info->firmware[i].missing ? + "missing" : "present", + info->firmware[i].optional ? + "optional" : "required"); + file_list_push(menu->selection_buf, tmp, "", + MENU_SETTINGS_CORE_INFO_NONE, 0); + } + } + } + + if (info->notes) + { + snprintf(tmp, sizeof(tmp), "Core notes: "); + file_list_push(menu->selection_buf, 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, "", + MENU_SETTINGS_CORE_INFO_NONE, 0); + } + } + } + else + file_list_push(menu->selection_buf, + "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, + setting_data); + add_setting_entry(menu,"User Options", MENU_SETTINGS_USER_OPTIONS, setting_data); + add_setting_entry(menu,"Netplay Options", MENU_SETTINGS_NETPLAY_OPTIONS, + setting_data); + add_setting_entry(menu,"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", "", + MENU_SETTINGS_DISK_OPTIONS, 0); + } + add_setting_entry(menu,"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); + break; + case MENU_SETTINGS_DISK_OPTIONS: + file_list_clear(menu->selection_buf); + file_list_push(menu->selection_buf, "Disk Index", "", + MENU_SETTINGS_DISK_INDEX, 0); + file_list_push(menu->selection_buf, "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, + setting_data); + add_setting_entry(menu,"input_overlay_opacity", 0, setting_data); + add_setting_entry(menu,"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); + 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); + break; + case MENU_SETTINGS_PATH_OPTIONS: + file_list_clear(menu->selection_buf); + add_setting_entry(menu,"rgui_browser_directory", + MENU_BROWSER_DIR_PATH, setting_data); + add_setting_entry(menu,"content_directory", + MENU_CONTENT_DIR_PATH, setting_data); + add_setting_entry(menu,"assets_directory", + MENU_ASSETS_DIR_PATH, setting_data); + add_setting_entry(menu,"rgui_config_directory", + MENU_CONFIG_DIR_PATH, setting_data); + add_setting_entry(menu,"libretro_dir_path", + MENU_LIBRETRO_DIR_PATH, setting_data); + add_setting_entry(menu,"libretro_info_path", + MENU_LIBRETRO_INFO_DIR_PATH, setting_data); + add_setting_entry(menu,"game_history_path", + MENU_CONTENT_HISTORY_PATH, setting_data); + add_setting_entry(menu,"video_filter_dir", + MENU_FILTER_DIR_PATH, setting_data); + add_setting_entry(menu,"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, + 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, + setting_data); + add_setting_entry(menu,"joypad_autoconfig_dir", MENU_AUTOCONFIG_DIR_PATH, + setting_data); + add_setting_entry(menu,"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", "", + MENU_SETTINGS_BIND_PLAYER, 0); + file_list_push(menu->selection_buf, "Device", "", + MENU_SETTINGS_BIND_DEVICE, 0); + file_list_push(menu->selection_buf, "Device Type", "", + MENU_SETTINGS_BIND_DEVICE_TYPE, 0); + file_list_push(menu->selection_buf, "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", "", + MENU_SETTINGS_CUSTOM_BIND_MODE, 0); + file_list_push(menu->selection_buf, "Configure All (RetroPad)", "", + MENU_SETTINGS_CUSTOM_BIND_ALL, 0); + file_list_push(menu->selection_buf, "Default All (RetroPad)", "", + MENU_SETTINGS_CUSTOM_BIND_DEFAULT_ALL, 0); + add_setting_entry(menu,"osk_enable", MENU_SETTINGS_ONSCREEN_KEYBOARD_ENABLE, + setting_data); + for (i = MENU_SETTINGS_BIND_BEGIN; i <= MENU_SETTINGS_BIND_ALL_LAST; i++) + file_list_push(menu->selection_buf, + 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); + 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); + break; + case MENU_SETTINGS_PERFORMANCE_COUNTERS: + file_list_clear(menu->selection_buf); + file_list_push(menu->selection_buf, "Frontend Counters", "", + MENU_SETTINGS_PERFORMANCE_COUNTERS_FRONTEND, 0); + file_list_push(menu->selection_buf, "Core Counters", "", + MENU_SETTINGS_PERFORMANCE_COUNTERS_LIBRETRO, 0); + break; + case MENU_SETTINGS_PERFORMANCE_COUNTERS_LIBRETRO: + file_list_clear(menu->selection_buf); + { + const struct retro_perf_counter **counters = (const struct retro_perf_counter**)perf_counters_libretro; + unsigned num = perf_ptr_libretro; + + if (!counters || num == 0) + break; + + for (i = 0; i < num; i++) + if (counters[i] && counters[i]->ident) + file_list_push(menu->selection_buf, counters[i]->ident, "", + MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN + i, 0); + } + break; + case MENU_SETTINGS_PERFORMANCE_COUNTERS_FRONTEND: + file_list_clear(menu->selection_buf); + { + const struct retro_perf_counter **counters = (const struct retro_perf_counter**)perf_counters_rarch; + unsigned num = perf_ptr_rarch; + + if (!counters || num == 0) + break; + + for (i = 0; i < num; i++) + if (counters[i] && counters[i]->ident) + file_list_push(menu->selection_buf, counters[i]->ident, "", + MENU_SETTINGS_PERF_COUNTERS_BEGIN + i, 0); + } + break; + case MENU_SETTINGS: + 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", MENU_SETTINGS_OPEN_FILEBROWSER_DEFERRED_CORE, setting_data); + add_setting_entry(menu,"load_content", MENU_SETTINGS_OPEN_FILEBROWSER, 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", MENU_SETTINGS_SAVESTATE_SAVE, setting_data); + add_setting_entry(menu,"loadstate", MENU_SETTINGS_SAVESTATE_LOAD, 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); + break; + } + + if (driver.menu_ctx && driver.menu_ctx->populate_entries) + driver.menu_ctx->populate_entries(menu, menu_type); +} diff --git a/frontend/menu/menu_entries.h b/frontend/menu/menu_entries.h new file mode 100644 index 0000000000..43087d1e2f --- /dev/null +++ b/frontend/menu/menu_entries.h @@ -0,0 +1,22 @@ +/* RetroArch - A frontend for libretro. + * Copyright (C) 2010-2014 - Hans-Kristian Arntzen + * Copyright (C) 2011-2014 - Daniel De Matteis + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#ifndef MENU_ENTRIES_H__ +#define MENU_ENTRIES_H__ + +void menu_entries_push(menu_handle_t *menu, unsigned menu_type); + +#endif diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj index 47ea0d86fa..e40a3de1d0 100644 --- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj +++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj @@ -223,6 +223,7 @@ + @@ -351,4 +352,4 @@ - \ No newline at end of file + diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters index 20d4e2ee99..b9b3fd90ea 100644 --- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters +++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters @@ -219,6 +219,9 @@ frontend\menu + + frontend\menu + frontend\menu @@ -333,4 +336,4 @@ {5a80dd03-b4d7-4118-92ff-55a601fd80fc} - \ No newline at end of file +