mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_common_backend.c) - Cleanups

Browse Source
This commit is contained in:
twinaphex 2014-10-16 03:55:03 +02:00
parent 443a11a52b
commit e371d598df
1 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,11 +282,11 @@ static int menu_viewport_iterate(unsigned action)
struct retro_game_geometry *geom = NULL; struct retro_game_geometry *geom = NULL;
const char *base_msg = NULL; const char *base_msg = NULL;
const char *label = NULL; const char *label = NULL;
unsigned menu_type = 0; unsigned type = 0;
rarch_viewport_t *custom = (rarch_viewport_t*) rarch_viewport_t *custom = (rarch_viewport_t*)
&g_extern.console.screen.viewports.custom_vp; &g_extern.console.screen.viewports.custom_vp;
file_list_get_last(driver.menu->menu_stack, NULL, &label, &menu_type); file_list_get_last(driver.menu->menu_stack, NULL, &label, &type);
geom = (struct retro_game_geometry*)&g_extern.system.av_info.geometry; geom = (struct retro_game_geometry*)&g_extern.system.av_info.geometry;
@ -299,7 +299,7 @@ static int menu_viewport_iterate(unsigned action)
switch (action) switch (action)
{ {
case MENU_ACTION_UP: case MENU_ACTION_UP:
if (menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT) if (type == MENU_SETTINGS_CUSTOM_VIEWPORT)
{ {
custom->y -= stride_y; custom->y -= stride_y;
custom->height += stride_y; custom->height += stride_y;
@ -311,7 +311,7 @@ static int menu_viewport_iterate(unsigned action)
break; break;
case MENU_ACTION_DOWN: case MENU_ACTION_DOWN:
if (menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT) if (type == MENU_SETTINGS_CUSTOM_VIEWPORT)
{ {
custom->y += stride_y; custom->y += stride_y;
if (custom->height >= (unsigned)stride_y) if (custom->height >= (unsigned)stride_y)
@ -324,7 +324,7 @@ static int menu_viewport_iterate(unsigned action)
break; break;
case MENU_ACTION_LEFT: case MENU_ACTION_LEFT:
if (menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT) if (type == MENU_SETTINGS_CUSTOM_VIEWPORT)
{ {
custom->x -= stride_x; custom->x -= stride_x;
custom->width += stride_x; custom->width += stride_x;
@ -336,7 +336,7 @@ static int menu_viewport_iterate(unsigned action)
break; break;
case MENU_ACTION_RIGHT: case MENU_ACTION_RIGHT:
if (menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT) if (type == MENU_SETTINGS_CUSTOM_VIEWPORT)
{ {
custom->x += stride_x; custom->x += stride_x;
if (custom->width >= (unsigned)stride_x) if (custom->width >= (unsigned)stride_x)
@ -360,7 +360,7 @@ static int menu_viewport_iterate(unsigned action)
case MENU_ACTION_OK: case MENU_ACTION_OK:
menu_entries_pop_list(driver.menu->menu_stack); menu_entries_pop_list(driver.menu->menu_stack);
if (menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT if (type == MENU_SETTINGS_CUSTOM_VIEWPORT
&& !g_settings.video.scale_integer) && !g_settings.video.scale_integer)
{ {
file_list_push(driver.menu->menu_stack, "", file_list_push(driver.menu->menu_stack, "",
@ -377,7 +377,7 @@ static int menu_viewport_iterate(unsigned action)
driver.video->viewport_info) driver.video->viewport_info)
driver.video->viewport_info(driver.video_data, &vp); driver.video->viewport_info(driver.video_data, &vp);
if (menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT) if (type == MENU_SETTINGS_CUSTOM_VIEWPORT)
{ {
custom->width += custom->x; custom->width += custom->x;
custom->height += custom->y; custom->height += custom->y;
@ -402,7 +402,7 @@ static int menu_viewport_iterate(unsigned action)
break; break;
} }
file_list_get_last(driver.menu->menu_stack, NULL, &label, &menu_type); file_list_get_last(driver.menu->menu_stack, NULL, &label, &type);
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->render) if (driver.video_data && driver.menu_ctx && driver.menu_ctx->render)
driver.menu_ctx->render(); driver.menu_ctx->render();
@ -425,7 +425,7 @@ static int menu_viewport_iterate(unsigned action)
} }
else else
{ {
if (menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT) if (type == MENU_SETTINGS_CUSTOM_VIEWPORT)
base_msg = "Set Upper-Left Corner"; base_msg = "Set Upper-Left Corner";
else if (!strcmp(label, "custom_viewport_2")) else if (!strcmp(label, "custom_viewport_2"))
base_msg = "Set Bottom-Right Corner"; base_msg = "Set Bottom-Right Corner";
@ -464,8 +464,7 @@ static int menu_load_or_open_zip_iterate(unsigned action)
const char *menu_path = NULL; const char *menu_path = NULL;
const char *menu_label = NULL; const char *menu_label = NULL;
const char* path = NULL; const char* path = NULL;
const char* label = NULL; unsigned int type = 0;
unsigned int menu_type = 0, type = 0;
snprintf(msg, sizeof(msg), "Opening compressed file\n" snprintf(msg, sizeof(msg), "Opening compressed file\n"
" \n" " \n"
@ -485,13 +484,13 @@ static int menu_load_or_open_zip_iterate(unsigned action)
menu_entries_pop_list(driver.menu->menu_stack); menu_entries_pop_list(driver.menu->menu_stack);
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); NULL);
if (file_list_get_size(driver.menu->selection_buf) == 0) if (file_list_get_size(driver.menu->selection_buf) == 0)
return 0; return 0;
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, NULL, &type);
} }
if (action == MENU_ACTION_OK) if (action == MENU_ACTION_OK)
@ -526,41 +525,40 @@ static int menu_load_or_open_zip_iterate(unsigned action)
static int menu_common_iterate(unsigned action) static int menu_common_iterate(unsigned action)
{ {
int ret = 0; int ret = 0;
unsigned menu_type = 0; unsigned type = 0;
const char *path = NULL; const char *label = NULL;
const char *menu_label = NULL;
unsigned scroll_speed = 0, fast_scroll_speed = 0; unsigned scroll_speed = 0, fast_scroll_speed = 0;
menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*)
file_list_get_actiondata_at_offset(driver.menu->selection_buf, file_list_get_actiondata_at_offset(driver.menu->selection_buf,
driver.menu->selection_ptr); driver.menu->selection_ptr);
file_list_get_last(driver.menu->menu_stack, &path, &menu_label, &menu_type); file_list_get_last(driver.menu->menu_stack, NULL, &label, &type);
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture) if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
driver.menu_ctx->set_texture(driver.menu); driver.menu_ctx->set_texture(driver.menu);
if (!strcmp(menu_label, "help")) if (!strcmp(label, "help"))
return menu_start_screen_iterate(action); return menu_start_screen_iterate(action);
else if (!strcmp(menu_label, "message")) else if (!strcmp(label, "message"))
return menu_message_toggle(action); return menu_message_toggle(action);
else if (!strcmp(menu_label, "load_open_zip")) else if (!strcmp(label, "load_open_zip"))
return menu_load_or_open_zip_iterate(action); return menu_load_or_open_zip_iterate(action);
else if (!strcmp(menu_label, "info_screen")) else if (!strcmp(label, "info_screen"))
return menu_info_screen_iterate(action); return menu_info_screen_iterate(action);
else if (menu_common_type_is(menu_label, menu_type) == MENU_SETTINGS) else if (menu_common_type_is(label, type) == MENU_SETTINGS)
return menu_settings_iterate(action, cbs); return menu_settings_iterate(action, cbs);
else if ( else if (
menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT || type == MENU_SETTINGS_CUSTOM_VIEWPORT ||
!strcmp(menu_label, "custom_viewport_2") !strcmp(label, "custom_viewport_2")
) )
return menu_viewport_iterate(action); return menu_viewport_iterate(action);
else if (menu_type == MENU_SETTINGS_CUSTOM_BIND) else if (type == MENU_SETTINGS_CUSTOM_BIND)
{ {
if (menu_input_bind_iterate(driver.menu)) if (menu_input_bind_iterate(driver.menu))
menu_entries_pop_list(driver.menu->menu_stack); menu_entries_pop_list(driver.menu->menu_stack);
return 0; return 0;
} }
else if (menu_type == MENU_SETTINGS_CUSTOM_BIND_KEYBOARD) else if (type == MENU_SETTINGS_CUSTOM_BIND_KEYBOARD)
{ {
if (menu_input_bind_iterate_keyboard(driver.menu)) if (menu_input_bind_iterate_keyboard(driver.menu))
menu_entries_pop_list(driver.menu->menu_stack); menu_entries_pop_list(driver.menu->menu_stack);