@matheusbsbs / matheus-bagliano / commits / ff40d185d2

parse_color: recognize "no$foo" to clear the $foo attribute

You can turn on ANSI text attributes like "reverse" by putting "reverse" in your color spec. However, you cannot ask to turn reverse off. For common cases, this does not matter. You would turn on "reverse" at the start of a colored section, and then clear all attributes with a "reset". However, you may wish to turn on some attributes, then selectively disable others. For example: git log --format="%C(bold ul yellow)%h%C(noul) %s" underlines just the hash, but without the need to re-specify the rest of the attributes. This can also help third-party programs, like contrib/diff-highlight, that want to turn some attribute on/off without disrupting existing coloring. Note that some attribute specifications are probably nonsensical (e.g., "bold nobold"). We do not bother to flag such constructs, and instead let the terminal sort it out. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Nov 20, 2014 at 10:25 UTC ff40d185d25ce821bd6ae5a524e58e4eab01dc86
4 files changed +20 -6
Documentation/config.txt
+2 -1
@@ -824,7 +824,8 @@ accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`,
824 `magenta`, `cyan` and `white`; the attributes are `bold`, `dim`, `ul`,
825 `blink` and `reverse`. The first color given is the foreground; the
826 second is the background. The position of the attribute, if any,
827 -doesn't matter.
827 +doesn't matter. Attributes may be turned off specifically by prefixing
828 +them with `no` (e.g., `noreverse`, `noul`, etc).
829 +
830 Colors (foreground and background) may also be given as numbers between
831 0 and 255; these use ANSI 256-color mode (but note that not all
color.c
+5 -3
@@ -124,9 +124,11 @@ static int parse_color(struct color *out, const char *name, int len)
124
125 static int parse_attr(const char *name, int len)
126 {
127 - static const int attr_values[] = { 1, 2, 4, 5, 7 };
127 + static const int attr_values[] = { 1, 2, 4, 5, 7,
128 + 22, 22, 24, 25, 27 };
129 static const char * const attr_names[] = {
129 - "bold", "dim", "ul", "blink", "reverse"
130 + "bold", "dim", "ul", "blink", "reverse",
131 + "nobold", "nodim", "noul", "noblink", "noreverse"
132 };
133 int i;
134 for (i = 0; i < ARRAY_SIZE(attr_names); i++) {
@@ -238,7 +240,7 @@ int color_parse_mem(const char *value, int value_len, char *dst)
240 attr &= ~bit;
241 if (sep++)
242 *dst++ = ';';
241 - *dst++ = '0' + i;
243 + dst += sprintf(dst, "%d", i);
244 }
245 if (!color_empty(&fg)) {
246 if (sep++)
color.h
+2 -2
@@ -8,7 +8,7 @@ struct strbuf;
8 /*
9 * The maximum length of ANSI color sequence we would generate:
10 * - leading ESC '[' 2
11 - * - attr + ';' 2 * 8 (e.g. "1;")
11 + * - attr + ';' 3 * 10 (e.g. "1;")
12 * - fg color + ';' 17 (e.g. "38;2;255;255;255;")
13 * - bg color + ';' 17 (e.g. "48;2;255;255;255;")
14 * - terminating 'm' NUL 2
@@ -16,7 +16,7 @@ struct strbuf;
16 * The above overcounts attr (we only use 5 not 8) and one semicolon
17 * but it is close enough.
18 */
19 -#define COLOR_MAXLEN 56
19 +#define COLOR_MAXLEN 70
20
21 /*
22 * IMPORTANT: Due to the way these color codes are emulated on Windows,
t/t4026-color.sh
+11
@@ -45,10 +45,21 @@ test_expect_success 'fg bg attr...' '
45 color "blue bold dim ul blink reverse" "[1;2;4;5;7;34m"
46 '
47
48 +# note that nobold and nodim are the same code (22)
49 +test_expect_success 'attr negation' '
50 + color "nobold nodim noul noblink noreverse" "[22;24;25;27m"
51 +'
52 +
53 test_expect_success 'long color specification' '
54 color "254 255 bold dim ul blink reverse" "[1;2;4;5;7;38;5;254;48;5;255m"
55 '
56
57 +test_expect_success 'absurdly long color specification' '
58 + color \
59 + "#ffffff #ffffff bold nobold dim nodim ul noul blink noblink reverse noreverse" \
60 + "[1;2;4;5;7;22;24;25;27;38;2;255;255;255;48;2;255;255;255m"
61 +'
62 +
63 test_expect_success '256 colors' '
64 color "254 bold 255" "[1;38;5;254;48;5;255m"
65 '