Changeset 98895c5c in mainline for contrib/font/bdf2c.pl

Timestamp:

2009-03-24T16:09:17Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2fce275

Parents:

6a75902c

Message:

simplify glyph mapping function
draw invalid glyphs with a distinctive color

File:

• contrib/font/bdf2c.pl (modified) (5 diffs)

contrib/font/bdf2c.pl

@@ -102 +102 @@
 @chars = sort { $a <=> $b } (@chars);
 
-print "#define FONT_GLYPHS     " . @chars . "\n";
+print "#define FONT_GLYPHS     " . (@chars + 1). "\n";
 print "#define FONT_SCANLINES  " . $height . "\n";
 
 print "\n";
 print "index_t fb_font_glyph(const wchar_t ch)\n";
-print "{";
+print "{\n";
+print "\tif (ch == 0x0000)\n";
+print "\t\treturn 0;\n\n";
 
 my $pos = 0;
@@ -118 +120 @@
                         if ($start == $prev) {
                                 printf "\tif (ch == 0x%.4x)\n", $start;
+                                print "\t\treturn " . $start_pos . ";\n";
                         } else {
                                 printf "\tif ((ch >= 0x%.4x) && (ch <= 0x%.4x))\n", $start, $prev;
+                                print "\t\treturn (ch - " . ($start - $start_pos) . ");\n";
                         }
                         
-                        print "\t\treturn (ch - " . ($start - $start_pos) . ");\n";
                         print "\t\n";
                 }
@@ -129 +132 @@
                 $start_pos = $pos;
         }
+        
         $pos++;
         $prev = $index;
 }
 
-print "\treturn 31;\n";
+print "\treturn " . @chars . ";\n";
 print "}\n";
 
@@ -139 +143 @@
 print "uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES] = {";
 
-my $f1 = 0;
 for $index (@chars) {
-        print "," if ($f1 > 0);
         print "\n\t{";
         
@@ -150 +152 @@
         }
         
-        print "}";
-        $f1++;
+        print "},";
 }
 
-print "\n};\n";
+print "\n\t\n\t/* Special glyph for unknown character */\n\t{";
+my $y;
+for ($y = 0; $y < $height; $y++) {
+        print ", " if ($y > 0);
+        printf "0x%.2x", $glyphs[63]->[$y];
+}
+
+print "}\n};\n";