From 12d8f6a93114c4205cdfc766e91759ad999667e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Wed, 21 Oct 2020 23:53:30 +0200 Subject: Implement C-a C-e C-b C-f in the editor Updates #4 --- sdn.cpp | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/sdn.cpp b/sdn.cpp index fb65d7d..83a887a 100644 --- a/sdn.cpp +++ b/sdn.cpp @@ -415,7 +415,8 @@ enum { ALT = 1 << 24, SYM = 1 << 25 }; // Outside the range of Unicode XX(CHDIR) XX(PARENT) XX(GO_START) XX(GO_HOME) \ XX(SEARCH) XX(RENAME) XX(RENAME_PREFILL) \ XX(TOGGLE_FULL) XX(REVERSE_SORT) XX(SHOW_HIDDEN) XX(REDRAW) XX(RELOAD) \ - XX(INPUT_ABORT) XX(INPUT_CONFIRM) XX(INPUT_B_DELETE) + XX(INPUT_ABORT) XX(INPUT_CONFIRM) XX(INPUT_B_DELETE) \ + XX(INPUT_BACKWARD) XX(INPUT_FORWARD) XX(INPUT_BEGINNING) XX(INPUT_END) #define XX(name) ACTION_ ## name, enum action { ACTIONS(XX) ACTION_COUNT }; @@ -453,6 +454,10 @@ static map g_input_actions { // Sometimes terminfo is wrong, we need to accept both of these {L'\b', ACTION_INPUT_B_DELETE}, {CTRL ('?'), ACTION_INPUT_B_DELETE}, {KEY (BACKSPACE), ACTION_INPUT_B_DELETE}, + {CTRL ('B'), ACTION_INPUT_BACKWARD}, {KEY (LEFT), ACTION_INPUT_BACKWARD}, + {CTRL ('F'), ACTION_INPUT_FORWARD}, {KEY (RIGHT), ACTION_INPUT_FORWARD}, + {CTRL ('A'), ACTION_INPUT_BEGINNING}, {KEY (HOME), ACTION_INPUT_BEGINNING}, + {CTRL ('E'), ACTION_INPUT_END}, {KEY (END), ACTION_INPUT_END}, }; static const map*> g_binding_contexts { {"normal", &g_normal_actions}, {"input", &g_input_actions}, @@ -1185,6 +1190,26 @@ fun handle_editor (wint_t c) { g.editor_on_change = nullptr; g.editor_on_confirm = nullptr; break; + case ACTION_INPUT_BEGINNING: + g.editor_cursor = 0; + break; + case ACTION_INPUT_END: + g.editor_cursor = g.editor_line.length (); + break; + case ACTION_INPUT_BACKWARD: + while (g.editor_cursor > 0) { + if (--g.editor_cursor <= 0 + || wcwidth (g.editor_line.at (g.editor_cursor))) + break; + } + break; + case ACTION_INPUT_FORWARD: + while (g.editor_cursor < int (g.editor_line.length ())) { + if (++g.editor_cursor >= int (g.editor_line.length ()) + || wcwidth (g.editor_line.at (g.editor_cursor))) + break; + } + break; case ACTION_INPUT_B_DELETE: // Remove the last character including its postfix combining characters while (g.editor_cursor > 0) { -- cgit v1.2.3