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

Kernel+LibVT: Fix selection with scrollback wrap-around

Browse source 
If lines are removed from the tail of the scrollback buffer, the
previous line indices will refer to different lines; therefore we need
to offset them.
This commit is contained in:
Daniel Bertalan 2021-06-05 16:46:33 +02:00 • committed by Andreas Kling
parent 13991eade7
commit ce9460de59
7 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,9 +39,10 @@ void Terminal::clear()
void Terminal::clear_history()
{
dbgln_if(TERMINAL_DEBUG, "Clear history");
auto previous_history_size = m_history.size();
m_history.clear();
m_history_start = 0;
m_client.terminal_history_changed();
m_client.terminal_history_changed(-previous_history_size);
}
#endif
@ -744,8 +745,11 @@ void Terminal::scroll_up(u16 region_top, u16 region_bottom, size_t count)
// NOTE: We have to invalidate the cursor first.
invalidate_cursor();
int history_delta = -count;
bool should_move_to_scrollback = !m_use_alternate_screen_buffer && max_history_size() != 0;
if (should_move_to_scrollback) {
auto remaining_lines = max_history_size() - history_size();
history_delta = (count > remaining_lines) ? remaining_lines - count : 0;
for (size_t i = 0; i < count; ++i)
add_line_to_history(move(active_buffer().ptr_at(region_top + i)));
}
@ -767,8 +771,7 @@ void Terminal::scroll_up(u16 region_top, u16 region_bottom, size_t count)
// The other lines have implicitly been set dirty by being cleared.
for (u16 row = region_top; row <= region_bottom - count; ++row)
active_buffer()[row].set_dirty(true);
if (!m_use_alternate_screen_buffer && max_history_size() != 0)
m_client.terminal_history_changed();
m_client.terminal_history_changed(history_delta);
}
// Insert `count` blank lines at the top of the region. Text moves down. Does not affect the scrollback buffer.