LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-20 01:37:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibLine: Replace some magic numbers with a magic function

Browse Source
This commit is contained in:
Nico Weber 2020-07-06 12:22:03 -04:00 committed by Andreas Kling
parent a163ee8b3b
commit 4726966ad7
Notes: sideshowbarker 2024-07-19 05:05:41 +09:00 
Author: https://github.com/nico
Commit: https://github.com/SerenityOS/serenity/commit/4726966ad78
Pull-request: https://github.com/SerenityOS/serenity/pull/2715
Reviewed-by: https://github.com/alimpfard
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Libraries/LibLine/Editor.cpp
View File

@ -41,6 +41,10 @@
// #define SUGGESTIONS_DEBUG
namespace {
u32 ctrl(char c) { return c & 0x3f; }
}
namespace Line {
Editor::Editor(Configuration configuration)
@ -721,7 +725,7 @@ void Editor::handle_read_event()
m_refresh_needed = true;
};
if (codepoint == 8 || codepoint == m_termios.c_cc[VERASE]) {
if (codepoint == '\b' || codepoint == m_termios.c_cc[VERASE]) {
do_backspace();
continue;
}
@ -746,7 +750,7 @@ void Editor::handle_read_event()
continue;
}
// ^L
if (codepoint == 0xc) {
if (codepoint == ctrl('L')) {
printf("\033[3J\033[H\033[2J"); // Clear screen.
VT::move_absolute(1, 1);
set_origin(1, 1);
@ -754,12 +758,12 @@ void Editor::handle_read_event()
continue;
}
// ^A
if (codepoint == 0x01) {
if (codepoint == ctrl('A')) {
m_cursor = 0;
continue;
}
// ^R
if (codepoint == 0x12) {
if (codepoint == ctrl('R')) {
if (m_is_searching) {
// how did we get here?
ASSERT_NOT_REACHED();
@ -786,7 +790,7 @@ void Editor::handle_read_event()
};
// Whenever the search editor gets a ^R, cycle between history entries.
m_search_editor->register_character_input_callback(0x12, [this](Editor& search_editor) {
m_search_editor->register_character_input_callback(ctrl('R'), [this](Editor& search_editor) {
++m_search_offset;
search_editor.m_refresh_needed = true;
return false; // Do not process this key event
@ -807,7 +811,7 @@ void Editor::handle_read_event()
// and we end up with the wrong order of prompts, so we will first refresh
// ourselves, then refresh the search editor, and then tell him not to process
// this event.
m_search_editor->register_character_input_callback(0x0c, [this](auto& search_editor) {
m_search_editor->register_character_input_callback(ctrl('L'), [this](auto& search_editor) {
printf("\033[3J\033[H\033[2J"); // Clear screen.
// refresh our own prompt
@ -887,7 +891,7 @@ void Editor::handle_read_event()
continue;
}
// ^E
if (codepoint == 0x05) {
if (codepoint == ctrl('E')) {
m_cursor = m_buffer.size();
continue;
}