From: Eyal Soha <shawarmakarma@gmail.com>
To: peff@peff.net, git@vger.kernel.org
Cc: Eyal Soha <shawarmakarma@gmail.com>
Subject: [PATCH 1/3] color.c: Refactor color_output to use enums
Date: Fri, 10 Jan 2020 10:05:45 -0500 [thread overview]
Message-ID: <20200110150547.221314-1-shawarmakarma@gmail.com> (raw)
In-Reply-To: <20200110111516.GA474613@coredump.intra.peff.net>
Signed-off-by: Eyal Soha <shawarmakarma@gmail.com>
---
color.c | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/color.c b/color.c
index ebb222ec33..0549501f47 100644
--- a/color.c
+++ b/color.c
@@ -24,6 +24,13 @@ const char *column_colors_ansi[] = {
GIT_COLOR_RESET,
};
+enum {
+ COLOR_BACKGROUND_OFFSET = 10,
+ COLOR_FOREGROUND_ANSI = 30,
+ COLOR_FOREGROUND_RGB = 38,
+ COLOR_FOREGROUND_256 = 38,
+};
+
/* Ignore the RESET at the end when giving the size */
const int column_colors_ansi_max = ARRAY_SIZE(column_colors_ansi) - 1;
@@ -92,7 +99,7 @@ static int parse_color(struct color *out, const char *name, int len)
for (i = 0; i < ARRAY_SIZE(color_names); i++) {
if (match_word(name, len, color_names[i])) {
out->type = COLOR_ANSI;
- out->value = i;
+ out->value = i + COLOR_FOREGROUND_ANSI;
return 0;
}
}
@@ -112,7 +119,7 @@ static int parse_color(struct color *out, const char *name, int len)
/* Rewrite low numbers as more-portable standard colors. */
} else if (val < 8) {
out->type = COLOR_ANSI;
- out->value = val;
+ out->value = val + COLOR_FOREGROUND_ANSI;
return 0;
} else if (val < 256) {
out->type = COLOR_256;
@@ -166,23 +173,22 @@ int color_parse(const char *value, char *dst)
* 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, int offset)
{
switch (c->type) {
case COLOR_UNSPECIFIED:
case COLOR_NORMAL:
break;
case COLOR_ANSI:
- if (len < 2)
- BUG("color parsing ran out of space");
- *out++ = type;
- *out++ = '0' + c->value;
+ out += xsnprintf(out, len, "%d", c->value + offset);
break;
case COLOR_256:
- out += xsnprintf(out, len, "%c8;5;%d", type, c->value);
+ out += xsnprintf(out, len, "%d;5;%d", COLOR_FOREGROUND_256 + offset,
+ c->value);
break;
case COLOR_RGB:
- out += xsnprintf(out, len, "%c8;2;%d;%d;%d", type,
+ out += xsnprintf(out, len, "%d;2;%d;%d;%d",
+ COLOR_FOREGROUND_RGB + offset,
c->red, c->green, c->blue);
break;
}
@@ -280,13 +286,13 @@ int color_parse_mem(const char *value, int value_len, char *dst)
if (sep++)
OUT(';');
/* foreground colors are all in the 3x range */
- dst = color_output(dst, end - dst, &fg, '3');
+ dst = color_output(dst, end - dst, &fg, 0);
}
if (!color_empty(&bg)) {
if (sep++)
OUT(';');
/* background colors are all in the 4x range */
- dst = color_output(dst, end - dst, &bg, '4');
+ dst = color_output(dst, end - dst, &bg, COLOR_BACKGROUND_OFFSET);
}
OUT('m');
}
--
2.24.1.591.g12029dc57d.dirty
next prev parent reply other threads:[~2020-01-10 15:06 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 ` Eyal Soha [this message]
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 ` [PATCH v3 2/3] color.c: support bright aixterm colors Junio C Hamano
2020-02-11 19:36 ` [PATCH v3 3/3] color.c: alias RGB colors 8-15 to " 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200110150547.221314-1-shawarmakarma@gmail.com \
--to=shawarmakarma@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).