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

LibLine: Fully redraw on resize when origin position changes

Browse source
This commit is contained in:
Ali Mohammad Pur 2024-02-06 01:40:45 +03:30 • committed by Ali Mohammad Pur
parent 35abbafb7b
commit cde528fdd9
2 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -644,12 +644,38 @@ ErrorOr<void> Editor::resized()
{ {
m_was_resized = true; m_was_resized = true;
m_previous_num_columns = m_num_columns; m_previous_num_columns = m_num_columns;
auto old_origin_row = m_origin_row;
auto old_origin_column = m_origin_column;
get_terminal_size(); get_terminal_size();
if (!m_has_origin_reset_scheduled) { if (!m_has_origin_reset_scheduled) {
// Reset the origin, but make sure it doesn't blow up if we can't read it // Reset the origin, but make sure it doesn't blow up if we can't read it
if (set_origin(false)) { if (set_origin(false)) {
// The origin we have right now actually points to where the cursor should be (in the middle of the buffer somewhere)
// Find the "true" origin.
auto current_buffer_metrics = actual_rendered_string_metrics(buffer_view(), m_current_masks);
auto lines = m_cached_prompt_metrics.lines_with_addition(current_buffer_metrics, m_num_columns);
auto offset = m_cached_prompt_metrics.offset_with_addition(current_buffer_metrics, m_num_columns);
if (lines > m_origin_row)
m_origin_row = 1;
else
m_origin_row -= lines - 1; // the prompt and the origin share a line.
if (offset > m_origin_column)
m_origin_column = 1;
else
m_origin_column -= offset;
set_origin(m_origin_row, m_origin_column);
TRY(handle_resize_event(false)); TRY(handle_resize_event(false));
if (old_origin_column != m_origin_column || old_origin_row != m_origin_row) {
m_expected_origin_changed = true;
deferred_invoke([this] {
(void)refresh_display();
});
}
} else { } else {
deferred_invoke([this] { handle_resize_event(true).release_value_but_fixme_should_propagate_errors(); }); deferred_invoke([this] { handle_resize_event(true).release_value_but_fixme_should_propagate_errors(); });
m_has_origin_reset_scheduled = true; m_has_origin_reset_scheduled = true;
@ -1365,8 +1391,9 @@ ErrorOr<void> Editor::refresh_display()
// Someone changed the window size, figure it out // Someone changed the window size, figure it out
// and react to it, we might need to redraw. // and react to it, we might need to redraw.
if (m_was_resized) { if (m_was_resized) {
if (m_previous_num_columns != m_num_columns) { if (m_expected_origin_changed || m_previous_num_columns != m_num_columns) {
// We need to cleanup and redo everything. // We need to cleanup and redo everything.
m_expected_origin_changed = false;
m_cached_prompt_valid = false; m_cached_prompt_valid = false;
m_refresh_needed = true; m_refresh_needed = true;
swap(m_previous_num_columns, m_num_columns); swap(m_previous_num_columns, m_num_columns);

1
Userland/Libraries/LibLine/Editor.h
View file

@ -442,6 +442,7 @@ private:
// Exact position before our prompt in the terminal. // Exact position before our prompt in the terminal.
size_t m_origin_row { 0 }; size_t m_origin_row { 0 };
size_t m_origin_column { 0 }; size_t m_origin_column { 0 };
bool m_expected_origin_changed { false };
bool m_has_origin_reset_scheduled { false }; bool m_has_origin_reset_scheduled { false };
OwnPtr<SuggestionDisplay> m_suggestion_display; OwnPtr<SuggestionDisplay> m_suggestion_display;