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

LibVT+Kernel: Clean up scroll API

Browse source 
This commit cleans up some of the `#ifdef`-ed code smell in
`Terminal`, by extending the scroll APIs to take a range of lines as a
parameter. This makes it possible to use the same code for `IL`/`DL` as
for scrolling.

Note that the current scrolling implementation is very naive, and does
many insertions/deletions in the middle of arrays, whereas swaps should
be enough. This optimization will come in a later commit.

The `linefeed` override was removed from `VirtualConsole`. Previously,
it exhibited incorrect behavior by moving to column 0. Now that we use
the method defined in `Terminal`, code which relied on this behavior
stopped working. We go instead go through the TTY layer which handles
the various output flags. Passing the input character-by-character
seems a bit excessive, so a fix for it will come in another PR.
This commit is contained in:
Daniel Bertalan 2021-06-02 15:36:31 +02:00 • committed by Andreas Kling
parent 5f92790489
commit ae6bdc4e29
5 changed files with 141 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -171,6 +171,11 @@ public:
return m_needs_bracketed_paste;
};
bool is_within_scroll_region(u16 line) const
{
return line >= m_scroll_region_top && line <= m_scroll_region_bottom;
}
protected:
// ^EscapeSequenceExecutor
virtual void emit_code_point(u32) override;
@ -199,18 +204,17 @@ protected:
};
void carriage_return();
#ifndef KERNEL
void scroll_up();
void scroll_down();
inline void scroll_up(size_t count = 1);
inline void scroll_down(size_t count = 1);
void linefeed();
#ifndef KERNEL
void scroll_up(u16 region_top, u16 region_bottom, size_t count);
void scroll_down(u16 region_top, u16 region_bottom, size_t count);
void put_character_at(unsigned row, unsigned column, u32 ch);
void set_window_title(const String&);
#else
virtual void scroll_up() = 0;
virtual void scroll_down() = 0;
virtual void linefeed() = 0;
virtual void scroll_up(u16 region_top, u16 region_bottom, size_t count) = 0;
virtual void scroll_down(u16 region_top, u16 region_bottom, size_t count) = 0;
virtual void put_character_at(unsigned row, unsigned column, u32 ch) = 0;
virtual void set_window_title(const String&) = 0;
#endif
void unimplemented_control_code(u8);
@ -307,18 +311,18 @@ protected:
// SD - Scroll Down (called "Pan Up" in VT510)
void SD(Parameters);
#ifndef KERNEL
// IL - Insert Line
void IL(Parameters);
#ifndef KERNEL
// DCH - Delete Character
void DCH(Parameters);
#else
virtual void DCH(Parameters) = 0;
#endif
// DL - Delete Line
void DL(Parameters);
#else
virtual void IL(Parameters) = 0;
virtual void DCH(Parameters) = 0;
virtual void DL(Parameters) = 0;
#endif
// CHA - Cursor Horizontal Absolute
void CHA(Parameters);