RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 16:47:42 +00:00
Code Issues Activity Actions

LibLine: Add Ctrl-N/P as history next/previous shortcuts

Browse source
This commit is contained in:
Nico Weber 2020-07-13 09:10:47 -04:00 • committed by Andreas Kling
parent b0384bb1bb
commit 0e10a92ebc
1 changed files with 49 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

83
Libraries/LibLine/Editor.cpp
View file

@ -469,6 +469,42 @@ void Editor::handle_read_event()
m_search_offset = 0; m_search_offset = 0;
}; };
auto do_search_backwards = [&] {
m_searching_backwards = true;
auto inline_search_cursor = m_inline_search_cursor;
StringBuilder builder;
builder.append(Utf32View { m_buffer.data(), inline_search_cursor });
String search_phrase = builder.to_string();
if (search(search_phrase, true, true)) {
++m_search_offset;
} else {
insert(search_phrase);
}
m_inline_search_cursor = inline_search_cursor;
};
auto do_search_forwards = [&] {
auto inline_search_cursor = m_inline_search_cursor;
StringBuilder builder;
builder.append(Utf32View { m_buffer.data(), inline_search_cursor });
String search_phrase = builder.to_string();
auto search_changed_directions = m_searching_backwards;
m_searching_backwards = false;
if (m_search_offset > 0) {
m_search_offset -= 1 + search_changed_directions;
if (!search(search_phrase, true, true)) {
insert(search_phrase);
}
} else {
m_search_offset = 0;
m_cursor = 0;
m_buffer.clear();
insert(search_phrase);
m_refresh_needed = true;
}
m_inline_search_cursor = inline_search_cursor;
};
auto do_backspace = [&] { auto do_backspace = [&] {
if (m_is_searching) { if (m_is_searching) {
return; return;
@ -519,47 +555,15 @@ void Editor::handle_read_event()
ctrl_held = true; ctrl_held = true;
continue; continue;
case 'A': // up case 'A': // up
{ do_search_backwards();
m_searching_backwards = true;
auto inline_search_cursor = m_inline_search_cursor;
StringBuilder builder;
builder.append(Utf32View { m_buffer.data(), inline_search_cursor });
String search_phrase = builder.to_string();
if (search(search_phrase, true, true)) {
++m_search_offset;
} else {
insert(search_phrase);
}
m_inline_search_cursor = inline_search_cursor;
m_state = InputState::Free; m_state = InputState::Free;
ctrl_held = false; ctrl_held = false;
continue; continue;
}
case 'B': // down case 'B': // down
{ do_search_forwards();
auto inline_search_cursor = m_inline_search_cursor;
StringBuilder builder;
builder.append(Utf32View { m_buffer.data(), inline_search_cursor });
String search_phrase = builder.to_string();
auto search_changed_directions = m_searching_backwards;
m_searching_backwards = false;
if (m_search_offset > 0) {
m_search_offset -= 1 + search_changed_directions;
if (!search(search_phrase, true, true)) {
insert(search_phrase);
}
} else {
m_search_offset = 0;
m_cursor = 0;
m_buffer.clear();
insert(search_phrase);
m_refresh_needed = true;
}
m_inline_search_cursor = inline_search_cursor;
m_state = InputState::Free; m_state = InputState::Free;
ctrl_held = false; ctrl_held = false;
continue; continue;
}
case 'D': // left case 'D': // left
do_cursor_left(ctrl_held ? Word : Character); do_cursor_left(ctrl_held ? Word : Character);
m_state = InputState::Free; m_state = InputState::Free;
@ -620,6 +624,17 @@ void Editor::handle_read_event()
} }
} }
// ^N
if (codepoint == ctrl('N')) {
do_search_forwards();
continue;
}
// ^P
if (codepoint == ctrl('P')) {
do_search_backwards();
continue;
}
m_search_offset = 0; // reset search offset on any key m_search_offset = 0; // reset search offset on any key
if (codepoint == '\t' || reverse_tab) { if (codepoint == '\t' || reverse_tab) {