Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Add prefs font for terminal output before file system

Browse Source
This commit is contained in:
Bananymous
2023-02-23 01:22:50 +02:00
parent a4980acc88
commit 390a747768
8 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/include/kernel/Font.h
View File

@@ -10,6 +10,7 @@ namespace Kernel
{
public:
static BAN::ErrorOr<Font> load(BAN::StringView);
static BAN::ErrorOr<Font> prefs();
uint32_t width() const { return m_width; }
uint32_t height() const { return m_height; }

2
kernel/include/kernel/TerminalDriver.h
View File

@@ -22,7 +22,7 @@ public:
};
public:
TerminalDriver(const Kernel::Font& font) : m_font(font) {}
TerminalDriver() : m_font(MUST(Kernel::Font::prefs())) {}
virtual ~TerminalDriver() {}
virtual uint32_t width() const = 0;
virtual uint32_t height() const = 0;

7
kernel/include/kernel/VesaTerminalDriver.h
View File

@@ -5,7 +5,7 @@
class VesaTerminalDriver final : public TerminalDriver
{
public:
static VesaTerminalDriver* create(const Kernel::Font&);
static VesaTerminalDriver* create();
~VesaTerminalDriver();
virtual uint32_t width() const override { return m_width / font().width(); }
@@ -17,9 +17,8 @@ public:
virtual void set_cursor_position(uint32_t, uint32_t) override;
private:
VesaTerminalDriver(uint32_t width, uint32_t height, uint32_t pitch, uint8_t bpp, uintptr_t address, const Kernel::Font& font)
: TerminalDriver(font)
, m_width(width)
VesaTerminalDriver(uint32_t width, uint32_t height, uint32_t pitch, uint8_t bpp, uintptr_t address)
: m_width(width)
, m_height(height)
, m_pitch(pitch)
, m_bpp(bpp)