Changeset 98895c5c in mainline
- Timestamp:
- 2009-03-24T16:09:17Z (16 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 2fce275
- Parents:
- 6a75902c
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
contrib/font/bdf2c.pl
r6a75902c r98895c5c 102 102 @chars = sort { $a <=> $b } (@chars); 103 103 104 print "#define FONT_GLYPHS " . @chars. "\n";104 print "#define FONT_GLYPHS " . (@chars + 1). "\n"; 105 105 print "#define FONT_SCANLINES " . $height . "\n"; 106 106 107 107 print "\n"; 108 108 print "index_t fb_font_glyph(const wchar_t ch)\n"; 109 print "{"; 109 print "{\n"; 110 print "\tif (ch == 0x0000)\n"; 111 print "\t\treturn 0;\n\n"; 110 112 111 113 my $pos = 0; … … 118 120 if ($start == $prev) { 119 121 printf "\tif (ch == 0x%.4x)\n", $start; 122 print "\t\treturn " . $start_pos . ";\n"; 120 123 } else { 121 124 printf "\tif ((ch >= 0x%.4x) && (ch <= 0x%.4x))\n", $start, $prev; 125 print "\t\treturn (ch - " . ($start - $start_pos) . ");\n"; 122 126 } 123 127 124 print "\t\treturn (ch - " . ($start - $start_pos) . ");\n";125 128 print "\t\n"; 126 129 } … … 129 132 $start_pos = $pos; 130 133 } 134 131 135 $pos++; 132 136 $prev = $index; 133 137 } 134 138 135 print "\treturn 31;\n";139 print "\treturn " . @chars . ";\n"; 136 140 print "}\n"; 137 141 … … 139 143 print "uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES] = {"; 140 144 141 my $f1 = 0;142 145 for $index (@chars) { 143 print "," if ($f1 > 0);144 146 print "\n\t{"; 145 147 … … 150 152 } 151 153 152 print "}"; 153 $f1++; 154 print "},"; 154 155 } 155 156 156 print "\n};\n"; 157 print "\n\t\n\t/* Special glyph for unknown character */\n\t{"; 158 my $y; 159 for ($y = 0; $y < $height; $y++) { 160 print ", " if ($y > 0); 161 printf "0x%.2x", $glyphs[63]->[$y]; 162 } 163 164 print "}\n};\n"; -
kernel/genarch/include/fb/font-8x16.h
r6a75902c r98895c5c 36 36 #define KERN_FONT_8X16_H_ 37 37 38 #define FONT_GLYPHS 289 838 #define FONT_GLYPHS 2899 39 39 #define FONT_WIDTH 8 40 40 #define FONT_SCANLINES 16 -
kernel/genarch/src/fb/fb.c
r6a75902c r98895c5c 78 78 #define BG_COLOR 0x000080 79 79 #define FG_COLOR 0xffff00 80 #define INV_COLOR 0xaaaaaa 80 81 81 82 #define CURSOR 0x2588 … … 345 346 346 347 for (glyph = 0; glyph < FONT_GLYPHS; glyph++) { 348 uint32_t fg_color; 349 350 if (glyph == FONT_GLYPHS - 1) 351 fg_color = INV_COLOR; 352 else 353 fg_color = FG_COLOR; 354 347 355 unsigned int y; 348 356 … … 354 362 x * pixelbytes]; 355 363 uint32_t rgb = (fb_font[glyph][y] & 356 (1 << (7 - x))) ? FG_COLOR: BG_COLOR;364 (1 << (7 - x))) ? fg_color : BG_COLOR; 357 365 rgb_conv(dst, rgb); 358 366 } -
kernel/genarch/src/fb/font-8x16.c
r6a75902c r98895c5c 67 67 68 68 if (ch == 0x02ee) 69 return (ch - 120);69 return 630; 70 70 71 71 if ((ch >= 0x0300) && (ch <= 0x0301)) … … 73 73 74 74 if (ch == 0x0303) 75 return (ch - 138);75 return 633; 76 76 77 77 if (ch == 0x0309) 78 return (ch - 143);78 return 634; 79 79 80 80 if ((ch >= 0x0312) && (ch <= 0x0314)) … … 82 82 83 83 if (ch == 0x0323) 84 return (ch - 165);84 return 638; 85 85 86 86 if ((ch >= 0x0340) && (ch <= 0x0341)) … … 91 91 92 92 if (ch == 0x037a) 93 return (ch - 247);93 return 643; 94 94 95 95 if (ch == 0x037e) 96 return (ch - 250);96 return 644; 97 97 98 98 if ((ch >= 0x0384) && (ch <= 0x038a)) … … 100 100 101 101 if (ch == 0x038c) 102 return (ch - 256);102 return 652; 103 103 104 104 if ((ch >= 0x038e) && (ch <= 0x03a1)) … … 157 157 158 158 if (ch == 0x060c) 159 return (ch - 366);159 return 1182; 160 160 161 161 if (ch == 0x061b) 162 return (ch - 380);162 return 1183; 163 163 164 164 if (ch == 0x061f) 165 return (ch - 383);165 return 1184; 166 166 167 167 if ((ch >= 0x0621) && (ch <= 0x063a)) … … 181 181 182 182 if (ch == 0x10d3) 183 return (ch - 2919);183 return 1388; 184 184 185 185 if (ch == 0x10d7) 186 return (ch - 2922);186 return 1389; 187 187 188 188 if (ch == 0x10da) 189 return (ch - 2924);189 return 1390; 190 190 191 191 if (ch == 0x10dd) 192 return (ch - 2926);192 return 1391; 193 193 194 194 if (ch == 0x10e6) 195 return (ch - 2934);195 return 1392; 196 196 197 197 if ((ch >= 0x1e00) && (ch <= 0x1e9b)) … … 214 214 215 215 if (ch == 0x2070) 216 return (ch - 6588);216 return 1716; 217 217 218 218 if ((ch >= 0x2074) && (ch <= 0x208f)) … … 235 235 236 236 if (ch == 0x2300) 237 return (ch - 6749);237 return 2211; 238 238 239 239 if (ch == 0x2302) 240 return (ch - 6750);240 return 2212; 241 241 242 242 if ((ch >= 0x2308) && (ch <= 0x230b)) … … 244 244 245 245 if (ch == 0x2310) 246 return (ch - 6759);246 return 2217; 247 247 248 248 if (ch == 0x2318) 249 return (ch - 6766);249 return 2218; 250 250 251 251 if ((ch >= 0x231a) && (ch <= 0x231b)) … … 262 262 263 263 if (ch == 0x23ce) 264 return (ch - 6906);264 return 2260; 265 265 266 266 if ((ch >= 0x2409) && (ch <= 0x240d)) … … 271 271 272 272 if (ch == 0x2426) 273 return (ch - 6986);273 return 2268; 274 274 275 275 if ((ch >= 0x2500) && (ch <= 0x2595)) … … 289 289 290 290 if (ch == 0x2620) 291 return (ch - 7237);291 return 2523; 292 292 293 293 if (ch == 0x2622) 294 return (ch - 7238);294 return 2524; 295 295 296 296 if (ch == 0x2626) 297 return (ch - 7241);297 return 2525; 298 298 299 299 if ((ch >= 0x2628) && (ch <= 0x262b)) … … 328 328 329 329 if (ch == 0xfc90) 330 return (ch - 61934);330 return 2722; 331 331 332 332 if ((ch >= 0xfcf2) && (ch <= 0xfcf4)) … … 337 337 338 338 if (ch == 0xfdf2) 339 return (ch - 62280);339 return 2730; 340 340 341 341 if ((ch >= 0xfe50) && (ch <= 0xfe52)) … … 352 352 353 353 if (ch == 0xfe74) 354 return (ch - 62380);354 return 2760; 355 355 356 356 if ((ch >= 0xfe76) && (ch <= 0xfefc)) … … 358 358 359 359 if (ch == 0xfeff) 360 return (ch - 62383);361 362 return 31;360 return 2896; 361 362 return 2898; 363 363 } 364 364 … … 3261 3261 {0x00, 0x00, 0x22, 0x12, 0x12, 0x0a, 0x0a, 0x0e, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 3262 3262 {0xf1, 0x35, 0x55, 0x8a, 0xe0, 0x06, 0x95, 0xd6, 0xb5, 0x97, 0x00, 0xee, 0x8a, 0xee, 0x28, 0xe8}, 3263 {0x00, 0x38, 0x7c, 0x7c, 0xc6, 0x92, 0xf2, 0xe6, 0xfe, 0xe6, 0x7c, 0x7c, 0x38, 0x00, 0x00, 0x00} 3263 {0x00, 0x38, 0x7c, 0x7c, 0xc6, 0x92, 0xf2, 0xe6, 0xfe, 0xe6, 0x7c, 0x7c, 0x38, 0x00, 0x00, 0x00}, 3264 3265 /* Special glyph for unknown character */ 3266 {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00} 3264 3267 }; 3265 3268
Note:
See TracChangeset
for help on using the changeset viewer.