diff --git a/Makefile.common b/Makefile.common index aa21397c44..db0bbb5e6c 100644 --- a/Makefile.common +++ b/Makefile.common @@ -343,7 +343,7 @@ ifeq ($(HAVE_MENU_COMMON), 1) menu/menu_entries_cbs_ok.o \ menu/menu_entries_cbs_cancel.o \ menu/menu_entries_cbs_start.o \ - menu/menu_entries_cbs_select.o \ + menu/menu_entries_cbs_info.o \ menu/menu_entries_cbs_refresh.o \ menu/menu_entries_cbs_left.o \ menu/menu_entries_cbs_right.o \ diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index bd9a76043f..d528347add 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2029,7 +2029,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) { case DISPLAYLIST_NONE: break; - case DISPLAYLIST_SELECT: + case DISPLAYLIST_INFO: menu_list_push(info->list, info->path, info->label, info->type, info->directory_ptr); break; case DISPLAYLIST_GENERIC: diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h index 48dbce6d5d..63a71387b6 100644 --- a/menu/menu_displaylist.h +++ b/menu/menu_displaylist.h @@ -30,7 +30,7 @@ extern "C" { enum { DISPLAYLIST_NONE = 0, - DISPLAYLIST_SELECT, + DISPLAYLIST_INFO, DISPLAYLIST_HELP, DISPLAYLIST_MAIN_MENU, DISPLAYLIST_GENERIC, diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index d8f8417f8e..f43f2479c0 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -193,7 +193,7 @@ void menu_entries_cbs_init(void *data, menu_entries_cbs_init_bind_cancel(cbs, path, label, type, idx, elem0, elem1); menu_entries_cbs_init_bind_scan(cbs, path, label, type, idx, elem0, elem1); menu_entries_cbs_init_bind_start(cbs, path, label, type, idx, elem0, elem1); - menu_entries_cbs_init_bind_select(cbs, path, label, type, idx, elem0, elem1); + menu_entries_cbs_init_bind_info(cbs, path, label, type, idx, elem0, elem1); menu_entries_cbs_init_bind_content_list_switch(cbs, path, label, type, idx, elem0, elem1); menu_entries_cbs_init_bind_up(cbs, path, label, type, idx, elem0, elem1); menu_entries_cbs_init_bind_down(cbs, path, label, type, idx, elem0, elem1); diff --git a/menu/menu_entries_cbs.h b/menu/menu_entries_cbs.h index 035d60580c..2be8216cf0 100644 --- a/menu/menu_entries_cbs.h +++ b/menu/menu_entries_cbs.h @@ -57,7 +57,7 @@ void menu_entries_cbs_init_bind_down(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, const char *elem0, const char *elem1); -void menu_entries_cbs_init_bind_select(menu_file_list_cbs_t *cbs, +void menu_entries_cbs_init_bind_info(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, const char *elem0, const char *elem1); diff --git a/menu/menu_entries_cbs_select.c b/menu/menu_entries_cbs_info.c similarity index 83% rename from menu/menu_entries_cbs_select.c rename to menu/menu_entries_cbs_info.c index 0b1fcf8bd4..e2518cb642 100644 --- a/menu/menu_entries_cbs_select.c +++ b/menu/menu_entries_cbs_info.c @@ -16,7 +16,7 @@ #include "menu.h" #include "menu_entries_cbs.h" -static int action_select_default(unsigned type, const char *label) +static int action_info_default(unsigned type, const char *label) { menu_displaylist_info_t info = {0}; menu_handle_t *menu = menu_driver_get_ptr(); @@ -26,15 +26,15 @@ static int action_select_default(unsigned type, const char *label) strlcpy(info.label, "info_screen", sizeof(info.label)); info.directory_ptr = menu->navigation.selection_ptr; - return menu_displaylist_push_list(&info, DISPLAYLIST_SELECT); + return menu_displaylist_push_list(&info, DISPLAYLIST_HELP); } -void menu_entries_cbs_init_bind_select(menu_file_list_cbs_t *cbs, +void menu_entries_cbs_init_bind_info(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, const char *elem0, const char *elem1) { if (!cbs) return; - cbs->action_select = action_select_default; + cbs->action_info = action_info_default; } diff --git a/menu/menu_entries_cbs_iterate.c b/menu/menu_entries_cbs_iterate.c index 9547b4a84f..217cc35cd7 100644 --- a/menu/menu_entries_cbs_iterate.c +++ b/menu/menu_entries_cbs_iterate.c @@ -351,7 +351,7 @@ static int action_iterate_menu_viewport(char *s, size_t len, const char *label, info.type = MENU_SETTINGS_CUSTOM_VIEWPORT; info.directory_ptr = menu->navigation.selection_ptr; - menu_displaylist_push_list(&info, DISPLAYLIST_SELECT); + menu_displaylist_push_list(&info, DISPLAYLIST_INFO); } break; @@ -366,7 +366,7 @@ static int action_iterate_menu_viewport(char *s, size_t len, const char *label, info.type = 0; info.directory_ptr = menu->navigation.selection_ptr; - menu_displaylist_push_list(&info, DISPLAYLIST_SELECT); + menu_displaylist_push_list(&info, DISPLAYLIST_INFO); } break; diff --git a/menu/menu_entries_cbs_ok.c b/menu/menu_entries_cbs_ok.c index af4db58788..63bea8e3a2 100644 --- a/menu/menu_entries_cbs_ok.c +++ b/menu/menu_entries_cbs_ok.c @@ -953,7 +953,7 @@ static int action_ok_compressed_archive_push(const char *path, strlcpy(info.path, path, sizeof(info.path)); strlcpy(info.label, "load_open_zip", sizeof(info.label)); - return menu_displaylist_push_list(&info, DISPLAYLIST_SELECT); + return menu_displaylist_push_list(&info, DISPLAYLIST_INFO); } static int action_ok_directory_push(const char *path, diff --git a/menu/menu_entry.c b/menu/menu_entry.c index 297edaea00..ac22dc528a 100644 --- a/menu/menu_entry.c +++ b/menu/menu_entry.c @@ -495,8 +495,8 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action) ret = cbs->action_right(entry->type, entry->label, false); break; case MENU_ACTION_SELECT: - if (cbs && cbs->action_select) - ret = cbs->action_select(entry->type, entry->label); + if (cbs && cbs->action_info) + ret = cbs->action_info(entry->type, entry->label); break; case MENU_ACTION_REFRESH: diff --git a/menu/menu_input.c b/menu/menu_input.c index c52297b323..5574da0631 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -399,7 +399,7 @@ static int menu_input_set_bind_mode_common(rarch_setting_t *setting, info.directory_ptr = nav->selection_ptr; strlcpy(info.label, "custom_bind", sizeof(info.label)); - menu_displaylist_push_list(&info, DISPLAYLIST_SELECT); + menu_displaylist_push_list(&info, DISPLAYLIST_INFO); break; case MENU_INPUT_BIND_ALL: menu->binds.target = &settings->input.binds @@ -412,7 +412,7 @@ static int menu_input_set_bind_mode_common(rarch_setting_t *setting, info.directory_ptr = nav->selection_ptr; strlcpy(info.label, "custom_bind_all", sizeof(info.label)); - menu_displaylist_push_list(&info, DISPLAYLIST_SELECT); + menu_displaylist_push_list(&info, DISPLAYLIST_INFO); break; } return 0; diff --git a/menu/menu_list.h b/menu/menu_list.h index c85ce1286b..10b1484755 100644 --- a/menu/menu_list.h +++ b/menu/menu_list.h @@ -43,7 +43,7 @@ typedef struct menu_file_list_cbs int (*action_scan)(const char *path, const char *label, unsigned type, size_t idx); int (*action_start)(unsigned type, const char *label); - int (*action_select)(unsigned type, const char *label); + int (*action_info)(unsigned type, const char *label); int (*action_content_list_switch)(void *data, void *userdata, const char *path, const char *label, unsigned type); int (*action_left)(unsigned type, const char *label, bool wraparound);