summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunegunn Choi <junegunn.c@gmail.com>2021-05-26 19:32:20 +0900
committerJunegunn Choi <junegunn.c@gmail.com>2021-05-26 19:35:26 +0900
commita4bc08f5a35da6e374a2ce0da4c931d7fd32fdf1 (patch)
tree71c42d88eeb781ace07c9fd0395434ca492cd43f
parent7e5aa1e2a5d7cdcafd22bd4e0180316f0aa9081b (diff)
Allow specifying 16 base ANSI colors by their names
Close #2502
-rw-r--r--CHANGELOG.md8
-rw-r--r--man/man1/fzf.118
-rw-r--r--src/options.go32
3 files changed, 57 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5f7f509..f2a89d8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
CHANGELOG
=========
+0.27.2
+------
+- 16 base ANSI colors can be specified by their names
+ ```sh
+ fzf --color fg:3,fg+:11
+ fzf --color fg:yellow,fg+:bright-yellow
+ ```
+
0.27.1
------
- Added `unbind` action. In the following Ripgrep launcher example, you can
diff --git a/man/man1/fzf.1 b/man/man1/fzf.1
index 3e835b99..13deb96e 100644
--- a/man/man1/fzf.1
+++ b/man/man1/fzf.1
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
..
-.TH fzf 1 "May 2021" "fzf 0.27.1" "fzf - a command-line fuzzy finder"
+.TH fzf 1 "May 2021" "fzf 0.27.2" "fzf - a command-line fuzzy finder"
.SH NAME
fzf - a command-line fuzzy finder
@@ -340,6 +340,22 @@ color mappings.
\fB-1 \fRDefault terminal foreground/background color
\fB \fR(or the original color of the text)
\fB0 ~ 15 \fR16 base colors
+ \fBblack\fR
+ \fBred\fR
+ \fBgreen\fR
+ \fByellow\fR
+ \fBblue\fR
+ \fBmagenta\fR
+ \fBcyan\fR
+ \fBwhite\fR
+ \fBbright-black\fR (gray | grey)
+ \fBbright-red\fR
+ \fBbright-green\fR
+ \fBbright-yellow\fR
+ \fBbright-blue\fR
+ \fBbright-magenta\fR
+ \fBbright-cyan\fR
+ \fBbright-white\fR
\fB16 ~ 255 \fRANSI 256 colors
\fB#rrggbb \fR24-bit colors
diff --git a/src/options.go b/src/options.go
index 7070bdf4..e215beef 100644
--- a/src/options.go
+++ b/src/options.go
@@ -670,6 +670,38 @@ func parseTheme(defaultTheme *tui.ColorTheme, str string) *tui.ColorTheme {
cattr.Attr |= tui.Blink
case "reverse":
cattr.Attr |= tui.Reverse
+ case "black":
+ cattr.Color = tui.Color(0)
+ case "red":
+ cattr.Color = tui.Color(1)
+ case "green":
+ cattr.Color = tui.Color(2)
+ case "yellow":
+ cattr.Color = tui.Color(3)
+ case "blue":
+ cattr.Color = tui.Color(4)
+ case "magenta":
+ cattr.Color = tui.Color(5)
+ case "cyan":
+ cattr.Color = tui.Color(6)
+ case "white":
+ cattr.Color = tui.Color(7)
+ case "bright-black", "gray", "grey":
+ cattr.Color = tui.Color(8)
+ case "bright-red":
+ cattr.Color = tui.Color(9)
+ case "bright-green":
+ cattr.Color = tui.Color(10)
+ case "bright-yellow":
+ cattr.Color = tui.Color(11)
+ case "bright-blue":
+ cattr.Color = tui.Color(12)
+ case "bright-magenta":
+ cattr.Color = tui.Color(13)
+ case "bright-cyan":
+ cattr.Color = tui.Color(14)
+ case "bright-white":
+ cattr.Color = tui.Color(15)
case "":
default:
if rrggbb.MatchString(component) {