[PATCH 2/5] Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
- From
Mark Lodato <lodatom@gmail.com>
- Date
- Feb 27, 2010, 04:57 UTC
- Message-ID
- <1267246670-19118-3-git-send-email-lodatom@gmail.com>
- In-Reply-To
- <1267246670-19118-1-git-send-email-lodatom@gmail.com>
Add GIT_COLOR_BOLD_* macros to set both bold and the color in one sequence. This saves two characters of output ("ESC [ m", minus ";") and makes the code more readable.
Add the remaining GIT_COLOR_BG_* macros to make the list complete. The white and black colors are not included since they look bad on most terminals.
Signed-off-by: Mark Lodato <lodatom@gmail.com> --- builtin-grep.c | 2 +- color.h | 11 +++++++++++ graph.c | 12 ++++++------ 3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/builtin-grep.c b/builtin-grep.c index 552ef1f..dcc3d48 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -871,7 +871,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) opt.regflags = REG_NEWLINE; opt.max_depth = -1; - strcpy(opt.color_match, GIT_COLOR_RED GIT_COLOR_BOLD); + strcpy(opt.color_match, GIT_COLOR_BOLD_RED); opt.color = -1; git_config(grep_config, &opt); if (opt.color == -1) diff --git a/color.h b/color.h index 3cb4b7f..bfeea1f 100644 --- a/color.h +++ b/color.h @@ -18,7 +18,18 @@ #define GIT_COLOR_BLUE "\033[34m" #define GIT_COLOR_MAGENTA "\033[35m" #define GIT_COLOR_CYAN "\033[36m" +#define GIT_COLOR_BOLD_RED "\033[1;31m" +#define GIT_COLOR_BOLD_GREEN "\033[1;32m" +#define GIT_COLOR_BOLD_YELLOW "\033[1;33m" +#define GIT_COLOR_BOLD_BLUE "\033[1;34m" +#define GIT_COLOR_BOLD_MAGENTA "\033[1;35m" +#define GIT_COLOR_BOLD_CYAN "\033[1;36m" #define GIT_COLOR_BG_RED "\033[41m" +#define GIT_COLOR_BG_GREEN "\033[42m" +#define GIT_COLOR_BG_YELLOW "\033[43m" +#define GIT_COLOR_BG_BLUE "\033[44m" +#define GIT_COLOR_BG_MAGENTA "\033[45m" +#define GIT_COLOR_BG_CYAN "\033[46m" /* * This variable stores the value of color.ui diff --git a/graph.c b/graph.c index 6746d42..e6bbcaa 100644 --- a/graph.c +++ b/graph.c @@ -80,12 +80,12 @@ static char column_colors[][COLOR_MAXLEN] = { GIT_COLOR_BLUE, GIT_COLOR_MAGENTA, GIT_COLOR_CYAN, - GIT_COLOR_BOLD GIT_COLOR_RED, - GIT_COLOR_BOLD GIT_COLOR_GREEN, - GIT_COLOR_BOLD GIT_COLOR_YELLOW, - GIT_COLOR_BOLD GIT_COLOR_BLUE, - GIT_COLOR_BOLD GIT_COLOR_MAGENTA, - GIT_COLOR_BOLD GIT_COLOR_CYAN, + GIT_COLOR_BOLD_RED, + GIT_COLOR_BOLD_GREEN, + GIT_COLOR_BOLD_YELLOW, + GIT_COLOR_BOLD_BLUE, + GIT_COLOR_BOLD_MAGENTA, + GIT_COLOR_BOLD_CYAN, }; #define COLUMN_COLORS_MAX (ARRAY_SIZE(column_colors))
-- 1.7.0