mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Cleanups pt. 1

Browse Source
This commit is contained in:
twinaphex 2014-09-24 06:35:57 +02:00
parent faebff2db0
commit 90be5e6f93
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
frontend/menu/backend/menu_common_backend.c
View File

@ -1696,14 +1696,14 @@ static int menu_load_or_open_zip_iterate(unsigned action)
if (action == MENU_ACTION_OK) if (action == MENU_ACTION_OK)
{ {
menu_entries_pop(driver.menu->menu_stack); char cat_path[PATH_MAX];
const char *menu_path = NULL;
const char *menu_label = NULL;
const char* path = NULL;
const char* label = NULL;
unsigned int menu_type = 0, type = 0;
const char *menu_path; menu_entries_pop(driver.menu->menu_stack);
const char *menu_label;
unsigned int menu_type;
char const* path;
char const* label;
unsigned int type;
file_list_get_last(driver.menu->menu_stack, &menu_path, &menu_label, file_list_get_last(driver.menu->menu_stack, &menu_path, &menu_label,
&menu_type); &menu_type);
@ -1714,21 +1714,19 @@ static int menu_load_or_open_zip_iterate(unsigned action)
file_list_get_at_offset(driver.menu->selection_buf, file_list_get_at_offset(driver.menu->selection_buf,
driver.menu->selection_ptr, &path, &label, &type); driver.menu->selection_ptr, &path, &label, &type);
char cat_path[PATH_MAX];
fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path)); fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path));
menu_entries_push(driver.menu->menu_stack, cat_path, menu_label, type, menu_entries_push(driver.menu->menu_stack, cat_path, menu_label, type,
driver.menu->selection_ptr); driver.menu->selection_ptr);
} }
else if (action == MENU_ACTION_CANCEL) else if (action == MENU_ACTION_CANCEL)
{ {
menu_entries_pop(driver.menu->menu_stack); const char *menu_path = NULL;
const char *menu_label = NULL;
const char* path = NULL;
const char* label = NULL;
unsigned int menu_type = 0, type = 0;
const char *menu_path; menu_entries_pop(driver.menu->menu_stack);
const char *menu_label;
unsigned int menu_type;
char const* path;
char const* label;
unsigned int type;
file_list_get_last(driver.menu->menu_stack, &menu_path, &menu_label, file_list_get_last(driver.menu->menu_stack, &menu_path, &menu_label,
&menu_type); &menu_type);
@ -1824,6 +1822,7 @@ static int menu_action_ok(const char *menu_path,
else if (!strcmp(menu_label, "disk_image_append")) else if (!strcmp(menu_label, "disk_image_append"))
{ {
char image[PATH_MAX]; char image[PATH_MAX];
fill_pathname_join(image, menu_path, path, sizeof(image)); fill_pathname_join(image, menu_path, path, sizeof(image));
rarch_disk_control_append_image(image); rarch_disk_control_append_image(image);
@ -1860,6 +1859,7 @@ static int menu_action_ok(const char *menu_path,
{ {
char config[PATH_MAX]; char config[PATH_MAX];
fill_pathname_join(config, menu_path, path, sizeof(config)); fill_pathname_join(config, menu_path, path, sizeof(config));
menu_flush_stack_type(driver.menu->menu_stack,MENU_SETTINGS); menu_flush_stack_type(driver.menu->menu_stack,MENU_SETTINGS);
driver.menu->msg_force = true; driver.menu->msg_force = true;
@ -1961,13 +1961,15 @@ static int menu_action_ok(const char *menu_path,
case MENU_FILE_CARCHIVE: case MENU_FILE_CARCHIVE:
{ {
char cat_path[PATH_MAX];
if (type == MENU_FILE_CARCHIVE && !strcmp(menu_label, "detect_core_list")) if (type == MENU_FILE_CARCHIVE && !strcmp(menu_label, "detect_core_list"))
{ {
file_list_push(driver.menu->menu_stack, path, "load_open_zip", file_list_push(driver.menu->menu_stack, path, "load_open_zip",
0, driver.menu->selection_ptr); 0, driver.menu->selection_ptr);
return 0; return 0;
} }
char cat_path[PATH_MAX];
fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path)); fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path));
menu_entries_push(driver.menu->menu_stack, menu_entries_push(driver.menu->menu_stack,
cat_path, menu_label, type, driver.menu->selection_ptr); cat_path, menu_label, type, driver.menu->selection_ptr);
@ -1997,6 +1999,7 @@ static int menu_common_iterate(unsigned action)
unsigned menu_type = 0; unsigned menu_type = 0;
const char *path = NULL; const char *path = NULL;
const char *menu_label = NULL; const char *menu_label = NULL;
unsigned scroll_speed = 0, fast_scroll_speed = 0;
file_list_get_last(driver.menu->menu_stack, &path, &menu_label, &menu_type); file_list_get_last(driver.menu->menu_stack, &path, &menu_label, &menu_type);
@ -2026,8 +2029,8 @@ static int menu_common_iterate(unsigned action)
if (driver.menu->need_refresh && action != MENU_ACTION_MESSAGE) if (driver.menu->need_refresh && action != MENU_ACTION_MESSAGE)
action = MENU_ACTION_NOOP; action = MENU_ACTION_NOOP;
unsigned scroll_speed = (max(driver.menu->scroll_accel, 2) - 2) / 4 + 1; scroll_speed = (max(driver.menu->scroll_accel, 2) - 2) / 4 + 1;
unsigned fast_scroll_speed = 4 + 4 * scroll_speed; fast_scroll_speed = 4 + 4 * scroll_speed;
switch (action) switch (action)
{ {