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

Kernel: Improve error handling when setting TTY font

Browse Source
This commit is contained in:
Bananymous
2025-04-18 02:42:24 +03:00
parent d6667844de
commit cef8779bf7
6 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/kernel/Terminal/TTY.cpp
View File

@@ -188,7 +188,7 @@ namespace Kernel
{
auto absolute_path = TRY(Process::current().absolute_path_of(BAN::StringView(reinterpret_cast<const char*>(argument))));
auto new_font = TRY(LibFont::Font::load(absolute_path));
set_font(new_font);
TRY(set_font(BAN::move(new_font)));
return 0;
}
case TIOCGWINSZ:

15
kernel/kernel/Terminal/VirtualTTY.cpp
View File

@@ -55,17 +55,14 @@ namespace Kernel
m_terminal_driver->clear(m_background);
}
void VirtualTTY::set_font(const LibFont::Font& font)
BAN::ErrorOr<void> VirtualTTY::set_font(LibFont::Font&& font)
{
if (!m_terminal_driver->has_font())
return BAN::Error::from_errno(EINVAL);
SpinLockGuard _(m_write_lock);
if (!m_terminal_driver->has_font())
{
dwarnln("terminal driver does not have a font");
return;
}
m_terminal_driver->set_font(font);
TRY(m_terminal_driver->set_font(BAN::move(font)));
uint32_t new_width = m_terminal_driver->width();
uint32_t new_height = m_terminal_driver->height();
@@ -91,6 +88,8 @@ namespace Kernel
for (uint32_t y = 0; y < m_height; y++)
for (uint32_t x = 0; x < m_width; x++)
render_from_buffer(x, y);
return {};
}
void VirtualTTY::set_cursor_position(uint32_t x, uint32_t y)