Remove option -w: always place HW cursor on current entry

This commit is contained in:
Arun Prakash Jana 2021-10-22 06:42:42 +05:30
parent 00c73512b9
commit cb5aefa59a
No known key found for this signature in database
GPG Key ID: A75979F35C080412
7 changed files with 12 additions and 23 deletions

View File

@ -42,7 +42,6 @@ _nnn ()
-u
-U
-V
-w
-x
-h
)

View File

@ -41,6 +41,5 @@ 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'
complete -c nnn -s x -d 'notis, sel to system clipboard, xterm title'
complete -c nnn -s h -d 'show program help'

View File

@ -39,7 +39,6 @@ args=(
'(-u)-u[use selection (no prompt)]'
'(-U)-U[show user and group]'
'(-V)-V[show program version and exit]'
'(-w)-C[hardware cursor mode]'
'(-x)-x[notis, sel to system clipboard, xterm title]'
'(-h)-h[show program help]'
'*:filename:_files'

5
nnn.1
View File

@ -6,7 +6,7 @@
.Nd The unorthodox terminal file manager.
.Sh SYNOPSIS
.Nm
.Op Ar -aAcCdDeEfgHJKnQrRSuUVwxh
.Op Ar -aAcCdDeEfgHJKnQrRSuUVxh
.Op Ar -b key
.Op Ar -F val
.Op Ar -l val
@ -141,9 +141,6 @@ supports the following options:
.Fl V
show version and exit
.Pp
.Fl w
place hardware cursor on hovered entry
.Pp
.Fl x
show notis on selection cp, mv, rm completion
copy path to system clipboard on select

View File

@ -189,8 +189,8 @@ index 897c32f1..00b57c2e 100644
while ((opt = (env_opts_id > 0
? env_opts[--env_opts_id]
- : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
+ : getopt(argc, argv, "aAb:cCdDeEfF:gGHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
- : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) {
+ : getopt(argc, argv, "aAb:cCdDeEfF:gGHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) {
switch (opt) {
#ifndef NOFIFO
case 'a':

View File

@ -193,8 +193,8 @@ index 5801e28e..8a88d5e7 100644
while ((opt = (env_opts_id > 0
? env_opts[--env_opts_id]
- : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
+ : getopt(argc, argv, "aAb:cCdDeEfF:gGHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
- : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) {
+ : getopt(argc, argv, "aAb:cCdDeEfF:gGHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) {
switch (opt) {
#ifndef NOFIFO
case 'a':

View File

@ -332,9 +332,9 @@ typedef struct {
uint_t fileinfo : 1; /* Show file information on hover */
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 */
uint_t reserved2 : 1;
uint_t useeditor : 1; /* Use VISUAL to open text files */
uint_t reserved2 : 3;
uint_t reserved3 : 3;
uint_t regex : 1; /* Use regex filters */
uint_t x11 : 1; /* Copy to system clipboard, show notis, xterm title */
uint_t timetype : 2; /* Time sort type (0: access, 1: change, 2: modification) */
@ -412,9 +412,9 @@ static settings cfg = {
0, /* fileinfo */
0, /* nonavopen */
1, /* autoselect */
0, /* cursormode */
0, /* useeditor */
0, /* reserved2 */
0, /* useeditor */
0, /* reserved3 */
0, /* regex */
0, /* x11 */
2, /* timetype (T_MOD) */
@ -6263,9 +6263,8 @@ static void statusbar(char *path)
}
attroff(COLOR_PAIR(cfg.curctx + 1));
if (cfg.cursormode)
tocursor();
/* Plase HW cursor on current for Braille systems */
tocursor();
}
static inline void markhovered(void)
@ -8074,7 +8073,6 @@ static void usage(void)
" -U show user and group\n"
#endif
" -V show version\n"
" -w place HW cursor on hovered\n"
#ifndef NOX11
" -x notis, selection sync, xterm title\n"
#endif
@ -8236,7 +8234,7 @@ int main(int argc, char *argv[])
while ((opt = (env_opts_id > 0
? env_opts[--env_opts_id]
: getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
: getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) {
switch (opt) {
#ifndef NOFIFO
case 'a':
@ -8370,9 +8368,6 @@ int main(int argc, char *argv[])
case 'V':
dprintf(STDOUT_FILENO, "%s\n", VERSION);
return EXIT_SUCCESS;
case 'w':
cfg.cursormode = 1;
break;
case 'x':
cfg.x11 = 1;
break;