mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-03-18 20:39:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add option to not move to next entry on select (#713)

Browse source
This commit is contained in:
FriendlyNeighborhoodShane 2020-08-30 05:25:08 +05:30 • committed by Arun Prakash Jana
parent 279f36f628
commit a8afbf89d5
No known key found for this signature in database
GPG key ID: A75979F35C080412
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nnn.1
View file

@ -18,6 +18,7 @@
.Op Ar -F .Op Ar -F
.Op Ar -g .Op Ar -g
.Op Ar -H .Op Ar -H
.Op Ar -J
.Op Ar -K .Op Ar -K
.Op Ar -l .Op Ar -l
.Op Ar -n .Op Ar -n
@ -95,6 +96,9 @@ supports the following options:
.Fl H .Fl H
show hidden files show hidden files
.Pp .Pp
.Fl J
disable auto-proceed on select
.Pp
.Fl K .Fl K
test for keybind collision test for keybind collision
.Pp .Pp

9
src/nnn.c
View file

@ -314,6 +314,7 @@ typedef struct {
uint selmode : 1; /* Set when selecting files */ uint selmode : 1; /* Set when selecting files */
uint oldcolor : 1; /* Show dirs in context colors */ uint oldcolor : 1; /* Show dirs in context colors */
uint reserved : 14; uint reserved : 14;
uint stayonsel : 1; /* Disable auto-proceed on select */
} runstate; } runstate;
/* Contexts or workspaces */ /* Contexts or workspaces */
@ -6461,7 +6462,7 @@ nochange:
else else
#endif #endif
/* move cursor to the next entry if this is not the last entry */ /* move cursor to the next entry if this is not the last entry */
if (!g_state.picker && cur != ndents - 1) if (!g_state.stayonsel && !g_state.picker && cur != ndents - 1)
move_cursor((cur + 1) % ndents, 0); move_cursor((cur + 1) % ndents, 0);
break; break;
case SEL_SELMUL: case SEL_SELMUL:
@ -7256,6 +7257,7 @@ static void usage(void)
" -F show fortune\n" " -F show fortune\n"
" -g regex filters [default: string]\n" " -g regex filters [default: string]\n"
" -H show hidden files\n" " -H show hidden files\n"
" -J no auto-proceed on select\n"
" -K detect key collision\n" " -K detect key collision\n"
" -l val set scroll lines\n" " -l val set scroll lines\n"
" -n type-to-nav mode\n" " -n type-to-nav mode\n"
@ -7417,7 +7419,7 @@ int main(int argc, char *argv[])
while ((opt = (env_opts_id > 0 while ((opt = (env_opts_id > 0
? env_opts[--env_opts_id] ? env_opts[--env_opts_id]
: getopt(argc, argv, "aAb:cCdeEfFgHKl:nop:P:QrRs:St:T:uVwxh"))) != -1) { : getopt(argc, argv, "aAb:cCdeEfFgHJKl:nop:P:QrRs:St:T:uVwxh"))) != -1) {
switch (opt) { switch (opt) {
#ifndef NOFIFO #ifndef NOFIFO
case 'a': case 'a':
@ -7462,6 +7464,9 @@ int main(int argc, char *argv[])
case 'H': case 'H':
cfg.showhidden = 1; cfg.showhidden = 1;
break; break;
case 'J':
g_state.stayonsel = 1;
break;
case 'K': case 'K':
check_key_collision(); check_key_collision();
return EXIT_SUCCESS; return EXIT_SUCCESS;