diff: Support 256 colors
Add support for more than 8 colors. Colors can be specified as numbers -1..255. -1 is same as "normal". Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Timo Hirvonen committed
Jul 13, 2006 at 19:08 UTC
f5b571fcf7929ca6e85b3c35c4bb96db305d0b1e
1 file changed
+18
-6
diff.c
+18
-6
@@ -26,8 +26,8 @@ enum color_diff {
26
DIFF_FILE_NEW = 5,
27
};
28
29
-/* "\033[1;30;47m\0" is 11 bytes */
30
-static char diff_colors[][16] = {
29
+/* "\033[1;38;5;2xx;48;5;2xxm\0" is 23 bytes */
30
+static char diff_colors[][24] = {
31
"\033[m", /* reset */
32
"", /* normal */
33
"\033[1m", /* bold */
@@ -57,12 +57,16 @@ static int parse_color(const char *name, int len)
57
"normal", "black", "red", "green", "yellow",
58
"blue", "magenta", "cyan", "white"
59
};
60
+ char *end;
61
int i;
62
for (i = 0; i < ARRAY_SIZE(color_names); i++) {
63
const char *str = color_names[i];
64
if (!strncasecmp(name, str, len) && !str[len])
65
return i - 1;
66
}
67
+ i = strtol(name, &end, 10);
68
+ if (*name && !*end && i >= -1 && i <= 255)
69
+ return i;
70
return -2;
71
}
72
@@ -135,14 +139,22 @@ static void parse_diff_color_value(const char *value, const char *var, char *dst
139
if (fg >= 0) {
140
if (sep++)
141
*dst++ = ';';
138
- *dst++ = '3';
139
- *dst++ = '0' + fg;
142
+ if (fg < 8) {
143
+ *dst++ = '3';
144
+ *dst++ = '0' + fg;
145
+ } else {
146
+ dst += sprintf(dst, "38;5;%d", fg);
147
+ }
148
}
149
if (bg >= 0) {
150
if (sep++)
151
*dst++ = ';';
144
- *dst++ = '4';
145
- *dst++ = '0' + bg;
152
+ if (bg < 8) {
153
+ *dst++ = '4';
154
+ *dst++ = '0' + bg;
155
+ } else {
156
+ dst += sprintf(dst, "48;5;%d", bg);
157
+ }
158
}
159
*dst++ = 'm';
160
}