mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Replace rgui pointers everywhere in menu code with driver.menu

Browse Source
This commit is contained in:
twinaphex 2014-05-31 22:34:45 +02:00
parent 500c3aac30
commit 5e05665a0e
3 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/menu/backend/menu_lakka_backend.c
View File

@ -41,9 +41,8 @@ static int menu_lakka_iterate(unsigned action)
{ {
menu_category_t *active_category; menu_category_t *active_category;
menu_item_t *active_item; menu_item_t *active_item;
rgui_handle_t *rgui = (rgui_handle_t*)driver.menu;
if (!rgui) if (!driver.menu)
{ {
RARCH_ERR("Cannot iterate menu, menu handle is not initialized.\n"); RARCH_ERR("Cannot iterate menu, menu handle is not initialized.\n");
return 0; return 0;
@ -61,7 +60,7 @@ static int menu_lakka_iterate(unsigned action)
return 0; return 0;
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture) if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
driver.menu_ctx->set_texture(rgui, false); driver.menu_ctx->set_texture(driver.menu, false);
switch (action) switch (action)
{ {
@ -125,7 +124,7 @@ static int menu_lakka_iterate(unsigned action)
strlcpy(g_settings.libretro, active_category->libretro, sizeof(g_settings.libretro)); strlcpy(g_settings.libretro, active_category->libretro, sizeof(g_settings.libretro));
#ifdef HAVE_DYNAMIC #ifdef HAVE_DYNAMIC
menu_update_system_info(driver.menu, &rgui->load_no_rom); menu_update_system_info(driver.menu, &driver.menu->load_no_rom);
g_extern.lifecycle_state |= (1ULL << MODE_LOAD_GAME); g_extern.lifecycle_state |= (1ULL << MODE_LOAD_GAME);
#else #else
rarch_environment_cb(RETRO_ENVIRONMENT_SET_LIBRETRO_PATH, (void*)g_settings.libretro); rarch_environment_cb(RETRO_ENVIRONMENT_SET_LIBRETRO_PATH, (void*)g_settings.libretro);
@ -173,7 +172,7 @@ static int menu_lakka_iterate(unsigned action)
} }
if (driver.menu_ctx && driver.menu_ctx->iterate) if (driver.menu_ctx && driver.menu_ctx->iterate)
driver.menu_ctx->iterate(rgui, action); driver.menu_ctx->iterate(driver.menu, action);
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->render) if (driver.video_data && driver.menu_ctx && driver.menu_ctx->render)
driver.menu_ctx->render(); driver.menu_ctx->render();

6
frontend/menu/disp/lakka.c
View File

@ -733,9 +733,8 @@ static void lakka_frame(void)
struct font_output_list *msg; struct font_output_list *msg;
gl_t *gl = (gl_t*)driver.video_data; gl_t *gl = (gl_t*)driver.video_data;
menu_category_t *active_category = (menu_category_t*)&categories[menu_active_category]; menu_category_t *active_category = (menu_category_t*)&categories[menu_active_category];
rgui_handle_t *rgui = (rgui_handle_t*)driver.menu;
if (!rgui || !gl) if (!driver.menu || !gl)
return; return;
update_tweens(0.002); update_tweens(0.002);
@ -1194,10 +1193,9 @@ static void lakka_free(void *data)
static int lakka_input_postprocess(uint64_t old_state) static int lakka_input_postprocess(uint64_t old_state)
{ {
rgui_handle_t *rgui = (rgui_handle_t*)driver.menu;
int ret = 0; int ret = 0;
if ((rgui && rgui->trigger_state & (1ULL << RARCH_MENU_TOGGLE)) && if ((driver.menu && driver.menu->trigger_state & (1ULL << RARCH_MENU_TOGGLE)) &&
g_extern.main_is_init && g_extern.main_is_init &&
!g_extern.libretro_dummy) !g_extern.libretro_dummy)
{ {

36
frontend/menu/disp/rmenu_xui.cpp
View File

@ -332,7 +332,6 @@ static void rmenu_xui_frame(void)
static int rmenu_xui_input_postprocess(uint64_t old_state) static int rmenu_xui_input_postprocess(uint64_t old_state)
{ {
rgui_handle_t *rgui = (rgui_handle_t*)driver.menu;
bool quit = false; bool quit = false;
bool resize = false; bool resize = false;
unsigned width; unsigned width;
@ -343,7 +342,7 @@ static int rmenu_xui_input_postprocess(uint64_t old_state)
(void)height; (void)height;
(void)frame_count; (void)frame_count;
if ((rgui->trigger_state & (1ULL << RARCH_MENU_TOGGLE)) && if ((driver.menu->trigger_state & (1ULL << RARCH_MENU_TOGGLE)) &&
g_extern.main_is_init) g_extern.main_is_init)
{ {
g_extern.lifecycle_state |= (1ULL << MODE_GAME); g_extern.lifecycle_state |= (1ULL << MODE_GAME);
@ -380,19 +379,18 @@ static void rmenu_xui_render(void)
const char *dir = NULL; const char *dir = NULL;
unsigned menu_type = 0; unsigned menu_type = 0;
unsigned menu_type_is = 0; unsigned menu_type_is = 0;
rgui_handle_t *rgui = (rgui_handle_t*)driver.menu;
if (!rgui || rgui->need_refresh && if (!driver.menu || driver.menu->need_refresh &&
(g_extern.lifecycle_state & (1ULL << MODE_MENU)) (g_extern.lifecycle_state & (1ULL << MODE_MENU))
&& !rgui->msg_force) && !driver.menu->msg_force)
return; return;
begin = rgui->selection_ptr; begin = driver.menu->selection_ptr;
end = file_list_get_size(rgui->selection_buf); end = file_list_get_size(driver.menu->selection_buf);
rmenu_xui_render_background(); rmenu_xui_render_background();
file_list_get_last(rgui->menu_stack, &dir, &menu_type); file_list_get_last(driver.menu->menu_stack, &dir, &menu_type);
if (driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->type_is) if (driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->type_is)
menu_type_is = driver.menu_ctx->backend->type_is(menu_type); menu_type_is = driver.menu_ctx->backend->type_is(menu_type);
@ -497,11 +495,11 @@ static void rmenu_xui_render(void)
snprintf(title, sizeof(title), "ASSETS DIR %s", dir); snprintf(title, sizeof(title), "ASSETS DIR %s", dir);
else else
{ {
if (rgui->defer_core) if (driver.menu->defer_core)
snprintf(title, sizeof(title), "CONTENT %s", dir); snprintf(title, sizeof(title), "CONTENT %s", dir);
else else
{ {
const char *core_name = rgui->info.library_name; const char *core_name = driver.menu->info.library_name;
if (!core_name) if (!core_name)
core_name = g_extern.system.info.library_name; core_name = g_extern.system.info.library_name;
if (!core_name) if (!core_name)
@ -518,13 +516,13 @@ static void rmenu_xui_render(void)
blit_line(RXUI_TERM_START_X + 15, 15, title_buf, true); blit_line(RXUI_TERM_START_X + 15, 15, title_buf, true);
char title_msg[64]; char title_msg[64];
const char *core_name = rgui->info.library_name; const char *core_name = driver.menu->info.library_name;
if (!core_name) if (!core_name)
core_name = g_extern.system.info.library_name; core_name = g_extern.system.info.library_name;
if (!core_name) if (!core_name)
core_name = "No Core"; core_name = "No Core";
const char *core_version = rgui->info.library_version; const char *core_version = driver.menu->info.library_version;
if (!core_version) if (!core_version)
core_version = g_extern.system.info.library_version; core_version = g_extern.system.info.library_version;
if (!core_version) if (!core_version)
@ -543,7 +541,7 @@ static void rmenu_xui_render(void)
{ {
const char *path = 0; const char *path = 0;
unsigned type = 0; unsigned type = 0;
file_list_get_at_offset(rgui->selection_buf, i, &path, &type); file_list_get_at_offset(driver.menu->selection_buf, i, &path, &type);
char message[256]; char message[256];
char type_str[256]; char type_str[256];
@ -570,7 +568,7 @@ static void rmenu_xui_render(void)
snprintf(type_str, sizeof(type_str), "%s", snprintf(type_str, sizeof(type_str), "%s",
g_settings.video.smooth ? "Linear" : "Nearest"); g_settings.video.smooth ? "Linear" : "Nearest");
else if (driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->shader_manager_get_str) else if (driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->shader_manager_get_str)
driver.menu_ctx->backend->shader_manager_get_str(rgui->shader, type_str, sizeof(type_str), type); driver.menu_ctx->backend->shader_manager_get_str(driver.menu->shader, type_str, sizeof(type_str), type);
} }
else else
// Pretty-print libretro cores from menu. // Pretty-print libretro cores from menu.
@ -579,7 +577,7 @@ static void rmenu_xui_render(void)
if (type == RGUI_FILE_PLAIN) if (type == RGUI_FILE_PLAIN)
{ {
strlcpy(type_str, "(CORE)", sizeof(type_str)); strlcpy(type_str, "(CORE)", sizeof(type_str));
file_list_get_alt_at_offset(rgui->selection_buf, i, &path); file_list_get_alt_at_offset(driver.menu->selection_buf, i, &path);
w = 6; w = 6;
} }
else else
@ -629,7 +627,7 @@ static void rmenu_xui_render(void)
char entry_title_buf[256]; char entry_title_buf[256];
char type_str_buf[64]; char type_str_buf[64];
bool selected = i == rgui->selection_ptr; bool selected = i == driver.menu->selection_ptr;
strlcpy(entry_title_buf, path, sizeof(entry_title_buf)); strlcpy(entry_title_buf, path, sizeof(entry_title_buf));
strlcpy(type_str_buf, type_str, sizeof(type_str_buf)); strlcpy(type_str_buf, type_str, sizeof(type_str_buf));
@ -651,13 +649,13 @@ static void rmenu_xui_render(void)
blit_line(x, y, message, i); blit_line(x, y, message, i);
} }
if (rgui->keyboard.display) if (driver.menu->keyboard.display)
{ {
char msg[1024]; char msg[1024];
const char *str = *rgui->keyboard.buffer; const char *str = *driver.menu->keyboard.buffer;
if (!str) if (!str)
str = ""; str = "";
snprintf(msg, sizeof(msg), "%s\n%s", rgui->keyboard.label, str); snprintf(msg, sizeof(msg), "%s\n%s", driver.menu->keyboard.label, str);
rmenu_xui_render_messagebox(msg); rmenu_xui_render_messagebox(msg);
} }
} }