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

Compare commits

base: p:aeffe40efcfe65e932b9b5c07ec0b6422162aa7b
Branches Tags
p:master
...
compare: p:916f354c9b77881a50f3874e706d714ccbdc7dd0
Branches Tags
p:master

2 Commits
aeffe40efc ... 916f354c9b

Author SHA1 Message Date
Přemysl Eric Janouch 916f354c9b
Move the cursor to just created directories 2021-10-30 12:32:40 +02:00
Přemysl Eric Janouch 050f875c47
Clean up 2021-10-30 12:13:45 +02:00
1 changed files with 18 additions and 14 deletions
Show Stats Expand all files Collapse all files

32
sdn.cpp
View File

@ -543,7 +543,6 @@ static struct {
int editor_cursor = 0; ///< Cursor position
bool editor_inserting; ///< Inserting a literal character
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
enum { AT_CURSOR, AT_BAR, AT_CWD, AT_INPUT, AT_INFO, AT_CMDLINE, AT_COUNT };
@ -829,8 +828,7 @@ fun at_cursor () -> const entry & {
return g.cursor >= int (g.entries.size ()) ? invalid : g.entries[g.cursor];
}
fun resort (const string anchor = at_cursor ().filename) {
sort (begin (g.entries), end (g.entries));
fun focus (const string &anchor) {
if (!anchor.empty ()) {
for (size_t i = 0; i < g.entries.size (); i++)
if (g.entries[i].filename == anchor)
@ -838,6 +836,11 @@ fun resort (const string anchor = at_cursor ().filename) {
}
}
fun resort (const string anchor = at_cursor ().filename) {
sort (begin (g.entries), end (g.entries));
focus (anchor);
}
fun reload (bool keep_anchor) {
g.unames.clear();
while (auto *ent = getpwent ())
@ -1249,8 +1252,8 @@ fun handle_editor (wint_t c) {
auto original = g.editor_line;
switch (action) {
case ACTION_INPUT_CONFIRM:
if (g.editor_on_confirm)
g.editor_on_confirm ();
if (auto handler = g.editor_on[action])
handler ();
// Fall-through
case ACTION_INPUT_ABORT:
g.editor = 0;
@ -1259,7 +1262,6 @@ fun handle_editor (wint_t c) {
g.editor_cursor = 0;
g.editor_inserting = false;
g.editor_on_change = nullptr;
g.editor_on_confirm = nullptr;
g.editor_on.clear ();
return;
case ACTION_INPUT_BEGINNING:
@ -1411,7 +1413,7 @@ fun handle (wint_t c) -> bool {
case ACTION_CHDIR:
g.editor = L"chdir";
g.editor_on_confirm = [] {
g.editor_on[ACTION_INPUT_CONFIRM] = [] {
change_dir (untilde (to_mb (g.editor_line)));
};
break;
@ -1427,10 +1429,10 @@ fun handle (wint_t c) -> bool {
case ACTION_SEARCH:
g.editor = L"search";
g.editor_on_change = [] { search_interactive (0); };
g.editor_on[ACTION_UP] = [] { search_interactive (-1); };
g.editor_on[ACTION_DOWN] = [] { search_interactive (+1); };
g.editor_on_confirm = [] { choose (at_cursor ()); };
g.editor_on_change = [] { search_interactive (0); };
g.editor_on[ACTION_UP] = [] { search_interactive (-1); };
g.editor_on[ACTION_DOWN] = [] { search_interactive (+1); };
g.editor_on[ACTION_INPUT_CONFIRM] = [] { choose (at_cursor ()); };
break;
case ACTION_RENAME_PREFILL:
g.editor_line = to_wide (current.filename);
@ -1438,7 +1440,7 @@ fun handle (wint_t c) -> bool {
// Fall-through
case ACTION_RENAME:
g.editor = L"rename";
g.editor_on_confirm = [] {
g.editor_on[ACTION_INPUT_CONFIRM] = [] {
auto mb = to_mb (g.editor_line);
if (rename (at_cursor ().filename.c_str (), mb.c_str ()))
show_message (strerror (errno));
@ -1447,10 +1449,12 @@ fun handle (wint_t c) -> bool {
break;
case ACTION_MKDIR:
g.editor = L"mkdir";
g.editor_on_confirm = [] {
if (mkdir (to_mb (g.editor_line).c_str (), 0777))
g.editor_on[ACTION_INPUT_CONFIRM] = [] {
auto mb = to_mb (g.editor_line);
if (mkdir (mb.c_str (), 0777))
show_message (strerror (errno));
reload (true);
focus (mb);
};
break;