diff --git a/.gitignore b/.gitignore index c528893f..7379e127 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,4 @@ *.map *.fsys *.log -Files/*.psf .dccache diff --git a/Core/Video/Display.cpp b/Core/Video/Display.cpp index 025ac245..d656aaa7 100644 --- a/Core/Video/Display.cpp +++ b/Core/Video/Display.cpp @@ -3,9 +3,9 @@ #include #include -extern uintptr_t _binary_Files_ter_powerline_v12n_psf_start; -extern uintptr_t _binary_Files_ter_powerline_v12n_psf_end; -extern uintptr_t _binary_Files_ter_powerline_v12n_psf_size; +extern uintptr_t _binary_Files_tamsyn_font_1_11_Tamsyn7x14r_psf_start; +extern uintptr_t _binary_Files_tamsyn_font_1_11_Tamsyn7x14r_psf_end; +extern uintptr_t _binary_Files_tamsyn_font_1_11_Tamsyn7x14r_psf_size; NewLock(PrintLock); @@ -174,7 +174,7 @@ namespace Video this->framebuffer = Info; if (LoadDefaultFont) { - this->CurrentFont = new Font(&_binary_Files_ter_powerline_v12n_psf_start, &_binary_Files_ter_powerline_v12n_psf_end, FontType::PCScreenFont2); + this->CurrentFont = new Font(&_binary_Files_tamsyn_font_1_11_Tamsyn7x14r_psf_start, &_binary_Files_tamsyn_font_1_11_Tamsyn7x14r_psf_end, FontType::PCScreenFont2); FontInfo Info = this->CurrentFont->GetInfo(); debug("Font loaded: %dx%d %s", Info.Width, Info.Height, Info.Type == FontType::PCScreenFont1 ? "PSF1" : "PSF2"); diff --git a/Files/tamsyn-font-1.11/LICENSE b/Files/tamsyn-font-1.11/LICENSE new file mode 100644 index 00000000..8fc49609 --- /dev/null +++ b/Files/tamsyn-font-1.11/LICENSE @@ -0,0 +1,10 @@ +Tamsyn font is free. You are hereby granted permission to use, copy, modify, +and distribute it as you see fit. + +Tamsyn font is provided "as is" without any express or implied warranty. + +The author makes no representations about the suitability of this font for +a particular purpose. + +In no event will the author be held liable for damages arising from the use +of this font. diff --git a/Files/tamsyn-font-1.11/README b/Files/tamsyn-font-1.11/README new file mode 100644 index 00000000..a9a2855b --- /dev/null +++ b/Files/tamsyn-font-1.11/README @@ -0,0 +1,82 @@ + _____ +|_ _|_ _ _ __ ___ ___ _ _ _ __ + | |/ _` | '_ ` _ \/ __| | | | '_ \ + | | (_| | | | | | \__ \ |_| | | | | + |_|\__,_|_| |_| |_|___/\__, |_| |_| + |___/ + +Monospaced Programming Font for Linux and Windows +-------------------------------------------------------------------------------- + +VERSION 1.11 2015-01-21 + +CHANGES IN 1.11 + + Changed capital "A" to be less pointy, more consistent between sizes. + Expecting hate mail. + + Previously, unimplemented chars defaulted to print a blank space under X. + Now those chars are not placed in the font at all in order to allow + fontconfig to fall back to use a char from another font. (Thanks, Allen, + for pointing this out and testing the fix.) + +CHANGES IN 1.10 + + New size: 7x13. + + New size: 8x16 (replaces 8x17) + + Many changes in favor of a cleaner look. In particular, replaced the + double-story lowercase "g" with the single-story variety. + + Added the degree symbol. (Enjoy, Sven!) + + Added the copyright symbol. + +CHANGES IN 1.9 + + Fixed the problem with inverted question mark facing the wrong way. (Thanks + to Swyter for reporting it.) + + Modified the small "w" and "g". + + Restored the original look for size 6x12 bold. + +CHANGES IN 1.8 + + Fixed a problem where chars showed up as boxes in xfontsel and some apps. + + Tweaks, esp. to 8x17 size + +CHANGES IN 1.7 + + Added two new sizes: tiny 5x9 and large 10x20. + + Retired size 7x12. (If this presents major problem for you, get in touch.) + + Added a pixel to the height of the 6x11 size, making it 6x12. + + Added new chars for partial ISO8859-1 support, mainly covering the accented + characters and currency symbols. I consider these new characters to be BETA, + since I don't use them so I'm not sure how they should look. If you have + feedback about them, please get in touch. + + Made many minor tweaks to character shapes. In particular, the f, l, and t + have a more "traditional" look. Also, I've changed the w and y again. + +FUTURE PLANS: + + Full CP437, ISO8859-1, Windows-1252 coverage + + Mac/ttf version + + Cyrillic + + Unified FON file containing all sizes in regular and bold + + Separate OEM and 1252 Windows versions + + +User feedback is welcomed and encouraged. + +Enjoy! diff --git a/Files/tamsyn-font-1.11/Tamsyn10x20b.psf b/Files/tamsyn-font-1.11/Tamsyn10x20b.psf new file mode 100644 index 00000000..4a582d9e Binary files /dev/null and b/Files/tamsyn-font-1.11/Tamsyn10x20b.psf differ diff --git a/Files/tamsyn-font-1.11/Tamsyn10x20r.psf b/Files/tamsyn-font-1.11/Tamsyn10x20r.psf new file mode 100644 index 00000000..e9222b77 Binary files /dev/null and b/Files/tamsyn-font-1.11/Tamsyn10x20r.psf differ diff --git a/Files/tamsyn-font-1.11/Tamsyn5x9b.psf b/Files/tamsyn-font-1.11/Tamsyn5x9b.psf new file mode 100644 index 00000000..cc3ade7b Binary files /dev/null and b/Files/tamsyn-font-1.11/Tamsyn5x9b.psf differ diff --git a/Files/tamsyn-font-1.11/Tamsyn5x9r.psf b/Files/tamsyn-font-1.11/Tamsyn5x9r.psf new file mode 100644 index 00000000..185806c5 Binary files /dev/null and b/Files/tamsyn-font-1.11/Tamsyn5x9r.psf differ diff --git a/Files/tamsyn-font-1.11/Tamsyn6x12b.psf b/Files/tamsyn-font-1.11/Tamsyn6x12b.psf new file mode 100644 index 00000000..4ae9d6a4 Binary files /dev/null and b/Files/tamsyn-font-1.11/Tamsyn6x12b.psf differ diff --git a/Files/tamsyn-font-1.11/Tamsyn6x12r.psf b/Files/tamsyn-font-1.11/Tamsyn6x12r.psf new file mode 100644 index 00000000..1373ec25 Binary files /dev/null and b/Files/tamsyn-font-1.11/Tamsyn6x12r.psf differ diff --git a/Files/tamsyn-font-1.11/Tamsyn7x13b.psf b/Files/tamsyn-font-1.11/Tamsyn7x13b.psf new file mode 100644 index 00000000..4ec3ee59 Binary files /dev/null and b/Files/tamsyn-font-1.11/Tamsyn7x13b.psf differ diff --git a/Files/tamsyn-font-1.11/Tamsyn7x13r.psf b/Files/tamsyn-font-1.11/Tamsyn7x13r.psf new file mode 100644 index 00000000..380702de Binary files /dev/null and b/Files/tamsyn-font-1.11/Tamsyn7x13r.psf differ diff --git a/Files/tamsyn-font-1.11/Tamsyn7x14b.psf b/Files/tamsyn-font-1.11/Tamsyn7x14b.psf new file mode 100644 index 00000000..a473750d Binary files /dev/null and b/Files/tamsyn-font-1.11/Tamsyn7x14b.psf differ diff --git a/Files/tamsyn-font-1.11/Tamsyn7x14r.psf b/Files/tamsyn-font-1.11/Tamsyn7x14r.psf new file mode 100644 index 00000000..1ce5d8e9 Binary files /dev/null and b/Files/tamsyn-font-1.11/Tamsyn7x14r.psf differ diff --git a/Files/tamsyn-font-1.11/Tamsyn8x15b.psf b/Files/tamsyn-font-1.11/Tamsyn8x15b.psf new file mode 100644 index 00000000..6219e995 Binary files /dev/null and b/Files/tamsyn-font-1.11/Tamsyn8x15b.psf differ diff --git a/Files/tamsyn-font-1.11/Tamsyn8x15r.psf b/Files/tamsyn-font-1.11/Tamsyn8x15r.psf new file mode 100644 index 00000000..0054a2b4 Binary files /dev/null and b/Files/tamsyn-font-1.11/Tamsyn8x15r.psf differ diff --git a/Files/tamsyn-font-1.11/Tamsyn8x16b.psf b/Files/tamsyn-font-1.11/Tamsyn8x16b.psf new file mode 100644 index 00000000..4eb9107d Binary files /dev/null and b/Files/tamsyn-font-1.11/Tamsyn8x16b.psf differ diff --git a/Files/tamsyn-font-1.11/Tamsyn8x16r.psf b/Files/tamsyn-font-1.11/Tamsyn8x16r.psf new file mode 100644 index 00000000..6fd82c17 Binary files /dev/null and b/Files/tamsyn-font-1.11/Tamsyn8x16r.psf differ diff --git a/Kernel.cpp b/Kernel.cpp index e0ebb073..ce4a8e49 100644 --- a/Kernel.cpp +++ b/Kernel.cpp @@ -35,6 +35,9 @@ * - General: * https://wiki.osdev.org/Main_Page * + * - Font: + * http://www.fial.com/~scott/tamsyn-font/ + * * - CPU XCR0 structure: * https://wiki.osdev.org/CPU_Registers_x86#XCR0 * diff --git a/Makefile b/Makefile index bd5de899..8e81d870 100644 --- a/Makefile +++ b/Makefile @@ -118,9 +118,7 @@ default: $(error Please specify a target) prepare: - rm -f ./Files/ter-powerline-v12n.psf - wget https://raw.githubusercontent.com/powerline/fonts/master/Terminus/PSF/ter-powerline-v12n.psf.gz -P Files - gzip -d Files/ter-powerline-v12n.psf.gz + $(info Nothing to prepare) build: $(KERNEL_FILENAME)