ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(menu entries) Cleanups

This commit is contained in:
twinaphex 2019-05-02 16:21:12 +02:00
parent 18568718ca
commit c205e59f57
1 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
menu/menu_entries.c
View File

@ -722,8 +722,6 @@ static void menu_list_flush_stack(menu_list_t *list,
unsigned type = 0; unsigned type = 0;
size_t entry_idx = 0; size_t entry_idx = 0;
file_list_t *menu_list = menu_list_get(list, (unsigned)idx); file_list_t *menu_list = menu_list_get(list, (unsigned)idx);
if (!list)
return;
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh); menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
file_list_get_last(menu_list, file_list_get_last(menu_list,
@ -734,7 +732,7 @@ static void menu_list_flush_stack(menu_list_t *list,
{ {
size_t new_selection_ptr = menu_navigation_get_selection(); size_t new_selection_ptr = menu_navigation_get_selection();
if (!list || !menu_list_pop_stack(list, idx, &new_selection_ptr, 1)) if (!menu_list_pop_stack(list, idx, &new_selection_ptr, 1))
break; break;
menu_navigation_set_selection(new_selection_ptr); menu_navigation_set_selection(new_selection_ptr);
@ -754,23 +752,6 @@ void menu_entries_get_at_offset(const file_list_t *list, size_t idx,
file_list_get_alt_at_offset(list, idx, alt); file_list_get_alt_at_offset(list, idx, alt);
} }
static bool menu_entries_clear(file_list_t *list)
{
unsigned i;
if (!list)
return false;
menu_driver_list_clear(list);
for (i = 0; i < list->size; i++)
file_list_free_actiondata(list, i);
if (list)
file_list_clear(list);
return true;
}
/** /**
* menu_entries_elem_get_first_char: * menu_entries_elem_get_first_char:
* @list : File list handle. * @list : File list handle.
@ -787,8 +768,8 @@ static int menu_entries_elem_get_first_char(
int ret = 0; int ret = 0;
const char *path = NULL; const char *path = NULL;
menu_entries_get_at_offset(list, offset, file_list_get_at_offset(list, offset, NULL, NULL, NULL, NULL);
NULL, NULL, NULL, NULL, &path); file_list_get_alt_at_offset(list, offset, &path);
if (path) if (path)
ret = tolower((int)*path); ret = tolower((int)*path);
@ -796,9 +777,9 @@ static int menu_entries_elem_get_first_char(
/* "Normalize" non-alphabetical entries so they /* "Normalize" non-alphabetical entries so they
* are lumped together for purposes of jumping. */ * are lumped together for purposes of jumping. */
if (ret < 'a') if (ret < 'a')
ret = 'a' - 1; return ('a' - 1);
else if (ret > 'z') else if (ret > 'z')
ret = 'z' + 1; return ('z' + 1);
return ret; return ret;
} }
@ -814,18 +795,20 @@ static void menu_entries_build_scroll_indices(file_list_t *list)
current = menu_entries_elem_get_first_char(list, 0); current = menu_entries_elem_get_first_char(list, 0);
menu_entries_get_at_offset(list, 0, NULL, NULL, &type, NULL, NULL); file_list_get_at_offset(list, 0, NULL, NULL, &type, NULL);
file_list_get_alt_at_offset(list, 0, NULL);
if (type == FILE_TYPE_DIRECTORY) if (type == FILE_TYPE_DIRECTORY)
current_is_dir = true; current_is_dir = true;
for (i = 1; i < list->size; i++) for (i = 1; i < list->size; i++)
{ {
int first = menu_entries_elem_get_first_char(list, (unsigned)i); int first = menu_entries_elem_get_first_char(list, (unsigned)i);
bool is_dir = false; bool is_dir = false;
unsigned idx = (unsigned)i;
menu_entries_get_at_offset(list, (unsigned)i, file_list_get_at_offset(list, idx, NULL, NULL, &type, NULL);
NULL, NULL, &type, NULL, NULL); file_list_get_alt_at_offset(list, idx, NULL);
if (type == FILE_TYPE_DIRECTORY) if (type == FILE_TYPE_DIRECTORY)
is_dir = true; is_dir = true;
@ -1279,7 +1262,21 @@ bool menu_entries_ctl(enum menu_entries_ctl_state state, void *data)
return false; return false;
return menu_entries_refresh((file_list_t*)data); return menu_entries_refresh((file_list_t*)data);
case MENU_ENTRIES_CTL_CLEAR: case MENU_ENTRIES_CTL_CLEAR:
return menu_entries_clear((file_list_t*)data); {
unsigned i;
file_list_t *list = (file_list_t*)data;
if (!list)
return false;
menu_driver_list_clear(list);
for (i = 0; i < list->size; i++)
file_list_free_actiondata(list, i);
file_list_clear(list);
}
break;
case MENU_ENTRIES_CTL_INIT: case MENU_ENTRIES_CTL_INIT:
return menu_entries_init(); return menu_entries_init();
case MENU_ENTRIES_CTL_SHOW_BACK: case MENU_ENTRIES_CTL_SHOW_BACK: