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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-06-06 14:17:58 +02:00
parent 802d501c39
commit 7063f3df13
2 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/menu_defines.h
View File

@ -64,7 +64,6 @@ enum rarch_menu_ctl_state
RARCH_MENU_CTL_UNSET_OWN_DRIVER, RARCH_MENU_CTL_UNSET_OWN_DRIVER,
RARCH_MENU_CTL_OWNS_DRIVER, RARCH_MENU_CTL_OWNS_DRIVER,
RARCH_MENU_CTL_FIND_DRIVER, RARCH_MENU_CTL_FIND_DRIVER,
RARCH_MENU_CTL_LIST_FREE,
RARCH_MENU_CTL_ENVIRONMENT, RARCH_MENU_CTL_ENVIRONMENT,
RARCH_MENU_CTL_POINTER_DOWN, RARCH_MENU_CTL_POINTER_DOWN,
RARCH_MENU_CTL_POINTER_UP, RARCH_MENU_CTL_POINTER_UP,
@ -81,7 +80,6 @@ enum rarch_menu_ctl_state
MENU_NAVIGATION_CTL_SET_LAST, MENU_NAVIGATION_CTL_SET_LAST,
MENU_NAVIGATION_CTL_DESCEND_ALPHABET, MENU_NAVIGATION_CTL_DESCEND_ALPHABET,
MENU_NAVIGATION_CTL_ASCEND_ALPHABET, MENU_NAVIGATION_CTL_ASCEND_ALPHABET,
MENU_NAVIGATION_CTL_SET_SCROLL_ACCEL,
MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL
}; };

73
retroarch.c
View File

