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

LibVT: Add missing cursor movement escape sequences

Browse source 
This commit adds support for the following ANSI escape sequences:
- `CNL` - Cursor Next Line
- `CPL` - Cursor Previous Line
- `VPR` - Line Position Relative
- `HPA` - Character Position Absolute
- `HPR` - Character Position Relative
This commit is contained in:
Daniel Bertalan 2021-05-29 10:48:02 +02:00 • committed by Andreas Kling
parent 07e3934f01
commit 4cf6963a1c
2 changed files with 116 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -444,12 +444,36 @@ void Terminal::CUB(Parameters params)
set_cursor(cursor_row(), new_column);
}
void Terminal::CNL(Parameters params)
{
unsigned num = 1;
if (params.size() >= 1 && params[0] != 0)
num = params[0];
unsigned new_row = cursor_row() + num;
if (new_row >= m_columns)
new_row = m_columns - 1;
set_cursor(new_row, 0);
}
void Terminal::CPL(Parameters params)
{
unsigned num = 1;
if (params.size() >= 1 && params[0] != 0)
num = params[0];
int new_row = (int)cursor_row() - num;
if (new_row < 0)
new_row = 0;
set_cursor(new_row, 0);
}
void Terminal::CHA(Parameters params)
{
unsigned new_column = 1;
if (params.size() >= 1 && params[0] != 0)
new_column = params[0] - 1;
set_cursor(cursor_row(), new_column);
new_column = params[0];
if (new_column > m_columns)
new_column = m_columns;
set_cursor(cursor_row(), new_column - 1);
}
void Terminal::REP(Parameters params)
@ -466,10 +490,44 @@ void Terminal::VPA(Parameters params)
{
unsigned new_row = 1;
if (params.size() >= 1 && params[0] != 0)
new_row = params[0] - 1;
new_row = params[0];
if (new_row > m_rows)
new_row = m_rows;
set_cursor(new_row - 1, cursor_column());
}
void Terminal::VPR(Parameters params)
{
unsigned num = 1;
if (params.size() >= 1 && params[0] != 0)
num = params[0];
int new_row = cursor_row() + num;
if (new_row >= m_rows)
new_row = m_rows - 1;
set_cursor(new_row, cursor_column());
}
void Terminal::HPA(Parameters params)
{
unsigned new_column = 1;
if (params.size() >= 1 && params[0] != 0)
new_column = params[0];
if (new_column > m_columns)
new_column = m_columns;
set_cursor(cursor_row(), new_column - 1);
}
void Terminal::HPR(Parameters params)
{
unsigned num = 1;
if (params.size() >= 1 && params[0] != 0)
num = params[0];
unsigned new_column = cursor_column() + num;
if (new_column >= m_columns)
new_column = m_columns - 1;
set_cursor(cursor_row(), new_column);
}
void Terminal::ECH(Parameters params)
{
// Erase characters (without moving cursor)
@ -925,6 +983,12 @@ void Terminal::execute_csi_sequence(Parameters parameters, Intermediates interme
case 'D':
CUB(parameters);
break;
case 'E':
CNL(parameters);
break;
case 'F':
CPL(parameters);
break;
case 'G':
CHA(parameters);
break;
@ -955,39 +1019,36 @@ void Terminal::execute_csi_sequence(Parameters parameters, Intermediates interme
case 'X':
ECH(parameters);
break;
case '`':
HPA(parameters);
break;
case 'a':
HPR(parameters);
break;
case 'b':
REP(parameters);
break;
case 'd':
VPA(parameters);
break;
case 'm':
SGR(parameters);
break;
case 's':
SCOSC();
break;
case 'u':
SCORC();
break;
case 't':
XTERM_WM(parameters);
break;
case 'r':
DECSTBM(parameters);
break;
case 'l':
RM(parameters, intermediates);
break;
case 'h':
SM(parameters, intermediates);
break;
case 'c':
DA(parameters);
break;
case 'd':
VPA(parameters);
break;
case 'e':
VPR(parameters);
break;
case 'f':
HVP(parameters);
break;
case 'h':
SM(parameters, intermediates);
break;
case 'l':
RM(parameters, intermediates);
break;
case 'm':
SGR(parameters);
break;
case 'n':
DSR(parameters);
break;
@ -997,6 +1058,18 @@ void Terminal::execute_csi_sequence(Parameters parameters, Intermediates interme
else
unimplemented_csi_sequence(parameters, intermediates, last_byte);
break;
case 'r':
DECSTBM(parameters);
break;
case 's':
SCOSC();
break;
case 't':
XTERM_WM(parameters);
break;
case 'u':
SCORC();
break;
default:
unimplemented_csi_sequence(parameters, intermediates, last_byte);
}

17
Userland/Libraries/LibVT/Terminal.h
View file

@ -234,6 +234,12 @@ protected:
// CUB – Cursor Backward
void CUB(Parameters);
// CNL - Cursor Next Line
void CNL(Parameters);
// CPL - Cursor Previous Line
void CPL(Parameters);
// CUP - Cursor Position
void CUP(Parameters);
@ -320,9 +326,18 @@ protected:
// REP - Repeat
void REP(Parameters);
// VPA - Vertical Line Position Absolute
// VPA - Line Position Absolute
void VPA(Parameters);
// VPR - Line Position Relative
void VPR(Parameters);
// HPA - Character Position Absolute
void HPA(Parameters);
// HPR - Character Position Relative
void HPR(Parameters);
// ECH - Erase Character
void ECH(Parameters);