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

Terminal: Implement ANSI SGR 10, 39, 49

This commit is contained in:
Bananymous 2025-04-17 23:15:44 +03:00
parent 3ca0ef1583
commit ebd00b1eb2
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
userspace/programs/Terminal/Terminal.cpp
View File

@ -32,6 +32,9 @@ static constexpr uint32_t s_colors_bright[] {
0xCC'FFFFFF, 0xCC'FFFFFF,
}; };
static constexpr auto s_default_bg_color = s_colors_dark[0];
static constexpr auto s_default_fg_color = s_colors_bright[7];
void Terminal::start_shell() void Terminal::start_shell()
{ {
int pts_master = posix_openpt(O_RDWR | O_NOCTTY); int pts_master = posix_openpt(O_RDWR | O_NOCTTY);
@ -108,8 +111,8 @@ void Terminal::run()
signal(SIGCHLD, [](int) { s_shell_exited = true; }); signal(SIGCHLD, [](int) { s_shell_exited = true; });
start_shell(); start_shell();
m_bg_color = s_colors_dark[0]; m_bg_color = s_default_bg_color;
m_fg_color = s_colors_bright[7]; m_fg_color = s_default_fg_color;
auto attributes = LibGUI::Window::default_attributes; auto attributes = LibGUI::Window::default_attributes;
attributes.alpha_channel = true; attributes.alpha_channel = true;
@ -278,8 +281,8 @@ void Terminal::handle_sgr()
switch (m_csi_info.fields[0]) switch (m_csi_info.fields[0])
{ {
case -1: case 0: case -1: case 0:
m_bg_color = s_colors_dark[0]; m_bg_color = s_default_bg_color;
m_fg_color = s_colors_bright[7]; m_fg_color = s_default_fg_color;
break; break;
case 1: case 1:
// FIXME: bold // FIXME: bold
@ -287,12 +290,21 @@ void Terminal::handle_sgr()
case 7: case 7:
BAN::swap(m_fg_color, m_bg_color); BAN::swap(m_fg_color, m_bg_color);
break; break;
case 10:
// default font
break;
case 30: case 31: case 32: case 33: case 34: case 35: case 36: case 37: case 30: case 31: case 32: case 33: case 34: case 35: case 36: case 37:
m_fg_color = s_colors_dark[m_csi_info.fields[0] - 30]; m_fg_color = s_colors_dark[m_csi_info.fields[0] - 30];
break; break;
case 39:
m_fg_color = s_default_fg_color;
break;
case 40: case 41: case 42: case 43: case 44: case 45: case 46: case 47: case 40: case 41: case 42: case 43: case 44: case 45: case 46: case 47:
m_bg_color = s_colors_dark[m_csi_info.fields[0] - 40]; m_bg_color = s_colors_dark[m_csi_info.fields[0] - 40];
break; break;
case 49:
m_bg_color = s_default_bg_color;
break;
case 90: case 91: case 92: case 93: case 94: case 95: case 96: case 97: case 90: case 91: case 92: case 93: case 94: case 95: case 96: case 97:
m_fg_color = s_colors_bright[m_csi_info.fields[0] - 90]; m_fg_color = s_colors_bright[m_csi_info.fields[0] - 90];
break; break;