This commit is contained in:
twinaphex 2015-09-27 00:11:13 +02:00
parent ceff590094
commit 68481e8942
2 changed files with 19 additions and 22 deletions

View File

@ -31,11 +31,29 @@ typedef struct menu_framebuf
bool dirty;
} menu_framebuf_t;
typedef struct menu_display
{
bool msg_force;
struct
{
void *buf;
int size;
const uint8_t *framebuf;
bool alloc_framebuf;
} font;
unsigned header_height;
msg_queue_t *msg_queue;
} menu_display_t;
static menu_display_t menu_display_state;
static menu_framebuf_t frame_buf_state;
menu_display_t *menu_display_get_ptr(void)
static menu_display_t *menu_display_get_ptr(void)
{
return &menu_display_state;
}

View File

@ -60,26 +60,6 @@ enum menu_display_ctl_state
MENU_DISPLAY_CTL_SET_FONT_FB
};
typedef struct menu_display
{
bool msg_force;
struct
{
void *buf;
int size;
const uint8_t *framebuf;
bool alloc_framebuf;
} font;
unsigned header_height;
msg_queue_t *msg_queue;
} menu_display_t;
menu_display_t *menu_display_get_ptr(void);
void menu_display_free(void);
bool menu_display_init(void);
@ -99,7 +79,6 @@ bool menu_display_init_main_font(void *data,
void menu_display_free_main_font(void);
bool menu_display_ctl(enum menu_display_ctl_state state, void *data);
void menu_display_timedate(char *s, size_t len, unsigned time_mode);