p
/
sdn
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Implement C-v in the editor 

Not completely happy with the explicit `halfdelay (1)`.

Updates #4
This commit is contained in:
Přemysl Eric Janouch 2020-10-23 01:32:43 +02:00
parent bbf97f6d3d
commit 20c883fb8a
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sdn.cpp
View File

@ -416,7 +416,7 @@ enum { ALT = 1 << 24, SYM = 1 << 25 }; // Outside the range of Unicode
XX(SEARCH) XX(RENAME) XX(RENAME_PREFILL) \ XX(SEARCH) XX(RENAME) XX(RENAME_PREFILL) \
XX(TOGGLE_FULL) XX(REVERSE_SORT) XX(SHOW_HIDDEN) XX(REDRAW) XX(RELOAD) \ 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_DELETE) \ XX(INPUT_ABORT) XX(INPUT_CONFIRM) XX(INPUT_B_DELETE) XX(INPUT_DELETE) \
XX(INPUT_B_KILL_LINE) XX(INPUT_KILL_LINE) \ XX(INPUT_B_KILL_LINE) XX(INPUT_KILL_LINE) XX(INPUT_QUOTED_INSERT) \
XX(INPUT_BACKWARD) XX(INPUT_FORWARD) XX(INPUT_BEGINNING) XX(INPUT_END) XX(INPUT_BACKWARD) XX(INPUT_FORWARD) XX(INPUT_BEGINNING) XX(INPUT_END)
#define XX(name) ACTION_ ## name, #define XX(name) ACTION_ ## name,
@ -457,6 +457,7 @@ static map<wint_t, action> g_input_actions {
{KEY (BACKSPACE), ACTION_INPUT_B_DELETE}, {KEY (DC), ACTION_INPUT_DELETE}, {KEY (BACKSPACE), ACTION_INPUT_B_DELETE}, {KEY (DC), ACTION_INPUT_DELETE},
{CTRL ('U'), ACTION_INPUT_B_KILL_LINE}, {CTRL ('U'), ACTION_INPUT_B_KILL_LINE},
{CTRL ('K'), ACTION_INPUT_KILL_LINE}, {CTRL ('K'), ACTION_INPUT_KILL_LINE},
{CTRL ('V'), ACTION_INPUT_QUOTED_INSERT},
{CTRL ('B'), ACTION_INPUT_BACKWARD}, {KEY (LEFT), ACTION_INPUT_BACKWARD}, {CTRL ('B'), ACTION_INPUT_BACKWARD}, {KEY (LEFT), ACTION_INPUT_BACKWARD},
{CTRL ('F'), ACTION_INPUT_FORWARD}, {KEY (RIGHT), ACTION_INPUT_FORWARD}, {CTRL ('F'), ACTION_INPUT_FORWARD}, {KEY (RIGHT), ACTION_INPUT_FORWARD},
{CTRL ('A'), ACTION_INPUT_BEGINNING}, {KEY (HOME), ACTION_INPUT_BEGINNING}, {CTRL ('A'), ACTION_INPUT_BEGINNING}, {KEY (HOME), ACTION_INPUT_BEGINNING},
@ -532,6 +533,7 @@ static struct {
const wchar_t *editor; ///< Prompt string for editing const wchar_t *editor; ///< Prompt string for editing
wstring editor_line; ///< Current user input wstring editor_line; ///< Current user input
int editor_cursor = 0; ///< Cursor position int editor_cursor = 0; ///< Cursor position
bool editor_inserting; ///< Inserting a literal character
void (*editor_on_change) (); ///< Callback on editor change void (*editor_on_change) (); ///< Callback on editor change
void (*editor_on_confirm) (); ///< Callback on editor confirmation void (*editor_on_confirm) (); ///< Callback on editor confirmation
@ -1188,7 +1190,12 @@ fun move_towards_spacing (int diff) -> bool {
} }
fun handle_editor (wint_t c) { fun handle_editor (wint_t c) {
auto i = g_input_actions.find (c); auto i = g_input_actions.find (g.editor_inserting ? WEOF : c);
if (g.editor_inserting) {
(void) halfdelay (1);
g.editor_inserting = false;
}
switch (i == g_input_actions.end () ? ACTION_NONE : i->second) { switch (i == g_input_actions.end () ? ACTION_NONE : i->second) {
case ACTION_INPUT_CONFIRM: case ACTION_INPUT_CONFIRM:
if (g.editor_on_confirm) if (g.editor_on_confirm)
@ -1198,6 +1205,7 @@ fun handle_editor (wint_t c) {
g.editor = 0; g.editor = 0;
g.editor_line.clear (); g.editor_line.clear ();
g.editor_cursor = 0; g.editor_cursor = 0;
g.editor_inserting = false;
g.editor_on_change = nullptr; g.editor_on_change = nullptr;
g.editor_on_confirm = nullptr; g.editor_on_confirm = nullptr;
break; break;
@ -1239,6 +1247,10 @@ fun handle_editor (wint_t c) {
case ACTION_INPUT_KILL_LINE: case ACTION_INPUT_KILL_LINE:
g.editor_line.erase (g.editor_cursor); g.editor_line.erase (g.editor_cursor);
break; break;
case ACTION_INPUT_QUOTED_INSERT:
(void) raw ();
g.editor_inserting = true;
break;
default: default:
if (c & (ALT | SYM)) { if (c & (ALT | SYM)) {
beep (); beep ();