mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-14 02:27:39 -04:00
038df5cdc9
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
112 lines
2.1 KiB
C
112 lines
2.1 KiB
C
/*
|
|
* writerbf - write an incore font in .rbf format.
|
|
* Must be compiled with -DFONT=font_name and linked
|
|
* with compiled in font.
|
|
*
|
|
* Copyright (c) 2002 by Greg Haerr <greg@censoft.com>
|
|
*/
|
|
#include <stdio.h>
|
|
#include "../firmware/font.h"
|
|
|
|
extern MWCFONT FONT;
|
|
PMWCFONT pf = &FONT;
|
|
|
|
static int
|
|
WRITEBYTE(FILE *fp, unsigned char c)
|
|
{
|
|
return putc(c, fp) != EOF;
|
|
}
|
|
|
|
static int
|
|
WRITESHORT(FILE *fp, unsigned short s)
|
|
{
|
|
putc(s, fp);
|
|
return putc(s>>8, fp) != EOF;
|
|
}
|
|
|
|
static int
|
|
WRITELONG(FILE *fp, unsigned long l)
|
|
{
|
|
putc(l, fp);
|
|
putc(l>>8, fp);
|
|
putc(l>>16, fp);
|
|
return putc(l>>24, fp) != EOF;
|
|
}
|
|
|
|
static int
|
|
WRITESTR(FILE *fp, char *str, int count)
|
|
{
|
|
return fwrite(str, 1, count, fp) == count;
|
|
}
|
|
|
|
static int
|
|
WRITESTRPAD(FILE *fp, char *str, int totlen)
|
|
{
|
|
int ret;
|
|
|
|
while (*str && totlen > 0)
|
|
if (*str) {
|
|
ret = putc(*str++, fp);
|
|
--totlen;
|
|
}
|
|
while (--totlen >= 0)
|
|
ret = putc(' ', fp);
|
|
return ret;
|
|
}
|
|
|
|
/* write font, < 0 return is error*/
|
|
int
|
|
rbf_write_font(PMWCFONT pf)
|
|
{
|
|
FILE *ofp;
|
|
int i;
|
|
char name[256];
|
|
|
|
sprintf(name, "%s.fnt", pf->name);
|
|
ofp = fopen(name, "wb");
|
|
if (!ofp)
|
|
return -1;
|
|
|
|
/* write magic and version #*/
|
|
WRITESTR(ofp, VERSION, 4);
|
|
|
|
/* internal font name*/
|
|
WRITESTRPAD(ofp, pf->name, 64);
|
|
|
|
/* copyright - FIXME not converted with bdf2c*/
|
|
WRITESTRPAD(ofp, " ", 256);
|
|
|
|
/* font info*/
|
|
WRITESHORT(ofp, pf->maxwidth);
|
|
WRITESHORT(ofp, pf->height);
|
|
WRITESHORT(ofp, pf->ascent);
|
|
WRITESHORT(ofp, 0);
|
|
WRITELONG(ofp, pf->firstchar);
|
|
WRITELONG(ofp, pf->defaultchar);
|
|
WRITELONG(ofp, pf->size);
|
|
|
|
/* variable font data sizes*/
|
|
WRITELONG(ofp, pf->bits_size); /* # words of MWIMAGEBITS*/
|
|
WRITELONG(ofp, pf->offset? pf->size: 0); /* # longs of offset*/
|
|
WRITELONG(ofp, pf->width? pf->size: 0); /* # bytes of width*/
|
|
|
|
/* variable font data*/
|
|
for (i=0; i<pf->bits_size; ++i)
|
|
WRITESHORT(ofp, pf->bits[i]);
|
|
if (ftell(ofp) & 2)
|
|
WRITESHORT(ofp, 0); /* pad to 32-bit boundary*/
|
|
|
|
if (pf->offset)
|
|
for (i=0; i<pf->size; ++i)
|
|
WRITELONG(ofp, pf->offset[i]);
|
|
|
|
if (pf->width)
|
|
for (i=0; i<pf->size; ++i)
|
|
WRITEBYTE(ofp, pf->width[i]);
|
|
}
|
|
|
|
int
|
|
main(int ac, char **av)
|
|
{
|
|
rbf_write_font(pf);
|
|
}
|