From 687f5931747bfca4e65a2e0965bfab85f2a5ef27 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 17 Oct 2014 20:36:02 +0200 Subject: [PATCH] Create menu_list.c --- Makefile.common | 1 + file_list.c | 51 -------- frontend/menu/backend/menu_common_backend.c | 10 +- frontend/menu/menu_common.c | 4 +- frontend/menu/menu_driver.h | 2 +- frontend/menu/menu_entries.c | 82 ++++++------- frontend/menu/menu_entries_cbs.c | 128 ++++++++++---------- frontend/menu/menu_list.c | 101 +++++++++++++++ frontend/menu/menu_list.h | 40 ++++++ griffin/griffin.c | 1 + 10 files changed, 256 insertions(+), 164 deletions(-) create mode 100644 frontend/menu/menu_list.c create mode 100644 frontend/menu/menu_list.h diff --git a/Makefile.common b/Makefile.common index aa3d636e18..fa11b958df 100644 --- a/Makefile.common +++ b/Makefile.common @@ -281,6 +281,7 @@ ifeq ($(HAVE_MENU_COMMON), 1) frontend/menu/menu_shader.o \ frontend/menu/menu_entries.o \ frontend/menu/menu_entries_cbs.o \ + frontend/menu/menu_list.o \ frontend/menu/menu_animation.o endif diff --git a/file_list.c b/file_list.c index 423e429897..f964d23df4 100644 --- a/file_list.c +++ b/file_list.c @@ -33,18 +33,6 @@ void file_list_push(file_list_t *list, list->capacity * sizeof(struct item_file)); } -#ifdef HAVE_MENU - if (driver.menu_ctx) - { - if (driver.menu_ctx->list_insert) - driver.menu_ctx->list_insert(list, path, label, list->size); - - if (driver.menu_ctx->backend->list_insert) - driver.menu_ctx->backend->list_insert(list, path, - label, type,list->size); - } -#endif - list->list[list->size].label = strdup(label); list->list[list->size].path = strdup(path); list->list[list->size].alt = NULL; @@ -70,32 +58,12 @@ void file_list_pop(file_list_t *list, size_t *directory_ptr) if (list->size != 0) { --list->size; -#ifdef HAVE_MENU - if (driver.menu_ctx) - { - if (driver.menu_ctx->list_delete) - driver.menu_ctx->list_delete(list, list->size, list->size); - if (driver.menu_ctx->backend->list_delete) - driver.menu_ctx->backend->list_delete(list, list->size, list->size); - } -#endif free(list->list[list->size].path); free(list->list[list->size].label); } if (directory_ptr) *directory_ptr = list->list[list->size].directory_ptr; - -#ifdef HAVE_MENU - if (driver.menu_ctx) - { - if (driver.menu_ctx->list_set_selection) - driver.menu_ctx->list_set_selection(list); - - if (driver.menu_ctx->backend->list_set_selection) - driver.menu_ctx->backend->list_set_selection(list); - } -#endif } void file_list_free(file_list_t *list) @@ -107,15 +75,6 @@ void file_list_free(file_list_t *list) for (i = 0; i < list->size; i++) { -#ifdef HAVE_MENU - if (driver.menu_ctx) - { - if (driver.menu_ctx->list_delete) - driver.menu_ctx->list_delete(list, i, list->size); - if (driver.menu_ctx->backend->list_delete) - driver.menu_ctx->backend->list_delete(list, i, list->size); - } -#endif free(list->list[i].path); free(list->list[i].label); } @@ -137,16 +96,6 @@ void file_list_clear(file_list_t *list) list->list[i].alt = NULL; } -#ifdef HAVE_MENU - if (driver.menu_ctx) - { - if (driver.menu_ctx->list_clear) - driver.menu_ctx->list_clear(list); - - if (driver.menu_ctx->backend->list_clear) - driver.menu_ctx->backend->list_clear(list); - } -#endif list->size = 0; } diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index 863635c344..cb5e382f33 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -223,7 +223,7 @@ static int menu_settings_iterate(unsigned action, menu_entries_pop_list(driver.menu->menu_stack); break; case MENU_ACTION_SELECT: - file_list_push(driver.menu->menu_stack, "", "info_screen", + menu_list_push(driver.menu->menu_stack, "", "info_screen", 0, driver.menu->selection_ptr); break; case MENU_ACTION_OK: @@ -268,7 +268,7 @@ static int menu_settings_iterate(unsigned action, /* Have to defer it so we let settings refresh. */ if (driver.menu->push_start_screen) { - file_list_push(driver.menu->menu_stack, "", "help", 0, 0); + menu_list_push(driver.menu->menu_stack, "", "help", 0, 0); driver.menu->push_start_screen = false; } @@ -352,7 +352,7 @@ static int menu_viewport_iterate(unsigned action) menu_entries_pop_list(driver.menu->menu_stack); if (!strcmp(label, "custom_viewport_2")) { - file_list_push(driver.menu->menu_stack, "", "", + menu_list_push(driver.menu->menu_stack, "", "", MENU_SETTINGS_CUSTOM_VIEWPORT, driver.menu->selection_ptr); } @@ -363,7 +363,7 @@ static int menu_viewport_iterate(unsigned action) if (type == MENU_SETTINGS_CUSTOM_VIEWPORT && !g_settings.video.scale_integer) { - file_list_push(driver.menu->menu_stack, "", + menu_list_push(driver.menu->menu_stack, "", "custom_viewport_2", 0, driver.menu->selection_ptr); } break; @@ -632,7 +632,7 @@ static int menu_common_iterate(unsigned action) break; case MENU_ACTION_SELECT: - file_list_push(driver.menu->menu_stack, "", "info_screen", + menu_list_push(driver.menu->menu_stack, "", "info_screen", 0, driver.menu->selection_ptr); break; diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index 531cee0427..ea36ca5f37 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -222,8 +222,8 @@ void menu_free(void *data) libretro_free_system_info(&g_extern.menu.info); #endif - file_list_free(menu->menu_stack); - file_list_free(menu->selection_buf); + menu_list_free(menu->menu_stack); + menu_list_free(menu->selection_buf); rarch_main_command(RARCH_CMD_HISTORY_DEINIT); diff --git a/frontend/menu/menu_driver.h b/frontend/menu/menu_driver.h index b5eef717eb..4da0db71ee 100644 --- a/frontend/menu/menu_driver.h +++ b/frontend/menu/menu_driver.h @@ -91,7 +91,7 @@ typedef struct /* This buffer can be used to display generic OK messages to the user. * Fill it and call - * file_list_push(driver.menu->menu_stack, "", "message", 0, 0); + * menu_list_push(driver.menu->menu_stack, "", "message", 0, 0); */ char message_contents[PATH_MAX]; diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c index 5377f8776b..29e22b6f38 100644 --- a/frontend/menu/menu_entries.c +++ b/frontend/menu/menu_entries.c @@ -106,7 +106,7 @@ void menu_entries_pop_list(file_list_t *list) if (file_list_get_size(list) > 1) { - file_list_pop(list, &driver.menu->selection_ptr); + menu_list_pop(list, &driver.menu->selection_ptr); driver.menu->need_refresh = true; } } @@ -135,7 +135,7 @@ void menu_entries_push( unsigned type, size_t directory_ptr) { - file_list_push(list, path, label, type, directory_ptr); + menu_list_push(list, path, label, type, directory_ptr); menu_clear_navigation(driver.menu, true); driver.menu->need_refresh = true; } @@ -153,7 +153,7 @@ static int push_main_menu_list(menu_handle_t *menu, if (!setting) return -1; - file_list_clear(list); + menu_list_clear(list); for (; setting->type != ST_END_GROUP; setting++) { @@ -164,7 +164,7 @@ static int push_main_menu_list(menu_handle_t *menu, ) continue; - file_list_push(list, setting->short_description, + menu_list_push(list, setting->short_description, setting->name, setting_set_flags(setting), 0); } @@ -181,34 +181,34 @@ int menu_entries_parse_list(file_list_t *list, file_list_t *menu_list, size_t i, list_size; struct string_list *str_list = NULL; - file_list_clear(list); + menu_list_clear(list); if (!*dir) { #if defined(GEKKO) #ifdef HW_RVL - file_list_push(list, + menu_list_push(list, "sd:/", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "usb:/", "", MENU_FILE_DIRECTORY, 0); #endif - file_list_push(list, + menu_list_push(list, "carda:/", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "cardb:/", "", MENU_FILE_DIRECTORY, 0); #elif defined(_XBOX1) - file_list_push(list, + menu_list_push(list, "C:", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "D:", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "E:", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "F:", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "G:", "", MENU_FILE_DIRECTORY, 0); #elif defined(_XBOX360) - file_list_push(list, + menu_list_push(list, "game:", "", MENU_FILE_DIRECTORY, 0); #elif defined(_WIN32) unsigned drives = GetLogicalDrives(); @@ -217,48 +217,48 @@ int menu_entries_parse_list(file_list_t *list, file_list_t *menu_list, { drive[0] = 'A' + i; if (drives & (1 << i)) - file_list_push(list, + menu_list_push(list, drive, "", MENU_FILE_DIRECTORY, 0); } #elif defined(__CELLOS_LV2__) - file_list_push(list, + menu_list_push(list, "/app_home/", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "/dev_hdd0/", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "/dev_hdd1/", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "/host_root/", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "/dev_usb000/", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "/dev_usb001/", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "/dev_usb002/", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "/dev_usb003/", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "/dev_usb004/", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "/dev_usb005/", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "/dev_usb006/", "", MENU_FILE_DIRECTORY, 0); #elif defined(PSP) - file_list_push(list, + menu_list_push(list, "ms0:/", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "ef0:/", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, "host0:/", "", MENU_FILE_DIRECTORY, 0); #elif defined(IOS) - file_list_push(list, + menu_list_push(list, "/var/mobile/", "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, + menu_list_push(list, g_defaults.core_dir, "", MENU_FILE_DIRECTORY, 0); - file_list_push(list, "/", "", + menu_list_push(list, "/", "", MENU_FILE_DIRECTORY, 0); #else - file_list_push(list, "/", "", + menu_list_push(list, "/", "", MENU_FILE_DIRECTORY, 0); #endif return 0; @@ -288,7 +288,7 @@ int menu_entries_parse_list(file_list_t *list, file_list_t *menu_list, dir_list_sort(str_list, true); if (push_dir) - file_list_push(list, "", "", + menu_list_push(list, "", "", MENU_FILE_USE_DIRECTORY, 0); list_size = str_list->size; @@ -351,11 +351,11 @@ int menu_entries_parse_list(file_list_t *list, file_list_t *menu_list, if (file_type == MENU_FILE_CARCHIVE) continue; - file_list_push(list, path, "", + menu_list_push(list, path, "", is_dir ? MENU_FILE_DIRECTORY : MENU_FILE_CORE, 0); } else - file_list_push(list, path, "", + menu_list_push(list, path, "", file_type, 0); } @@ -432,7 +432,7 @@ void menu_flush_stack_type(file_list_t *list, file_list_get_last(list, &path, &label, &type); while (type != final_type) { - file_list_pop(list, &driver.menu->selection_ptr); + menu_list_pop(list, &driver.menu->selection_ptr); file_list_get_last(list, &path, &label, &type); } } @@ -451,7 +451,7 @@ void menu_entries_pop_stack(file_list_t *list, file_list_get_last(list, &path, &label, &type); while (strcmp(needle, label) == 0) { - file_list_pop(list, &driver.menu->selection_ptr); + menu_list_pop(list, &driver.menu->selection_ptr); file_list_get_last(list, &path, &label, &type); } } @@ -470,7 +470,7 @@ void menu_flush_stack_label(file_list_t *list, file_list_get_last(list, &path, &label, &type); while (strcmp(needle, label) != 0) { - file_list_pop(list, &driver.menu->selection_ptr); + menu_list_pop(list, &driver.menu->selection_ptr); file_list_get_last(list, &path, &label, &type); } } @@ -483,7 +483,7 @@ bool menu_entries_init(menu_handle_t *menu) menu->list_mainmenu = setting_data_new(SL_FLAG_MAIN_MENU); menu->list_settings = setting_data_new(SL_FLAG_ALL_SETTINGS); - file_list_push(menu->menu_stack, "", "Main Menu", MENU_SETTINGS, 0); + menu_list_push(menu->menu_stack, "", "Main Menu", MENU_SETTINGS, 0); menu_clear_navigation(menu, true); push_main_menu_list(menu, menu->selection_buf, "", "Main Menu", 0); diff --git a/frontend/menu/menu_entries_cbs.c b/frontend/menu/menu_entries_cbs.c index 6d695a291c..2448e741db 100644 --- a/frontend/menu/menu_entries_cbs.c +++ b/frontend/menu/menu_entries_cbs.c @@ -325,7 +325,7 @@ static int action_ok_compressed_archive_push(const char *path, if (!strcmp(menu_label, "detect_core_list")) { - file_list_push(driver.menu->menu_stack, path, "load_open_zip", + menu_list_push(driver.menu->menu_stack, path, "load_open_zip", 0, driver.menu->selection_ptr); return 0; } @@ -504,7 +504,7 @@ static int action_ok_bind_all(const char *path, driver.menu->binds.begin = MENU_SETTINGS_BIND_BEGIN; driver.menu->binds.last = MENU_SETTINGS_BIND_LAST; - file_list_push(driver.menu->menu_stack, "", "", + menu_list_push(driver.menu->menu_stack, "", "", driver.menu->bind_mode_keyboard ? MENU_SETTINGS_CUSTOM_BIND_KEYBOARD : MENU_SETTINGS_CUSTOM_BIND, @@ -567,7 +567,7 @@ static int action_ok_bind_key(const char *path, driver.menu->binds.last = type; driver.menu->binds.target = bind; driver.menu->binds.player = driver.menu->current_pad; - file_list_push(driver.menu->menu_stack, "", "", + menu_list_push(driver.menu->menu_stack, "", "", driver.menu->bind_mode_keyboard ? MENU_SETTINGS_CUSTOM_BIND_KEYBOARD : MENU_SETTINGS_CUSTOM_BIND, driver.menu->selection_ptr); @@ -591,7 +591,7 @@ static int action_ok_bind_key(const char *path, static int action_ok_custom_viewport(const char *path, const char *label, unsigned type, size_t index) { - file_list_push(driver.menu->menu_stack, "", "", + menu_list_push(driver.menu->menu_stack, "", "", MENU_SETTINGS_CUSTOM_VIEWPORT, driver.menu->selection_ptr); @@ -681,7 +681,7 @@ static int action_ok_help(const char *path, if (!driver.menu) return -1; - file_list_push(driver.menu->menu_stack, "", "help", 0, 0); + menu_list_push(driver.menu->menu_stack, "", "help", 0, 0); driver.menu->push_start_screen = false; return 0; @@ -1429,13 +1429,13 @@ static int deferred_push_core_list_deferred(void *data, void *userdata, if (!list || !menu_list) return -1; - file_list_clear(list); + menu_list_clear(list); core_info_list_get_supported_cores(g_extern.core_info, driver.menu->deferred_path, &info, &list_size); for (i = 0; i < list_size; i++) { - file_list_push(list, info[i].path, "", + menu_list_push(list, info[i].path, "", MENU_FILE_CORE, 0); file_list_set_alt_at_offset(list, i, info[i].display_name); @@ -1464,7 +1464,7 @@ static int deferred_push_core_information(void *data, void *userdata, return -1; info = (core_info_t*)g_extern.core_info_current; - file_list_clear(list); + menu_list_clear(list); if (info->data) { @@ -1472,7 +1472,7 @@ static int deferred_push_core_information(void *data, void *userdata, snprintf(tmp, sizeof(tmp), "Core name: %s", info->display_name ? info->display_name : ""); - file_list_push(list, tmp, "", + menu_list_push(list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0); if (info->authors_list) @@ -1480,7 +1480,7 @@ static int deferred_push_core_information(void *data, void *userdata, strlcpy(tmp, "Authors: ", sizeof(tmp)); string_list_join_concat(tmp, sizeof(tmp), info->authors_list, ", "); - file_list_push(list, tmp, "", + menu_list_push(list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0); } @@ -1489,7 +1489,7 @@ static int deferred_push_core_information(void *data, void *userdata, strlcpy(tmp, "Permissions: ", sizeof(tmp)); string_list_join_concat(tmp, sizeof(tmp), info->permissions_list, ", "); - file_list_push(list, tmp, "", + menu_list_push(list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0); } @@ -1498,7 +1498,7 @@ static int deferred_push_core_information(void *data, void *userdata, strlcpy(tmp, "License(s): ", sizeof(tmp)); string_list_join_concat(tmp, sizeof(tmp), info->licenses_list, ", "); - file_list_push(list, tmp, "", + menu_list_push(list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0); } @@ -1507,7 +1507,7 @@ static int deferred_push_core_information(void *data, void *userdata, strlcpy(tmp, "Supported extensions: ", sizeof(tmp)); string_list_join_concat(tmp, sizeof(tmp), info->supported_extensions_list, ", "); - file_list_push(list, tmp, "", + menu_list_push(list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0); } @@ -1517,7 +1517,7 @@ static int deferred_push_core_information(void *data, void *userdata, g_extern.core_info, info->path, g_settings.system_directory); - file_list_push(list, "Firmware: ", "", + menu_list_push(list, "Firmware: ", "", MENU_SETTINGS_CORE_INFO_NONE, 0); for (i = 0; i < info->firmware_count; i++) { @@ -1525,7 +1525,7 @@ static int deferred_push_core_information(void *data, void *userdata, { snprintf(tmp, sizeof(tmp), " name: %s", info->firmware[i].desc ? info->firmware[i].desc : ""); - file_list_push(list, tmp, "", + menu_list_push(list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0); snprintf(tmp, sizeof(tmp), " status: %s, %s", @@ -1533,7 +1533,7 @@ static int deferred_push_core_information(void *data, void *userdata, "missing" : "present", info->firmware[i].optional ? "optional" : "required"); - file_list_push(list, tmp, "", + menu_list_push(list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0); } } @@ -1542,20 +1542,20 @@ static int deferred_push_core_information(void *data, void *userdata, if (info->notes) { snprintf(tmp, sizeof(tmp), "Core notes: "); - file_list_push(list, tmp, "", + menu_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(list, tmp, "", + menu_list_push(list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0); } } } else - file_list_push(list, + menu_list_push(list, "No information available.", "", MENU_SETTINGS_CORE_OPTION_NONE, 0); @@ -1574,10 +1574,10 @@ static int deferred_push_performance_counters(void *data, void *userdata, if (!list || !menu_list) return -1; - file_list_clear(list); - file_list_push(list, "Frontend Counters", "frontend_counters", + menu_list_clear(list); + menu_list_push(list, "Frontend Counters", "frontend_counters", MENU_FILE_PUSH, 0); - file_list_push(list, "Core Counters", "core_counters", + menu_list_push(list, "Core Counters", "core_counters", MENU_FILE_PUSH, 0); if (driver.menu_ctx && driver.menu_ctx->populate_entries) @@ -1609,14 +1609,14 @@ static int deferred_push_video_shader_preset_parameters(void *data, void *userda if (!list || !menu_list) return -1; - file_list_clear(list); + menu_list_clear(list); shader = (struct gfx_shader*) shader_manager_get_current_shader(driver.menu, label, type); if (shader) for (i = 0; i < shader->num_parameters; i++) - file_list_push(list, + menu_list_push(list, shader->parameters[i].desc, label, MENU_SETTINGS_SHADER_PARAMETER_0 + i, 0); driver.menu->parameter_shader = shader; @@ -1638,14 +1638,14 @@ static int deferred_push_video_shader_parameters(void *data, void *userdata, if (!list || !menu_list) return -1; - file_list_clear(list); + menu_list_clear(list); shader = (struct gfx_shader*) shader_manager_get_current_shader(driver.menu, label, type); if (shader) for (i = 0; i < shader->num_parameters; i++) - file_list_push(list, + menu_list_push(list, shader->parameters[i].desc, label, MENU_SETTINGS_SHADER_PARAMETER_0 + i, 0); driver.menu->parameter_shader = shader; @@ -1670,12 +1670,12 @@ static int deferred_push_settings(void *data, void *userdata, rarch_setting_t *setting = (rarch_setting_t*)setting_data_find_setting(driver.menu->list_settings, "Driver Options"); - file_list_clear(list); + menu_list_clear(list); for (; setting->type != ST_NONE; setting++) { if (setting->type == ST_GROUP) - file_list_push(list, setting->short_description, + menu_list_push(list, setting->short_description, setting->name, setting_set_flags(setting), 0); } @@ -1699,15 +1699,15 @@ static int deferred_push_category(void *data, void *userdata, rarch_setting_t *setting = (rarch_setting_t*)setting_data_find_setting( driver.menu->list_settings, label); - file_list_clear(list); + menu_list_clear(list); if (!strcmp(label, "Video Options")) { #if defined(GEKKO) || defined(__CELLOS_LV2__) - file_list_push(list, "Screen Resolution", "", + menu_list_push(list, "Screen Resolution", "", MENU_SETTINGS_VIDEO_RESOLUTION, 0); #endif - file_list_push(list, "Custom Ratio", "", + menu_list_push(list, "Custom Ratio", "", MENU_SETTINGS_CUSTOM_VIEWPORT, 0); } @@ -1720,7 +1720,7 @@ static int deferred_push_category(void *data, void *userdata, ) continue; - file_list_push(list, setting->short_description, + menu_list_push(list, setting->short_description, setting->name, setting_set_flags(setting), 0); } @@ -1739,7 +1739,7 @@ static void add_setting_entry(menu_handle_t *menu, setting_data_find_setting(settings, label); if (setting) - file_list_push(list, setting->short_description, + menu_list_push(list, setting->short_description, setting->name, id, 0); } @@ -1756,20 +1756,20 @@ static int deferred_push_input_options(void *data, void *userdata, settings_list_free(driver.menu->list_settings); driver.menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_ALL_SETTINGS); - file_list_clear(list); - file_list_push(list, "Player", "input_bind_player_no", 0, 0); - file_list_push(list, "Device", "input_bind_device_id", 0, 0); - file_list_push(list, "Device Type", "input_bind_device_type", 0, 0); - file_list_push(list, "Analog D-pad Mode", "input_bind_analog_dpad_mode", 0, 0); + menu_list_clear(list); + menu_list_push(list, "Player", "input_bind_player_no", 0, 0); + menu_list_push(list, "Device", "input_bind_device_id", 0, 0); + menu_list_push(list, "Device Type", "input_bind_device_type", 0, 0); + menu_list_push(list, "Analog D-pad Mode", "input_bind_analog_dpad_mode", 0, 0); add_setting_entry(driver.menu,list,"input_axis_threshold", 0, driver.menu->list_settings); add_setting_entry(driver.menu,list,"input_autodetect_enable", 0, driver.menu->list_settings); add_setting_entry(driver.menu,list,"input_turbo_period", 0, driver.menu->list_settings); add_setting_entry(driver.menu,list,"input_duty_cycle", 0, driver.menu->list_settings); - file_list_push(list, "Bind Mode", "", + menu_list_push(list, "Bind Mode", "", MENU_SETTINGS_CUSTOM_BIND_MODE, 0); - file_list_push(list, "Configure All (RetroPad)", "", + menu_list_push(list, "Configure All (RetroPad)", "", MENU_SETTINGS_CUSTOM_BIND_ALL, 0); - file_list_push(list, "Default All (RetroPad)", "", + menu_list_push(list, "Default All (RetroPad)", "", MENU_SETTINGS_CUSTOM_BIND_DEFAULT_ALL, 0); add_setting_entry(driver.menu,list,"osk_enable", 0, driver.menu->list_settings); for (i = MENU_SETTINGS_BIND_BEGIN; i <= MENU_SETTINGS_BIND_ALL_LAST; i++) @@ -1802,20 +1802,20 @@ static int deferred_push_shader_options(void *data, void *userdata, if (!shader) return -1; - file_list_clear(list); - file_list_push(list, "Apply Shader Changes", "shader_apply_changes", + menu_list_clear(list); + menu_list_push(list, "Apply Shader Changes", "shader_apply_changes", MENU_FILE_PUSH, 0); - file_list_push(list, "Default Filter", "video_shader_default_filter", + menu_list_push(list, "Default Filter", "video_shader_default_filter", 0, 0); - file_list_push(list, "Load Shader Preset", "video_shader_preset", + menu_list_push(list, "Load Shader Preset", "video_shader_preset", MENU_FILE_PUSH, 0); - file_list_push(list, "Shader Preset Save As", + menu_list_push(list, "Shader Preset Save As", "video_shader_preset_save_as", MENU_FILE_LINEFEED_SWITCH, 0); - file_list_push(list, "Parameters (Current)", + menu_list_push(list, "Parameters (Current)", "video_shader_parameters", MENU_FILE_PUSH, 0); - file_list_push(list, "Parameters (Menu)", + menu_list_push(list, "Parameters (Menu)", "video_shader_preset_parameters", MENU_FILE_PUSH, 0); - file_list_push(list, "Shader Passes", "video_shader_num_passes", + menu_list_push(list, "Shader Passes", "video_shader_num_passes", 0, 0); for (i = 0; i < shader->passes; i++) @@ -1823,15 +1823,15 @@ static int deferred_push_shader_options(void *data, void *userdata, char buf[64]; snprintf(buf, sizeof(buf), "Shader #%u", i); - file_list_push(list, buf, "video_shader_pass", + menu_list_push(list, buf, "video_shader_pass", MENU_SETTINGS_SHADER_PASS_0 + i, 0); snprintf(buf, sizeof(buf), "Shader #%u Filter", i); - file_list_push(list, buf, "video_shader_filter_pass", + menu_list_push(list, buf, "video_shader_filter_pass", MENU_SETTINGS_SHADER_PASS_FILTER_0 + i, 0); snprintf(buf, sizeof(buf), "Shader #%u Scale", i); - file_list_push(list, buf, "video_shader_scale_pass", + menu_list_push(list, buf, "video_shader_scale_pass", MENU_SETTINGS_SHADER_PASS_SCALE_0 + i, 0); } @@ -1852,7 +1852,7 @@ static void push_perfcounter(menu_handle_t *menu, for (i = 0; i < num; i++) if (counters[i] && counters[i]->ident) - file_list_push(list, counters[i]->ident, "", + menu_list_push(list, counters[i]->ident, "", id + i, 0); } @@ -1865,7 +1865,7 @@ static int deferred_push_core_counters(void *data, void *userdata, if (!list || !menu_list) return -1; - file_list_clear(list); + menu_list_clear(list); push_perfcounter(driver.menu, list, perf_counters_libretro, perf_ptr_libretro, MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN); @@ -1884,7 +1884,7 @@ static int deferred_push_frontend_counters(void *data, void *userdata, if (!list || !menu_list) return -1; - file_list_clear(list); + menu_list_clear(list); push_perfcounter(driver.menu, list, perf_counters_rarch, perf_ptr_rarch, MENU_SETTINGS_PERF_COUNTERS_BEGIN); @@ -1904,17 +1904,17 @@ static int deferred_push_core_options(void *data, void *userdata, if (!list || !menu_list) return -1; - file_list_clear(list); + menu_list_clear(list); if (g_extern.system.core_options) { size_t opts = core_option_size(g_extern.system.core_options); for (i = 0; i < opts; i++) - file_list_push(list, + menu_list_push(list, core_option_get_desc(g_extern.system.core_options, i), "", MENU_SETTINGS_CORE_OPTION_START + i, 0); } else - file_list_push(list, "No options available.", "", + menu_list_push(list, "No options available.", "", MENU_SETTINGS_CORE_OPTION_NONE, 0); if (driver.menu_ctx && driver.menu_ctx->populate_entries) @@ -1932,12 +1932,12 @@ static int deferred_push_disk_options(void *data, void *userdata, if (!list || !menu_list) return -1; - file_list_clear(list); - file_list_push(list, "Disk Index", "disk_index", + menu_list_clear(list); + menu_list_push(list, "Disk Index", "disk_index", MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX, 0); - file_list_push(list, "Disk Cycle Tray Status", "disk_cycle_tray_status", + menu_list_push(list, "Disk Cycle Tray Status", "disk_cycle_tray_status", MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_CYCLE_TRAY_STATUS, 0); - file_list_push(list, "Disk Image Append", "disk_image_append", + menu_list_push(list, "Disk Image Append", "disk_image_append", MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_IMAGE_APPEND, 0); if (driver.menu_ctx && driver.menu_ctx->populate_entries) @@ -1972,7 +1972,7 @@ static int deferred_push_history_list(void *data, void *userdata, if (!list || !menu_list || !driver.menu) return -1; - file_list_clear(list); + menu_list_clear(list); list_size = content_playlist_size(g_defaults.history); for (i = 0; i < list_size; i++) @@ -1992,7 +1992,7 @@ static int deferred_push_history_list(void *data, void *userdata, path_short,core_name); } - file_list_push(list, fill_buf, "", + menu_list_push(list, fill_buf, "", MENU_FILE_PLAYLIST_ENTRY, 0); } diff --git a/frontend/menu/menu_list.c b/frontend/menu/menu_list.c new file mode 100644 index 0000000000..d67272b77c --- /dev/null +++ b/frontend/menu/menu_list.c @@ -0,0 +1,101 @@ +/* RetroArch - A frontend for libretro. + * 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 "../../driver.h" +#include "menu_list.h" + +void menu_list_free(file_list_t *list) +{ + unsigned i; + if (!list) + return; + + if (!driver.menu_ctx) + goto end; + + for (i = 0; i < list->size; i++) + { + if (driver.menu_ctx->list_delete) + driver.menu_ctx->list_delete(list, i, list->size); + if (driver.menu_ctx->backend->list_delete) + driver.menu_ctx->backend->list_delete(list, i, list->size); + } + +end: + file_list_free(list); +} + +void menu_list_pop(file_list_t *list, size_t *directory_ptr) +{ + if (!driver.menu_ctx) + goto end; + + if (list->size != 0) + { + size_t list_size = list->size - 1; + + if (driver.menu_ctx->list_delete) + driver.menu_ctx->list_delete(list, list_size, list_size); + if (driver.menu_ctx->backend->list_delete) + driver.menu_ctx->backend->list_delete(list, list_size, list_size); + } + +end: + file_list_pop(list, directory_ptr); + + if (!driver.menu_ctx) + return; + + if (driver.menu_ctx->list_set_selection) + driver.menu_ctx->list_set_selection(list); + + if (driver.menu_ctx->backend->list_set_selection) + driver.menu_ctx->backend->list_set_selection(list); +} + +void menu_list_clear(file_list_t *list) +{ + if (!driver.menu_ctx) + goto end; + + if (driver.menu_ctx->list_clear) + driver.menu_ctx->list_clear(list); + + if (driver.menu_ctx->backend->list_clear) + driver.menu_ctx->backend->list_clear(list); + +end: + + file_list_clear(list); +} + +void menu_list_push(file_list_t *list, + const char *path, const char *label, + unsigned type, size_t directory_ptr) +{ + if (!list) + return; + file_list_push(list, path, label, type, directory_ptr); + + if (!driver.menu_ctx) + return; + + if (driver.menu_ctx->list_insert) + driver.menu_ctx->list_insert(list, path, label, list->size - 1); + + if (driver.menu_ctx->backend->list_insert) + driver.menu_ctx->backend->list_insert(list, path, + label, type, list->size - 1); +} diff --git a/frontend/menu/menu_list.h b/frontend/menu/menu_list.h new file mode 100644 index 0000000000..0080ba03c2 --- /dev/null +++ b/frontend/menu/menu_list.h @@ -0,0 +1,40 @@ +/* RetroArch - A frontend for libretro. + * 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_LIST_H +#define _MENU_LIST_H + +#include +#include "../../file_list.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void menu_list_free(file_list_t *list); + +void menu_list_pop(file_list_t *list, size_t *directory_ptr); + +void menu_list_clear(file_list_t *list); + +void menu_list_push(file_list_t *list, + const char *path, const char *label, + unsigned type, size_t directory_ptr); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/griffin/griffin.c b/griffin/griffin.c index 399a66a23e..c926489130 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -647,6 +647,7 @@ MENU #include "../frontend/menu/menu_input_line_cb.c" #include "../frontend/menu/menu_common.c" #include "../frontend/menu/menu_action.c" +#include "../frontend/menu/menu_list.c" #include "../frontend/menu/menu_entries.c" #include "../frontend/menu/menu_entries_cbs.c" #include "../frontend/menu/menu_shader.c"