summaryrefslogtreecommitdiffstats
path: root/firmware/font.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2011-11-08 10:09:33 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2011-11-08 10:09:33 +0000
commitf19f3efb078b2947638f6f7a7f209de44daf78b3 (patch)
tree46ddfc7234b2de6e848d5bcd7630821d91a84f37 /firmware/font.c
parent452a3ce2742949e184d6bc9c9b1f7985dae3e874 (diff)
downloadrockbox-f19f3efb078b2947638f6f7a7f209de44daf78b3.tar.gz
rockbox-f19f3efb078b2947638f6f7a7f209de44daf78b3.tar.bz2
rockbox-f19f3efb078b2947638f6f7a7f209de44daf78b3.zip
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)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30932 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/font.c')
-rw-r--r--firmware/font.c75
1 files changed, 19 insertions, 56 deletions
diff --git a/firmware/font.c b/firmware/font.c
index 8e576016bd..ff5bc4b008 100644
--- a/firmware/font.c
+++ b/firmware/font.c
@@ -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;
- }
- 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;
+ 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;
+ }
}
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
*/