From f4f1acf856b3e2c6aa174efc243e9f9e33e15e3b Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Tue, 20 Aug 2019 20:00:48 +0530 Subject: [PATCH] Remove wild load option --- README.md | 11 ++--- misc/auto-completion/bash/nnn-completion.bash | 1 - misc/auto-completion/fish/nnn.fish | 1 - misc/auto-completion/zsh/_nnn | 1 - nnn.1 | 6 --- src/nnn.c | 44 +++++-------------- src/nnn.h | 3 -- 7 files changed, 14 insertions(+), 53 deletions(-) diff --git a/README.md b/README.md index bab48c48..1f8753b4 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ Visit the **[Wiki](https://github.com/jarun/nnn/wiki)** for how tos, use cases, - Disk usage analyzer (block/apparent) - File picker, (neo)vim plugin - Navigation - - *Navigate-as-you-type* with dir auto-select, *wild load* + - *Navigate-as-you-type* with dir auto-select - 4 contexts (_aka_ tabs/workspaces) - Bookmarks; pin and visit a directory - Familiar, easy shortcuts (arrows, ~, -, @) @@ -209,7 +209,7 @@ Option completion scripts for Bash, Fish and Zsh can be found in respective subd ``` usage: nnn [-b key] [-d] [-e] [-H] [-i] [-n] [-o] - [-p file] [-s] [-S] [-t] [-v] [-w] [-h] [PATH] + [-p file] [-s] [-S] [-t] [-v] [-h] [PATH] The missing terminal file manager for X. @@ -229,7 +229,6 @@ optional args: -S du mode -t disable dir auto-select -v show version - -w wild load -h show help ``` @@ -262,8 +261,8 @@ Press ? in `nnn` to see the list anytime. ^F Extract archive F List archive e Edit in EDITOR p Open in PAGER ORDER TOGGLES - ^J du E Extn S Apparent du - ^W Random s Size t Time modified + ^J du S Apparent du + s Size E Extn t Time modified MISC ! ^] Shell L Lock C Execute entry R ^V Pick plugin xK Run plugin key K @@ -374,8 +373,6 @@ When there's a unique match and it's a directory, `nnn` auto selects the directo This mode takes navigation to the next level when short, unique keypress sequences are possible. For example, to reach `nnn` development directory (located at `~/GitHub/nnn`) from my `$HOME` (which is the default directory the terminal starts in), I use the sequence gn. -The **_wild load_** option can be extremely handy for users who use this mode constantly. The entries are unsorted when the directory loads. Applying filters sorts the entries (with directories on top). Directory color is disabled in this mode. - #### File indicators The following indicators are used in the detail view: diff --git a/misc/auto-completion/bash/nnn-completion.bash b/misc/auto-completion/bash/nnn-completion.bash index cb5f12e1..cf590840 100644 --- a/misc/auto-completion/bash/nnn-completion.bash +++ b/misc/auto-completion/bash/nnn-completion.bash @@ -23,7 +23,6 @@ _nnn () { -S -t -v - -w -h ) if [[ $prev == -b ]]; then diff --git a/misc/auto-completion/fish/nnn.fish b/misc/auto-completion/fish/nnn.fish index a53478f2..5ec9cd58 100644 --- a/misc/auto-completion/fish/nnn.fish +++ b/misc/auto-completion/fish/nnn.fish @@ -17,5 +17,4 @@ complete -c nnn -s s -d 'use substring match for filters' complete -c nnn -s S -d 'start in disk usage analyzer mode' complete -c nnn -s t -d 'disable dir auto-select' complete -c nnn -s v -d 'show program version and exit' -complete -c nnn -s w -d 'wild load' complete -c nnn -s h -d 'show program help' diff --git a/misc/auto-completion/zsh/_nnn b/misc/auto-completion/zsh/_nnn index 269bd8f1..3bb3ff8a 100644 --- a/misc/auto-completion/zsh/_nnn +++ b/misc/auto-completion/zsh/_nnn @@ -21,7 +21,6 @@ args=( '(-S)-S[start in disk usage analyzer mode]' '(-t)-t[disable dir auto-select]' '(-v)-v[show program version and exit]' - '(-w)-w[wild load]' '(-h)-h[show program help]' '*:filename:_files' ) diff --git a/nnn.1 b/nnn.1 index a620d082..86af3788 100644 --- a/nnn.1 +++ b/nnn.1 @@ -16,7 +16,6 @@ .Op Ar -s .Op Ar -S .Op Ar -v -.Op Ar -w .Op Ar -h .Op Ar PATH .Sh DESCRIPTION @@ -73,9 +72,6 @@ supports the following options: .Fl v show version and exit .Pp -.Fl w - wild load - entries unsorted on directory load -.Pp .Fl h show program help and exit .Sh CONFIGURATION @@ -124,8 +120,6 @@ In the \fInavigate-as-you-type\fR mode directories are opened in filter mode, allowing continuous navigation. Works best with the \fBarrow keys\fR. .br When there's a unique match and it's a directory, `nnn` auto selects the directory and enters it in this mode. -.br -The \fIwild load\fR option can be extremely handy for users who use the \fInavigate-as-you-type\fR mode constantly. The entries are unsorted when the directory loads. Applying filters sorts the entries (with directories on top). Directory color is disabled in this mode. .Sh SELECTION Use \fI^K\fR to select the file under the cursor. .Pp diff --git a/src/nnn.c b/src/nnn.c index 6a4840d3..3458c224 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -215,7 +215,7 @@ typedef struct { uint copymode : 1; /* Set when copying files */ uint showdetail : 1; /* Clear to show fewer file info */ uint ctxactive : 1; /* Context active or not */ - uint reserved : 7; + uint reserved : 8; /* The following settings are global */ uint curctx : 2; /* Current context number */ uint dircolor : 1; /* Current status of dir color */ @@ -228,7 +228,6 @@ typedef struct { uint runplugin : 1; /* Choose plugin mode */ uint runctx : 2; /* The context in which plugin is to be run */ uint filter_re : 1; /* Use regex filters */ - uint wild : 1; /* Do not sort entries on dir load */ uint trash : 1; /* Move removed files to trash */ } settings; @@ -268,7 +267,6 @@ static settings cfg = { 0, /* runplugin */ 0, /* runctx */ 1, /* filter_re */ - 0, /* wild */ 0, /* trash */ }; @@ -2843,8 +2841,8 @@ static bool show_help(const char *path) "b^F Extract archive F List archive\n" "ce Edit in EDITOR p Open in PAGER\n" "1ORDER TOGGLES\n" - "b^J du E Extn S Apparent du\n" - "b^W Random s Size t Time modified\n" + "b^J du S Apparent du\n" + "cs Size E Extn t Time modified\n" "1MISC\n" "9! ^] Shell L Lock C Execute entry\n" "9R ^V Pick plugin xK Run plugin key K\n" @@ -3167,8 +3165,7 @@ static void populate(char *path, char *lastname) if (!ndents) return; - if (!cfg.wild) - qsort(dents, ndents, sizeof(*dents), entrycmp); + qsort(dents, ndents, sizeof(*dents), entrycmp); #ifdef DBGMODE clock_gettime(CLOCK_REALTIME, &ts2); @@ -3285,10 +3282,8 @@ static void redraw(char *path) } else ncols -= 5; - if (!cfg.wild) { - attron(COLOR_PAIR(cfg.curctx + 1) | A_BOLD); - cfg.dircolor = 1; - } + attron(COLOR_PAIR(cfg.curctx + 1) | A_BOLD); + cfg.dircolor = 1; /* Print listing */ for (i = curscroll; i < ndents && i < curscroll + onscreen; ++i) { @@ -3841,8 +3836,7 @@ nochange: case SEL_ASIZE: // fallthrough case SEL_BSIZE: // fallthrough case SEL_EXTN: // fallthrough - case SEL_MTIME: // fallthrough - case SEL_WILD: + case SEL_MTIME: switch (sel) { case SEL_MFLTR: cfg.filtermode ^= 1; @@ -3869,7 +3863,6 @@ nochange: cfg.blkorder = 0; cfg.extnorder = 0; cfg.copymode = 0; - cfg.wild = 0; break; case SEL_ASIZE: cfg.apparentsz ^= 1; @@ -3896,7 +3889,6 @@ nochange: cfg.sizeorder = 0; cfg.extnorder = 0; cfg.copymode = 0; - cfg.wild = 0; break; case SEL_EXTN: cfg.extnorder ^= 1; @@ -3905,27 +3897,15 @@ nochange: cfg.apparentsz = 0; cfg.blkorder = 0; cfg.copymode = 0; - cfg.wild = 0; break; - case SEL_MTIME: + default: /* SEL_MTIME */ cfg.mtimeorder ^= 1; cfg.sizeorder = 0; cfg.apparentsz = 0; cfg.blkorder = 0; cfg.extnorder = 0; cfg.copymode = 0; - cfg.wild = 0; break; - default: /* SEL_WILD */ - cfg.wild ^= 1; - cfg.mtimeorder = 0; - cfg.sizeorder = 0; - cfg.apparentsz = 0; - cfg.blkorder = 0; - cfg.extnorder = 0; - cfg.copymode = 0; - setdirwatch(); - goto nochange; } /* Save current */ @@ -4577,7 +4557,7 @@ static void usage(void) { fprintf(stdout, "%s: nnn [-b key] [-d] [-e] [-H] [-i] [-n] [-o]\n" - " [-p file] [-s] [-S] [-t] [-v] [-w] [-h] [PATH]\n\n" + " [-p file] [-s] [-S] [-t] [-v] [-h] [PATH]\n\n" "The missing terminal file manager for X.\n\n" "positional args:\n" " PATH start dir [default: current dir]\n\n" @@ -4594,7 +4574,6 @@ static void usage(void) " -S du mode\n" " -t disable dir auto-select\n" " -v show version\n" - " -w wild load\n" " -h show help\n\n" "v%s\n%s\n", __func__, VERSION, GENERAL_INFO); } @@ -4725,7 +4704,7 @@ int main(int argc, char *argv[]) char *arg = NULL; int opt; - while ((opt = getopt(argc, argv, "HSib:denop:stvwh")) != -1) { + while ((opt = getopt(argc, argv, "HSib:denop:stvh")) != -1) { switch (opt) { case 'S': cfg.blkorder = 1; @@ -4781,9 +4760,6 @@ int main(int argc, char *argv[]) case 'v': fprintf(stdout, "%s\n", VERSION); return _SUCCESS; - case 'w': - cfg.wild = 1; - break; case 'h': usage(); return _SUCCESS; diff --git a/src/nnn.h b/src/nnn.h index 75143741..e236e32e 100644 --- a/src/nnn.h +++ b/src/nnn.h @@ -74,7 +74,6 @@ enum action { SEL_BSIZE, /* block size */ SEL_EXTN, /* order by extension */ SEL_MTIME, - SEL_WILD, SEL_REDRAW, SEL_SEL, SEL_SELMUL, @@ -199,8 +198,6 @@ static struct key bindings[] = { { 'E', SEL_EXTN }, /* Toggle sort by time */ { 't', SEL_MTIME }, - /* Wild load */ - { CONTROL('W'), SEL_WILD }, /* Redraw window */ { CONTROL('L'), SEL_REDRAW }, /* Copy currently selected file path */