Remove option to disable color

diff --git a/README.md b/README.md
index fc2c4d899823096eae98c23ddc78ffa0686a7f3d..3dbc27f173032720054a902244da9be1e6df67ba 100644 (file)
--- a/README.md
+++ b/README.md
@@ -219,7 +219,6 @@ positional args:
 
 optional args:
  -b key  open bookmark key
- -C      disable directory color
  -e      use exiftool for media info
  -i      nav-as-you-type mode
  -l      light mode

diff --git a/nnn.1 b/nnn.1
index a52ec59f034343f762cb79dc4e542ae62a6d494c..8bed5b1bc1850a15d5756912bba9ed4f8ce78eca 100644 (file)
--- a/nnn.1
+++ b/nnn.1
@@ -7,7 +7,6 @@
 .Sh SYNOPSIS
 .Nm
 .Op Ar -b key
-.Op Ar -C
 .Op Ar -e
 .Op Ar -i
 .Op Ar -l
@@ -174,9 +173,6 @@ supports the following options:
 .Fl "b key"
         specify bookmark key to open
 .Pp
-.Fl C
-        disable directory color
-.Pp
 .Fl e
         use exiftool instead of mediainfo
 .Pp

diff --git a/scripts/auto-completion/bash/nnn-completion.bash b/scripts/auto-completion/bash/nnn-completion.bash
index 7a265bc3c7c8e86a759dc7fb019f027d3de6a512..8364271a09f62ee624fb2295cdc21d9a448b4eb2 100644 (file)
--- a/scripts/auto-completion/bash/nnn-completion.bash
+++ b/scripts/auto-completion/bash/nnn-completion.bash
@@ -12,7 +12,6 @@ _nnn () {
     local -a opts opts_with_args
     opts=(
         -b
-        -C
         -e
         -h
         -i

diff --git a/scripts/auto-completion/fish/nnn.fish b/scripts/auto-completion/fish/nnn.fish
index f6e86a4352d2e681ae91f6c6abab378d1e433840..cfdf0252f6d9576051c4eb6b092e1cd34904c119 100644 (file)
--- a/scripts/auto-completion/fish/nnn.fish
+++ b/scripts/auto-completion/fish/nnn.fish
@@ -6,7 +6,6 @@
 #
 
 complete -c nnn -s b -r -d 'bookmark key to open'
-complete -c nnn -s C    -d 'disable directory color'
 complete -c nnn -s e    -d 'use exiftool instead of mediainfo'
 complete -c nnn -s h    -d 'show this help and exit'
 complete -c nnn -s i    -d 'start in navigate-as-you-type mode'

diff --git a/scripts/auto-completion/zsh/_nnn b/scripts/auto-completion/zsh/_nnn
index 0ec803346450f1301caa1b3b41e4b714edc57619..be2bed61511fe6b5f40a02f9193b771ba54ee34a 100644 (file)
--- a/scripts/auto-completion/zsh/_nnn
+++ b/scripts/auto-completion/zsh/_nnn
@@ -10,7 +10,6 @@ setopt localoptions noshwordsplit noksharrays
 local -a args
 args=(
     '(-b)-b[bookmark key to open]:key char'
-    '(-C)-C[disable directory color]'
     '(-e)-e[use exiftool instead of mediainfo]'
     '(-h)-h[show this help and exit]'
     '(-i)-i[start in navigate-as-you-type mode]'

diff --git a/src/nnn.c b/src/nnn.c
index 014b073c0eee1943b8a541160f609a675e3c46a1..d75d733117e9499c3eccdc84447a72f02cf50a91 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -281,11 +281,10 @@ typedef struct {
        uint copymode   : 1;  /* Set when copying files */
        uint autoselect : 1;  /* Auto-select dir in nav-as-you-type mode */
        uint showdetail : 1;  /* Clear to show fewer file info */
-       uint showcolor  : 1;  /* Set to show dirs in blue */
        uint dircolor   : 1;  /* Current status of dir color */
        uint metaviewer : 1;  /* Index of metadata viewer in utils[] */
        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 picker     : 1;  /* Write selection to user-specified file */
@@ -311,7 +310,7 @@ typedef struct {
 /* GLOBALS */
 
 /* Configuration, contexts */
-static settings cfg = {0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0};
+static settings cfg = {0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0};
 static context g_ctx[CTX_MAX] __attribute__ ((aligned));
 
 static struct entry *dents;
@@ -936,12 +935,13 @@ static bool initcurses(void)
        curs_set(FALSE); /* Hide cursor */
        start_color();
        use_default_colors();
-       if (cfg.showcolor) {
-               init_pair(1, g_ctx[0].color, -1);
-               init_pair(2, g_ctx[1].color, -1);
-               init_pair(3, g_ctx[2].color, -1);
-               init_pair(4, g_ctx[3].color, -1);
-       }
+
+       /* Initialize default colors */
+       init_pair(1, g_ctx[0].color, -1);
+       init_pair(2, g_ctx[1].color, -1);
+       init_pair(3, g_ctx[2].color, -1);
+       init_pair(4, g_ctx[3].color, -1);
+
        settimeout(); /* One second */
        set_escdelay(25);
        return TRUE;
@@ -2751,20 +2751,14 @@ static void redraw(char *path)
                if (!g_ctx[i].c_cfg.ctxactive)
                        printw("%d ", i + 1);
                else if (cfg.curctx != i) {
-                       if (cfg.showcolor)
-                               attrs = COLOR_PAIR(i + 1) | A_BOLD | A_UNDERLINE;
-                       else
-                               attrs = A_UNDERLINE;
+                       attrs = COLOR_PAIR(i + 1) | A_BOLD | A_UNDERLINE;
                        attron(attrs);
                        printw("%d", i + 1);
                        attroff(attrs);
                        printw(" ");
                } else {
                        /* Print current context in reverse */
-                       if (cfg.showcolor)
-                               attrs = COLOR_PAIR(i + 1) | A_BOLD | A_REVERSE;
-                       else
-                               attrs = A_REVERSE;
+                       attrs = COLOR_PAIR(i + 1) | A_BOLD | A_REVERSE;
                        attron(attrs);
                        printw("%d", i + 1);
                        attroff(attrs);
@@ -2793,7 +2787,7 @@ static void redraw(char *path)
        else
                ncols -= 5;
 
-       if (!cfg.wild && cfg.showcolor) {
+       if (!cfg.wild) {
                attron(COLOR_PAIR(cfg.curctx + 1) | A_BOLD);
                cfg.dircolor = 1;
        }
@@ -4004,7 +3998,7 @@ int main(int argc, char *argv[])
        char *ipath = NULL;
        int opt;
 
-       while ((opt = getopt(argc, argv, "Slib:Cenp:svwh")) != -1) {
+       while ((opt = getopt(argc, argv, "Slib:enp:svwh")) != -1) {
                switch (opt) {
                case 'S':
                        cfg.blkorder = 1;
@@ -4021,9 +4015,6 @@ int main(int argc, char *argv[])
                case 'b':
                        ipath = optarg;
                        break;
-               case 'C':
-                       cfg.showcolor = 0;
-                       break;
                case 'e':
                        cfg.metaviewer = EXIFTOOL;
                        break;
@@ -4069,23 +4060,21 @@ int main(int argc, char *argv[])
        }
 
        /* Get the context colors; copier used as tmp var */
-       if (cfg.showcolor) {
-               copier = xgetenv(env_cfg[NNN_CONTEXT_COLORS], "4444");
-               opt = 0;
-               while (opt < CTX_MAX) {
-                       if (*copier) {
-                               if (*copier < '0' || *copier > '7') {
-                                       fprintf(stderr, "invalid color code\n");
-                                       return 1;
-                               }
+       copier = xgetenv(env_cfg[NNN_CONTEXT_COLORS], "4444");
+       opt = 0;
+       while (opt < CTX_MAX) {
+               if (*copier) {
+                       if (*copier < '0' || *copier > '7') {
+                               fprintf(stderr, "invalid color code\n");
+                               return 1;
+                       }
 
-                               g_ctx[opt].color = *copier - '0';
-                               ++copier;
-                       } else
-                               g_ctx[opt].color = 4;
+                       g_ctx[opt].color = *copier - '0';
+                       ++copier;
+               } else
+                       g_ctx[opt].color = 4;
 
-                       ++opt;
-               }
+               ++opt;
        }
 
        /* Parse bookmarks string */