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

(menu_input.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-05-11 11:21:23 +02:00
parent 78c55c55c5
commit 722f46721f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
menu/menu_input.c
View File

@ -710,6 +710,7 @@ static int menu_input_mouse_post_iterate(menu_file_list_cbs_t *cbs,
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr();
menu_navigation_t *nav = menu_navigation_get_ptr(); menu_navigation_t *nav = menu_navigation_get_ptr();
if (!menu) if (!menu)
@ -733,7 +734,7 @@ static int menu_input_mouse_post_iterate(menu_file_list_cbs_t *cbs,
if (!menu->mouse.oldleft) if (!menu->mouse.oldleft)
{ {
rarch_setting_t *setting = menu_setting_find( rarch_setting_t *setting = menu_setting_find(
menu->menu_list->selection_buf->list[nav->selection_ptr].label); menu_list->selection_buf->list[nav->selection_ptr].label);
menu->mouse.oldleft = true; menu->mouse.oldleft = true;
#if 0 #if 0
@ -744,7 +745,7 @@ static int menu_input_mouse_post_iterate(menu_file_list_cbs_t *cbs,
#endif #endif
if (menu->mouse.y < menu->header_height) if (menu->mouse.y < menu->header_height)
{ {
menu_list_pop_stack(menu->menu_list); menu_list_pop_stack(menu_list);
return 0; return 0;
} }
if (menu->mouse.ptr == nav->selection_ptr if (menu->mouse.ptr == nav->selection_ptr
@ -755,7 +756,7 @@ static int menu_input_mouse_post_iterate(menu_file_list_cbs_t *cbs,
if (menu->mouse.ptr == nav->selection_ptr if (menu->mouse.ptr == nav->selection_ptr
&& cbs && cbs->action_ok) && cbs && cbs->action_ok)
return cbs->action_ok(path, label, type, nav->selection_ptr); return cbs->action_ok(path, label, type, nav->selection_ptr);
else if (menu->mouse.ptr <= menu_list_get_size(menu->menu_list)-1) else if (menu->mouse.ptr <= menu_list_get_size(menu_list)-1)
menu_navigation_set(nav, menu->mouse.ptr, false); menu_navigation_set(nav, menu->mouse.ptr, false);
} }
} }
@ -767,7 +768,7 @@ static int menu_input_mouse_post_iterate(menu_file_list_cbs_t *cbs,
if (!menu->mouse.oldright) if (!menu->mouse.oldright)
{ {
menu->mouse.oldright = true; menu->mouse.oldright = true;
menu_list_pop_stack(menu->menu_list); menu_list_pop_stack(menu_list);
} }
} }
else else
@ -786,10 +787,12 @@ static int pointer_tap(menu_file_list_cbs_t *cbs, const char *path,
const char *label, unsigned type, unsigned action) const char *label, unsigned type, unsigned action)
{ {
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr();
menu_navigation_t *nav = menu_navigation_get_ptr();
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
rarch_setting_t *setting = rarch_setting_t *setting =
menu_setting_find( menu_setting_find(
driver->menu->menu_list->selection_buf->list[menu->navigation.selection_ptr].label); menu_list->selection_buf->list[nav->selection_ptr].label);
if (menu->pointer.ptr == menu->navigation.selection_ptr if (menu->pointer.ptr == menu->navigation.selection_ptr
&& cbs && cbs->action_toggle && setting && && cbs && cbs->action_toggle && setting &&