beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-21 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibLine: Treat leftover data in buffer as a read event

Browse source 
Fixes #4328.
This commit is contained in:
AnotherTest 2020-12-18 15:29:07 +03:30 committed by Andreas Kling
parent 5e6b9cbc91
commit 5d1425718e
Notes: sideshowbarker 2024-07-19 00:45:25 +09:00 
Author: https://github.com/alimpfard
Commit: https://github.com/SerenityOS/serenity/commit/5d1425718e6
Pull-request: https://github.com/SerenityOS/serenity/pull/4448
Issue: https://github.com/SerenityOS/serenity/issues/4328
2 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Libraries/LibLine/Editor.cpp
View file

@ -557,21 +557,9 @@ auto Editor::get_line(const String& prompt) -> Result<String, Editor::Error>
m_notifier = Core::Notifier::construct(STDIN_FILENO, Core::Notifier::Read);
add_child(*m_notifier);
m_notifier->on_ready_to_read = [&] {
if (m_was_interrupted) {
handle_interrupt_event();
}
handle_read_event();
if (m_always_refresh)
m_refresh_needed = true;
refresh_display();
if (m_finish)
really_quit_event_loop();
};
m_notifier->on_ready_to_read = [&] { try_update_once(); };
if (!m_incomplete_data.is_empty())
deferred_invoke([&](auto&) { try_update_once(); });
if (loop.exec() == Retry)
return get_line(prompt);
@ -597,6 +585,23 @@ void Editor::save_to(JsonObject& object)
object.set("used_display_area", move(display_area));
}
void Editor::try_update_once()
{
if (m_was_interrupted) {
handle_interrupt_event();
}
handle_read_event();
if (m_always_refresh)
m_refresh_needed = true;
refresh_display();
if (m_finish)
really_quit_event_loop();
}
void Editor::handle_interrupt_event()
{
m_was_interrupted = false;
@ -924,6 +929,9 @@ void Editor::handle_read_event()
for (size_t i = 0; i < consumed_code_points; ++i)
m_incomplete_data.take_first();
}
if (!m_incomplete_data.is_empty() && !m_finish)
deferred_invoke([&](auto&) { try_update_once(); });
}
void Editor::cleanup_suggestions()

1
Libraries/LibLine/Editor.h
View file

@ -262,6 +262,7 @@ private:
// FIXME: Port to Core::Property
void save_to(JsonObject&);
void try_update_once();
void handle_interrupt_event();
void handle_read_event();