mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-29 18:32:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups - move code over to menu_driver.c

Browse Source
This commit is contained in:
twinaphex 2021-09-07 11:55:12 +02:00
parent 3a78b46862
commit 10782f9abc
7 changed files with 147 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
menu/cbs/menu_cbs_cancel.c
View File

@ -35,7 +35,7 @@ int action_cancel_pop_default(const char *path,
size_t new_selection_ptr;
const char *menu_label = NULL;
unsigned menu_type = MENU_SETTINGS_NONE;
menu_serch_terms_t *menu_search_terms = menu_entries_search_get_terms();
menu_search_terms_t *menu_search_terms= menu_entries_search_get_terms();
#ifdef HAVE_AUDIOMIXER
settings_t *settings = config_get_ptr();
bool audio_enable_menu = settings->bools.audio_enable_menu;
@ -109,7 +109,8 @@ static int action_cancel_core_content(const char *path,
if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CORE_UPDATER_LIST)))
{
menu_serch_terms_t *menu_search_terms = menu_entries_search_get_terms();
menu_search_terms_t *menu_search_terms =
menu_entries_search_get_terms();
/* Check whether search terms have been set
* > If so, remove the last search term */

2
menu/drivers/ozone.c
View File

@ -9541,7 +9541,7 @@ static void ozone_populate_entries(void *data,
* (Ozone is a fickle beast...) */
if (ozone->is_playlist)
{
menu_serch_terms_t *menu_search_terms =
menu_search_terms_t *menu_search_terms=
menu_entries_search_get_terms();
size_t num_search_terms =
menu_search_terms ? menu_search_terms->size : 0;

10
menu/menu_displaylist.c
View File

@ -182,7 +182,7 @@ static void filebrowser_parse(
const char *path = info->path;
bool path_is_compressed = !string_is_empty(path) ?
path_is_compressed_file(path) : false;
menu_serch_terms_t *search_terms = menu_entries_search_get_terms();
menu_search_terms_t *search_terms = menu_entries_search_get_terms();
if (path_is_compressed)
{
@ -864,7 +864,7 @@ static unsigned menu_displaylist_parse_core_manager_list(
if (core_info_list)
{
menu_serch_terms_t *search_terms = menu_entries_search_get_terms();
menu_search_terms_t *search_terms= menu_entries_search_get_terms();
core_info_t *core_info = NULL;
size_t menu_index = 0;
size_t i;
@ -1809,7 +1809,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
size_t list_size = playlist_size(playlist);
bool show_inline_core_name = false;
const char *menu_driver = menu_driver_ident();
menu_serch_terms_t *search_terms = menu_entries_search_get_terms();
menu_search_terms_t *search_terms = menu_entries_search_get_terms();
unsigned pl_show_inline_core_name = settings->uints.playlist_show_inline_core_name;
bool pl_show_sublabels = settings->bools.playlist_show_sublabels;
void (*sanitization)(char*);
@ -6651,7 +6651,7 @@ unsigned menu_displaylist_build_list(
#ifdef HAVE_CHEATS
if (cheat_manager_alloc_if_empty())
{
menu_serch_terms_t *search_terms = menu_entries_search_get_terms();
menu_search_terms_t *search_terms= menu_entries_search_get_terms();
bool search_active = search_terms && (search_terms->size > 0);
unsigned num_cheats = cheat_manager_get_size();
unsigned num_cheats_shown = 0;
@ -10986,7 +10986,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
#ifdef HAVE_NETWORKING
{
core_updater_list_t *core_list = core_updater_list_get_cached();
menu_serch_terms_t *search_terms = menu_entries_search_get_terms();
menu_search_terms_t *search_terms= menu_entries_search_get_terms();
bool show_experimental_cores = settings->bools.network_buildbot_show_experimental_cores;
size_t selection = menu_navigation_get_selection();

108
menu/menu_driver.c
View File

@ -2255,3 +2255,111 @@ void menu_input_set_pointer_visibility(
}
}
}
/**
* menu_entries_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.
**/
int menu_entries_elem_get_first_char(
file_list_t *list, unsigned offset)
{
const char *path = list->list[offset].alt
? list->list[offset].alt
: list->list[offset].path;
int ret = path ? TOLOWER((int)*path) : 0;
/* "Normalize" non-alphabetical entries so they
* are lumped together for purposes of jumping. */
if (ret < 'a')
return ('a' - 1);
else if (ret > 'z')
return ('z' + 1);
return ret;
}
void menu_entries_build_scroll_indices(
struct menu_state *menu_st,
file_list_t *list)
{
bool current_is_dir = false;
size_t i = 0;
int current = menu_entries_elem_get_first_char(list, 0);
unsigned type = list->list[0].type;
menu_st->scroll.index_list[0] = 0;
menu_st->scroll.index_size = 1;
if (type == FILE_TYPE_DIRECTORY)
current_is_dir = true;
for (i = 1; i < list->size; i++)
{
int first = menu_entries_elem_get_first_char(list, (unsigned)i);
bool is_dir = false;
unsigned idx = (unsigned)i;
type = list->list[idx].type;
if (type == FILE_TYPE_DIRECTORY)
is_dir = true;
if ((current_is_dir && !is_dir) || (first > current))
{
/* Add scroll index */
menu_st->scroll.index_list[menu_st->scroll.index_size] = i;
if (!((menu_st->scroll.index_size + 1) >= SCROLL_INDEX_SIZE))
menu_st->scroll.index_size++;
}
current = first;
current_is_dir = is_dir;
}
/* Add scroll index */
menu_st->scroll.index_list[menu_st->scroll.index_size] = list->size - 1;
if (!((menu_st->scroll.index_size + 1) >= SCROLL_INDEX_SIZE))
menu_st->scroll.index_size++;
}
void menu_display_common_image_upload(
const menu_ctx_driver_t *menu_driver_ctx,
void *menu_userdata,
struct texture_image *img,
void *user_data,
unsigned type)
{
if ( menu_driver_ctx
&& menu_driver_ctx->load_image)
menu_driver_ctx->load_image(menu_userdata,
img, (enum menu_image_type)type);
image_texture_free(img);
free(img);
free(user_data);
}
enum menu_driver_id_type menu_driver_set_id(
const char *driver_name)
{
if (!string_is_empty(driver_name))
{
if (string_is_equal(driver_name, "rgui"))
return MENU_DRIVER_ID_RGUI;
else if (string_is_equal(driver_name, "ozone"))
return MENU_DRIVER_ID_OZONE;
else if (string_is_equal(driver_name, "glui"))
return MENU_DRIVER_ID_GLUI;
else if (string_is_equal(driver_name, "xmb"))
return MENU_DRIVER_ID_XMB;
else if (string_is_equal(driver_name, "stripes"))
return MENU_DRIVER_ID_STRIPES;
}
return MENU_DRIVER_ID_UNKNOWN;
}

17
menu/menu_driver.h
View File

@ -764,6 +764,23 @@ void menu_driver_get_last_shader_path_int(
const char **dir_out, const char **file_name_out);
#endif
int menu_entries_elem_get_first_char(
file_list_t *list, unsigned offset);
void menu_entries_build_scroll_indices(
struct menu_state *menu_st,
file_list_t *list);
void menu_display_common_image_upload(
const menu_ctx_driver_t *menu_driver_ctx,
void *menu_userdata,
struct texture_image *img,
void *user_data,
unsigned type);
enum menu_driver_id_type menu_driver_set_id(
const char *driver_name);
bool generic_menu_init_list(struct menu_state *menu_st,
settings_t *settings);

8
menu/menu_entries.h
View File

@ -91,11 +91,11 @@ typedef struct menu_ctx_list
enum menu_list_type type;
} menu_ctx_list_t;
typedef struct menu_serch_terms
typedef struct menu_search_terms
{
size_t size;
char terms[MENU_SEARCH_FILTER_MAX_TERMS][MENU_SEARCH_FILTER_MAX_LENGTH];
} menu_serch_terms_t;
} menu_search_terms_t;
typedef struct menu_file_list_cbs
{
@ -130,7 +130,7 @@ typedef struct menu_file_list_cbs
const char *label, char *s, size_t len,
const char *path,
char *path_buf, size_t path_buf_size);
menu_serch_terms_t search;
menu_search_terms_t search;
enum msg_hash_enums enum_idx;
char action_sublabel_cache[MENU_SUBLABEL_MAX_LENGTH];
char action_title_cache [512];
@ -196,7 +196,7 @@ bool menu_entries_ctl(enum menu_entries_ctl_state state, void *data);
bool menu_entries_search_push(const char *search_term);
bool menu_entries_search_pop(void);
menu_serch_terms_t *menu_entries_search_get_terms(void);
menu_search_terms_t *menu_entries_search_get_terms(void);
/* Convenience function: Appends list of current
* search terms to specified string */
void menu_entries_search_append_terms_string(char *s, size_t len);

128
retroarch.c
View File

@ -1747,77 +1747,6 @@ int menu_entry_action(
return -1;
}
/**
* menu_entries_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_entries_elem_get_first_char(
file_list_t *list, unsigned offset)
{
const char *path = list->list[offset].alt
? list->list[offset].alt
: list->list[offset].path;
int ret = path ? TOLOWER((int)*path) : 0;
/* "Normalize" non-alphabetical entries so they
* are lumped together for purposes of jumping. */
if (ret < 'a')
return ('a' - 1);
else if (ret > 'z')
return ('z' + 1);
return ret;
}
static void menu_entries_build_scroll_indices(
struct menu_state *menu_st,
file_list_t *list)
{
bool current_is_dir = false;
size_t i = 0;
int current = menu_entries_elem_get_first_char(list, 0);
unsigned type = list->list[0].type;
menu_st->scroll.index_list[0] = 0;
menu_st->scroll.index_size = 1;
if (type == FILE_TYPE_DIRECTORY)
current_is_dir = true;
for (i = 1; i < list->size; i++)
{
int first = menu_entries_elem_get_first_char(list, (unsigned)i);
bool is_dir = false;
unsigned idx = (unsigned)i;
type = list->list[idx].type;
if (type == FILE_TYPE_DIRECTORY)
is_dir = true;
if ((current_is_dir && !is_dir) || (first > current))
{
/* Add scroll index */
menu_st->scroll.index_list[menu_st->scroll.index_size] = i;
if (!((menu_st->scroll.index_size + 1) >= SCROLL_INDEX_SIZE))
menu_st->scroll.index_size++;
}
current = first;
current_is_dir = is_dir;
}
/* Add scroll index */
menu_st->scroll.index_list[menu_st->scroll.index_size] = list->size - 1;
if (!((menu_st->scroll.index_size + 1) >= SCROLL_INDEX_SIZE))
menu_st->scroll.index_size++;
}
menu_file_list_cbs_t *menu_entries_get_last_stack_actiondata(void)
{
struct rarch_state *p_rarch = &rarch_st;
@ -2420,7 +2349,7 @@ bool menu_entries_ctl(enum menu_entries_ctl_state state, void *data)
return true;
}
static menu_serch_terms_t *menu_entries_search_get_terms_internal(void)
static menu_search_terms_t *menu_entries_search_get_terms_internal(void)
{
struct rarch_state *p_rarch = &rarch_st;
struct menu_state *menu_st = &p_rarch->menu_driver_state;
@ -2441,7 +2370,7 @@ static menu_serch_terms_t *menu_entries_search_get_terms_internal(void)
bool menu_entries_search_push(const char *search_term)
{
menu_serch_terms_t *search = menu_entries_search_get_terms_internal();
menu_search_terms_t *search = menu_entries_search_get_terms_internal();
char search_term_clipped[MENU_SEARCH_FILTER_MAX_LENGTH];
size_t i;
@ -2478,7 +2407,7 @@ bool menu_entries_search_push(const char *search_term)
bool menu_entries_search_pop(void)
{
menu_serch_terms_t *search = menu_entries_search_get_terms_internal();
menu_search_terms_t *search = menu_entries_search_get_terms_internal();
/* Do nothing if list of search terms is empty */
if (!search ||
@ -2492,9 +2421,9 @@ bool menu_entries_search_pop(void)
return true;
}
menu_serch_terms_t *menu_entries_search_get_terms(void)
menu_search_terms_t *menu_entries_search_get_terms(void)
{
menu_serch_terms_t *search = menu_entries_search_get_terms_internal();
menu_search_terms_t *search = menu_entries_search_get_terms_internal();
if (!search ||
(search->size == 0))
@ -2507,7 +2436,7 @@ menu_serch_terms_t *menu_entries_search_get_terms(void)
* search terms to specified string */
void menu_entries_search_append_terms_string(char *s, size_t len)
{
menu_serch_terms_t *search = menu_entries_search_get_terms_internal();
menu_search_terms_t *search = menu_entries_search_get_terms_internal();
if (search &&
(search->size > 0) &&
@ -2633,23 +2562,6 @@ end:
return match_found;
}
static void menu_display_common_image_upload(
const menu_ctx_driver_t *menu_driver_ctx,
void *menu_userdata,
struct texture_image *img,
void *user_data,
unsigned type)
{
if ( menu_driver_ctx
&& menu_driver_ctx->load_image)
menu_driver_ctx->load_image(menu_userdata,
img, (enum menu_image_type)type);
image_texture_free(img);
free(img);
free(user_data);
}
/* TODO/FIXME - seems only RGUI uses this - can this be
* refactored away or we can have one common function used
* across all menu drivers? */
@ -3273,24 +3185,6 @@ bool menu_driver_list_cache(menu_ctx_list_t *list)
return true;
}
static enum menu_driver_id_type menu_driver_set_id(const char *driver_name)
{
if (!string_is_empty(driver_name))
{
if (string_is_equal(driver_name, "rgui"))
return MENU_DRIVER_ID_RGUI;
else if (string_is_equal(driver_name, "ozone"))
return MENU_DRIVER_ID_OZONE;
else if (string_is_equal(driver_name, "glui"))
return MENU_DRIVER_ID_GLUI;
else if (string_is_equal(driver_name, "xmb"))
return MENU_DRIVER_ID_XMB;
else if (string_is_equal(driver_name, "stripes"))
return MENU_DRIVER_ID_STRIPES;
}
return MENU_DRIVER_ID_UNKNOWN;
}
static bool menu_driver_init_internal(
gfx_display_t *p_disp,
struct rarch_state *p_rarch,
@ -4318,7 +4212,6 @@ clear:
}
static bool menu_shader_manager_save_preset_internal(
struct rarch_state *p_rarch,
bool save_reference,
const struct video_shader *shader,
const char *basename,
@ -4446,7 +4339,6 @@ static bool menu_shader_manager_save_preset_internal(
}
static bool menu_shader_manager_operate_auto_preset(
struct rarch_state *p_rarch,
struct retro_system_info *system,
settings_t *settings,
enum auto_shader_operation op,
@ -4520,7 +4412,6 @@ static bool menu_shader_manager_operate_auto_preset(
{
case AUTO_SHADER_OP_SAVE:
return menu_shader_manager_save_preset_internal(
p_rarch,
settings->bools.video_shader_preset_save_reference_enable,
shader, file,
dir_video_shader,
@ -4638,7 +4529,7 @@ bool menu_shader_manager_save_auto_preset(
struct retro_system_info *system = &runloop_state.system.info;
settings_t *settings = p_rarch->configuration_settings;
return menu_shader_manager_operate_auto_preset(
p_rarch, system, settings,
system, settings,
AUTO_SHADER_OP_SAVE, shader,
dir_video_shader,
dir_menu_config,
@ -4678,7 +4569,6 @@ bool menu_shader_manager_save_preset(const struct video_shader *shader,
preset_dirs[2] = config_directory;
return menu_shader_manager_save_preset_internal(
p_rarch,
settings->bools.video_shader_preset_save_reference_enable,
shader, basename,
dir_video_shader,
@ -4702,7 +4592,7 @@ bool menu_shader_manager_remove_auto_preset(
struct retro_system_info *system = &runloop_state.system.info;
settings_t *settings = p_rarch->configuration_settings;
return menu_shader_manager_operate_auto_preset(
p_rarch, system, settings,
system, settings,
AUTO_SHADER_OP_REMOVE, NULL,
dir_video_shader,
dir_menu_config,
@ -4724,7 +4614,7 @@ bool menu_shader_manager_auto_preset_exists(
struct retro_system_info *system = &runloop_state.system.info;
settings_t *settings = p_rarch->configuration_settings;
return menu_shader_manager_operate_auto_preset(
p_rarch, system, settings,
system, settings,
AUTO_SHADER_OP_EXISTS, NULL,
dir_video_shader,
dir_menu_config,