mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 13:20:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify menu_common_backend.c

Browse Source
This commit is contained in:
twinaphex 2014-10-28 00:12:38 +01:00
parent 4bc159e1db
commit 6e9288b8ce
1 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,24 +102,6 @@ static int menu_info_screen_iterate(unsigned action)
return 0; return 0;
} }
static int menu_action_ok(menu_file_list_cbs_t *cbs)
{
const char *label = NULL;
const char *path = NULL;
unsigned type = 0;
if (menu_list_get_size(driver.menu->menu_list) == 0)
return 0;
menu_list_get_at_offset(driver.menu->menu_list->selection_buf,
driver.menu->selection_ptr, &path, &label, &type);
if (cbs && cbs->action_ok)
return cbs->action_ok(path, label, type, driver.menu->selection_ptr);
return 0;
}
static int menu_start_screen_iterate(unsigned action) static int menu_start_screen_iterate(unsigned action)
{ {
unsigned i; unsigned i;
@ -228,7 +210,8 @@ static int mouse_iterate(unsigned action)
return 0; return 0;
} }
static int mouse_post_iterate(menu_file_list_cbs_t *cbs, unsigned action) static int mouse_post_iterate(menu_file_list_cbs_t *cbs, const char *path,
const char *label, unsigned type, unsigned action)
{ {
if (!driver.menu->mouse.enable) if (!driver.menu->mouse.enable)
return 0; return 0;
@ -241,7 +224,9 @@ static int mouse_post_iterate(menu_file_list_cbs_t *cbs, unsigned action)
if (!driver.menu->mouse.oldleft) if (!driver.menu->mouse.oldleft)
{ {
driver.menu->mouse.oldleft = true; driver.menu->mouse.oldleft = true;
return menu_action_ok(cbs);
if (cbs && cbs->action_ok)
return cbs->action_ok(path, label, type, driver.menu->selection_ptr);
} }
} }
else else
@ -616,17 +601,11 @@ static int menu_common_iterate(unsigned action)
break; break;
case MENU_ACTION_OK: case MENU_ACTION_OK:
if (is_category) if (cbs && cbs->action_ok)
{ return cbs->action_ok(path_offset, label_offset, type_offset, driver.menu->selection_ptr);
if (cbs && cbs->action_ok) /* fall-through */
return cbs->action_ok(path_offset, label_offset, type_offset, driver.menu->selection_ptr); if (!is_category)
/* fall-through */
}
else
{
ret = menu_action_ok(cbs);
break; break;
}
case MENU_ACTION_START: case MENU_ACTION_START:
if (is_category) if (is_category)
{ {
@ -697,7 +676,7 @@ static int menu_common_iterate(unsigned action)
break; break;
} }
ret = mouse_post_iterate(cbs, action); ret = mouse_post_iterate(cbs, path_offset, label_offset, type_offset, action);
if (driver.menu_ctx && driver.menu_ctx->iterate) if (driver.menu_ctx && driver.menu_ctx->iterate)
driver.menu_ctx->iterate(driver.menu, action); driver.menu_ctx->iterate(driver.menu, action);