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-11 06:59:19 +01:00
parent 3b2e11c446
commit cf57120fdd
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
menu/drivers/rmenu.c
View File

@ -101,10 +101,7 @@ static void rmenu_render_messagebox(const char *message)
return; return;
if (list->elems == 0) if (list->elems == 0)
{ goto end;
string_list_free(list);
return;
}
j = 0; j = 0;
@ -134,6 +131,8 @@ static void rmenu_render_messagebox(const char *message)
} }
render_normal = false; render_normal = false;
end:
string_list_free(list);
} }
static void rmenu_render(void) static void rmenu_render(void)

28
menu/drivers/rmenu_xui.cpp
View File

@ -374,33 +374,24 @@ static void xui_render_message(const char *msg)
struct font_params font_parms; struct font_params font_parms;
size_t i = 0; size_t i = 0;
size_t j = 0; size_t j = 0;
struct string_list *list = NULL;
struct string_list *list = string_split(msg, "\n");
d3d_video_t *d3d = (d3d_video_t*)driver.video_data; d3d_video_t *d3d = (d3d_video_t*)driver.video_data;
if (!d3d)
return;
list = string_split(msg, "\n");
if (!list) if (!list)
return; return;
if (!d3d || list->elems == 0) if (list->elems == 0)
{ goto end;
string_list_free(list);
return;
}
for (i = 0; i < list->size; i++, j++) for (i = 0; i < list->size; i++, j++)
{ {
char *msg = (char*)list->elems[i].data; char *msg = (char*)list->elems[i].data;
unsigned msglen = strlen(msg); unsigned msglen = strlen(msg);
#if 0
if (msglen > RMENU_TERM_WIDTH)
{
msg[RMENU_TERM_WIDTH - 2] = '.';
msg[RMENU_TERM_WIDTH - 1] = '.';
msg[RMENU_TERM_WIDTH - 0] = '.';
msg[RMENU_TERM_WIDTH + 1] = '\0';
msglen = RMENU_TERM_WIDTH;
}
#endif
float msg_width = d3d->resolution_hd_enable ? 160 : 100; float msg_width = d3d->resolution_hd_enable ? 160 : 100;
float msg_height = 120; float msg_height = 120;
float msg_offset = 32; float msg_offset = 32;
@ -413,6 +404,9 @@ static void xui_render_message(const char *msg)
driver.video_poke->set_osd_msg(driver.video_data, driver.video_poke->set_osd_msg(driver.video_data,
msg, &font_parms, NULL); msg, &font_parms, NULL);
} }
end:
string_list_free(list);
} }
static void rmenu_xui_frame(void) static void rmenu_xui_frame(void)