From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Eyal Soha <shawarmakarma@gmail.com>, Jeff King <peff@peff.net>
Subject: [PATCH v3 2/3] color.c: support bright aixterm colors
Date: Tue, 11 Feb 2020 11:36:24 -0800 [thread overview]
Message-ID: <20200211193625.231492-3-gitster@pobox.com> (raw)
In-Reply-To: <20200211193625.231492-1-gitster@pobox.com>
From: Eyal Soha <shawarmakarma@gmail.com>
These colors are the bright variants of the 3-bit colors. Instead of
30-37 range for the foreground and 40-47 range for the background,
they live in 90-97 and 100-107 range, respectively.
Signed-off-by: Eyal Soha <shawarmakarma@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/config.txt | 4 +++-
color.c | 36 ++++++++++++++++++++++++++++--------
t/t4026-color.sh | 8 ++++++++
3 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 83e7bba872..08b13ba72b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -263,7 +263,9 @@ color::
+
The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
`blue`, `magenta`, `cyan` and `white`. The first color given is the
-foreground; the second is the background.
+foreground; the second is the background. All the basic colors except
+`normal` have a bright variant that can be speficied by prefixing the
+color with `bright`, like `brightred`.
+
Colors may also be given as numbers between 0 and 255; these use ANSI
256-color mode (but note that not all terminals may support this). If
diff --git a/color.c b/color.c
index 4ee690bd4e..0c0ec4672f 100644
--- a/color.c
+++ b/color.c
@@ -29,6 +29,7 @@ enum {
COLOR_FOREGROUND_ANSI = 30,
COLOR_FOREGROUND_RGB = 38,
COLOR_FOREGROUND_256 = 38,
+ COLOR_FOREGROUND_BRIGHT_ANSI = 90,
};
/* Ignore the RESET at the end when giving the size */
@@ -68,15 +69,38 @@ static int get_hex_color(const char *in, unsigned char *out)
return 0;
}
-static int parse_color(struct color *out, const char *name, int len)
+/*
+ * If an ANSI color is recognized in "name", fill "out" and return 0.
+ * Otherwise, leave out unchanged and return -1.
+ */
+static int parse_ansi_color(struct color *out, const char *name, int len)
{
/* Positions in array must match ANSI color codes */
static const char * const color_names[] = {
"black", "red", "green", "yellow",
"blue", "magenta", "cyan", "white"
};
- char *end;
int i;
+ int color_offset = COLOR_FOREGROUND_ANSI;
+
+ if (strncasecmp(name, "bright", 6) == 0) {
+ color_offset = COLOR_FOREGROUND_BRIGHT_ANSI;
+ name += 6;
+ len -= 6;
+ }
+ for (i = 0; i < ARRAY_SIZE(color_names); i++) {
+ if (match_word(name, len, color_names[i])) {
+ out->type = COLOR_ANSI;
+ out->value = i + color_offset;
+ return 0;
+ }
+ }
+ return -1;
+}
+
+static int parse_color(struct color *out, const char *name, int len)
+{
+ char *end;
long val;
/* First try the special word "normal"... */
@@ -96,12 +120,8 @@ static int parse_color(struct color *out, const char *name, int len)
}
/* Then pick from our human-readable color names... */
- for (i = 0; i < ARRAY_SIZE(color_names); i++) {
- if (match_word(name, len, color_names[i])) {
- out->type = COLOR_ANSI;
- out->value = i + COLOR_FOREGROUND_ANSI;
- return 0;
- }
+ if (parse_ansi_color(out, name, len) == 0) {
+ return 0;
}
/* And finally try a literal 256-color-mode number */
diff --git a/t/t4026-color.sh b/t/t4026-color.sh
index 671e951ee5..78c69de90a 100755
--- a/t/t4026-color.sh
+++ b/t/t4026-color.sh
@@ -30,6 +30,14 @@ test_expect_success 'attribute before color name' '
color "bold red" "[1;31m"
'
+test_expect_success 'aixterm bright fg color' '
+ color "brightred" "[91m"
+'
+
+test_expect_success 'aixterm bright bg color' '
+ color "green brightblue" "[32;104m"
+'
+
test_expect_success 'color name before attribute' '
color "red bold" "[1;31m"
'
--
2.25.0-453-g769eb9f0f1
next prev parent reply other threads:[~2020-02-11 19:36 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CANsz78+ugmd62F4Qk+VT7Pi=ZPtMSkZjXOwLNRCFhoS9jrOkeQ@mail.gmail.com>
[not found] ` <CANsz78K-BiswWPdhd_N25NuApcv7zSb2cw2Y9DSinkpNpuogYw@mail.gmail.com>
2020-01-07 15:36 ` Fwd: Add support for axiterm colors in parse_color Eyal Soha
2020-01-08 9:52 ` Jeff King
2020-01-10 0:20 ` Eyal Soha
2020-01-10 11:15 ` Jeff King
2020-01-10 15:02 ` Eyal Soha
2020-01-15 15:32 ` Eyal Soha
2020-01-10 15:05 ` [PATCH 1/3] color.c: Refactor color_output to use enums Eyal Soha
2020-01-10 15:05 ` [PATCH 2/3] color.c: Support bright aixterm colors Eyal Soha
2020-01-15 22:42 ` Jeff King
2020-01-10 15:05 ` [PATCH 3/3] color.c: Alias RGB colors 8-15 to " Eyal Soha
2020-01-15 22:45 ` Jeff King
2020-01-15 22:33 ` [PATCH 1/3] color.c: Refactor color_output to use enums Jeff King
2020-01-16 18:01 ` Junio C Hamano
2020-01-16 18:23 ` Jeff King
2020-01-16 19:25 ` Eyal Soha
2020-01-18 14:53 ` Eyal Soha
2020-01-18 14:53 ` [PATCH 2/3] color.c: Support bright aixterm colors Eyal Soha
2020-01-18 18:47 ` Junio C Hamano
2020-01-21 16:52 ` Eyal Soha
2020-01-21 16:56 ` [PATCH 1/3] color.c: refactor color_output arguments Eyal Soha
2020-01-21 16:56 ` [PATCH 2/3] color.c: support bright aixterm colors Eyal Soha
2020-01-23 22:54 ` Junio C Hamano
2020-01-21 16:56 ` [PATCH 3/3] color.c: alias RGB colors 8-15 to " Eyal Soha
2020-01-23 22:50 ` [PATCH 1/3] color.c: refactor color_output arguments Junio C Hamano
2020-02-11 19:36 ` [PATCH v3 0/3] es/bright-colors (hopefully final) reroll Junio C Hamano
2020-02-11 19:36 ` [PATCH v3 1/3] color.c: refactor color_output arguments Junio C Hamano
2020-02-11 19:46 ` Jeff King
2020-02-11 23:01 ` Eyal Soha
2020-02-11 23:06 ` Junio C Hamano
2020-02-11 19:36 ` Junio C Hamano [this message]
2020-02-11 19:36 ` [PATCH v3 3/3] color.c: alias RGB colors 8-15 to aixterm colors Junio C Hamano
2020-01-21 17:37 ` [PATCH 2/3] color.c: Support bright " Junio C Hamano
2020-01-18 14:53 ` [PATCH 3/3] color.c: Alias RGB colors 8-15 to " Eyal Soha
2020-01-18 18:34 ` Junio C Hamano
2020-01-18 17:51 ` [PATCH 1/3] color.c: Refactor color_output to use enums Junio C Hamano
2020-01-21 16:37 ` Eyal Soha
2020-01-21 17:49 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200211193625.231492-3-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=shawarmakarma@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).