RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 11:27:35 +00:00
Code Issues Activity Actions

Kernel+LibVT: Implement left-right scrolling

Browse source 
This commit implements the left/right scrolling used in the `ICH`/`DCH`
escape sequences for `VirtualConsole`. This brings us one step closer to
VT420/xterm compatibility.

We can now finally remove the last escape sequence related `ifdef`s.
This commit is contained in:
Daniel Bertalan 2021-06-05 15:11:45 +02:00 • committed by Andreas Kling
parent 7419569a2b
commit 89843cd692
4 changed files with 68 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Kernel/TTY/VirtualConsole.cpp
View file

@ -86,14 +86,14 @@ void ConsoleImpl::clear_in_line(u16 row, u16 first_column, u16 last_column)
m_client.clear_in_line(row, first_column, last_column);
}
void ConsoleImpl::ICH(Parameters)
void ConsoleImpl::scroll_left(u16 row, u16 column, size_t count)
{
// FIXME: Implement this
m_client.scroll_left(row, column, count);
}
void ConsoleImpl::DCH(Parameters)
void ConsoleImpl::scroll_right(u16 row, u16 column, size_t count)
{
// FIXME: Implement this
m_client.scroll_right(row, column, count);
}
void VirtualConsole::set_graphical(bool graphical)
@ -425,6 +425,28 @@ void VirtualConsole::scroll_down(u16 region_top, u16 region_bottom, size_t count
m_lines[row].dirty = true;
}
void VirtualConsole::scroll_left(u16 row, u16 column, size_t count)
{
VERIFY(row < rows());
VERIFY(column < columns());
count = min<size_t>(count, columns() - column);
memmove(&cell_at(column, row), &cell_at(column + count, row), sizeof(Cell) * (columns() - column - count));
for (size_t i = column + count; i < columns(); ++i)
cell_at(i, row).clear();
m_lines[row].dirty = true;
}
void VirtualConsole::scroll_right(u16 row, u16 column, size_t count)
{
VERIFY(row < rows());
VERIFY(column < columns());
count = min<size_t>(count, columns() - column);
memmove(&cell_at(column + count, row), &cell_at(column, row), sizeof(Cell) * (columns() - column - count));
for (size_t i = column; i < column + count; ++i)
cell_at(i, row).clear();
m_lines[row].dirty = true;
}
void VirtualConsole::clear_in_line(u16 row, u16 first_column, u16 last_column)
{
VERIFY(row < rows());

7
Kernel/TTY/VirtualConsole.h
View file

@ -39,11 +39,10 @@ private:
virtual void scroll_up(u16 region_top, u16 region_bottom, size_t count) override;
virtual void scroll_down(u16 region_top, u16 region_bottom, size_t count) override;
virtual void scroll_left(u16 row, u16 column, size_t count) override;
virtual void scroll_right(u16 row, u16 column, size_t count) override;
virtual void put_character_at(unsigned row, unsigned column, u32 ch) override;
virtual void clear_in_line(u16 row, u16 first_column, u16 last_column) override;
virtual void ICH(Parameters) override;
virtual void DCH(Parameters) override;
};
class VirtualConsole final : public TTY
@ -138,6 +137,8 @@ private:
void scroll_down(u16 region_top, u16 region_bottom, size_t count);
void scroll_up(u16 region_top, u16 region_bottom, size_t count);
void scroll_left(u16 row, u16 column, size_t count);
void scroll_right(u16 row, u16 column, size_t count);
void clear_line(size_t index)
{
clear_in_line(index, 0, m_console_impl.columns() - 1);