From 038df5cdc99c53530f52f7c0755bd64c473908b0 Mon Sep 17 00:00:00 2001
From: Eric Linenberg <elinenbe@umich.edu>
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
---
 tools/bdf2c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'tools/bdf2c')

diff --git a/tools/bdf2c b/tools/bdf2c
index e6b8ee7df7..6832e5ce8f 100755
--- a/tools/bdf2c
+++ b/tools/bdf2c
@@ -5,6 +5,7 @@
 #
 # from The Microwindows Project (http://microwindows.org)
 #
+# modified 09/13/02 correct output when no DEFAULT_CHAR, allow numeric font name
 # modified 09/12/02 added -limit <max_encode_hex_value> option
 # modified on 09/10/02 by G Haerr
 #	- fixed DWIDTH 0 parsing
@@ -79,7 +80,7 @@ print "   descent: $font_descent\n";
 print "*/\n\n";
 
 print "/* Font character bitmap data. */\n";
-print "static MWIMAGEBITS ${font}_bits[] = {\n";
+print "static MWIMAGEBITS _${font}_bits[] = {\n";
 
 $ch_height = $font_ascent + $font_descent;
 $ofs = 0;
@@ -162,8 +163,10 @@ print "};\n\n";
 
 ##print STDERR "Maximum character width=$maxwidth\n";
 
+$default_char = $firstchar if !defined $default_char;
+
 print "/* Character->glyph mapping. */\n";
-print "static unsigned long ${font}_offset[] = {\n";
+print "static unsigned long _${font}_offset[] = {\n";
 for (my $i = $firstchar; $i <= $lastchar; $i++) {
     my $char = $i;
     my $ofs = $encoding_tab[$i];
@@ -177,13 +180,13 @@ $gen_width_table = 0;
 for (my $i = $firstchar; $i <= $lastchar; $i++) {
     my $char = $i;
     my $width = $width[$i];
-    $width = $width[$default_char], $char = $default_char if !defined $encoding_tab[$i];
+    $width = $width[$default_char] if !defined $encoding_tab[$i];
     $gen_width_table = 1 if $width != $maxwidth
 }
 
 if ($gen_width_table) {
 	print "/* Character width data. */\n";
-	print "static unsigned char ${font}_width[] = {\n";
+	print "static unsigned char _${font}_width[] = {\n";
 	for (my $i = $firstchar; $i <= $lastchar; $i++) {
 	    my $char = $i;
 	    my $width = $width[$i];
@@ -204,11 +207,11 @@ print "  $ch_height,\n";
 print "  $font_ascent,\n";
 print "  $firstchar,\n";
 print "  $size,\n";
-print "  ${font}_bits,\n";
-print "  ${font}_offset,\n";
+print "  _${font}_bits,\n";
+print "  _${font}_offset,\n";
 if ($gen_width_table) {
-	print "  ${font}_width,\n";
+	print "  _${font}_width,\n";
 } else { print "  0,  /* fixed width*/\n"; }
 print "  $default_char,\n";
-print "  sizeof(${font}_bits)/sizeof(MWIMAGEBITS),\n";
+print "  sizeof(_${font}_bits)/sizeof(MWIMAGEBITS),\n";
 print "};\n";
-- 
cgit v1.2.3