CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-03 18:22:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor menu_entry

Browse Source
This commit is contained in:
twinaphex 2017-09-29 18:22:11 +02:00
parent 05d5def6c2
commit 08f9e4aaf9
2 changed files with 54 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
menu/widgets/menu_entry.c
View File

@ -77,6 +77,18 @@ enum menu_entry_type menu_entry_get_type(uint32_t i)
void menu_entry_free(menu_entry_t *entry)
{
if (!entry)
return;
if (entry->label && !string_is_empty(entry->label))
free(entry->label);
if (entry->rich_label && !string_is_empty(entry->rich_label))
free(entry->rich_label);
if (entry->sublabel && !string_is_empty(entry->sublabel))
free(entry->sublabel);
if (entry->path && !string_is_empty(entry->path))
free(entry->path);
if (entry->value && !string_is_empty(entry->value))
free(entry->value);
}
menu_entry_t *menu_entry_alloc(void)
@ -89,11 +101,11 @@ menu_entry_t *menu_entry_alloc(void)
void menu_entry_init(menu_entry_t *entry)
{
entry->path[0] = '\0';
entry->label[0] = '\0';
entry->sublabel[0] = '\0';
entry->value[0] = '\0';
entry->rich_label[0] = '\0';
entry->path = NULL;
entry->label = NULL;
entry->value = NULL;
entry->sublabel = NULL;
entry->rich_label = NULL;
entry->enum_idx = MSG_UNKNOWN;
entry->entry_idx = 0;
entry->idx = 0;
@ -294,12 +306,15 @@ float menu_entry_num_max(uint32_t i)
void menu_entry_get(menu_entry_t *entry, size_t stack_idx,
size_t i, void *userdata, bool use_representation)
{
char newpath[255];
const char *path = NULL;
const char *entry_label = NULL;
menu_file_list_cbs_t *cbs = NULL;
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(stack_idx);
file_list_t *list = (userdata) ? (file_list_t*)userdata : selection_buf;
newpath[0] = '\0';
if (!list)
return;
@ -318,38 +333,58 @@ void menu_entry_get(menu_entry_t *entry, size_t stack_idx,
menu_entries_get_last_stack(NULL, &label, NULL, &enum_idx, NULL);
if (cbs->action_get_value && use_representation)
{
entry->value = (char*)malloc(255 *
sizeof(char));
entry->value[0] = '\0';
cbs->action_get_value(list,
&entry->spacing, entry->type, (unsigned)i, label,
entry->value, sizeof(entry->value),
entry->value,
255 * sizeof(char),
entry_label, path,
entry->path, sizeof(entry->path));
newpath,
sizeof(newpath)
);
}
if (cbs->action_label)
{
entry->rich_label = (char*)malloc(255 *
sizeof(char));
entry->rich_label[0] = '\0';
cbs->action_label(list,
entry->type, (unsigned)i,
label, path,
entry->rich_label,
sizeof(entry->rich_label));
255 * sizeof(char));
}
if (cbs->action_sublabel)
{
entry->sublabel = (char*)malloc(255 *
sizeof(char));
entry->sublabel[0] = '\0';
cbs->action_sublabel(list,
entry->type, (unsigned)i,
label, path,
entry->sublabel,
sizeof(entry->sublabel));
255 * sizeof(char));
}
}
entry->idx = (unsigned)i;
if (path && !use_representation)
strlcpy(entry->path, path, sizeof(entry->path));
if (cbs && cbs->setting && cbs->setting->enum_value_idx != MSG_UNKNOWN
strlcpy(newpath, path, sizeof(newpath));
else if (cbs && cbs->setting && cbs->setting->enum_value_idx != MSG_UNKNOWN
&& !cbs->setting->dont_use_enum_idx_representation)
strlcpy(entry->path, msg_hash_to_str(cbs->setting->enum_value_idx), sizeof(entry->path));
strlcpy(newpath, msg_hash_to_str(cbs->setting->enum_value_idx), sizeof(newpath));
if (!string_is_empty(newpath))
entry->path = strdup(newpath);
if (entry_label)
strlcpy(entry->label, entry_label, sizeof(entry->label));
entry->label = strdup(entry_label);
}
bool menu_entry_is_currently_selected(unsigned id)

10
menu/widgets/menu_entry.h
View File

@ -50,11 +50,11 @@ typedef struct menu_entry
unsigned type;
unsigned spacing;
size_t entry_idx;
char path[255];
char label[255];
char sublabel[255];
char rich_label[255];
char value[255];
char *path;
char *label;
char *sublabel;
char *rich_label;
char *value;
} menu_entry_t;
enum menu_entry_type menu_entry_get_type(uint32_t i);