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

Create MENU_DISPLAY_CTL_DEINIT

Browse Source
This commit is contained in:
twinaphex 2016-02-09 00:07:12 +01:00
parent a8b5c4f3b1
commit 5e9f8b276b
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
menu/menu_display.c
View File

@ -36,17 +36,8 @@
#include "../gfx/video_thread_wrapper.h" #include "../gfx/video_thread_wrapper.h"
#endif #endif
typedef struct menu_framebuf
{
unsigned width;
unsigned height;
size_t pitch;
} menu_framebuf_t;
typedef struct menu_display typedef struct menu_display
{ {
bool msg_force;
struct struct
{ {
void *buf; void *buf;
@ -89,17 +80,7 @@ static menu_display_ctx_driver_t *menu_display_context_get_ptr(void)
void menu_display_free(void) void menu_display_free(void)
{ {
menu_display_t *disp = menu_display_get_ptr(); menu_display_ctl(MENU_DISPLAY_CTL_DEINIT, NULL);
if (!disp)
return;
if (disp->msg_queue)
msg_queue_free(disp->msg_queue);
disp->msg_queue = NULL;
menu_animation_ctl(MENU_ANIMATION_CTL_DEINIT, NULL);
menu_display_ctl(MENU_DISPLAY_CTL_FRAMEBUF_DEINIT, NULL);
memset(menu_display_get_ptr(), 0, sizeof(menu_display_t));
} }
bool menu_display_init(void) bool menu_display_init(void)
@ -228,7 +209,10 @@ bool menu_display_init_main_font(const char *font_path, float font_size)
bool menu_display_ctl(enum menu_display_ctl_state state, void *data) bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
{ {
unsigned width, height; unsigned width, height;
static menu_framebuf_t menu_display_framebuf; static bool menu_display_msg_force = false;
static unsigned menu_display_framebuf_width = 0;
static unsigned menu_display_framebuf_height = 0;
static size_t menu_display_framebuf_pitch = 0;
static const uint8_t *menu_display_font_framebuf = NULL; static const uint8_t *menu_display_font_framebuf = NULL;
static bool menu_display_font_alloc_framebuf = false; static bool menu_display_font_alloc_framebuf = false;
static bool menu_display_framebuf_dirty = false; static bool menu_display_framebuf_dirty = false;
@ -258,7 +242,20 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
return menu_display_font_bind_block(NULL); return menu_display_font_bind_block(NULL);
case MENU_DISPLAY_CTL_FRAMEBUF_DEINIT: case MENU_DISPLAY_CTL_FRAMEBUF_DEINIT:
memset(&menu_display_framebuf, 0, sizeof(menu_framebuf_t)); menu_display_framebuf_width = 0;
menu_display_framebuf_height = 0;
menu_display_framebuf_pitch = 0;
break;
case MENU_DISPLAY_CTL_DEINIT:
if (disp->msg_queue)
msg_queue_free(disp->msg_queue);
disp->msg_queue = NULL;
menu_display_msg_force = false;
menu_animation_ctl(MENU_ANIMATION_CTL_DEINIT, NULL);
menu_display_ctl(MENU_DISPLAY_CTL_FRAMEBUF_DEINIT, NULL);
memset(disp, 0, sizeof(menu_display_t));
break; break;
case MENU_DISPLAY_CTL_SET_STUB_DRAW_FRAME: case MENU_DISPLAY_CTL_SET_STUB_DRAW_FRAME:
draw_bak = menu_disp->draw; draw_bak = menu_disp->draw;
@ -336,7 +333,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
unsigned *ptr = (unsigned*)data; unsigned *ptr = (unsigned*)data;
if (!ptr) if (!ptr)
return false; return false;
menu_display_framebuf.width = *ptr; menu_display_framebuf_width = *ptr;
} }
return true; return true;
case MENU_DISPLAY_CTL_WIDTH: case MENU_DISPLAY_CTL_WIDTH:
@ -344,7 +341,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
unsigned *ptr = (unsigned*)data; unsigned *ptr = (unsigned*)data;
if (!ptr) if (!ptr)
return false; return false;
*ptr = menu_display_framebuf.width; *ptr = menu_display_framebuf_width;
} }
return true; return true;
case MENU_DISPLAY_CTL_HEIGHT: case MENU_DISPLAY_CTL_HEIGHT:
@ -352,7 +349,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
unsigned *ptr = (unsigned*)data; unsigned *ptr = (unsigned*)data;
if (!ptr) if (!ptr)
return false; return false;
*ptr = menu_display_framebuf.height; *ptr = menu_display_framebuf_height;
} }
return true; return true;
case MENU_DISPLAY_CTL_HEADER_HEIGHT: case MENU_DISPLAY_CTL_HEADER_HEIGHT:
@ -392,7 +389,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
unsigned *ptr = (unsigned*)data; unsigned *ptr = (unsigned*)data;
if (!ptr) if (!ptr)
return false; return false;
menu_display_framebuf.height = *ptr; menu_display_framebuf_height = *ptr;
} }
return true; return true;
case MENU_DISPLAY_CTL_FB_PITCH: case MENU_DISPLAY_CTL_FB_PITCH:
@ -400,7 +397,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
size_t *ptr = (size_t*)data; size_t *ptr = (size_t*)data;
if (!ptr) if (!ptr)
return false; return false;
*ptr = menu_display_framebuf.pitch; *ptr = menu_display_framebuf_pitch;
} }
return true; return true;
case MENU_DISPLAY_CTL_SET_FB_PITCH: case MENU_DISPLAY_CTL_SET_FB_PITCH:
@ -408,7 +405,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
size_t *ptr = (size_t*)data; size_t *ptr = (size_t*)data;
if (!ptr) if (!ptr)
return false; return false;
menu_display_framebuf.pitch = *ptr; menu_display_framebuf_pitch = *ptr;
} }
return true; return true;
case MENU_DISPLAY_CTL_MSG_FORCE: case MENU_DISPLAY_CTL_MSG_FORCE:
@ -416,7 +413,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
bool *ptr = (bool*)data; bool *ptr = (bool*)data;
if (!ptr) if (!ptr)
return false; return false;
*ptr = disp->msg_force; *ptr = menu_display_msg_force;
} }
return true; return true;
case MENU_DISPLAY_CTL_SET_MSG_FORCE: case MENU_DISPLAY_CTL_SET_MSG_FORCE:
@ -424,7 +421,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
bool *ptr = (bool*)data; bool *ptr = (bool*)data;
if (!ptr) if (!ptr)
return false; return false;
disp->msg_force = *ptr; menu_display_msg_force = *ptr;
} }
return true; return true;
case MENU_DISPLAY_CTL_FONT_DATA_INIT: case MENU_DISPLAY_CTL_FONT_DATA_INIT:

1
menu/menu_display.h
View File

@ -53,6 +53,7 @@ enum menu_display_ctl_state
MENU_DISPLAY_CTL_SET_STUB_DRAW_FRAME, MENU_DISPLAY_CTL_SET_STUB_DRAW_FRAME,
MENU_DISPLAY_CTL_UNSET_STUB_DRAW_FRAME, MENU_DISPLAY_CTL_UNSET_STUB_DRAW_FRAME,
MENU_DISPLAY_CTL_FRAMEBUF_DEINIT, MENU_DISPLAY_CTL_FRAMEBUF_DEINIT,
MENU_DISPLAY_CTL_DEINIT,
MENU_DISPLAY_CTL_FONT_DATA_INIT, MENU_DISPLAY_CTL_FONT_DATA_INIT,
MENU_DISPLAY_CTL_SET_FONT_DATA_INIT, MENU_DISPLAY_CTL_SET_FONT_DATA_INIT,
MENU_DISPLAY_CTL_FONT_SIZE, MENU_DISPLAY_CTL_FONT_SIZE,