mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move menu_list_ functions to menu_list.c

Browse Source
This commit is contained in:
twinaphex 2015-10-17 17:38:17 +02:00
parent 776707577b
commit 71a5e8eab5
3 changed files with 118 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
menu/menu_displaylist.c
View File

@ -117,119 +117,6 @@ static void print_buf_lines(file_list_t *list, char *buf, int buf_size,
}
#endif
/**
* menu_list_elem_is_dir:
* @list : File list handle.
* @offset : Offset index of element.
*
* Is the current entry at offset @offset a directory?
*
* Returns: true (1) if entry is a directory, otherwise false (0).
**/
static bool menu_list_elem_is_dir(file_list_t *list,
unsigned offset)
{
unsigned type = 0;
menu_list_get_at_offset(list, offset, NULL, NULL, &type, NULL);
return type == MENU_FILE_DIRECTORY;
}
/**
* menu_list_elem_get_first_char:
* @list : File list handle.
* @offset : Offset index of element.
*
* Gets the first character of an element in the
* file list.
*
* Returns: first character of element in file list.
**/
static int menu_list_elem_get_first_char(
file_list_t *list, unsigned offset)
{
int ret;
const char *path = NULL;
menu_list_get_alt_at_offset(list, offset, &path);
ret = tolower((int)*path);
/* "Normalize" non-alphabetical entries so they
* are lumped together for purposes of jumping. */
if (ret < 'a')
ret = 'a' - 1;
else if (ret > 'z')
ret = 'z' + 1;
return ret;
}
static void menu_list_build_scroll_indices(file_list_t *list)
{
int current;
bool current_is_dir;
size_t i, scroll_value = 0;
if (!list || !list->size)
return;
menu_navigation_ctl(MENU_NAVIGATION_CTL_CLEAR_SCROLL_INDICES, NULL);
menu_navigation_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &scroll_value);
current = menu_list_elem_get_first_char(list, 0);
current_is_dir = menu_list_elem_is_dir(list, 0);
for (i = 1; i < list->size; i++)
{
int first = menu_list_elem_get_first_char(list, i);
bool is_dir = menu_list_elem_is_dir(list, i);
if ((current_is_dir && !is_dir) || (first > current))
menu_navigation_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &i);
current = first;
current_is_dir = is_dir;
}
scroll_value = list->size - 1;
menu_navigation_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &scroll_value);
}
/**
* Before a refresh, we could have deleted a
* file on disk, causing selection_ptr to
* suddendly be out of range.
*
* Ensure it doesn't overflow.
**/
static void menu_list_refresh(file_list_t *list)
{
size_t list_size, selection;
menu_list_t *menu_list = menu_list_get_ptr();
if (!menu_list || !list)
return;
if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection))
return;
menu_list_build_scroll_indices(list);
list_size = menu_list_get_size(menu_list);
if ((selection >= list_size) && list_size)
{
size_t idx = list_size - 1;
bool scroll = true;
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET_SELECTION, &idx);
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
}
else if (!list_size)
{
bool pending_push = true;
menu_navigation_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push);
}
}
static void menu_displaylist_push_perfcounter(
menu_displaylist_info_t *info,
struct retro_perf_counter **counters,
@ -1679,39 +1566,6 @@ static int menu_displaylist_parse_settings_in_subgroup(menu_displaylist_info_t *
return 0;
}
#if 0
static void menu_displaylist_push_horizontal_menu_list_content(
file_list_t *list, core_info_t *info, const char* path)
{
unsigned j;
struct string_list *str_list =
dir_list_new(path, info->supported_extensions, true);
if (!str_list)
return;
dir_list_sort(str_list, true);
for (j = 0; j < str_list->size; j++)
{
const char *name = str_list->elems[j].data;
if (!name)
continue;
if (str_list->elems[j].attr.i == RARCH_DIRECTORY)
menu_displaylist_push_horizontal_menu_list_content(list, info, name);
else
menu_entries_push(
list, name,
"content_actions",
MENU_FILE_CONTENTLIST_ENTRY, 0);
}
string_list_free(str_list);
}
#endif
static int menu_displaylist_sort_playlist(const content_playlist_entry_t *a,
const content_playlist_entry_t *b)
{
@ -2994,14 +2848,15 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
if (need_sort)
file_list_sort_on_alt(info->list);
if (need_refresh)
menu_list_refresh(info->list);
if (need_push)
{
driver_t *driver = driver_get_ptr();
const ui_companion_driver_t *ui = ui_companion_get_ptr();
if (need_refresh)
menu_list_refresh(info->list);
menu_driver_populate_entries(info->path, info->label, info->type);
if (ui && driver)

113
menu/menu_list.c
View File

@ -241,3 +241,116 @@ void menu_list_get_alt_at_offset(const file_list_t *list, size_t idx,
{
file_list_get_alt_at_offset(list, idx, alt);
}
/**
* menu_list_elem_is_dir:
* @list : File list handle.
* @offset : Offset index of element.
*
* Is the current entry at offset @offset a directory?
*
* Returns: true (1) if entry is a directory, otherwise false (0).
**/
static bool menu_list_elem_is_dir(file_list_t *list,
unsigned offset)
{
unsigned type = 0;
menu_list_get_at_offset(list, offset, NULL, NULL, &type, NULL);
return type == MENU_FILE_DIRECTORY;
}
/**
* menu_list_elem_get_first_char:
* @list : File list handle.
* @offset : Offset index of element.
*
* Gets the first character of an element in the
* file list.
*
* Returns: first character of element in file list.
**/
static int menu_list_elem_get_first_char(
file_list_t *list, unsigned offset)
{
int ret;
const char *path = NULL;
menu_list_get_alt_at_offset(list, offset, &path);
ret = tolower((int)*path);
/* "Normalize" non-alphabetical entries so they
* are lumped together for purposes of jumping. */
if (ret < 'a')
ret = 'a' - 1;
else if (ret > 'z')
ret = 'z' + 1;
return ret;
}
static void menu_list_build_scroll_indices(file_list_t *list)
{
int current;
bool current_is_dir;
size_t i, scroll_value = 0;
if (!list || !list->size)
return;
menu_navigation_ctl(MENU_NAVIGATION_CTL_CLEAR_SCROLL_INDICES, NULL);
menu_navigation_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &scroll_value);
current = menu_list_elem_get_first_char(list, 0);
current_is_dir = menu_list_elem_is_dir(list, 0);
for (i = 1; i < list->size; i++)
{
int first = menu_list_elem_get_first_char(list, i);
bool is_dir = menu_list_elem_is_dir(list, i);
if ((current_is_dir && !is_dir) || (first > current))
menu_navigation_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &i);
current = first;
current_is_dir = is_dir;
}
scroll_value = list->size - 1;
menu_navigation_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &scroll_value);
}
/**
* Before a refresh, we could have deleted a
* file on disk, causing selection_ptr to
* suddendly be out of range.
*
* Ensure it doesn't overflow.
**/
void menu_list_refresh(file_list_t *list)
{
size_t list_size, selection;
menu_list_t *menu_list = menu_list_get_ptr();
if (!menu_list || !list)
return;
if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection))
return;
menu_list_build_scroll_indices(list);
list_size = menu_list_get_size(menu_list);
if ((selection >= list_size) && list_size)
{
size_t idx = list_size - 1;
bool scroll = true;
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET_SELECTION, &idx);
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
}
else if (!list_size)
{
bool pending_push = true;
menu_navigation_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push);
}
}

2
menu/menu_list.h
View File

@ -148,6 +148,8 @@ void menu_list_get_alt_at_offset(const file_list_t *list, size_t idx,
void menu_list_set_alt_at_offset(file_list_t *list, size_t idx,
const char *alt);
void menu_list_refresh(file_list_t *list);
#ifdef __cplusplus
}
#endif