summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-02-14 06:26:16 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-02-14 06:26:16 +0000
commit1c2aa35371aed8d895b3448dad865b913da57cfb (patch)
tree8a790ad8efe5d0abd73eaf77adc854d336ce0ef4 /tools
parented21ab1c8c9b16ec62933313c3d36a93d9255f62 (diff)
downloadrockbox-1c2aa35371aed8d895b3448dad865b913da57cfb.tar.gz
rockbox-1c2aa35371aed8d895b3448dad865b913da57cfb.tar.bz2
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/SOURCES3
-rw-r--r--tools/checkwps/checkwps.c16
-rw-r--r--tools/convbdf.c11
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 @@
../../apps/gui/skin_engine/wps_debug.c
../../apps/gui/skin_engine/skin_parser.c
../../apps/gui/skin_engine/skin_buffer.c
+#ifdef HAVE_LCD_BITMAP
+../../apps/gui/skin_engine/skin_fonts.c
+#endif
../../apps/gui/viewport.c
../../apps/misc.c
../../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 @@
#include "settings.h"
#include "viewport.h"
#include "file.h"
+#include "font.h"
bool debug_wps = true;
int wps_verbose_level = 0;
@@ -236,6 +237,21 @@ void screen_clear_area(struct screen * display, int xstart, int ystart,
}
#endif
+#ifdef HAVE_LCD_BITMAP
+static int loaded_fonts = 0;
+int font_load(struct font* pf, const char *path)
+{
+ int id = SYSTEMFONTCOUNT + loaded_fonts;
+ loaded_fonts++;
+ return id;
+}
+
+void font_unload(int font_id)
+{
+ (void)font_id;
+}
+#endif
+
int main(int argc, char **argv)
{
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)
" %s /* offset */\n"
" %s\n"
" %d, /* defaultchar */\n"
- " %d /* bits_size */\n"
+ " %d, /* bits_size */\n"
+ " -1, /* font fd */\n"
+ " 0, /* buffer start */\n"
+ " 0, /* ^ position */\n"
+ " 0, /* ^ end */\n"
+ " 0, /* ^ size */\n"
+ " {{0,0,0,0,0},0,0,0}, /* cache */\n"
+ " 0, /* */\n"
+ " 0, /* */\n"
+ " 0, /* */\n"
"};\n"
"#endif /* HAVE_LCD_BITMAP */\n",
pf->maxwidth, pf->height,