RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 23:57:34 +00:00
Code Issues Activity Actions

LibVT: Fix issues running nano

Browse source 
This commit fixes 3 correctness issues with the ANSI escape sequence
handling logic:
1. Default parameters were not handled correctly: the specification says
   that 0-valued CSI escape sequence parameters should take their
   default values.
2. We did not call `scroll_{up, down}` when encountering RI/IND commands
   that reached the scroll margins. This caused nano to only scroll the
   first line.
This commit is contained in:
Daniel Bertalan 2021-05-23 15:57:21 +02:00 • committed by Ali Mohammad Pur
parent 146bd794eb
commit 6465f87827
1 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Userland/Libraries/LibVT/Terminal.cpp
View file

@ -363,9 +363,9 @@ void Terminal::DECSTBM(Parameters params)
{ {
unsigned top = 1; unsigned top = 1;
unsigned bottom = m_rows; unsigned bottom = m_rows;
if (params.size() >= 1) if (params.size() >= 1 && params[0] != 0)
top = params[0]; top = params[0];
if (params.size() >= 2) if (params.size() >= 2 && params[1] != 0)
bottom = params[1]; bottom = params[1];
if ((bottom - top) < 2 || bottom > m_rows) { if ((bottom - top) < 2 || bottom > m_rows) {
dbgln("Error: DECSTBM: scrolling region invalid: {}-{}", top, bottom); dbgln("Error: DECSTBM: scrolling region invalid: {}-{}", top, bottom);
@ -374,6 +374,7 @@ void Terminal::DECSTBM(Parameters params)
m_scroll_region_top = top - 1; m_scroll_region_top = top - 1;
m_scroll_region_bottom = bottom - 1; m_scroll_region_bottom = bottom - 1;
set_cursor(0, 0); set_cursor(0, 0);
dbgln_if(TERMINAL_DEBUG, "Set scrolling region: {}-{}", m_scroll_region_top, m_scroll_region_bottom);
} }
void Terminal::CUP(Parameters params) void Terminal::CUP(Parameters params)
@ -381,9 +382,9 @@ void Terminal::CUP(Parameters params)
// CUP – Cursor Position // CUP – Cursor Position
unsigned row = 1; unsigned row = 1;
unsigned col = 1; unsigned col = 1;
if (params.size() >= 1) if (params.size() >= 1 && params[0] != 0)
row = params[0]; row = params[0];
if (params.size() >= 2) if (params.size() >= 2 && params[1] != 0)
col = params[1]; col = params[1];
set_cursor(row - 1, col - 1); set_cursor(row - 1, col - 1);
} }
@ -552,8 +553,8 @@ void Terminal::ED(Parameters params)
void Terminal::SU(Parameters params) void Terminal::SU(Parameters params)
{ {
int count = 1; unsigned count = 1;
if (params.size() >= 1) if (params.size() >= 1 && params[0] != 0)
count = params[0]; count = params[0];
for (u16 i = 0; i < count; i++) for (u16 i = 0; i < count; i++)
@ -562,8 +563,8 @@ void Terminal::SU(Parameters params)
void Terminal::SD(Parameters params) void Terminal::SD(Parameters params)
{ {
int count = 1; unsigned count = 1;
if (params.size() >= 1) if (params.size() >= 1 && params[0] != 0)
count = params[0]; count = params[0];
for (u16 i = 0; i < count; i++) for (u16 i = 0; i < count; i++)
@ -743,18 +744,28 @@ void Terminal::set_cursor(unsigned a_row, unsigned a_column, bool skip_debug)
void Terminal::NEL() void Terminal::NEL()
{ {
linefeed(); if (cursor_row() == m_scroll_region_bottom)
carriage_return(); scroll_up();
else
set_cursor(cursor_row() + 1, 0);
} }
void Terminal::IND() void Terminal::IND()
{ {
CUD({}); // Not equivalent to CUD: if we are at the bottom margin, we have to scroll up.
if (cursor_row() == m_scroll_region_bottom)
scroll_up();
else
set_cursor(cursor_row() + 1, cursor_column());
} }
void Terminal::RI() void Terminal::RI()
{ {
CUU({}); // Not equivalent to CUU : if we at the top margin , we have to scroll down.
if (cursor_row() == m_scroll_region_top)
scroll_down();
else
set_cursor(cursor_row() - 1, cursor_column());
} }
void Terminal::DSR(Parameters params) void Terminal::DSR(Parameters params)
@ -1262,6 +1273,8 @@ void Terminal::set_size(u16 columns, u16 rows)
m_horizontal_tabs[columns - 1] = 1; m_horizontal_tabs[columns - 1] = 1;
m_client.terminal_did_resize(m_columns, m_rows); m_client.terminal_did_resize(m_columns, m_rows);
dbgln_if(TERMINAL_DEBUG, "Set terminal size: {}x{}", m_rows, m_columns);
} }
#endif #endif