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

Go through menu_driver_resolve

Browse Source
This commit is contained in:
twinaphex 2015-02-13 23:41:34 +01:00
parent 6815604d70
commit 7df7201b31
3 changed files with 57 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gfx/drivers/gx_gfx.c
View File

@ -358,6 +358,7 @@ static void init_texture(void *data, unsigned width, unsigned height)
gx_video_t *gx = (gx_video_t*)data; gx_video_t *gx = (gx_video_t*)data;
struct __gx_texobj *fb_ptr = (struct __gx_texobj*)&g_tex.obj; struct __gx_texobj *fb_ptr = (struct __gx_texobj*)&g_tex.obj;
struct __gx_texobj *menu_ptr = (struct __gx_texobj*)&menu_tex.obj; struct __gx_texobj *menu_ptr = (struct __gx_texobj*)&menu_tex.obj;
menu_handle_t *menu = menu_driver_resolve();
width &= ~3; width &= ~3;
height &= ~3; height &= ~3;
@ -365,10 +366,10 @@ static void init_texture(void *data, unsigned width, unsigned height)
menu_w = 320; menu_w = 320;
menu_h = 240; menu_h = 240;
if (driver.menu) if (menu)
{ {
menu_w = driver.menu->frame_buf.width; menu_w = menu->frame_buf.width;
menu_h = driver.menu->frame_buf.height; menu_h = menu->frame_buf.height;
} }
__GX_InitTexObj(fb_ptr, g_tex.data, width, height, __GX_InitTexObj(fb_ptr, g_tex.data, width, height,
@ -961,13 +962,18 @@ static bool gx_frame(void *data, const void *frame,
if (gx->menu_texture_enable && gx->menu_data) if (gx->menu_texture_enable && gx->menu_data)
{ {
convert_texture16(gx->menu_data, menu_tex.data, menu_handle_t *menu = menu_driver_resolve();
driver.menu->frame_buf.width,
driver.menu->frame_buf.height, if (menu)
driver.menu->frame_buf.width * 2); {
DCFlushRange(menu_tex.data, convert_texture16(gx->menu_data, menu_tex.data,
driver.menu->frame_buf.width * menu->frame_buf.width,
driver.menu->frame_buf.height * 2); menu->frame_buf.height,
menu->frame_buf.width * 2);
DCFlushRange(menu_tex.data,
menu->frame_buf.width *
menu->frame_buf.height * 2);
}
} }
__GX_InvalidateTexAll(__gx); __GX_InvalidateTexAll(__gx);

3
runloop.c
View File

@ -1036,7 +1036,8 @@ int rarch_main_iterate(void)
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (g_extern.is_menu) if (g_extern.is_menu)
{ {
if (driver.menu) menu_handle_t *menu = menu_driver_resolve();
if (menu)
if (menu_iterate(input, old_input, trigger_input) == -1) if (menu_iterate(input, old_input, trigger_input) == -1)
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED); rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);

69
settings_data.c
View File

@ -418,7 +418,7 @@ static int setting_data_string_action_start_allow_input(void *data)
{ {
rarch_setting_t *setting = (rarch_setting_t*)data; rarch_setting_t *setting = (rarch_setting_t*)data;
if (!setting || !driver.menu) if (!setting)
return -1; return -1;
*setting->value.string = '\0'; *setting->value.string = '\0';
@ -432,7 +432,7 @@ static int setting_data_bind_action_start(void *data)
struct retro_keybind *def_binds = (struct retro_keybind *)retro_keybinds_1; struct retro_keybind *def_binds = (struct retro_keybind *)retro_keybinds_1;
struct retro_keybind *keybind = NULL; struct retro_keybind *keybind = NULL;
if (!setting || !driver.menu) if (!setting)
return -1; return -1;
keybind = (struct retro_keybind*)setting->value.keybind; keybind = (struct retro_keybind*)setting->value.keybind;
@ -814,37 +814,39 @@ static int load_content_action_toggle(void *data, unsigned action)
static int setting_data_action_ok_bind_all(void *data, unsigned action) static int setting_data_action_ok_bind_all(void *data, unsigned action)
{ {
rarch_setting_t *setting = (rarch_setting_t*)data; rarch_setting_t *setting = (rarch_setting_t*)data;
menu_handle_t *menu = menu_driver_resolve();
if (!setting || !driver.menu) if (!setting || !menu)
return -1; return -1;
driver.menu->binds.target = &g_settings.input.binds menu->binds.target = &g_settings.input.binds
[setting->index_offset][0]; [setting->index_offset][0];
driver.menu->binds.begin = MENU_SETTINGS_BIND_BEGIN; menu->binds.begin = MENU_SETTINGS_BIND_BEGIN;
driver.menu->binds.last = MENU_SETTINGS_BIND_LAST; menu->binds.last = MENU_SETTINGS_BIND_LAST;
menu_list_push_stack( menu_list_push_stack(
driver.menu->menu_list, menu->menu_list,
"", "",
"custom_bind_all", "custom_bind_all",
g_extern.menu.bind_mode_keyboard ? g_extern.menu.bind_mode_keyboard ?
MENU_SETTINGS_CUSTOM_BIND_KEYBOARD : MENU_SETTINGS_CUSTOM_BIND_KEYBOARD :
MENU_SETTINGS_CUSTOM_BIND, MENU_SETTINGS_CUSTOM_BIND,
driver.menu->selection_ptr); menu->selection_ptr);
if (g_extern.menu.bind_mode_keyboard) if (g_extern.menu.bind_mode_keyboard)
{ {
driver.menu->binds.timeout_end = menu->binds.timeout_end =
rarch_get_time_usec() + rarch_get_time_usec() +
MENU_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000; MENU_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000;
input_keyboard_wait_keys(driver.menu, input_keyboard_wait_keys(menu,
menu_input_custom_bind_keyboard_cb); menu_input_custom_bind_keyboard_cb);
} }
else else
{ {
menu_input_poll_bind_get_rested_axes(&driver.menu->binds); menu_input_poll_bind_get_rested_axes(&menu->binds);
menu_input_poll_bind_state(&driver.menu->binds); menu_input_poll_bind_state(&menu->binds);
} }
return 0; return 0;
} }
@ -854,7 +856,10 @@ static int setting_data_action_ok_bind_defaults(void *data, unsigned action)
struct retro_keybind *target = NULL; struct retro_keybind *target = NULL;
const struct retro_keybind *def_binds = NULL; const struct retro_keybind *def_binds = NULL;
rarch_setting_t *setting = (rarch_setting_t*)data; rarch_setting_t *setting = (rarch_setting_t*)data;
menu_handle_t *menu = menu_driver_resolve();
if (!menu)
return -1;
if (!setting) if (!setting)
return -1; return -1;
@ -863,11 +868,11 @@ static int setting_data_action_ok_bind_defaults(void *data, unsigned action)
def_binds = (setting->index_offset) ? def_binds = (setting->index_offset) ?
retro_keybinds_rest : retro_keybinds_1; retro_keybinds_rest : retro_keybinds_1;
if (!driver.menu || !target) if (!target)
return -1; return -1;
driver.menu->binds.begin = MENU_SETTINGS_BIND_BEGIN; menu->binds.begin = MENU_SETTINGS_BIND_BEGIN;
driver.menu->binds.last = MENU_SETTINGS_BIND_LAST; menu->binds.last = MENU_SETTINGS_BIND_LAST;
for (i = MENU_SETTINGS_BIND_BEGIN; for (i = MENU_SETTINGS_BIND_BEGIN;
i <= MENU_SETTINGS_BIND_LAST; i++, target++) i <= MENU_SETTINGS_BIND_LAST; i++, target++)
@ -1001,11 +1006,12 @@ static int setting_data_bind_action_ok(void *data, unsigned action)
{ {
struct retro_keybind *keybind = NULL; struct retro_keybind *keybind = NULL;
rarch_setting_t *setting = (rarch_setting_t*)data; rarch_setting_t *setting = (rarch_setting_t*)data;
menu_handle_t *menu = menu_driver_resolve();
if (!setting) if (!setting)
return -1; return -1;
if (!driver.menu || !driver.menu->menu_list) if (!menu || !menu->menu_list)
return -1; return -1;
keybind = (struct retro_keybind*)setting->value.keybind; keybind = (struct retro_keybind*)setting->value.keybind;
@ -1013,29 +1019,29 @@ static int setting_data_bind_action_ok(void *data, unsigned action)
if (!keybind) if (!keybind)
return -1; return -1;
driver.menu->binds.begin = setting->bind_type; menu->binds.begin = setting->bind_type;
driver.menu->binds.last = setting->bind_type; menu->binds.last = setting->bind_type;
driver.menu->binds.target = keybind; menu->binds.target = keybind;
driver.menu->binds.user = setting->index_offset; menu->binds.user = setting->index_offset;
menu_list_push_stack( menu_list_push_stack(
driver.menu->menu_list, menu->menu_list,
"", "",
"custom_bind", "custom_bind",
g_extern.menu.bind_mode_keyboard ? g_extern.menu.bind_mode_keyboard ?
MENU_SETTINGS_CUSTOM_BIND_KEYBOARD : MENU_SETTINGS_CUSTOM_BIND, MENU_SETTINGS_CUSTOM_BIND_KEYBOARD : MENU_SETTINGS_CUSTOM_BIND,
driver.menu->selection_ptr); menu->selection_ptr);
if (g_extern.menu.bind_mode_keyboard) if (g_extern.menu.bind_mode_keyboard)
{ {
driver.menu->binds.timeout_end = rarch_get_time_usec() + menu->binds.timeout_end = rarch_get_time_usec() +
MENU_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000; MENU_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000;
input_keyboard_wait_keys(driver.menu, input_keyboard_wait_keys(menu,
menu_input_custom_bind_keyboard_cb); menu_input_custom_bind_keyboard_cb);
} }
else else
{ {
menu_input_poll_bind_get_rested_axes(&driver.menu->binds); menu_input_poll_bind_get_rested_axes(&menu->binds);
menu_input_poll_bind_state(&driver.menu->binds); menu_input_poll_bind_state(&menu->binds);
} }
return 0; return 0;
@ -2791,11 +2797,12 @@ void setting_data_get_label(file_list_t *list, char *type_str,
{ {
rarch_setting_t *setting_data = NULL; rarch_setting_t *setting_data = NULL;
rarch_setting_t *setting = NULL; rarch_setting_t *setting = NULL;
menu_handle_t *menu = menu_driver_resolve();
if (!driver.menu || !driver.menu->menu_list || !label) if (!menu || !menu->menu_list || !label)
return; return;
setting_data = (rarch_setting_t*)driver.menu->list_settings; setting_data = (rarch_setting_t*)menu->list_settings;
if (!setting_data) if (!setting_data)
return; return;
@ -2867,14 +2874,16 @@ static void general_write_handler(void *data)
if (!strcmp(setting->name, "help")) if (!strcmp(setting->name, "help"))
{ {
if (!driver.menu || !driver.menu->menu_list) menu_handle_t *menu = menu_driver_resolve();
if (!menu || !menu->menu_list)
return; return;
if (*setting->value.boolean) if (*setting->value.boolean)
{ {
#ifdef HAVE_MENU #ifdef HAVE_MENU
menu_list_push_stack_refresh( menu_list_push_stack_refresh(
driver.menu->menu_list, menu->menu_list,
"", "",
"help", "help",
0, 0,