On Tue, Jan 07, 2020 at 10:36:53AM -0500, Eyal Soha wrote: > https://en.wikipedia.org/wiki/ANSI_escape_code > > ANSI color codes 90-97 and 100-107 are brighter versions of the 30-37 > and 40-47 colors. To view them, run `colortest-16`. In that > colortest, they are named with a leading "+". Maybe git config could > support those colors, too, with a leading plus in the name? They are > nice for having a different shade of a color in a diff. Depending on your terminal, you can already access these colors via 256-color mode. Generally 0-7 are the standard colors there, then 8-15 are the "bright" variants, and then an rgb cube. You can see how your terminal displays all of them with something like this: reset=$(git config --type=color --default=reset foo.bar) for i in $(seq 0 255); do color=$(git config --type=color --default="$i" foo.bar) echo "$color$i$reset" done Some terminals also show "bold red" as bright red, but many modern ones seem to actually provide a bold font. That said, I'm not entirely opposed to having more human-readable aliases. I'm not sure if it's worth using the 16-color version (e.g., "ESC[91m" versus the 256-color version "ESC[38;5;9m"). It's possible it would be compatible with more terminals, and it is slightly fewer bytes. > diff --git a/color.c b/color.c > index ebb222ec33..a39fe7d133 100644 > --- a/color.c > +++ b/color.c > @@ -33,6 +33,7 @@ struct color { > COLOR_UNSPECIFIED = 0, > COLOR_NORMAL, > COLOR_ANSI, /* basic 0-7 ANSI colors */ > + COLOR_AXITERM, /* brighter than 0-7 ANSI colors */ What's AXITERM? I couldn't find it mentioned anywhere around ANSI codes. I kind of wonder if we could just call these ANSI as well, and have color_output() just decide whether to add an offset of 60 when we see a color number between 8 and 15. Or possibly c->value should just have the 60-offset value in the first place. > * already have the ANSI escape code in it. "out" should have enough > * space in it to fit any color. > */ > -static char *color_output(char *out, int len, const struct color *c, char type) > +static char *color_output(char *out, int len, const struct color *c, > + const char *type) This "type" field was already pretty ugly, and I think your patch makes it even worse. It would probably be less bad if we just passed in the integer 30 instead of '3', and then do: /* handles ANSI; your bright colors would want to add 60 */ out += xsnprintf(out, len, "%d", type + c->value); And then likewise the 256-color and rgb paths would do: out += xsnprintf(out, len, "%d;5;%d", type + 8, c->value); Bonus points for declaring: enum { COLOR_FOREGROUND = 30, COLOR_BACKGROUND = 40, } color_ground; to make the caller more readable. > case COLOR_ANSI: > - if (len < 2) > + case COLOR_AXITERM: > + if (len < strlen(type) + 1) > BUG("color parsing ran out of space"); > - *out++ = type; > - *out++ = '0' + c->value; > + out += xsnprintf(out, len, "%s%c", type, '0' + c->value); This BUG() can go away. The point was to make sure we don't overflow "out", but xsnprintf() will check that for us (that's why there isn't one in the COLOR_256 and COLOR_RGB case arms). > @@ -279,14 +287,24 @@ int color_parse_mem(const char *value, int > value_len, char *dst) > if (!color_empty(&fg)) { > if (sep++) > OUT(';'); > - /* foreground colors are all in the 3x range */ > - dst = color_output(dst, end - dst, &fg, '3'); > + /* foreground colors are in the 3x range */ > + char *range = "3"; > + if (fg.type == COLOR_AXITERM) { > + /* axiterm fg colors are in the 9x range */ > + range = "9"; > + } > + dst = color_output(dst, end - dst, &fg, range); And if we can handle the regular/bright stuff instead of color_output(), we don't need to have this extra fg.type check. -Peff
