RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 04:07:44 +00:00
Code Issues Activity Actions

LibLine: Make line management less broken when at the last line

Browse source 
Previously, all sorts of weird stuff would happen when the editor was at
the last line of the terminal (or when the printed line would be at the
last line), this commit makes the editor scroll the terminal up before
trying to write to a row that doesn't actually exist (yet).
This fixes ^R search making a mess when initiated at the last line
(especially with multiline prompts).
This commit is contained in:
Ali Mohammad Pur 2021-05-16 09:45:22 +04:30 • committed by Linus Groh
parent 3f08e957d4
commit bbaa463032
3 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Userland/Libraries/LibLine/Editor.cpp
View file

@ -185,6 +185,24 @@ Editor::~Editor()
restore();
}
void Editor::ensure_free_lines_from_origin(size_t count)
{
if (count > m_num_lines) {
// It's hopeless...
TODO();
}
if (m_origin_row + count <= m_num_lines)
return;
auto diff = m_origin_row + count - m_num_lines - 1;
out(stderr, "\x1b[{}S", diff);
fflush(stderr);
m_origin_row -= diff;
m_refresh_needed = false;
m_chars_touched_in_the_middle = 0;
}
void Editor::get_terminal_size()
{
struct winsize ws;
@ -1379,16 +1397,11 @@ void Editor::reposition_cursor(bool to_end)
auto line = cursor_line() - 1;
auto column = offset_in_line();
ensure_free_lines_from_origin(line);
VERIFY(column + m_origin_column <= m_num_columns);
VT::move_absolute(line + m_origin_row, column + m_origin_column);
if (line + m_origin_row > m_num_lines) {
for (size_t i = m_num_lines; i < line + m_origin_row; ++i)
fputc('\n', stderr);
m_origin_row -= line + m_origin_row - m_num_lines;
VT::move_relative(0, column + m_origin_column);
}
m_cursor = saved_cursor;
}