Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add cmdline and runtime options to not move to next entry after select key #713

Merged
merged 1 commit into from
Aug 29, 2020
Merged

Add cmdline and runtime options to not move to next entry after select key #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions nnn.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
.Op Ar -F
.Op Ar -g
.Op Ar -H
.Op Ar -j
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make this capital J. So far I am using the capital to disable things.

.Op Ar -K
.Op Ar -l
.Op Ar -n
Expand Down Expand Up @@ -95,6 +96,9 @@ supports the following options:
.Fl H
show hidden files
.Pp
.Fl j
disable auto-proceed on select
.Pp
.Fl K
test for keybind collision
.Pp
Expand Down
9 changes: 7 additions & 2 deletions src/nnn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ typedef struct {
uint selmode : 1; /* Set when selecting files */
uint oldcolor : 1; /* Show dirs in context colors */
uint reserved : 14;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@FriendlyNeighborhoodShane we should have made the reserved field 13 bits in width. We both missed this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops. haha. Thanks for informing me about this, didn't even realise that was futureproof padding at the end of the struct.

I'm no C veteran, but I think both experienced and new hackers would benefit from a comment explicitly stating its purpose there.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. we should have a comment.

uint stayonsel : 1; /* Disable auto-proceed on select */
} runstate;

/* Contexts or workspaces */
Expand Down Expand Up @@ -6453,7 +6454,7 @@ static bool browse(char *ipath, const char *session, int pkey)
else
#endif
/* 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);
break;
case SEL_SELMUL:
Expand Down Expand Up @@ -7248,6 +7249,7 @@ static void usage(void)
" -F show fortune\n"
" -g regex filters [default: string]\n"
" -H show hidden files\n"
" -j disable auto-proceed on select"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

no auto-proceed on select

saves a few bytes.

" -K detect key collision\n"
" -l val set scroll lines\n"
" -n type-to-nav mode\n"
Expand Down Expand Up @@ -7409,7 +7411,7 @@ int main(int argc, char *argv[])

while ((opt = (env_opts_id > 0
? 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) {
#ifndef NOFIFO
case 'a':
Expand Down Expand Up @@ -7454,6 +7456,9 @@ int main(int argc, char *argv[])
case 'H':
cfg.showhidden = 1;
break;
case 'j':
g_state.stayonsel = 1;
break;
case 'K':
check_key_collision();
return EXIT_SUCCESS;
Expand Down