From 038df5cdc99c53530f52f7c0755bd64c473908b0 Mon Sep 17 00:00:00 2001 From: Eric Linenberg Date: Mon, 16 Sep 2002 03:18:49 +0000 Subject: Daniel, The following patch makes loadable fonts actually work (finally!). It took me quite a while, but I finally figured out why the sim worked and the target didn't: the SH1 processor won't read longwords from a shortword alignment... I had to rev the .fnt file to version 1.1 (requires remaking *.fnt files) in order to fix this. Please apply the following patch completely. It's diffed against the latest CVS. I've also attached rockbox-fonts-1.1.tar.gz which includes known working *.fnt files, including a courB08 system.fnt, for demonstration. Now the real work can begin... Although the new system.fnt will work fine, if you try going to a really big font (try copying courB14.fnt to system.fnt), then you will find that it comes up and works in tree mode, but will crash the system when going into WPS mode... I'm sure this is because of the low-level lcd_bitmap not clipping properly when given a too-large bitmap, which the characters become. I haven't yet tried to debug the low-level driver. Of course, it all works on the sim... So the apps developers will now have to make sure that all apps screen sizes may vary according to the loaded font. The font height can be gotten through the lcd_getfontsize API. Files patched in fonts-6.patch 1. apps/menu.c - LCD_PROPFONTS error (2nd resubmission on this, please checkin) 2. firmware/font.c - fixes and reformatting. Please check this in as is, my vi editor requires more reformatting changes since I left tabs in the file, these are removed now (2nd resubmission on this, please checkin) 3. firmware/fonts.h - doc change on .fnt file format, .fnt version number incremented. 4. firmware/loadfont.c - fixes to load font properly, typedefs removed. 5. firmware/system.c - lcd_setfont(FONT_SYSFIXED) before issuing error, otherwise font may not exist. 6. tools/bdf2c - fixes for correct output when filename starts with a number, as well as when no DEFAULT_CHAR in .bdf file. (2nd resubmission on this, please checkin) 7. tools/writerbf.c - fixes for bugfixed fontfile format. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2294 a1c6a512-1295-4272-9138-f99709370657 --- firmware/loadfont.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'firmware/loadfont.c') diff --git a/firmware/loadfont.c b/firmware/loadfont.c index 7f572a4841..e78f208b13 100644 --- a/firmware/loadfont.c +++ b/firmware/loadfont.c @@ -39,9 +39,8 @@ /* static buffer allocation structures*/ static unsigned char mbuf[MAX_FONT_SIZE]; static unsigned char *freeptr = mbuf; -typedef unsigned char CFILE; -static CFILE *fileptr; -static CFILE *eofptr; +static unsigned char *fileptr; +static unsigned char *eofptr; static int READSHORT(unsigned short *sp) @@ -101,9 +100,9 @@ PMWCFONT rbf_load_font(char *path, PMWCFONT pf) { int fd, filesize; - unsigned short maxwidth, height, ascent; + unsigned short maxwidth, height, ascent, pad; unsigned long firstchar, defaultchar, size; - unsigned long nbits, noffset, nwidth; + unsigned long i, nbits, noffset, nwidth; char version[4+1]; char copyright[256+1]; @@ -115,10 +114,12 @@ rbf_load_font(char *path, PMWCFONT pf) DEBUGF("Can't open font: %s\n", path); return NULL; } +freeptr = (unsigned char *)(((int)mbuf + 3) & ~3); fileptr = freeptr; filesize = read(fd, fileptr, MAX_FONT_SIZE); - freeptr += filesize; eofptr = fileptr + filesize; + //freeptr += filesize; + //freeptr = (unsigned char *)(freeptr + 3) & ~3; /* pad freeptr*/ close(fd); if (filesize == MAX_FONT_SIZE) { DEBUGF("Font %s too large: %d\n", path, filesize); @@ -151,6 +152,8 @@ rbf_load_font(char *path, PMWCFONT pf) if (!READSHORT(&ascent)) return NULL; pf->ascent = ascent; + if (!READSHORT(&pad)) + return NULL; if (!READLONG(&firstchar)) return NULL; pf->firstchar = firstchar; @@ -177,16 +180,22 @@ rbf_load_font(char *path, PMWCFONT pf) /* variable font data*/ pf->bits = (MWIMAGEBITS *)fileptr; - fileptr += nbits*sizeof(MWIMAGEBITS); + for (i=0; ibits[i])) + return NULL; + /* pad to longword boundary*/ + fileptr = (unsigned char *)(((int)fileptr + 3) & ~3); if (noffset) { pf->offset = (unsigned long *)fileptr; - fileptr += noffset*sizeof(unsigned long); + for (i=0; ioffset[i])) + return NULL; } else pf->offset = NULL; if (nwidth) { pf->width = (unsigned char *)fileptr; - fileptr += noffset*sizeof(unsigned char); + fileptr += nwidth*sizeof(unsigned char); } else pf->width = NULL; if (fileptr > eofptr) @@ -198,5 +207,6 @@ rbf_load_font(char *path, PMWCFONT pf) /* ----------------------------------------------------------------- * local variables: * eval: (load-file "rockbox-mode.el") + * vim: et sw=4 ts=8 sts=4 tw=78 * end: */ -- cgit v1.2.3