nnn

commit 93ca773c594f3f1da81f8ccba3766184b982d35d
parent 2dccb94f3fc0736e6c68e43ce6375368c1cd09a0
Author: Arun Prakash Jana <engineerarun@gmail.com>
Date:   Wed, 17 Mar 2021 23:06:08 +0530

Resurrect current/sel prompt

Diffstat:
M
misc/auto-completion/bash/nnn-completion.bash
 | 
1
+
M
misc/auto-completion/fish/nnn.fish
 | 
1
+
M
misc/auto-completion/zsh/_nnn
 | 
1
+
M
nnn.1
 | 
4
++++
M
src/nnn.c
 | 
29
+++++++++++++++++++++++------

5 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/misc/auto-completion/bash/nnn-completion.bash b/misc/auto-completion/bash/nnn-completion.bash
@@ -39,6 +39,7 @@ _nnn ()
         -S
         -t
         -T
+        -u
         -U
         -V
         -w
diff --git a/misc/auto-completion/fish/nnn.fish b/misc/auto-completion/fish/nnn.fish
@@ -38,6 +38,7 @@ complete -c nnn -s s -r -d 'load session by name' -x -a '@\t"last session" (ls $
 complete -c nnn -s S    -d 'persistent session'
 complete -c nnn -s t -r -d 'timeout in seconds to lock'
 complete -c nnn -s T -r -d 'a d e r s t v'
+complete -c nnn -s u    -d 'use selection (no prompt)'
 complete -c nnn -s U    -d 'show user and group'
 complete -c nnn -s V    -d 'show program version and exit'
 complete -c nnn -s w    -d 'hardware cursor mode'
diff --git a/misc/auto-completion/zsh/_nnn b/misc/auto-completion/zsh/_nnn
@@ -36,6 +36,7 @@ args=(
     '(-S)-S[persistent session]'
     '(-t)-t[timeout to lock]:seconds'
     '(-T)-T[a d e r s t v]:key'
+    '(-u)-u[use selection (no prompt)]'
     '(-U)-U[show user and group]'
     '(-V)-V[show program version and exit]'
     '(-w)-C[hardware cursor mode]'
diff --git a/nnn.1 b/nnn.1
@@ -32,6 +32,7 @@
 .Op Ar -S
 .Op Ar -t secs
 .Op Ar -T key
+.Op Ar -u
 .Op Ar -U
 .Op Ar -V
 .Op Ar -w
@@ -144,6 +145,9 @@ supports the following options:
         sort order
         keys: 'a'u / 'd'u / 'e'xtension / 'r'everse / 's'ize / 't'ime / 'v'ersion
 .Pp
+.Fl u
+        use selection if available, don't prompt to choose between selection and hovered entry
+.Pp
 .Fl U
         show user and group names in status bar
 .Pp
diff --git a/src/nnn.c b/src/nnn.c
@@ -295,7 +295,8 @@ typedef struct {
 	uint_t reserved1  : 1;
 	/* The following settings are global */
 	uint_t curctx     : 3;  /* Current context number */
-	uint_t reserved2  : 2;
+	uint_t prefersel  : 1;  /* Prefer selection over current, if exists */
+	uint_t reserved2  : 1;
 	uint_t nonavopen  : 1;  /* Open file on right arrow or `l` */
 	uint_t autoselect : 1;  /* Auto-select dir in type-to-nav mode */
 	uint_t cursormode : 1;  /* Move hardware cursor with selection */
@@ -372,6 +373,7 @@ static settings cfg = {
 	0, /* version */
 	0, /* reserved1 */
 	0, /* curctx */
+	0, /* prefersel */
 	0, /* reserved2 */
 	0, /* nonavopen */
 	1, /* autoselect */
@@ -524,7 +526,7 @@ static char * const utils[] = {
 #define MSG_FAILED 5
 #define MSG_SSN_NAME 6
 #define MSG_CP_MV_AS 7
-#define MSG_NOCHNAGE 8
+#define MSG_CUR_SEL_OPTS 8
 #define MSG_FORCE_RM 9
 #define MSG_LIMIT 10
 #define MSG_NEW_OPTS 11
@@ -558,8 +560,9 @@ static char * const utils[] = {
 #define MSG_FIRST 39
 #define MSG_RM_TMP 40
 #define MSG_INVALID_KEY 41
+#define MSG_NOCHANGE 42
 #ifndef DIR_LIMITED_SELECTION
-#define MSG_DIR_CHANGED 42 /* Must be the last entry */
+#define MSG_DIR_CHANGED 43 /* Must be the last entry */
 #endif
 
 static const char * const messages[] = {
@@ -571,7 +574,7 @@ static const char * const messages[] = {
 	"failed!",
 	"session name: ",
 	"'c'p / 'm'v as?",
-	"unchanged",
+	"'c'urrent / 's'el?",
 	"rm -rf %s file%s? [Esc cancels]",
 	"limit exceeded",
 	"'f'ile / 'd'ir / 's'ym / 'h'ard?",
@@ -605,6 +608,7 @@ static const char * const messages[] = {
 	"first file (\')/char?",
 	"remove tmp file?",
 	"invalid key",
+	"unchanged",
 #ifndef DIR_LIMITED_SELECTION
 	"dir changed, range sel off", /* Must be the last entry */
 #endif
@@ -1222,6 +1226,15 @@ static int get_input(const char *prompt)
 
 static int get_cur_or_sel(void)
 {
+	if (selbufpos && ndents) {
+		if (cfg.prefersel)
+			return 's';
+
+		int choice = get_input(messages[MSG_CUR_SEL_OPTS]);
+
+		return ((choice == 'c' || choice == 's') ? choice : 0);
+	}
+
 	if (selbufpos)
 		return 's';
 
@@ -5578,7 +5591,7 @@ static bool set_time_type(int *presel)
 
 			ret = TRUE;
 		} else
-			r = MSG_NOCHNAGE;
+			r = MSG_NOCHANGE;
 	} else
 		r = MSG_INVALID_KEY;
 
@@ -7428,6 +7441,7 @@ static void usage(void)
 #endif
 		" -t secs timeout to lock\n"
 		" -T key  sort order [a/d/e/r/s/t/v]\n"
+		" -u      use selection (no prompt)\n"
 #ifndef NOUG
 		" -U      show user and group\n"
 #endif
@@ -7584,7 +7598,7 @@ int main(int argc, char *argv[])
 
 	while ((opt = (env_opts_id > 0
 		       ? env_opts[--env_opts_id]
-		       : getopt(argc, argv, "aAb:cCdDeEfFgHJKl:nop:P:QrRs:St:T:UVwxh"))) != -1) {
+		       : getopt(argc, argv, "aAb:cCdDeEfFgHJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
 		switch (opt) {
 #ifndef NOFIFO
 		case 'a':
@@ -7700,6 +7714,9 @@ int main(int argc, char *argv[])
 			if (env_opts_id < 0)
 				sort = (uchar_t)optarg[0];
 			break;
+		case 'u':
+			cfg.prefersel = 1;
+			break;
 		case 'U':
 			g_state.uidgid = 1;
 			break;