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

(RMenu) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-06-12 16:17:19 +02:00
parent 1011e0499e
commit c814f71221
2 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
menu/drivers/rmenu.c
View File

@ -123,13 +123,15 @@ end:
static void rmenu_render(void) static void rmenu_render(void)
{ {
size_t begin, end, i, j; size_t begin, end, i, j;
struct font_params font_parms; struct font_params font_parms = {0};
char title[256], title_buf[256]; char title[256] = {0};
char title_msg[64]; char title_buf[256] = {0};
menu_handle_t *menu = menu_driver_get_ptr(); char title_msg[64] = {0};
global_t *global = global_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
uint64_t frame_count = video_driver_get_frame_count(); menu_navigation_t *nav = menu_navigation_get_ptr();
size_t entries_end = menu_entries_get_end(); global_t *global = global_get_ptr();
uint64_t frame_count = video_driver_get_frame_count();
size_t entries_end = menu_entries_get_end();
if (!menu) if (!menu)
return; return;
@ -151,10 +153,10 @@ static void rmenu_render(void)
if (!menu->menu_list->selection_buf) if (!menu->menu_list->selection_buf)
return; return;
begin = (menu->navigation.selection_ptr >= (ENTRIES_HEIGHT / 2)) ? begin = (nav->selection_ptr >= (ENTRIES_HEIGHT / 2)) ?
(menu->navigation.selection_ptr - (ENTRIES_HEIGHT / 2)) : 0; (nav->selection_ptr - (ENTRIES_HEIGHT / 2)) : 0;
end = ((menu->navigation.selection_ptr + ENTRIES_HEIGHT) <= entries_end) end = ((nav->selection_ptr + ENTRIES_HEIGHT) <= entries_end)
? menu->navigation.selection_ptr + ENTRIES_HEIGHT : entries_end; ? nav->selection_ptr + ENTRIES_HEIGHT : entries_end;
if (entries_end <= ENTRIES_HEIGHT) if (entries_end <= ENTRIES_HEIGHT)
begin = 0; begin = 0;
@ -190,11 +192,13 @@ static void rmenu_render(void)
for (i = begin; i < end; i++, j++) for (i = begin; i < end; i++, j++)
{ {
char entry_path[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; char entry_path[PATH_MAX_LENGTH] = {0};
char message[PATH_MAX_LENGTH], char entry_value[PATH_MAX_LENGTH] = {0};
entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; char message[PATH_MAX_LENGTH] = {0};
unsigned entry_spacing = menu_entry_get_spacing(i); char entry_title_buf[PATH_MAX_LENGTH] = {0};
bool entry_selected = menu_entry_is_currently_selected(i); char type_str_buf[PATH_MAX_LENGTH] = {0};
unsigned entry_spacing = menu_entry_get_spacing(i);
bool entry_selected = menu_entry_is_currently_selected(i);
menu_entry_get_value(i, entry_value, sizeof(entry_value)); menu_entry_get_value(i, entry_value, sizeof(entry_value));
menu_entry_get_path(i, entry_path, sizeof(entry_path)); menu_entry_get_path(i, entry_path, sizeof(entry_path));

42
menu/drivers/rmenu_xui.cpp
View File

@ -171,13 +171,13 @@ HRESULT XuiTextureLoader(IXuiDevice *pDevice, LPCWSTR szFileName,
XUIImageInfo *pImageInfo, IDirect3DTexture9 **ppTex) XUIImageInfo *pImageInfo, IDirect3DTexture9 **ppTex)
{ {
D3DXIMAGE_INFO pSrc; D3DXIMAGE_INFO pSrc;
CONST BYTE *pbTextureData = 0; CONST BYTE *pbTextureData = 0;
UINT cbTextureData = 0; UINT cbTextureData = 0;
HXUIRESOURCE hResource = 0; HXUIRESOURCE hResource = 0;
BOOL bIsMemoryResource = FALSE; BOOL bIsMemoryResource = FALSE;
IDirect3DDevice9 * d3dDevice = NULL; IDirect3DDevice9 * d3dDevice = NULL;
HRESULT hr = XuiResourceOpenNoLoc(szFileName, &hResource, HRESULT hr =
&bIsMemoryResource); XuiResourceOpenNoLoc(szFileName, &hResource, &bIsMemoryResource);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
@ -202,7 +202,8 @@ HRESULT XuiTextureLoader(IXuiDevice *pDevice, LPCWSTR szFileName,
goto cleanup; goto cleanup;
} }
hr = XuiResourceRead(hResource, (BYTE*)pbTextureData, cbTextureData, &cbTextureData); hr = XuiResourceRead(hResource,
(BYTE*)pbTextureData, cbTextureData, &cbTextureData);
if (FAILED(hr)) if (FAILED(hr))
goto cleanup; goto cleanup;
@ -263,13 +264,14 @@ cleanup:
static void* rmenu_xui_init(void) static void* rmenu_xui_init(void)
{ {
HRESULT hr; HRESULT hr;
D3DPRESENT_PARAMETERS d3dpp; d3d_video_t *d3d = NULL;
d3d_video_t *d3d; D3DPRESENT_PARAMETERS d3dpp = {0};
video_info_t video_info = {0}; video_info_t video_info = {0};
TypefaceDescriptor typeface = {0}; TypefaceDescriptor typeface = {0};
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu)); menu_handle_t *menu = (menu_handle_t*)
calloc(1, sizeof(*menu));
if (!menu) if (!menu)
return NULL; return NULL;
@ -357,12 +359,12 @@ static void rmenu_xui_free(void *data)
static void xui_render_message(const char *msg) static void xui_render_message(const char *msg)
{ {
struct font_params font_parms; struct font_params font_parms = {0};
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 = NULL;
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
d3d_video_t *d3d = (d3d_video_t*)driver->video_data; d3d_video_t *d3d = (d3d_video_t*)driver->video_data;
if (!d3d) if (!d3d)
return; return;