diff --git a/services/graphics-server/src/blitstr2/README.md b/services/graphics-server/src/blitstr2/README.md index ec16d6924..f448be89d 100644 --- a/services/graphics-server/src/blitstr2/README.md +++ b/services/graphics-server/src/blitstr2/README.md @@ -4,6 +4,12 @@ This code is vendored in from https://github.com/samblenny/blitstr2 with permiss multi-lingual string blitter for 1-bit monochrome (sequel to blitstr) +## Maintenance Notes +- Font files are regenerated by running `ruby config_editor.rb` followed by `go run main.go --write` in the `/src/blitstr2/codegen` directory relative to this README.md file +- The Go files have been modified to generate the necessary templates for the loader/kernel split of the font tables. The main bit of manual "glue" is at the top of `main.rs` inside the `map_fonts()` routine, where the `AtomicU32` pointers that hold the final linked location of the font maps are initialized at boot. +- Font sources are located in `src/blitstr2/codegen/src_data`, along with various indices and codepoints. +- Most font sources were generated by https://github.com/samblenny/hd1b_other +- The `latin` sets that have a more manual process consisting of taking a screenshot of ResEdit's KCHR screen on a Mac OS 7 emulator via https://archive.org/details/mac_MacOS_7.0.1_compilation and massaging the result into a usable sprite sheet. The only two native font sizes that look good ane 9 and 12 point, which gives a coverage of 9, 12, 18 and 24 point sizes (with pixel doubling). ## What's New diff --git a/services/graphics-server/src/main.rs b/services/graphics-server/src/main.rs index a490a5d69..b0b4865d8 100644 --- a/services/graphics-server/src/main.rs +++ b/services/graphics-server/src/main.rs @@ -75,23 +75,6 @@ fn map_fonts() -> MemoryRange { blitstr2::fonts::small::GLYPH_LOCATION.store((fontregion.as_ptr() as usize + fontmap::SMALL_OFFSET as usize) as u32, Ordering::SeqCst); blitstr2::fonts::zh::GLYPH_LOCATION.store((fontregion.as_ptr() as usize + fontmap::ZH_OFFSET as usize) as u32, Ordering::SeqCst); - /* - blitstr::map_font(blitstr::GlyphData::Emoji( - (fontregion.as_ptr() as usize + fontmap::EMOJI_OFFSET) as usize, - )); - blitstr::map_font(blitstr::GlyphData::Hanzi( - (fontregion.as_ptr() as usize + fontmap::HANZI_OFFSET) as usize, - )); - blitstr::map_font(blitstr::GlyphData::Regular( - (fontregion.as_ptr() as usize + fontmap::REGULAR_OFFSET) as usize, - )); - blitstr::map_font(blitstr::GlyphData::Small( - (fontregion.as_ptr() as usize + fontmap::SMALL_OFFSET) as usize, - )); - blitstr::map_font(blitstr::GlyphData::Bold( - (fontregion.as_ptr() as usize + fontmap::BOLD_OFFSET) as usize, - )); - */ fontregion }