RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 05:58:11 +00:00
Code Issues Activity Actions

LibLine: Handle interrupts again

Browse source 
This commit makes LibLine handle interrupts (as reported via
interrupted() and resized()) again.
There is a little catch with the shell:
```
$     ls |
pipe> <C-c> (prompt stays here until a key is pressed)
```
This commit is contained in:
AnotherTest 2020-06-01 16:26:31 +04:30 • committed by Andreas Kling
parent 29029568ee
commit 889a8e7d0f
3 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Libraries/LibLine/Editor.cpp
View file

@ -292,6 +292,9 @@ auto Editor::get_line(const String& prompt) -> Result<String, Editor::Error>
add_child(*m_notifier);
m_notifier->on_ready_to_read = [&] {
if (m_was_interrupted)
handle_interrupt_event();
handle_read_event();
if (m_always_refresh)
@ -342,6 +345,23 @@ void Editor::save_to(JsonObject& object)
object.set("used_display_area", move(display_area));
}
void Editor::handle_interrupt_event()
{
m_was_interrupted = false;
if (!m_buffer.is_empty())
printf("^C");
m_buffer.clear();
m_cursor = 0;
if (on_interrupt_handled)
on_interrupt_handled();
m_refresh_needed = true;
refresh_display();
}
void Editor::handle_read_event()
{
char keybuf[16];
@ -360,18 +380,7 @@ void Editor::handle_read_event()
return;
}
m_was_interrupted = false;
if (!m_buffer.is_empty())
printf("^C");
m_buffer.clear();
m_cursor = 0;
if (on_interrupt_handled)
on_interrupt_handled();
m_refresh_needed = true;
handle_interrupt_event();
return;
}