@ -2598,6 +2598,9 @@ static bool accessibility_speak_priority(
#endif #endif
#ifdef HAVE_MENU #ifdef HAVE_MENU
static void menu_driver_list_free(
struct rarch_state *p_rarch,
menu_ctx_list_t *list);
static void menu_input_post_iterate( static void menu_input_post_iterate(
struct rarch_state *p_rarch, struct rarch_state *p_rarch,
int *ret, unsigned action); int *ret, unsigned action);
@ -4044,7 +4047,9 @@ int menu_entry_action(
return -1; return -1;
} }
static void menu_list_free_list(file_list_t *list) static void menu_list_free_list(
struct rarch_state *p_rarch,
file_list_t *list)
{ {
unsigned i; unsigned i;
@ -4056,13 +4061,15 @@ static void menu_list_free_list(file_list_t *list)
list_info.idx = i; list_info.idx = i;
list_info.list_size = list->size; list_info.list_size = list->size;
menu_driver_ctl(RARCH_MENU_CTL_LIST_FREE, &list_info); menu_driver_list_free(p_rarch, &list_info);
} }
file_list_free(list); file_list_free(list);
} }
static void menu_list_free(menu_list_t *menu_list) static void menu_list_free(
struct rarch_state *p_rarch,
menu_list_t *menu_list)
{ {
if (!menu_list) if (!menu_list)
return; return;
@ -4076,7 +4083,8 @@ static void menu_list_free(menu_list_t *menu_list)
if (!menu_list->menu_stack[i]) if (!menu_list->menu_stack[i])
continue; continue;
menu_list_free_list(menu_list->menu_stack[i]); menu_list_free_list(p_rarch,
menu_list->menu_stack[i]);
menu_list->menu_stack[i] = NULL; menu_list->menu_stack[i] = NULL;
} }
@ -4092,7 +4100,8 @@ static void menu_list_free(menu_list_t *menu_list)
if (!menu_list->selection_buf[i]) if (!menu_list->selection_buf[i])
continue; continue;
menu_list_free_list(menu_list->selection_buf[i]); menu_list_free_list(p_rarch,
menu_list->selection_buf[i]);
menu_list->selection_buf[i] = NULL; menu_list->selection_buf[i] = NULL;
} }
@ -4102,7 +4111,7 @@ static void menu_list_free(menu_list_t *menu_list)
free(menu_list); free(menu_list);
} }
static menu_list_t *menu_list_new(void) static menu_list_t *menu_list_new(struct rarch_state *p_rarch)
{ {
unsigned i; unsigned i;
menu_list_t *list = (menu_list_t*)malloc(sizeof(*list)); menu_list_t *list = (menu_list_t*)malloc(sizeof(*list));
@ -4136,7 +4145,7 @@ static menu_list_t *menu_list_new(void)
return list; return list;
error: error:
menu_list_free(list); menu_list_free(p_rarch, list);
return NULL; return NULL;
} }
@ -4174,7 +4183,7 @@ static bool menu_list_pop_stack(
list_info.idx = menu_list->size - 1; list_info.idx = menu_list->size - 1;
list_info.list_size = menu_list->size - 1; list_info.list_size = menu_list->size - 1;
menu_driver_ctl(RARCH_MENU_CTL_LIST_FREE, &list_info); menu_driver_list_free(p_rarch, &list_info);
} }
file_list_pop(menu_list, directory_ptr); file_list_pop(menu_list, directory_ptr);
@ -4464,7 +4473,7 @@ static void menu_entries_list_deinit(struct rarch_state *p_rarch)
{ {
struct menu_state *menu_st = &p_rarch->menu_driver_state; struct menu_state *menu_st = &p_rarch->menu_driver_state;
if (menu_st->entries.list) if (menu_st->entries.list)
menu_list_free(menu_st->entries.list); menu_list_free(p_rarch, menu_st->entries.list);
menu_st->entries.list = NULL; menu_st->entries.list = NULL;
} }
@ -4481,7 +4490,7 @@ static void menu_entries_settings_deinit(struct rarch_state *p_rarch)
static bool menu_entries_init(struct rarch_state *p_rarch) static bool menu_entries_init(struct rarch_state *p_rarch)
{ {
struct menu_state *menu_st = &p_rarch->menu_driver_state; struct menu_state *menu_st = &p_rarch->menu_driver_state;
if (!(menu_st->entries.list = (menu_list_t*)menu_list_new())) if (!(menu_st->entries.list = (menu_list_t*)menu_list_new(p_rarch)))
goto error; goto error;
menu_setting_ctl(MENU_SETTING_CTL_NEW, &menu_st->entries.list_settings); menu_setting_ctl(MENU_SETTING_CTL_NEW, &menu_st->entries.list_settings);
@ -5843,6 +5852,22 @@ retro_time_t menu_driver_get_current_time(void)
return menu_st->current_time_us; return menu_st->current_time_us;
} }
static void menu_driver_list_free(
struct rarch_state *p_rarch,
menu_ctx_list_t *list)
{
if (p_rarch->menu_driver_ctx)
if (p_rarch->menu_driver_ctx->list_free)
p_rarch->menu_driver_ctx->list_free(
list->list, list->idx, list->list_size);
if (list->list)
{
file_list_free_userdata (list->list, list->idx);
file_list_free_actiondata(list->list, list->idx);
}
}
bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
{ {
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;
@ -5982,22 +6007,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
} }
p_rarch->menu_driver_data = NULL; p_rarch->menu_driver_data = NULL;
break; break;
case RARCH_MENU_CTL_LIST_FREE:
{
menu_ctx_list_t *list = (menu_ctx_list_t*)data;
if (p_rarch->menu_driver_ctx)
if (p_rarch->menu_driver_ctx->list_free)
p_rarch->menu_driver_ctx->list_free(
list->list, list->idx, list->list_size);
if (list->list)
{
file_list_free_userdata (list->list, list->idx);
file_list_free_actiondata(list->list, list->idx);
}
}
break;
case RARCH_MENU_CTL_ENVIRONMENT: case RARCH_MENU_CTL_ENVIRONMENT:
{ {
menu_ctx_environment_t *menu_environ = menu_ctx_environment_t *menu_environ =
@ -6253,14 +6262,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
*sel = menu_st->scroll.acceleration; *sel = menu_st->scroll.acceleration;
} }
break; break;
case MENU_NAVIGATION_CTL_SET_SCROLL_ACCEL:
{
size_t *sel = (size_t*)data;
if (!sel)
return false;
menu_st->scroll.acceleration = (unsigned)(*sel);
}
break;
default: default:
case RARCH_MENU_CTL_NONE: case RARCH_MENU_CTL_NONE:
break; break;
@ -19896,6 +19897,7 @@ static unsigned menu_event(
bool set_scroll = false; bool set_scroll = false;
size_t new_scroll_accel = 0; size_t new_scroll_accel = 0;
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;
struct menu_state *menu_st = &p_rarch->menu_driver_state;
menu_input_t *menu_input = &p_rarch->menu_input_state; menu_input_t *menu_input = &p_rarch->menu_input_state;
menu_input_pointer_hw_state_t *pointer_hw_state = &p_rarch->menu_input_pointer_hw_state; menu_input_pointer_hw_state_t *pointer_hw_state = &p_rarch->menu_input_pointer_hw_state;
settings_t *settings = p_rarch->configuration_settings; settings_t *settings = p_rarch->configuration_settings;
@ -19972,8 +19974,7 @@ static unsigned menu_event(
} }
if (set_scroll) if (set_scroll)
menu_driver_ctl(MENU_NAVIGATION_CTL_SET_SCROLL_ACCEL, menu_st->scroll.acceleration = (unsigned)(new_scroll_accel);
&new_scroll_accel);
delay_count += gfx_animation_get_delta_time(); delay_count += gfx_animation_get_delta_time();