mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-20 01:37:39 +03:00
parent
5204c9062c
commit
3a231c00aa
Notes:
sideshowbarker
2024-07-18 22:32:47 +09:00
Author: https://github.com/alimpfard Commit: https://github.com/SerenityOS/serenity/commit/3a231c00aa8 Pull-request: https://github.com/SerenityOS/serenity/pull/5246 Issue: https://github.com/SerenityOS/serenity/issues/5233
@ -539,7 +539,7 @@ void Editor::interrupted()
|
||||
|
||||
m_was_interrupted = true;
|
||||
handle_interrupt_event();
|
||||
if (!m_finish)
|
||||
if (!m_finish || !m_previous_interrupt_was_handled_as_interrupt)
|
||||
return;
|
||||
|
||||
m_finish = false;
|
||||
@ -681,11 +681,14 @@ void Editor::try_update_once()
|
||||
void Editor::handle_interrupt_event()
|
||||
{
|
||||
m_was_interrupted = false;
|
||||
m_previous_interrupt_was_handled_as_interrupt = false;
|
||||
|
||||
m_callback_machine.interrupted(*this);
|
||||
if (!m_callback_machine.should_process_last_pressed_key())
|
||||
return;
|
||||
|
||||
m_previous_interrupt_was_handled_as_interrupt = true;
|
||||
|
||||
fprintf(stderr, "^C");
|
||||
fflush(stderr);
|
||||
|
||||
|
@ -448,6 +448,7 @@ private:
|
||||
struct termios m_default_termios {
|
||||
};
|
||||
bool m_was_interrupted { false };
|
||||
bool m_previous_interrupt_was_handled_as_interrupt { true };
|
||||
bool m_was_resized { false };
|
||||
|
||||
// FIXME: This should be something more take_first()-friendly.
|
||||
|
@ -258,6 +258,14 @@ void Editor::enter_search()
|
||||
return false; // Do not process this key event
|
||||
});
|
||||
|
||||
// ^C should cancel the search.
|
||||
m_search_editor->register_key_input_callback(ctrl('C'), [this](Editor& search_editor) {
|
||||
search_editor.finish();
|
||||
m_reset_buffer_on_search_end = true;
|
||||
search_editor.deferred_invoke([&search_editor](auto&) { search_editor.really_quit_event_loop(); });
|
||||
return false;
|
||||
});
|
||||
|
||||
// Whenever the search editor gets a backspace, cycle back between history entries
|
||||
// unless we're at the zeroth entry, in which case, allow the deletion.
|
||||
m_search_editor->register_key_input_callback(m_termios.c_cc[VERASE], [this](Editor& search_editor) {
|
||||
|
Loading…
Reference in New Issue
Block a user