mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-26 18:35:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RGUI) Get rid of rmenu_ namespace

Browse Source
This commit is contained in:
twinaphex 2013-03-09 22:15:20 +01:00
parent 544acdf8e1
commit b4fad2dab2
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/menu/rgui.c
View File

@ -1448,7 +1448,7 @@ int rgui_iterate(rgui_handle_t *rgui, rgui_action_t action)
return ret;
}
static const struct retro_keybind _rmenu_nav_binds[] = {
static const struct retro_keybind _menu_nav_binds[] = {
#if defined(HW_RVL)
{ 0, 0, NULL, 0, GX_GC_UP | GX_GC_LSTICK_UP | GX_GC_RSTICK_UP | GX_CLASSIC_UP | GX_CLASSIC_LSTICK_UP | GX_CLASSIC_RSTICK_UP | GX_WIIMOTE_UP | GX_NUNCHUK_UP, 0 },
{ 0, 0, NULL, 0, GX_GC_DOWN | GX_GC_LSTICK_DOWN | GX_GC_RSTICK_DOWN | GX_CLASSIC_DOWN | GX_CLASSIC_LSTICK_DOWN | GX_CLASSIC_RSTICK_DOWN | GX_WIIMOTE_DOWN | GX_NUNCHUK_DOWN, 0 },
@ -1484,8 +1484,8 @@ static const struct retro_keybind _rmenu_nav_binds[] = {
#endif
};
static const struct retro_keybind *rmenu_nav_binds[] = {
_rmenu_nav_binds
static const struct retro_keybind *menu_nav_binds[] = {
_menu_nav_binds
};
enum
@ -1613,7 +1613,7 @@ void menu_free(void)
static uint16_t trigger_state = 0;
int rmenu_input_process(void *data, void *state)
static int menu_input_process(void *data, void *state)
{
if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME))
{
@ -1694,7 +1694,7 @@ bool menu_iterate(void)
#endif
for (unsigned i = 0; i < RMENU_DEVICE_NAV_LAST; i++)
input_state |= driver.input->input_state(NULL, rmenu_nav_binds, 0,
input_state |= driver.input->input_state(NULL, menu_nav_binds, 0,
RETRO_DEVICE_JOYPAD, 0, i) ? (1ULL << i) : 0;
input_state |= driver.input->key_pressed(driver.input_data, RARCH_MENU_TOGGLE) ? (1ULL << GX_DEVICE_NAV_MENU) : 0;
@ -1702,7 +1702,7 @@ bool menu_iterate(void)
#ifdef HAVE_OVERLAY
for (unsigned i = 0; i < RMENU_DEVICE_NAV_LAST; i++)
input_state |= driver.overlay_state & rmenu_nav_binds[0][i].joykey ? (1ULL << i) : 0;
input_state |= driver.overlay_state & menu_nav_binds[0][i].joykey ? (1ULL << i) : 0;
#endif
trigger_state = input_state & ~old_input_state;
@ -1767,7 +1767,7 @@ bool menu_iterate(void)
// draw last frame for loading messages
rarch_render_cached_frame();
input_process_ret = rmenu_input_process(NULL, NULL);
input_process_ret = menu_input_process(NULL, NULL);
if (input_entry_ret != 0 || input_process_ret != 0)
goto deinit;

6
frontend/menu/rmenu.c
View File

@ -2487,7 +2487,7 @@ int ingame_menu(void *data, void *state)
INPUT POLL CALLBACK
============================================================ */
void rmenu_input_poll(void *data, void *state)
void menu_input_poll(void *data, void *state)
{
menu *current_menu = (menu*)data;
@ -2543,7 +2543,7 @@ void rmenu_input_poll(void *data, void *state)
INPUT PROCESS CALLBACK
============================================================ */
int rmenu_input_process(void *data, void *state)
int menu_input_process(void *data, void *state)
{
(void)data;
DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
@ -2685,7 +2685,7 @@ bool menu_iterate(void)
}
if(current_menu.input_poll)
rmenu_input_poll(&current_menu, &rmenu_state);
menu_input_poll(&current_menu, &rmenu_state);
#ifdef HAVE_OSKUTIL
if(rmenu_state.osk_init != NULL)

4
frontend/menu/utils/menu_stack.c
View File

@ -53,8 +53,8 @@ static void menu_stack_get_current_ptr(menu *current_menu)
current_menu->browser_draw = NULL;
current_menu->input_process = NULL;
current_menu->input_poll = rmenu_input_poll;
current_menu->input_process = rmenu_input_process;
current_menu->input_poll = menu_input_poll;
current_menu->input_process = menu_input_process;
switch(menu_id)
{

7
frontend/menu/utils/menu_stack.h
View File

@ -54,11 +54,8 @@ int ingame_menu_resize(void *data, void *state);
int ingame_menu_screenshot(void *data, void *state);
int ingame_menu(void *data, void *state);
// input poll forward declarations
void rmenu_input_poll(void *data, void *state);
// input process forward declarations
int rmenu_input_process(void *data, void *state);
void menu_input_poll(void *data, void *state);
int menu_input_process(void *data, void *state);
// browser_draw forward declarations
void browser_render(void *data);