len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 21:25:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Redo r30826 (and hopefully not reintroduce font issues) which cleans up the font API. FONT_UI is deprecated, use screens[screen].getuifont() instead (and .setuifont() to set it after a font has been loaded)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30932 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2011-11-08 10:09:33 +00:00
parent 452a3ce274
commit f19f3efb07
13 changed files with 94 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

5
firmware/export/font.h
View file

@ -55,7 +55,7 @@ enum {
/* SYSFONT, FONT_UI, FONT_UI_REMOTE + MAXUSERFONTS fonts in skins */
#define MAXFONTS (FONT_FIRSTUSERFONT + MAXUSERFONTS)
#define FONT_UI MAXUSERFONTS
#define FONT_UI MAXFONTS
/*
* .fnt loadable font file format definition
@ -124,9 +124,6 @@ int font_glyphs_to_bufsize(const char *path, int glyphs);
void font_unload(int font_id);
void font_unload_all(void);
void font_lock(int font_id, bool lock);
/* set the default UI font */
void font_set_ui(int font_id);
int font_get_ui(void);
struct font* font_get(int font);

75
firmware/font.c
View file

@ -88,7 +88,6 @@ struct buflib_alloc_data {
};
static int buflib_allocations[MAXFONTS];
static int font_ui = -1;
static int cache_fd;
static struct font* cache_pf;
@ -560,7 +559,7 @@ int font_load_ex(const char *path, size_t buffer_size)
lock_font_handle(handle, false);
buflib_allocations[font_id] = handle;
//printf("%s -> [%d] -> %d\n", path, font_id, handle);
//printf("%s -> [%d] -> %d\n", path, font_id, *handle);
return font_id; /* success!*/
}
int font_load(const char *path)
@ -617,52 +616,28 @@ void font_unload_all(void)
/*
* Return a pointer to an incore font structure.
* Return the requested font, font_ui, or sysfont
* If the requested font isn't loaded/compiled-in,
* decrement the font number and try again.
*/
struct font* font_get(int font_id)
struct font* font_get(int font)
{
struct buflib_alloc_data *alloc;
struct font *pf;
int handle, id=-1;
if( font_id == FONT_UI )
id = font_ui;
if( font_id == FONT_SYSFIXED )
struct font* pf;
if (font == FONT_UI)
font = MAXFONTS-1;
if (font <= FONT_SYSFIXED)
return &sysfont;
if( id == -1 )
id = font_id;
handle = buflib_allocations[id];
if( handle > 0 )
{
alloc = core_get_data(buflib_allocations[id]);
pf=&alloc->font;
if( pf && pf->height )
return pf;
while (1) {
if (buflib_allocations[font] > 0)
{
struct buflib_alloc_data *alloc = core_get_data(buflib_allocations[font]);
pf = &alloc->font;
if (pf && pf->height)
return pf;
}
if (--font < 0)
return &sysfont;
}
handle = buflib_allocations[font_ui];
if( handle > 0 )
{
alloc = core_get_data(buflib_allocations[font_ui]);
pf=&alloc->font;
if( pf && pf->height )
return pf;
}
return &sysfont;
}
void font_set_ui( int font_id )
{
font_ui = font_id;
return;
}
int font_get_ui()
{
return font_ui;
}
static int pf_to_handle(struct font* pf)
@ -1004,18 +979,6 @@ struct font* font_get(int font)
return &sysfont;
}
void font_set_ui(int font_id)
{
(void)font_id;
return;
}
int font_get_ui()
{
return FONT_SYSFIXED;
}
/*
* Returns width of character
*/