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

(RGUI) Go through frame_buf pointer

This commit is contained in:
twinaphex 2015-06-13 16:51:16 +02:00
parent 158e86ce8a
commit 9fd3d6f635
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
menu/drivers/rgui.c
View File

@ -296,17 +296,17 @@ static void rgui_render_messagebox(const char *message)
} }
height = FONT_HEIGHT_STRIDE * list->size + 6 + 10; height = FONT_HEIGHT_STRIDE * list->size + 6 + 10;
x = (menu->frame_buf.width - width) / 2; x = (frame_buf->width - width) / 2;
y = (menu->frame_buf.height - height) / 2; y = (frame_buf->height - height) / 2;
fill_rect(&menu->frame_buf, x + 5, y + 5, width - 10, fill_rect(frame_buf, x + 5, y + 5, width - 10,
height - 10, gray_filler); height - 10, gray_filler);
fill_rect(&menu->frame_buf, x, y, width - 5, 5, green_filler); fill_rect(frame_buf, x, y, width - 5, 5, green_filler);
fill_rect(&menu->frame_buf, x + width - 5, y, 5, fill_rect(frame_buf, x + width - 5, y, 5,
height - 5, green_filler); height - 5, green_filler);
fill_rect(&menu->frame_buf, x + 5, y + height - 5, fill_rect(frame_buf, x + 5, y + height - 5,
width - 5, 5, green_filler); width - 5, 5, green_filler);
fill_rect(&menu->frame_buf, x, y + 5, 5, fill_rect(frame_buf, x, y + 5, 5,
height - 5, green_filler); height - 5, green_filler);
color = NORMAL_COLOR(settings); color = NORMAL_COLOR(settings);
@ -515,23 +515,26 @@ static void rgui_render(void)
static void *rgui_init(void) static void *rgui_init(void)
{ {
bool ret = false; bool ret = false;
menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu)); menu_framebuf_t *frame_buf = NULL;
menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu));
if (!menu) if (!menu)
return NULL; return NULL;
/* 4 extra lines to cache the checked background */ frame_buf = &menu->frame_buf;
menu->frame_buf.data = (uint16_t*)calloc(400 * (240 + 4), sizeof(uint16_t));
if (!menu->frame_buf.data) /* 4 extra lines to cache the checked background */
frame_buf->data = (uint16_t*)calloc(400 * (240 + 4), sizeof(uint16_t));
if (!frame_buf->data)
goto error; goto error;
menu->frame_buf.width = 320; frame_buf->width = 320;
menu->frame_buf.height = 240; frame_buf->height = 240;
menu->header_height = FONT_HEIGHT_STRIDE * 2; menu->header_height = FONT_HEIGHT_STRIDE * 2;
menu->begin = 0; menu->begin = 0;
menu->frame_buf.pitch = menu->frame_buf.width * sizeof(uint16_t); frame_buf->pitch = frame_buf->width * sizeof(uint16_t);
ret = rguidisp_init_font(menu); ret = rguidisp_init_font(menu);
@ -541,18 +544,20 @@ static void *rgui_init(void)
goto error; goto error;
} }
fill_rect(&menu->frame_buf, 0, menu->frame_buf.height, fill_rect(frame_buf, 0, frame_buf->height,
menu->frame_buf.width, 4, gray_filler); frame_buf->width, 4, gray_filler);
return menu; return menu;
error: error:
if (menu) if (menu)
{ {
if (menu->frame_buf.data) if (frame_buf->data)
free(menu->frame_buf.data); free(frame_buf->data);
frame_buf->data = NULL;
if (menu->userdata) if (menu->userdata)
free(menu->userdata); free(menu->userdata);
menu->userdata = NULL;
free(menu); free(menu);
} }
return NULL; return NULL;