Changeset 98895c5c in mainline

Timestamp:

2009-03-24T16:09:17Z (16 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

Files:

• contrib/font/bdf2c.pl (modified) (5 diffs)
• kernel/genarch/include/fb/font-8x16.h (modified) (1 diff)
• kernel/genarch/src/fb/fb.c (modified) (3 diffs)
• kernel/genarch/src/fb/font-8x16.c (modified) (18 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";

kernel/genarch/include/fb/font-8x16.h

@@ -36 +36 @@
 #define KERN_FONT_8X16_H_
 
-#define FONT_GLYPHS     2898
+#define FONT_GLYPHS     2899
 #define FONT_WIDTH      8
 #define FONT_SCANLINES  16

kernel/genarch/src/fb/fb.c

@@ -78 +78 @@
 #define BG_COLOR     0x000080
 #define FG_COLOR     0xffff00
+#define INV_COLOR    0xaaaaaa
 
 #define CURSOR       0x2588
@@ -345 +346 @@
         
         for (glyph = 0; glyph < FONT_GLYPHS; glyph++) {
+                uint32_t fg_color;
+                
+                if (glyph == FONT_GLYPHS - 1)
+                        fg_color = INV_COLOR;
+                else
+                        fg_color = FG_COLOR;
+                
                 unsigned int y;
                 
@@ -354 +362 @@
                                     x * pixelbytes];
                                 uint32_t rgb = (fb_font[glyph][y] &
-                                    (1 << (7 - x))) ? FG_COLOR : BG_COLOR;
+                                    (1 << (7 - x))) ? fg_color : BG_COLOR;
                                 rgb_conv(dst, rgb);
                         }

kernel/genarch/src/fb/font-8x16.c

@@ -67 +67 @@
         
         if (ch == 0x02ee)
-                return (ch - 120);
+                return 630;
         
         if ((ch >= 0x0300) && (ch <= 0x0301))
@@ -73 +73 @@
         
         if (ch == 0x0303)
-                return (ch - 138);
+                return 633;
         
         if (ch == 0x0309)
-                return (ch - 143);
+                return 634;
         
         if ((ch >= 0x0312) && (ch <= 0x0314))
@@ -82 +82 @@
         
         if (ch == 0x0323)
-                return (ch - 165);
+                return 638;
         
         if ((ch >= 0x0340) && (ch <= 0x0341))
@@ -91 +91 @@
         
         if (ch == 0x037a)
-                return (ch - 247);
+                return 643;
         
         if (ch == 0x037e)
-                return (ch - 250);
+                return 644;
         
         if ((ch >= 0x0384) && (ch <= 0x038a))
@@ -100 +100 @@
         
         if (ch == 0x038c)
-                return (ch - 256);
+                return 652;
         
         if ((ch >= 0x038e) && (ch <= 0x03a1))
@@ -157 +157 @@
         
         if (ch == 0x060c)
-                return (ch - 366);
+                return 1182;
         
         if (ch == 0x061b)
-                return (ch - 380);
+                return 1183;
         
         if (ch == 0x061f)
-                return (ch - 383);
+                return 1184;
         
         if ((ch >= 0x0621) && (ch <= 0x063a))
@@ -181 +181 @@
         
         if (ch == 0x10d3)
-                return (ch - 2919);
+                return 1388;
         
         if (ch == 0x10d7)
-                return (ch - 2922);
+                return 1389;
         
         if (ch == 0x10da)
-                return (ch - 2924);
+                return 1390;
         
         if (ch == 0x10dd)
-                return (ch - 2926);
+                return 1391;
         
         if (ch == 0x10e6)
-                return (ch - 2934);
+                return 1392;
         
         if ((ch >= 0x1e00) && (ch <= 0x1e9b))
@@ -214 +214 @@
         
         if (ch == 0x2070)
-                return (ch - 6588);
+                return 1716;
         
         if ((ch >= 0x2074) && (ch <= 0x208f))
@@ -235 +235 @@
         
         if (ch == 0x2300)
-                return (ch - 6749);
+                return 2211;
         
         if (ch == 0x2302)
-                return (ch - 6750);
+                return 2212;
         
         if ((ch >= 0x2308) && (ch <= 0x230b))
@@ -244 +244 @@
         
         if (ch == 0x2310)
-                return (ch - 6759);
+                return 2217;
         
         if (ch == 0x2318)
-                return (ch - 6766);
+                return 2218;
         
         if ((ch >= 0x231a) && (ch <= 0x231b))
@@ -262 +262 @@
         
         if (ch == 0x23ce)
-                return (ch - 6906);
+                return 2260;
         
         if ((ch >= 0x2409) && (ch <= 0x240d))
@@ -271 +271 @@
         
         if (ch == 0x2426)
-                return (ch - 6986);
+                return 2268;
         
         if ((ch >= 0x2500) && (ch <= 0x2595))
@@ -289 +289 @@
         
         if (ch == 0x2620)
-                return (ch - 7237);
+                return 2523;
         
         if (ch == 0x2622)
-                return (ch - 7238);
+                return 2524;
         
         if (ch == 0x2626)
-                return (ch - 7241);
+                return 2525;
         
         if ((ch >= 0x2628) && (ch <= 0x262b))
@@ -328 +328 @@
         
         if (ch == 0xfc90)
-                return (ch - 61934);
+                return 2722;
         
         if ((ch >= 0xfcf2) && (ch <= 0xfcf4))
@@ -337 +337 @@
         
         if (ch == 0xfdf2)
-                return (ch - 62280);
+                return 2730;
         
         if ((ch >= 0xfe50) && (ch <= 0xfe52))
@@ -352 +352 @@
         
         if (ch == 0xfe74)
-                return (ch - 62380);
+                return 2760;
         
         if ((ch >= 0xfe76) && (ch <= 0xfefc))
@@ -358 +358 @@
         
         if (ch == 0xfeff)
-                return (ch - 62383);
-        
-        return 31;
+                return 2896;
+        
+        return 2898;
 }
 
@@ -3261 +3261 @@
         {0x00, 0x00, 0x22, 0x12, 0x12, 0x0a, 0x0a, 0x0e, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
         {0xf1, 0x35, 0x55, 0x8a, 0xe0, 0x06, 0x95, 0xd6, 0xb5, 0x97, 0x00, 0xee, 0x8a, 0xee, 0x28, 0xe8},
-        {0x00, 0x38, 0x7c, 0x7c, 0xc6, 0x92, 0xf2, 0xe6, 0xfe, 0xe6, 0x7c, 0x7c, 0x38, 0x00, 0x00, 0x00}
+        {0x00, 0x38, 0x7c, 0x7c, 0xc6, 0x92, 0xf2, 0xe6, 0xfe, 0xe6, 0x7c, 0x7c, 0x38, 0x00, 0x00, 0x00},
+        
+        /* Special glyph for unknown character */
+        {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00}
 };