mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 18:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Turn menu_list_pop into static function

Browse Source
This commit is contained in:
twinaphex 2015-09-05 00:50:17 +02:00
parent 94d7d7d1aa
commit 9a95f98283
6 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/cbs/menu_cbs_ok.c
View File

@ -460,6 +460,7 @@ static int action_ok_playlist_entry(const char *path,
content_playlist_t *playlist = g_defaults.history; content_playlist_t *playlist = g_defaults.history;
bool is_history = true; bool is_history = true;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
menu_navigation_t *nav = menu_navigation_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr();
uint32_t hash_label = menu_hash_calculate(label); uint32_t hash_label = menu_hash_calculate(label);
@ -517,7 +518,7 @@ static int action_ok_playlist_entry(const char *path,
{ {
case MENU_LABEL_COLLECTION: case MENU_LABEL_COLLECTION:
case MENU_LABEL_RDB_ENTRY_START_CONTENT: case MENU_LABEL_RDB_ENTRY_START_CONTENT:
menu_list_pop_stack(menu_list); menu_list_pop_stack(menu_list, &nav->selection_ptr);
break; break;
default: default:
menu_list_flush_stack(menu_list, NULL, MENU_SETTINGS); menu_list_flush_stack(menu_list, NULL, MENU_SETTINGS);
@ -870,6 +871,7 @@ static int action_ok_core_deferred_set(const char *path,
{ {
char core_display_name[PATH_MAX_LENGTH]; char core_display_name[PATH_MAX_LENGTH];
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
menu_navigation_t *nav = menu_navigation_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr();
if (!menu || !menu_list) if (!menu || !menu_list)
return -1; return -1;
@ -888,7 +890,7 @@ static int action_ok_core_deferred_set(const char *path,
content_playlist_write_file(menu->playlist); content_playlist_write_file(menu->playlist);
menu_list_pop_stack(menu_list); menu_list_pop_stack(menu_list, &nav->selection_ptr);
return -1; return -1;
} }

3
menu/menu_entry.c
View File

@ -33,10 +33,11 @@
/* Clicks the back button */ /* Clicks the back button */
int menu_entry_go_back(void) int menu_entry_go_back(void)
{ {
menu_navigation_t *nav = menu_navigation_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr();
if (!menu_list) if (!menu_list)
return -1; return -1;
menu_list_pop_stack(menu_list); menu_list_pop_stack(menu_list, &nav->selection_ptr);
return 0; return 0;
} }

9
menu/menu_input.c
View File

@ -722,7 +722,7 @@ static int menu_input_mouse_frame(
} }
if (BIT64_GET(input_mouse, MOUSE_ACTION_BUTTON_R)) if (BIT64_GET(input_mouse, MOUSE_ACTION_BUTTON_R))
menu_list_pop_stack(menu_list); menu_list_pop_stack(menu_list, &nav->selection_ptr);
if (BIT64_GET(input_mouse, MOUSE_ACTION_WHEEL_DOWN)) if (BIT64_GET(input_mouse, MOUSE_ACTION_WHEEL_DOWN))
menu_navigation_increment(nav, 1); menu_navigation_increment(nav, 1);
@ -767,7 +767,7 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse,
if ((unsigned)menu_input->mouse.y < disp->header_height) if ((unsigned)menu_input->mouse.y < disp->header_height)
{ {
menu_list_pop_stack(menu_list); menu_list_pop_stack(menu_list, &nav->selection_ptr);
return 0; return 0;
} }
if ( if (
@ -830,6 +830,7 @@ static int menu_input_pointer_post_iterate(menu_file_list_cbs_t *cbs,
{ {
int ret = 0; int ret = 0;
menu_display_t *disp = menu_display_get_ptr(); menu_display_t *disp = menu_display_get_ptr();
menu_navigation_t *nav = menu_navigation_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr();
menu_input_t *menu_input = menu_input_get_ptr(); menu_input_t *menu_input = menu_input_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -880,7 +881,7 @@ static int menu_input_pointer_post_iterate(menu_file_list_cbs_t *cbs,
if (!menu_input->pointer.dragging) if (!menu_input->pointer.dragging)
{ {
if ((unsigned)menu_input->pointer.start_y < disp->header_height) if ((unsigned)menu_input->pointer.start_y < disp->header_height)
menu_list_pop_stack(menu_list); menu_list_pop_stack(menu_list, &nav->selection_ptr);
else if (menu_input->pointer.ptr <= menu_list_get_size(menu_list)-1) else if (menu_input->pointer.ptr <= menu_list_get_size(menu_list)-1)
{ {
menu_input->pointer.oldpressed[0] = false; menu_input->pointer.oldpressed[0] = false;
@ -904,7 +905,7 @@ static int menu_input_pointer_post_iterate(menu_file_list_cbs_t *cbs,
if (!menu_input->pointer.oldback) if (!menu_input->pointer.oldback)
{ {
menu_input->pointer.oldback = true; menu_input->pointer.oldback = true;
menu_list_pop_stack(menu_list); menu_list_pop_stack(menu_list, &nav->selection_ptr);
} }
} }
menu_input->pointer.oldback = menu_input->pointer.back; menu_input->pointer.oldback = menu_input->pointer.back;

4
menu/menu_iterate.c
View File

@ -469,7 +469,7 @@ int menu_iterate(bool render_this_frame, unsigned action)
break; break;
case ITERATE_TYPE_BIND: case ITERATE_TYPE_BIND:
if (menu_input_bind_iterate(menu->state.msg, sizeof(menu->state.msg))) if (menu_input_bind_iterate(menu->state.msg, sizeof(menu->state.msg)))
menu_list_pop_stack(menu_list); menu_list_pop_stack(menu_list, &nav->selection_ptr);
else else
menu->state.do_messagebox = true; menu->state.do_messagebox = true;
if (render_this_frame) if (render_this_frame)
@ -527,7 +527,7 @@ int menu_iterate(bool render_this_frame, unsigned action)
} }
if (menu->state.do_pop_stack && action == MENU_ACTION_OK) if (menu->state.do_pop_stack && action == MENU_ACTION_OK)
menu_list_pop(menu_list->menu_stack, menu->state.pop_selected); menu_list_pop_stack(menu_list, menu->state.pop_selected);
if (menu->state.do_post_iterate) if (menu->state.do_post_iterate)
menu_input_post_iterate(&ret, action); menu_input_post_iterate(&ret, action);

24
menu/menu_list.c
View File

@ -133,6 +133,16 @@ static INLINE int menu_list_flush_stack_type(
return needle ? strcmp(needle, label) : (type != final_type); return needle ? strcmp(needle, label) : (type != final_type);
} }
static void menu_list_pop(file_list_t *list, size_t *directory_ptr)
{
if (list->size != 0)
menu_driver_list_free(list, list->size - 1, list->size - 1);
file_list_pop(list, directory_ptr);
menu_driver_list_set_selection(list);
}
void menu_list_flush_stack(menu_list_t *list, void menu_list_flush_stack(menu_list_t *list,
const char *needle, unsigned final_type) const char *needle, unsigned final_type)
{ {
@ -157,9 +167,8 @@ void menu_list_flush_stack(menu_list_t *list,
} }
} }
void menu_list_pop_stack(menu_list_t *list) void menu_list_pop_stack(menu_list_t *list, size_t *directory_ptr)
{ {
menu_navigation_t *nav = menu_navigation_get_ptr();
if (!list) if (!list)
return; return;
@ -168,19 +177,10 @@ void menu_list_pop_stack(menu_list_t *list)
menu_driver_list_cache(MENU_LIST_PLAIN, 0); menu_driver_list_cache(MENU_LIST_PLAIN, 0);
menu_list_pop(list->menu_stack, &nav->selection_ptr); menu_list_pop(list->menu_stack, directory_ptr);
menu_entries_set_refresh(false); menu_entries_set_refresh(false);
} }
void menu_list_pop(file_list_t *list, size_t *directory_ptr)
{
if (list->size != 0)
menu_driver_list_free(list, list->size - 1, list->size - 1);
file_list_pop(list, directory_ptr);
menu_driver_list_set_selection(list);
}
void menu_list_clear(file_list_t *list) void menu_list_clear(file_list_t *list)
{ {

4
menu/menu_list.h
View File

@ -78,9 +78,7 @@ menu_list_t *menu_list_new(void);
void menu_list_flush_stack(menu_list_t *list, void menu_list_flush_stack(menu_list_t *list,
const char *needle, unsigned final_type); const char *needle, unsigned final_type);
void menu_list_pop(file_list_t *list, size_t *directory_ptr); void menu_list_pop_stack(menu_list_t *list, size_t *directory_ptr);
void menu_list_pop_stack(menu_list_t *list);
void menu_list_get_at_offset(const file_list_t *list, size_t idx, void menu_list_get_at_offset(const file_list_t *list, size_t idx,
const char **path, const char **label, unsigned *file_type, const char **path, const char **label, unsigned *file_type,