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

Kernel: Move cursor handling from TTY -> TerminalDriver

Browse Source
This commit is contained in:
Bananymous
2025-04-18 02:43:41 +03:00
parent c0942d78cb
commit 40d1d20cd6
5 changed files with 110 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
kernel/include/kernel/Terminal/FramebufferTerminal.h
View File

@@ -11,29 +11,38 @@ namespace Kernel
public:
static BAN::ErrorOr<BAN::RefPtr<FramebufferTerminalDriver>> create(BAN::RefPtr<FramebufferDevice>);
virtual uint32_t width() const override { return m_framebuffer_device->width() / m_font.width(); }
virtual uint32_t height() const override { return m_framebuffer_device->height() / m_font.height(); }
uint32_t width() const override { return m_framebuffer_device->width() / m_font.width(); }
uint32_t height() const override { return m_framebuffer_device->height() / m_font.height(); }
virtual void putchar_at(uint16_t, uint32_t, uint32_t, Color, Color) override;
virtual bool scroll(Color) override;
virtual void clear(Color) override;
void putchar_at(uint16_t, uint32_t, uint32_t, Color, Color) override;
bool scroll(Color) override;
void clear(Color) override;
virtual void set_cursor_position(uint32_t, uint32_t) override;
void set_cursor_shown(bool) override;
void set_cursor_position(uint32_t, uint32_t) override;
virtual bool has_font() const override { return true; }
bool has_font() const override { return true; }
virtual void set_font(LibFont::Font&& font) override { m_font = BAN::move(font); };
virtual const LibFont::Font& font() const override { return m_font; };
BAN::ErrorOr<void> set_font(LibFont::Font&& font) override;
const LibFont::Font& font() const override { return m_font; };
private:
FramebufferTerminalDriver(BAN::RefPtr<FramebufferDevice> framebuffer_device)
: m_framebuffer_device(framebuffer_device)
{ }
void read_cursor();
void show_cursor(bool use_data);
private:
BAN::RefPtr<FramebufferDevice> m_framebuffer_device;
LibFont::Font m_font;
static constexpr Color s_cursor_color = TerminalColor::BRIGHT_WHITE;
uint32_t m_cursor_x { 0 };
uint32_t m_cursor_y { 0 };
bool m_cursor_shown { true };
BAN::Vector<uint32_t> m_cursor_data;
static constexpr Color m_cursor_color = TerminalColor::BRIGHT_WHITE;
};
}

1
kernel/include/kernel/Terminal/TerminalDriver.h
View File

@@ -34,6 +34,7 @@ namespace Kernel
virtual bool scroll(Color) { return false; }
virtual void clear(Color) = 0;
virtual void set_cursor_shown(bool) = 0;
virtual void set_cursor_position(uint32_t, uint32_t) = 0;
virtual bool has_font() const { return false; }

2
kernel/include/kernel/Terminal/VirtualTTY.h
View File

@@ -34,7 +34,6 @@ namespace Kernel
void putcodepoint(uint32_t codepoint);
void putchar_at(uint32_t codepoint, uint32_t x, uint32_t y);
void render_from_buffer(uint32_t x, uint32_t y);
void set_cursor_position(uint32_t x, uint32_t y);
private:
enum class State
@@ -82,7 +81,6 @@ namespace Kernel
uint32_t m_row { 0 };
uint32_t m_column { 0 };
Cell* m_buffer { nullptr };
bool m_show_cursor { true };
BAN::RefPtr<TerminalDriver> m_terminal_driver;
};