Sinipelto/banan-os
1
0
Fork 0
forked from Bananymous/banan-os
Code Pull Requests Activity

Kernel: Don't store copy of palette in virtual TTY

Browse Source 
It can be just queried from the terminal driver
This commit is contained in:
Bananymous
2026-08-19 21:32:36 +03:00
parent bf0bd19289
commit 36b34b0df0
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/include/kernel/Terminal/VirtualTTY.h
-2
View File
@@ -96,8 +96,6 @@ namespace Kernel
uint32_t m_last_cursor_row { static_cast<uint32_t>(-1) }; uint32_t m_last_cursor_row { static_cast<uint32_t>(-1) };
uint32_t m_last_cursor_column { static_cast<uint32_t>(-1) }; uint32_t m_last_cursor_column { static_cast<uint32_t>(-1) };
const Palette& m_palette;
TerminalDriver::Color m_foreground; TerminalDriver::Color m_foreground;
TerminalDriver::Color m_background; TerminalDriver::Color m_background;
bool m_colors_inverted { false }; bool m_colors_inverted { false };
kernel/kernel/Terminal/TTY.cpp
+2 -2
View File
@@ -237,8 +237,6 @@ namespace Kernel
if (ch == _POSIX_VDISABLE) if (ch == _POSIX_VDISABLE)
return; return;
LockGuard _(m_mutex);
const auto termios = get_termios(); const auto termios = get_termios();
if ((termios.c_iflag & ISTRIP)) if ((termios.c_iflag & ISTRIP))
@@ -271,6 +269,8 @@ namespace Kernel
bool should_flush = false; bool should_flush = false;
bool force_echo = false; bool force_echo = false;
LockGuard _(m_mutex);
if (!(termios.c_lflag & ICANON)) if (!(termios.c_lflag & ICANON))
should_flush = true; should_flush = true;
else else
kernel/kernel/Terminal/VirtualTTY.cpp
+14 -12
View File
@@ -47,9 +47,8 @@ namespace Kernel
}, 0600, 0, 0) }, 0600, 0, 0)
, m_name(MUST(BAN::String::formatted("tty{}", s_next_tty_number++))) , m_name(MUST(BAN::String::formatted("tty{}", s_next_tty_number++)))
, m_terminal_driver(driver) , m_terminal_driver(driver)
, m_palette(driver->palette()) , m_foreground(driver->palette()[15])
, m_foreground(m_palette[15]) , m_background(driver->palette()[0])
, m_background(m_palette[0])
{ {
m_width = m_terminal_driver->width(); m_width = m_terminal_driver->width();
m_height = m_terminal_driver->height(); m_height = m_terminal_driver->height();
@@ -122,11 +121,14 @@ namespace Kernel
void VirtualTTY::handle_ansi_csi_color(uint8_t value) void VirtualTTY::handle_ansi_csi_color(uint8_t value)
{ {
ASSERT(m_write_lock.is_locked_by_current_thread()); ASSERT(m_write_lock.is_locked_by_current_thread());
auto& palette = m_terminal_driver->palette();
switch (value) switch (value)
{ {
case 0: case 0:
m_foreground = m_palette[15]; m_foreground = palette[15];
m_background = m_palette[0]; m_background = palette[0];
m_colors_inverted = false; m_colors_inverted = false;
break; break;
@@ -138,25 +140,25 @@ namespace Kernel
case 27: m_colors_inverted = false; break; case 27: m_colors_inverted = false; break;
case 30 ... 37: case 30 ... 37:
m_foreground = m_palette[value - 30]; m_foreground = palette[value - 30];
break; break;
case 39: case 39:
m_foreground = m_palette[15]; m_foreground = palette[15];
break; break;
case 40 ... 47: case 40 ... 47:
m_background = m_palette[value - 40]; m_background = palette[value - 40];
break; break;
case 49: case 49:
m_background = m_palette[0]; m_background = palette[0];
break; break;
case 90 ... 97: case 90 ... 97:
m_foreground = m_palette[value - 90 + 8]; m_foreground = palette[value - 90 + 8];
break; break;
case 100 ... 107: case 100 ... 107:
m_background = m_palette[value - 100 + 8]; m_background = palette[value - 100 + 8];
break; break;
default: default:
@@ -173,7 +175,7 @@ namespace Kernel
const uint8_t code = BAN::Math::min(m_ansi_state.nums[2], 255); const uint8_t code = BAN::Math::min(m_ansi_state.nums[2], 255);
if (code < 16) if (code < 16)
return m_palette[code]; return m_terminal_driver->palette()[code];
if (code < 232) if (code < 232)
{ {