RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:27:43 +00:00
Code Issues Activity Actions

Load the default font from disk in the kernel as well.

Browse source
This commit is contained in:
Andreas Kling 2019-02-03 01:42:34 +01:00
parent abe3f515b1
commit 5751063c63
2 changed files with 17 additions and 1059 deletions
Download patch file Download diff file Expand all files Collapse all files

25
SharedGraphics/Font.cpp
View file

@ -1,10 +1,13 @@
#include "Font.h" #include "Font.h"
#include "Peanut8x10.h"
#include "Liza8x10.h"
#include <AK/kmalloc.h> #include <AK/kmalloc.h>
#include <AK/BufferStream.h> #include <AK/BufferStream.h>
#include <AK/StdLibExtras.h> #include <AK/StdLibExtras.h>
#ifdef KERNEL
#include <Kernel/FileDescriptor.h>
#include <Kernel/VirtualFileSystem.h>
#endif
#ifdef USERLAND #ifdef USERLAND
#include <LibC/unistd.h> #include <LibC/unistd.h>
#include <LibC/stdio.h> #include <LibC/stdio.h>
@ -13,8 +16,6 @@
#include <LibC/mman.h> #include <LibC/mman.h>
#endif #endif
#define DEFAULT_FONT_NAME Liza8x10
static const byte error_glyph_width = 8; static const byte error_glyph_width = 8;
static const byte error_glyph_height = 10; static const byte error_glyph_height = 10;
static constexpr const char* error_glyph { static constexpr const char* error_glyph {
@ -39,13 +40,21 @@ void Font::initialize()
Font& Font::default_font() Font& Font::default_font()
{ {
static const char* default_font_path = "/res/fonts/Liza8x10.font";
if (!s_default_font) { if (!s_default_font) {
#ifdef USERLAND #ifdef USERLAND
s_default_font = Font::load_from_file("/res/fonts/Liza8x10.font").leak_ref(); s_default_font = Font::load_from_file(default_font_path).leak_ref();
ASSERT(s_default_font); ASSERT(s_default_font);
#else #else
int error;
s_default_font = adopt(*new Font(DEFAULT_FONT_NAME::name, DEFAULT_FONT_NAME::glyphs, DEFAULT_FONT_NAME::glyph_width, DEFAULT_FONT_NAME::glyph_height, DEFAULT_FONT_NAME::first_glyph, DEFAULT_FONT_NAME::last_glyph)).leak_ref(); auto descriptor = VFS::the().open(default_font_path, error, 0, 0, *VFS::the().root_inode());
if (!descriptor) {
kprintf("Failed to open default font (%s)\n", default_font_path);
ASSERT_NOT_REACHED();
}
auto buffer = descriptor->read_entire_file(*current);
ASSERT(buffer);
s_default_font = Font::load_from_memory(buffer.pointer()).leak_ref();
#endif #endif
} }
return *s_default_font; return *s_default_font;
@ -92,7 +101,6 @@ Font::~Font()
{ {
} }
#ifdef USERLAND
struct FontFileHeader { struct FontFileHeader {
char magic[4]; char magic[4];
byte glyph_width; byte glyph_width;
@ -135,6 +143,7 @@ RetainPtr<Font> Font::load_from_memory(const byte* data)
return adopt(*new Font(String(header.name), new_glyphs, header.glyph_width, header.glyph_height, 0, 255)); return adopt(*new Font(String(header.name), new_glyphs, header.glyph_width, header.glyph_height, 0, 255));
} }
#ifdef USERLAND
RetainPtr<Font> Font::load_from_file(const String& path) RetainPtr<Font> Font::load_from_file(const String& path)
{ {
int fd = open(path.characters(), O_RDONLY, 0644); int fd = open(path.characters(), O_RDONLY, 0644);

1051
SharedGraphics/Liza8x10.h
View file

File diff suppressed because it is too large Load diff