ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(RMenu) Cleanups

This commit is contained in:
twinaphex 2015-02-01 08:15:46 +01:00
parent 6060849910
commit 435f4140b9
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
menu/drivers/rmenu.c
View File

@ -135,7 +135,15 @@ static void rmenu_render_messagebox(const char *message)
static void rmenu_render(void) static void rmenu_render(void)
{ {
size_t begin, end; size_t begin, end;
size_t i, j;
struct font_params font_parms; struct font_params font_parms;
char title[256];
char title_buf[256], title_msg[64];
const char *dir = NULL;
const char *label = NULL;
const char *core_name = NULL;
const char *core_version = NULL;
unsigned menu_type = 0;
menu_handle_t *menu = (menu_handle_t*)driver.menu; menu_handle_t *menu = (menu_handle_t*)driver.menu;
if (!menu) if (!menu)
@ -169,15 +177,10 @@ static void rmenu_render(void)
rmenu_render_background(); rmenu_render_background();
char title[256];
const char *dir = NULL;
const char *label = NULL;
unsigned menu_type = 0;
menu_list_get_last_stack(driver.menu->menu_list, &dir, &label, &menu_type); menu_list_get_last_stack(driver.menu->menu_list, &dir, &label, &menu_type);
get_title(label, dir, menu_type, title, sizeof(title)); get_title(label, dir, menu_type, title, sizeof(title));
char title_buf[256];
menu_ticker_line(title_buf, RMENU_TERM_WIDTH, menu_ticker_line(title_buf, RMENU_TERM_WIDTH,
g_extern.frame_count / 15, title, true); g_extern.frame_count / 15, title, true);
@ -192,14 +195,13 @@ static void rmenu_render(void)
driver.video_poke->set_osd_msg(driver.video_data, driver.video_poke->set_osd_msg(driver.video_data,
title_buf, &font_parms, NULL); title_buf, &font_parms, NULL);
char title_msg[64]; core_name = g_extern.menu.info.library_name;
const char *core_name = g_extern.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 = g_extern.menu.info.library_version; core_version = g_extern.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)
@ -218,8 +220,6 @@ static void rmenu_render(void)
driver.video_poke->set_osd_msg(driver.video_data, driver.video_poke->set_osd_msg(driver.video_data,
title_msg, &font_parms, NULL); title_msg, &font_parms, NULL);
size_t i, j;
j = 0; j = 0;
for (i = begin; i < end; i++, j++) for (i = begin; i < end; i++, j++)
@ -256,7 +256,9 @@ static void rmenu_render(void)
snprintf(message, sizeof(message), "%c %s", snprintf(message, sizeof(message), "%c %s",
selected ? '>' : ' ', entry_title_buf); selected ? '>' : ' ', entry_title_buf);
//blit_line(menu, x, y, message, selected); #if 0
blit_line(menu, x, y, message, selected);
#endif
font_parms.x = POSITION_EDGE_MIN + POSITION_OFFSET; font_parms.x = POSITION_EDGE_MIN + POSITION_OFFSET;
font_parms.y = POSITION_EDGE_MIN + POSITION_RENDER_OFFSET font_parms.y = POSITION_EDGE_MIN + POSITION_RENDER_OFFSET
+ (POSITION_OFFSET * j); + (POSITION_OFFSET * j);
@ -284,15 +286,21 @@ void rmenu_set_texture(void *data)
if (menu_texture_inited) if (menu_texture_inited)
return; return;
if (driver.video_data && driver.video_poke if (!driver.video_data)
&& driver.video_poke->set_texture_enable return;
&& menu_texture && menu_texture->pixels) if (!driver.video_poke)
{ return;
if (!driver.video_poke->set_texture_enable)
return;
if (!menu_texture)
return;
if (!menu_texture->pixels)
return;
driver.video_poke->set_texture_frame(driver.video_data, driver.video_poke->set_texture_frame(driver.video_data,
menu_texture->pixels, menu_texture->pixels,
true, menu->width, menu->height, 1.0f); true, menu->width, menu->height, 1.0f);
menu_texture_inited = true; menu_texture_inited = true;
}
} }
static void rmenu_wallpaper_set_defaults(char *menu_bg, size_t sizeof_menu_bg) static void rmenu_wallpaper_set_defaults(char *menu_bg, size_t sizeof_menu_bg)