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

Clean up

This commit is contained in:
Přemysl Eric Janouch 2021-10-30 12:13:45 +02:00
parent aeffe40efc
commit 050f875c47
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sdn.cpp
View File

@ -543,7 +543,6 @@ static struct {
int editor_cursor = 0; ///< Cursor position int editor_cursor = 0; ///< Cursor position
bool editor_inserting; ///< Inserting a literal character 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
map<action, void (*) ()> editor_on; ///< Handlers for custom actions map<action, void (*) ()> editor_on; ///< Handlers for custom actions
enum { AT_CURSOR, AT_BAR, AT_CWD, AT_INPUT, AT_INFO, AT_CMDLINE, AT_COUNT }; enum { AT_CURSOR, AT_BAR, AT_CWD, AT_INPUT, AT_INFO, AT_CMDLINE, AT_COUNT };
@ -1249,8 +1248,8 @@ fun handle_editor (wint_t c) {
auto original = g.editor_line; auto original = g.editor_line;
switch (action) { switch (action) {
case ACTION_INPUT_CONFIRM: case ACTION_INPUT_CONFIRM:
if (g.editor_on_confirm) if (auto handler = g.editor_on[action])
g.editor_on_confirm (); handler ();
// Fall-through // Fall-through
case ACTION_INPUT_ABORT: case ACTION_INPUT_ABORT:
g.editor = 0; g.editor = 0;
@ -1259,7 +1258,6 @@ fun handle_editor (wint_t c) {
g.editor_cursor = 0; g.editor_cursor = 0;
g.editor_inserting = false; g.editor_inserting = false;
g.editor_on_change = nullptr; g.editor_on_change = nullptr;
g.editor_on_confirm = nullptr;
g.editor_on.clear (); g.editor_on.clear ();
return; return;
case ACTION_INPUT_BEGINNING: case ACTION_INPUT_BEGINNING:
@ -1411,7 +1409,7 @@ fun handle (wint_t c) -> bool {
case ACTION_CHDIR: case ACTION_CHDIR:
g.editor = L"chdir"; g.editor = L"chdir";
g.editor_on_confirm = [] { g.editor_on[ACTION_INPUT_CONFIRM] = [] {
change_dir (untilde (to_mb (g.editor_line))); change_dir (untilde (to_mb (g.editor_line)));
}; };
break; break;
@ -1427,10 +1425,10 @@ fun handle (wint_t c) -> bool {
case ACTION_SEARCH: case ACTION_SEARCH:
g.editor = L"search"; g.editor = L"search";
g.editor_on_change = [] { search_interactive (0); }; g.editor_on_change = [] { search_interactive (0); };
g.editor_on[ACTION_UP] = [] { search_interactive (-1); }; g.editor_on[ACTION_UP] = [] { search_interactive (-1); };
g.editor_on[ACTION_DOWN] = [] { search_interactive (+1); }; g.editor_on[ACTION_DOWN] = [] { search_interactive (+1); };
g.editor_on_confirm = [] { choose (at_cursor ()); }; g.editor_on[ACTION_INPUT_CONFIRM] = [] { choose (at_cursor ()); };
break; break;
case ACTION_RENAME_PREFILL: case ACTION_RENAME_PREFILL:
g.editor_line = to_wide (current.filename); g.editor_line = to_wide (current.filename);
@ -1438,7 +1436,7 @@ fun handle (wint_t c) -> bool {
// Fall-through // Fall-through
case ACTION_RENAME: case ACTION_RENAME:
g.editor = L"rename"; g.editor = L"rename";
g.editor_on_confirm = [] { g.editor_on[ACTION_INPUT_CONFIRM] = [] {
auto mb = to_mb (g.editor_line); auto mb = to_mb (g.editor_line);
if (rename (at_cursor ().filename.c_str (), mb.c_str ())) if (rename (at_cursor ().filename.c_str (), mb.c_str ()))
show_message (strerror (errno)); show_message (strerror (errno));
@ -1447,7 +1445,7 @@ fun handle (wint_t c) -> bool {
break; break;
case ACTION_MKDIR: case ACTION_MKDIR:
g.editor = L"mkdir"; g.editor = L"mkdir";
g.editor_on_confirm = [] { g.editor_on[ACTION_INPUT_CONFIRM] = [] {
if (mkdir (to_mb (g.editor_line).c_str (), 0777)) if (mkdir (to_mb (g.editor_line).c_str (), 0777))
show_message (strerror (errno)); show_message (strerror (errno));
reload (true); reload (true);