diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-02-14 06:26:16 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-02-14 06:26:16 +0000 |
commit | 1c2aa35371aed8d895b3448dad865b913da57cfb (patch) | |
tree | 8a790ad8efe5d0abd73eaf77adc854d336ce0ef4 /tools | |
parent | ed21ab1c8c9b16ec62933313c3d36a93d9255f62 (diff) | |
download | rockbox-1c2aa35371aed8d895b3448dad865b913da57cfb.tar.gz rockbox-1c2aa35371aed8d895b3448dad865b913da57cfb.zip |
FS#10984 - multifont! 2 major additions:
1) seperate UI font for the remote and main displays
2) allow individual skins to load additional fonts for use in the skin (Uo to 7 extra in this first version) see CustomWPS for info on how to load a font in the skins.
Code should always use FONT_UI+screen_number to get the correct user font
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24644 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rw-r--r-- | tools/checkwps/SOURCES | 3 | ||||
-rw-r--r-- | tools/checkwps/checkwps.c | 16 | ||||
-rw-r--r-- | tools/convbdf.c | 11 |
3 files changed, 29 insertions, 1 deletions
diff --git a/tools/checkwps/SOURCES b/tools/checkwps/SOURCES index 06ef3b9ee5..6223b97178 100644 --- a/tools/checkwps/SOURCES +++ b/tools/checkwps/SOURCES | |||
@@ -1,6 +1,9 @@ | |||
1 | ../../apps/gui/skin_engine/wps_debug.c | 1 | ../../apps/gui/skin_engine/wps_debug.c |
2 | ../../apps/gui/skin_engine/skin_parser.c | 2 | ../../apps/gui/skin_engine/skin_parser.c |
3 | ../../apps/gui/skin_engine/skin_buffer.c | 3 | ../../apps/gui/skin_engine/skin_buffer.c |
4 | #ifdef HAVE_LCD_BITMAP | ||
5 | ../../apps/gui/skin_engine/skin_fonts.c | ||
6 | #endif | ||
4 | ../../apps/gui/viewport.c | 7 | ../../apps/gui/viewport.c |
5 | ../../apps/misc.c | 8 | ../../apps/misc.c |
6 | ../../firmware/common/strlcpy.c | 9 | ../../firmware/common/strlcpy.c |
diff --git a/tools/checkwps/checkwps.c b/tools/checkwps/checkwps.c index 38a650a878..32b6daa88b 100644 --- a/tools/checkwps/checkwps.c +++ b/tools/checkwps/checkwps.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "settings.h" | 31 | #include "settings.h" |
32 | #include "viewport.h" | 32 | #include "viewport.h" |
33 | #include "file.h" | 33 | #include "file.h" |
34 | #include "font.h" | ||
34 | 35 | ||
35 | bool debug_wps = true; | 36 | bool debug_wps = true; |
36 | int wps_verbose_level = 0; | 37 | int wps_verbose_level = 0; |
@@ -236,6 +237,21 @@ void screen_clear_area(struct screen * display, int xstart, int ystart, | |||
236 | } | 237 | } |
237 | #endif | 238 | #endif |
238 | 239 | ||
240 | #ifdef HAVE_LCD_BITMAP | ||
241 | static int loaded_fonts = 0; | ||
242 | int font_load(struct font* pf, const char *path) | ||
243 | { | ||
244 | int id = SYSTEMFONTCOUNT + loaded_fonts; | ||
245 | loaded_fonts++; | ||
246 | return id; | ||
247 | } | ||
248 | |||
249 | void font_unload(int font_id) | ||
250 | { | ||
251 | (void)font_id; | ||
252 | } | ||
253 | #endif | ||
254 | |||
239 | int main(int argc, char **argv) | 255 | int main(int argc, char **argv) |
240 | { | 256 | { |
241 | int res; | 257 | int res; |
diff --git a/tools/convbdf.c b/tools/convbdf.c index fd82fb5a73..9e42cb8d01 100644 --- a/tools/convbdf.c +++ b/tools/convbdf.c | |||
@@ -1393,7 +1393,16 @@ int gen_c_source(struct font* pf, char *path) | |||
1393 | " %s /* offset */\n" | 1393 | " %s /* offset */\n" |
1394 | " %s\n" | 1394 | " %s\n" |
1395 | " %d, /* defaultchar */\n" | 1395 | " %d, /* defaultchar */\n" |
1396 | " %d /* bits_size */\n" | 1396 | " %d, /* bits_size */\n" |
1397 | " -1, /* font fd */\n" | ||
1398 | " 0, /* buffer start */\n" | ||
1399 | " 0, /* ^ position */\n" | ||
1400 | " 0, /* ^ end */\n" | ||
1401 | " 0, /* ^ size */\n" | ||
1402 | " {{0,0,0,0,0},0,0,0}, /* cache */\n" | ||
1403 | " 0, /* */\n" | ||
1404 | " 0, /* */\n" | ||
1405 | " 0, /* */\n" | ||
1397 | "};\n" | 1406 | "};\n" |
1398 | "#endif /* HAVE_LCD_BITMAP */\n", | 1407 | "#endif /* HAVE_LCD_BITMAP */\n", |
1399 | pf->maxwidth, pf->height, | 1408 | pf->maxwidth, pf->height, |