parse_color: support 24-bit RGB values
Some terminals (like XTerm) allow full 24-bit RGB color specifications using an extension to the regular ANSI color scheme. Let's allow users to specify hex RGB colors, enabling the all-important feature of hot pink ref decorations: git log --format="%h%C(#ff69b4)%d%C(reset) %s" 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
17a4be26060b00a867cbe54ee906fe03813470ec
4 files changed
+37
-5
Documentation/config.txt
+2
-1
@@ -828,7 +828,8 @@ doesn't matter.
828
+
829
Colors (foreground and background) may also be given as numbers between
830
0 and 255; these use ANSI 256-color mode (but note that not all
831
-terminals may support this).
831
+terminals may support this). If your terminal supports it, you may also
832
+specify 24-bit RGB values as hex, like `#ff0ab3`.
833
834
color.diff::
835
Whether to use ANSI escape sequences to add color to patches.
color.c
+28
-1
@@ -32,10 +32,13 @@ struct color {
32
COLOR_UNSPECIFIED = 0,
33
COLOR_NORMAL,
34
COLOR_ANSI, /* basic 0-7 ANSI colors */
35
- COLOR_256
35
+ COLOR_256,
36
+ COLOR_RGB
37
} type;
38
/* The numeric value for ANSI and 256-color modes */
39
unsigned char value;
40
+ /* 24-bit RGB color values */
41
+ unsigned char red, green, blue;
42
};
43
44
/*
@@ -47,6 +50,16 @@ static int match_word(const char *word, int len, const char *match)
50
return !strncasecmp(word, match, len) && !match[len];
51
}
52
53
+static int get_hex_color(const char *in, unsigned char *out)
54
+{
55
+ unsigned int val;
56
+ val = (hexval(in[0]) << 4) | hexval(in[1]);
57
+ if (val & ~0xff)
58
+ return -1;
59
+ *out = val;
60
+ return 0;
61
+}
62
+
63
static int parse_color(struct color *out, const char *name, int len)
64
{
65
/* Positions in array must match ANSI color codes */
@@ -64,6 +77,16 @@ static int parse_color(struct color *out, const char *name, int len)
77
return 0;
78
}
79
80
+ /* Try a 24-bit RGB value */
81
+ if (len == 7 && name[0] == '#') {
82
+ if (!get_hex_color(name + 1, &out->red) &&
83
+ !get_hex_color(name + 3, &out->green) &&
84
+ !get_hex_color(name + 5, &out->blue)) {
85
+ out->type = COLOR_RGB;
86
+ return 0;
87
+ }
88
+ }
89
+
90
/* Then pick from our human-readable color names... */
91
for (i = 0; i < ARRAY_SIZE(color_names); i++) {
92
if (match_word(name, len, color_names[i])) {
@@ -140,6 +163,10 @@ static char *color_output(char *out, const struct color *c, char type)
163
case COLOR_256:
164
out += sprintf(out, "%c8;5;%d", type, c->value);
165
break;
166
+ case COLOR_RGB:
167
+ out += sprintf(out, "%c8;2;%d;%d;%d", type,
168
+ c->red, c->green, c->blue);
169
+ break;
170
}
171
return out;
172
}
color.h
+3
-3
@@ -9,14 +9,14 @@ struct strbuf;
9
* The maximum length of ANSI color sequence we would generate:
10
* - leading ESC '[' 2
11
* - attr + ';' 2 * 8 (e.g. "1;")
12
- * - fg color + ';' 9 (e.g. "38;5;2xx;")
13
- * - fg color + ';' 9 (e.g. "48;5;2xx;")
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
15
*
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 40
19
+#define COLOR_MAXLEN 56
20
21
/*
22
* IMPORTANT: Due to the way these color codes are emulated on Windows,
t/t4026-color.sh
+4
@@ -53,6 +53,10 @@ test_expect_success '256 colors' '
53
color "254 bold 255" "[1;38;5;254;48;5;255m"
54
'
55
56
+test_expect_success '24-bit colors' '
57
+ color "#ff00ff black" "[38;2;255;0;255;40m"
58
+'
59
+
60
test_expect_success '"normal" yields no color at all"' '
61
color "normal black" "[40m"
62
'