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

(RMenu/RGUI) Standardization pt. 1

Browse Source
This commit is contained in:
twinaphex 2013-04-18 23:00:27 +02:00
parent 16a40af173
commit a979cba13c
4 changed files with 56 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/menu/menu_common.h
View File

@ -65,7 +65,20 @@ enum
DEVICE_NAV_R3, DEVICE_NAV_R3,
DEVICE_NAV_LAST DEVICE_NAV_LAST
}; };
#elif defined(HAVE_RGUI)
enum
{
DEVICE_NAV_UP = 0,
DEVICE_NAV_DOWN,
DEVICE_NAV_LEFT,
DEVICE_NAV_RIGHT,
DEVICE_NAV_A,
DEVICE_NAV_B,
DEVICE_NAV_START,
DEVICE_NAV_SELECT,
DEVICE_NAV_MENU,
DEVICE_NAV_LAST
};
#endif #endif
typedef enum typedef enum
@ -202,7 +215,7 @@ void menu_init(void);
bool menu_iterate(void); bool menu_iterate(void);
void menu_free(void); void menu_free(void);
int rgui_iterate(rgui_handle_t *rgui, uint64_t action); int rgui_iterate(rgui_handle_t *rgui);
rgui_handle_t *rgui_init(void); rgui_handle_t *rgui_init(void);
void rgui_free(rgui_handle_t *rgui); void rgui_free(rgui_handle_t *rgui);

88
frontend/menu/rgui.c
View File

@ -179,6 +179,8 @@ static bool menu_type_is_shader_browser(unsigned type)
type == RGUI_SETTINGS_SHADER_PRESET; type == RGUI_SETTINGS_SHADER_PRESET;
} }
static void rgui_settings_populate_entries(rgui_handle_t *rgui);
rgui_handle_t *rgui_init(void) rgui_handle_t *rgui_init(void)
{ {
uint16_t *framebuf = menu_framebuf; uint16_t *framebuf = menu_framebuf;
@ -211,8 +213,8 @@ rgui_handle_t *rgui_init(void)
rgui->selection_buf = (rgui_list_t*)calloc(1, sizeof(rgui_list_t)); rgui->selection_buf = (rgui_list_t*)calloc(1, sizeof(rgui_list_t));
rgui_list_push(rgui->menu_stack, g_settings.rgui_browser_directory, RGUI_FILE_DIRECTORY, 0); rgui_list_push(rgui->menu_stack, g_settings.rgui_browser_directory, RGUI_FILE_DIRECTORY, 0);
rgui_list_push(rgui->menu_stack, "", RGUI_SETTINGS, 0); rgui_list_push(rgui->menu_stack, "", RGUI_SETTINGS, 0);
rgui->selection_ptr = 0;
rgui_iterate(rgui, RGUI_ACTION_REFRESH); rgui_settings_populate_entries(rgui);
return rgui; return rgui;
} }
@ -1697,13 +1699,39 @@ static bool directory_parse(rgui_handle_t *rgui, const char *directory, unsigned
return true; return true;
} }
int rgui_iterate(rgui_handle_t *rgui, uint64_t action) static uint16_t trigger_state = 0;
int rgui_iterate(rgui_handle_t *rgui)
{ {
uint64_t action = RGUI_ACTION_NOOP;
// don't run anything first frame, only capture held inputs for old_input_state
if (trigger_state & (1ULL << DEVICE_NAV_UP))
action = RGUI_ACTION_UP;
else if (trigger_state & (1ULL << DEVICE_NAV_DOWN))
action = RGUI_ACTION_DOWN;
else if (trigger_state & (1ULL << DEVICE_NAV_LEFT))
action = RGUI_ACTION_LEFT;
else if (trigger_state & (1ULL << DEVICE_NAV_RIGHT))
action = RGUI_ACTION_RIGHT;
else if (trigger_state & (1ULL << DEVICE_NAV_B))
action = RGUI_ACTION_CANCEL;
else if (trigger_state & (1ULL << DEVICE_NAV_A))
action = RGUI_ACTION_OK;
else if (trigger_state & (1ULL << DEVICE_NAV_SELECT))
action = RGUI_ACTION_START;
else if (trigger_state & (1ULL << DEVICE_NAV_START))
action = RGUI_ACTION_SETTINGS;
const char *dir = 0; const char *dir = 0;
unsigned menu_type = 0; unsigned menu_type = 0;
rgui_list_get_last(rgui->menu_stack, &dir, &menu_type); rgui_list_get_last(rgui->menu_stack, &dir, &menu_type);
int ret = 0; int ret = 0;
if (driver.video_poke && driver.video_poke->set_texture_enable)
driver.video_poke->set_texture_frame(driver.video_data, menu_framebuf,
false, RGUI_WIDTH, RGUI_HEIGHT, 1.0f);
if (menu_type_is_settings(menu_type)) if (menu_type_is_settings(menu_type))
return rgui_settings_iterate(rgui, action); return rgui_settings_iterate(rgui, action);
else if (menu_type == RGUI_SETTINGS_CUSTOM_VIEWPORT || menu_type == RGUI_SETTINGS_CUSTOM_VIEWPORT_2) else if (menu_type == RGUI_SETTINGS_CUSTOM_VIEWPORT || menu_type == RGUI_SETTINGS_CUSTOM_VIEWPORT_2)
@ -1936,30 +1964,11 @@ static const struct retro_keybind *menu_nav_binds[] = {
_menu_nav_binds _menu_nav_binds
}; };
enum static int menu_input_process(void *data, uint64_t old_state)
{
DEVICE_NAV_UP = 0,
DEVICE_NAV_DOWN,
DEVICE_NAV_LEFT,
DEVICE_NAV_RIGHT,
DEVICE_NAV_A,
DEVICE_NAV_B,
DEVICE_NAV_START,
DEVICE_NAV_SELECT,
DEVICE_NAV_MENU,
DEVICE_NAV_LAST
};
/*============================================================
RMENU API
============================================================ */
static uint16_t trigger_state = 0;
static int menu_input_process(void *data, void *state)
{ {
(void)data; (void)data;
(void)old_state;
int ret = 0; int ret = 0;
if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME))
@ -2042,7 +2051,6 @@ bool menu_iterate(void)
static bool initial_held = true; static bool initial_held = true;
static bool first_held = false; static bool first_held = false;
bool do_held; bool do_held;
rgui_action_t action;
uint64_t input_state = 0; uint64_t input_state = 0;
if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_PREINIT)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_PREINIT))
@ -2101,42 +2109,18 @@ bool menu_iterate(void)
} }
old_input_state = input_state; old_input_state = input_state;
action = RGUI_ACTION_NOOP; int input_entry_ret = rgui_iterate(rgui);
// don't run anything first frame, only capture held inputs for old_input_state
if (trigger_state & (1ULL << DEVICE_NAV_UP))
action = RGUI_ACTION_UP;
else if (trigger_state & (1ULL << DEVICE_NAV_DOWN))
action = RGUI_ACTION_DOWN;
else if (trigger_state & (1ULL << DEVICE_NAV_LEFT))
action = RGUI_ACTION_LEFT;
else if (trigger_state & (1ULL << DEVICE_NAV_RIGHT))
action = RGUI_ACTION_RIGHT;
else if (trigger_state & (1ULL << DEVICE_NAV_B))
action = RGUI_ACTION_CANCEL;
else if (trigger_state & (1ULL << DEVICE_NAV_A))
action = RGUI_ACTION_OK;
else if (trigger_state & (1ULL << DEVICE_NAV_SELECT))
action = RGUI_ACTION_START;
else if (trigger_state & (1ULL << DEVICE_NAV_START))
action = RGUI_ACTION_SETTINGS;
int input_entry_ret = rgui_iterate(rgui, action);
// draw last frame for loading messages // draw last frame for loading messages
if (driver.video_poke && driver.video_poke->set_texture_enable) if (driver.video_poke && driver.video_poke->set_texture_enable)
{
driver.video_poke->set_texture_frame(driver.video_data, menu_framebuf,
false, RGUI_WIDTH, RGUI_HEIGHT, 1.0f);
driver.video_poke->set_texture_enable(driver.video_data, true, false); driver.video_poke->set_texture_enable(driver.video_data, true, false);
}
rarch_render_cached_frame(); rarch_render_cached_frame();
if (driver.video_poke && driver.video_poke->set_texture_enable) if (driver.video_poke && driver.video_poke->set_texture_enable)
driver.video_poke->set_texture_enable(driver.video_data, false, false); driver.video_poke->set_texture_enable(driver.video_data, false, false);
if (menu_input_process(NULL, NULL) || input_entry_ret) if (menu_input_process(rgui, old_input_state) || input_entry_ret)
goto deinit; goto deinit;
return true; return true;

