aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Arun Prakash Jana <engineerarun@gmail.com>2017-04-10 18:35:30 +0530
committerGravatar Arun Prakash Jana <engineerarun@gmail.com>2017-04-10 18:35:30 +0530
commitf2a5002fa9a76b23092e40756f802fc8a31eb0b4 (patch)
tree6a88925e30e9b2ed252751a42b9cdfdd0381427e
parenta569d383bcbdde97565b32cbc40bb6e9fc24b70a (diff)
downloadnnn-f2a5002fa9a76b23092e40756f802fc8a31eb0b4.tar.gz
Toggle help and file details screens with same key
-rw-r--r--README.md4
-rw-r--r--nnn.14
-rw-r--r--nnn.c20
3 files changed, 12 insertions, 16 deletions
diff --git a/README.md b/README.md
index e481ee4..9a3ea45 100644
--- a/README.md
+++ b/README.md
@@ -149,7 +149,7 @@ Start nnn (default: current directory):
| `/`, `&` | Filter dir contents |
| `c` | Show change dir prompt |
| `d` | Toggle detail view |
-| `D` | Show details of selected file |
+| `D` | Toggle current file details screen |
| `.` | Toggle hide .dot files |
| `s` | Toggle sort by file size |
| `S` | Toggle disk usage analyzer mode |
@@ -160,7 +160,7 @@ Start nnn (default: current directory):
| `p` | Open entry in `PAGER` (fallback less) |
| `^K` | Invoke file name copier |
| `^L` | Force a redraw |
-| `?` | Show help |
+| `?` | Toggle help screen |
| `q` | Quit |
### Filters
diff --git a/nnn.1 b/nnn.1
index 9a277f5..85acf11 100644
--- a/nnn.1
+++ b/nnn.1
@@ -49,7 +49,7 @@ Change into the given directory
.It Ic d
Toggle detail view
.It Ic D
-Show details of selected file
+Toggle current file details screen
.It Ic \&.
Toggle hide .dot files
.It Ic s
@@ -71,7 +71,7 @@ Invoke file name copier
.It Ic ^L
Force a redraw
.It Ic \&?
-Show help
+Toggle help screen
.It Ic q
Quit
.El
diff --git a/nnn.c b/nnn.c
index 1eb9393..d45e445 100644
--- a/nnn.c
+++ b/nnn.c
@@ -877,11 +877,9 @@ show_stats(char* fpath, char* fname, struct stat *sb)
}
/* Show exit keys */
- printw("\n\n << (q/Esc)");
-
- for (*buf = getch(); *buf != 'q' && *buf != 27; *buf = getch())
- if (*buf == 'q' || *buf == 27)
- return;
+ printw("\n\n << (D)");
+ while ((*buf = getch()) != 'D');
+ return;
}
static void
@@ -906,7 +904,7 @@ show_help(void)
/, & Filter dir contents\n\
c Show change dir prompt\n\
d Toggle detail view\n\
- D Show details of selected file\n\
+ D Toggle current file details screen\n\
. Toggle hide .dot files\n\
s Toggle sort by file size\n\
S Toggle disk usage analyzer mode\n\
@@ -917,15 +915,13 @@ show_help(void)
p Open entry in PAGER (fallback less)\n\
^K Invoke file name copier\n\
^L Force a redraw\n\
- ? Show help\n\
+ ? Toggle help screen\n\
q Quit\n");
/* Show exit keys */
- printw("\n\n << (q/Esc)");
-
- for (c = getch(); c != 'q' && c != 27; c = getch())
- if (c == 'q' || c == 27)
- return;
+ printw("\n\n << (?)");
+ while ((c = getch()) != '?');
+ return;
}
static int