mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-24 20:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

option -p: pick last selected entry if no explicit select

Browse source
This commit is contained in:
Arun Prakash Jana 2018-11-24 00:40:03 +05:30
parent 6853487109
commit fb64e7e2dd
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 51 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
src/nnn.c
View file

@ -436,6 +436,7 @@ static void printerr(int linenum)
fprintf(stderr, "line %d: (%d) %s\n", linenum, errno, strerror(errno)); fprintf(stderr, "line %d: (%d) %s\n", linenum, errno, strerror(errno));
if (!cfg.picker && g_cppath[0]) if (!cfg.picker && g_cppath[0])
unlink(g_cppath); unlink(g_cppath);
free(pcopybuf);
exit(1); exit(1);
} }
@ -1264,15 +1265,15 @@ static char *xreadline(char *fname, char *prompt)
if (r != ERR) { if (r != ERR) {
if (r == OK) { if (r == OK) {
switch (*ch) { switch (*ch) {
case KEY_ENTER: //fallthrough case KEY_ENTER: // fallthrough
case '\n': //fallthrough case '\n': // fallthrough
case '\r': case '\r':
goto END; goto END;
case '\b': /* some old curses (e.g. rhel25) still send '\b' for backspace */ case '\b': /* some old curses (e.g. rhel25) still send '\b' for backspace */
if (pos > 0) { if (pos > 0) {
memmove(buf + pos - 1, buf + pos, (len - pos) << 2); memmove(buf + pos - 1, buf + pos, (len - pos) << 2);
--len, --pos; --len, --pos;
} //fallthrough } // fallthrough
case '\t': /* TAB breaks cursor position, ignore it */ case '\t': /* TAB breaks cursor position, ignore it */
continue; continue;
case CONTROL('L'): case CONTROL('L'):
@ -2719,9 +2720,9 @@ nochange:
case SEL_LEADER: case SEL_LEADER:
fd = get_input(NULL); fd = get_input(NULL);
switch (fd) { switch (fd) {
case 'q': //fallthrough case 'q': // fallthrough
case '~': //fallthrough case '~': // fallthrough
case '-': //fallthrough case '-': // fallthrough
case '&': case '&':
presel = fd; presel = fd;
goto nochange; goto nochange;
@ -2737,11 +2738,11 @@ nochange:
else else
do do
(r == 0) ? (r = MAX_CTX - 1) : --r; (r == 0) ? (r = MAX_CTX - 1) : --r;
while (!g_ctx[r].c_cfg.ctxactive); //fallthrough while (!g_ctx[r].c_cfg.ctxactive); // fallthrough
fd = '1' + r; //fallthrough fd = '1' + r; // fallthrough
case '1': //fallthrough case '1': // fallthrough
case '2': //fallthrough case '2': // fallthrough
case '3': //fallthrough case '3': // fallthrough
case '4': case '4':
r = fd - '1'; /* Save the next context id */ r = fd - '1'; /* Save the next context id */
if (cfg.curctx == r) if (cfg.curctx == r)
@ -3329,34 +3330,6 @@ nochange:
case SEL_LOCK: case SEL_LOCK:
spawn(utils[LOCKER], NULL, NULL, NULL, F_NORMAL | F_SIGINT); spawn(utils[LOCKER], NULL, NULL, NULL, F_NORMAL | F_SIGINT);
break; break;
case SEL_QUITCTX:
{
uint iter = 1;
r = cfg.curctx;
while (iter < MAX_CTX) {
(r == MAX_CTX - 1) ? (r = 0) : ++r;
if (g_ctx[r].c_cfg.ctxactive) {
g_ctx[cfg.curctx].c_cfg.ctxactive = 0;
/* Switch to next active context */
path = g_ctx[r].c_path;
ipath = g_ctx[r].c_init;
lastdir = g_ctx[r].c_last;
lastname = g_ctx[r].c_name;
cfg = g_ctx[r].c_cfg;
hfltr = g_ctx[r].c_fltr;
cfg.curctx = r;
setdirwatch();
goto begin;
}
++iter;
}
dentfree(dents);
return;
}
case SEL_CDQUIT: // fallthrough case SEL_CDQUIT: // fallthrough
case SEL_QUIT: case SEL_QUIT:
for (r = 0; r < MAX_CTX; ++r) for (r = 0; r < MAX_CTX; ++r)
@ -3381,6 +3354,37 @@ nochange:
fprintf(fp, "cd \"%s\"", path); fprintf(fp, "cd \"%s\"", path);
fclose(fp); fclose(fp);
} }
} // fallthrough
case SEL_QUITCTX:
if (sel == SEL_QUITCTX) {
uint iter = 1;
r = cfg.curctx;
while (iter < MAX_CTX) {
(r == MAX_CTX - 1) ? (r = 0) : ++r;
if (g_ctx[r].c_cfg.ctxactive) {
g_ctx[cfg.curctx].c_cfg.ctxactive = 0;
/* Switch to next active context */
path = g_ctx[r].c_path;
ipath = g_ctx[r].c_init;
lastdir = g_ctx[r].c_last;
lastname = g_ctx[r].c_name;
cfg = g_ctx[r].c_cfg;
hfltr = g_ctx[r].c_fltr;
cfg.curctx = r;
setdirwatch();
goto begin;
}
++iter;
}
}
if (cfg.picker && copybufpos == 0 && ndents) {
r = mkpath(path, dents[cur].name, newpath, PATH_MAX);
appendfpath(newpath, r);
writecp(newpath, r - 1);
} }
dentfree(dents); dentfree(dents);
@ -3582,11 +3586,17 @@ int main(int argc, char *argv[])
exitcurses(); exitcurses();
if (cfg.pickraw) { if (cfg.pickraw) {
opt = write(1, pcopybuf, copybufpos - 1); if (copybufpos) {
DPRINTF_D(opt); opt = write(1, pcopybuf, copybufpos - 1);
if (opt != (int)(copybufpos - 1))
fprintf(stderr, "%s\n", strerror(errno));
}
} else if (!cfg.picker && g_cppath[0]) } else if (!cfg.picker && g_cppath[0])
unlink(g_cppath); unlink(g_cppath);
/* Free the copy buffer */
free(pcopybuf);
#ifdef LINUX_INOTIFY #ifdef LINUX_INOTIFY
/* Shutdown inotify */ /* Shutdown inotify */
if (inotify_wd >= 0) if (inotify_wd >= 0)