10
frontend/menu/rmenu.c
View File

@ -3105,7 +3105,9 @@ static int menu_input_process(void *data, uint64_t old_state)
RMENU API RMENU API
============================================================ */ ============================================================ */
int rgui_iterate(rgui_handle_t *rgui, uint64_t input) static uint64_t input = 0;
int rgui_iterate(rgui_handle_t *rgui)
{ {
rgui->menu_type = menu_stack_enum_array[stack_idx - 1]; rgui->menu_type = menu_stack_enum_array[stack_idx - 1];
@ -3232,7 +3234,6 @@ void rgui_free(rgui_handle_t *rgui)
bool menu_iterate(void) bool menu_iterate(void)
{ {
static uint64_t input = 0;
static uint64_t old_input_state = 0; static uint64_t old_input_state = 0;
if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_PREINIT)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_PREINIT))
@ -3289,8 +3290,7 @@ bool menu_iterate(void)
} }
old_input_state = input_state_first_frame; old_input_state = input_state_first_frame;
int input_entry_ret = rgui_iterate(rgui);
int input_entry_ret = rgui_iterate(rgui, input);
// draw last frame for loading messages // draw last frame for loading messages
if (driver.video_poke && driver.video_poke->set_texture_enable) if (driver.video_poke && driver.video_poke->set_texture_enable)
@ -3301,7 +3301,7 @@ bool menu_iterate(void)
if (driver.video_poke && driver.video_poke->set_texture_enable) if (driver.video_poke && driver.video_poke->set_texture_enable)
driver.video_poke->set_texture_enable(driver.video_data, false, true); driver.video_poke->set_texture_enable(driver.video_data, false, true);
if (input_entry_ret != 0 || menu_input_process(rgui, old_input_state) != 0) if (menu_input_process(rgui, old_input_state) || input_entry_ret)
goto deinit; goto deinit;
return true; return true;

3
frontend/platform/platform_gx.c
View File

@ -372,9 +372,6 @@ static void system_process_args(int argc, char *argv[])
strlcpy(g_extern.fullpath, rom, sizeof(g_extern.fullpath)); strlcpy(g_extern.fullpath, rom, sizeof(g_extern.fullpath));
g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME);
rgui_iterate(rgui, RGUI_ACTION_MESSAGE);
rarch_render_cached_frame();
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU);
g_extern.lifecycle_mode_state |= (1ULL << MODE_INIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_INIT);
} }