From patchwork Fri Jan 10 15:05:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eyal Soha X-Patchwork-Id: 11327621 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 521A0138D for ; Fri, 10 Jan 2020 15:06:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F1AC20721 for ; Fri, 10 Jan 2020 15:06:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B+eAJaS8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728183AbgAJPGB (ORCPT ); Fri, 10 Jan 2020 10:06:01 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:34861 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728141AbgAJPGA (ORCPT ); Fri, 10 Jan 2020 10:06:00 -0500 Received: by mail-qt1-f196.google.com with SMTP id e12so2168683qto.2 for ; Fri, 10 Jan 2020 07:06:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NMs+mb6lFIu35mWCREXzjjIUxNIovxKh81QiEK5wE0M=; b=B+eAJaS8U+Pz8UJjM9VrdMK2lNrNOTEWJcw0UhpJem0v6DBWTo2+VxU8ZugOuDUGal RehaDkbciZ+ajEMN7pnUE+zsl7BJ6TQ/VzBfW6WE3zNiQN3JQy0jZ2zltv/wk0NAsle1 sGwszc6OZlM4KQh/yyI6wsZDP8tOMVG/F5w90qwalbnT72MCOodq3PB0qKONW3H4QlRj xsZrBVVcdhRnqiUbMfXgWqXE0CC7TB60ghEmGrBP7seuUNo3tEYUXfJ+LNbx3OfbYdq3 YYRe5NuZ0atUDW7zc6njFNqbxXt6IOjkOpv+6Jsq7hBMZs4hturHOvBnHDyXpD2+/Wpp IVmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NMs+mb6lFIu35mWCREXzjjIUxNIovxKh81QiEK5wE0M=; b=VGwWABEc1/oVN7/RX8qLS7syzggSQ6Go5tPQezHPx+wQPDP+GR2PY5eNhGcsntLoCY QK2jz3JNBhEQUPorf1Hd9kT+uVrc58NJP8rcPtW7NKSifPfp/7ThOwbZ8mLxq/UzNkfN H/x2gjIP3agfI39y0MWVmpTpTyq18k7/V9iQIFKrNPAAlUe59QouTc34POshIotB+Koz g9l+ndz1SxXNELNvKlpa/a2CdII/Ye2QZ3gUzjB3hCpH6dFPRXAeYjSW2ho2kqufGT/Q IrZ4gBCTT0CG1fApHldmLWfiP+kjMfgNllsJELn874gQqssVWWubJriu3ksQ50jdXaTm B0SA== X-Gm-Message-State: APjAAAXO6r/oup7sjweTBUvSW3TA76X26y/1SkGhf/mYqa/GNSQqi3vI PfL5kJkSRvPeNZ7GmoKPy1o= X-Google-Smtp-Source: APXvYqzsolaGyDWEAxpaBUBGBncTzyvRhWcoyZw3FK0E83vGAgoKNz1Koe4JtqMMPa5cGPYmbb0P6A== X-Received: by 2002:ac8:440b:: with SMTP id j11mr2779616qtn.283.1578668759835; Fri, 10 Jan 2020 07:05:59 -0800 (PST) Received: from eyalsoha.corp.google.com ([2620:0:1003:512:ad66:81e4:4335:3c9d]) by smtp.gmail.com with ESMTPSA id s20sm956258qkg.131.2020.01.10.07.05.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 07:05:58 -0800 (PST) From: Eyal Soha To: peff@peff.net, git@vger.kernel.org Cc: Eyal Soha Subject: [PATCH 1/3] color.c: Refactor color_output to use enums Date: Fri, 10 Jan 2020 10:05:45 -0500 Message-Id: <20200110150547.221314-1-shawarmakarma@gmail.com> X-Mailer: git-send-email 2.24.1.591.g12029dc57d.dirty In-Reply-To: <20200110111516.GA474613@coredump.intra.peff.net> References: <20200110111516.GA474613@coredump.intra.peff.net> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Eyal Soha --- 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'); } From patchwork Fri Jan 10 15:05:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eyal Soha X-Patchwork-Id: 11327623 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7DE446C1 for ; Fri, 10 Jan 2020 15:06:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C76D20721 for ; Fri, 10 Jan 2020 15:06:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KAI6LPEJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728244AbgAJPGF (ORCPT ); Fri, 10 Jan 2020 10:06:05 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:43008 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728141AbgAJPGF (ORCPT ); Fri, 10 Jan 2020 10:06:05 -0500 Received: by mail-qt1-f193.google.com with SMTP id d18so2130141qtj.10 for ; Fri, 10 Jan 2020 07:06:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ni1DLPfGBgVWGFdfiw8QjKBc7JajUqvf1fS0IRqthVc=; b=KAI6LPEJzYx6SnSQT6nLHpZFYYtqRYGFbLopdUVJqzKWNHQugh39dUo82Rq8JIH0h6 IxGEdAFYAq+ZBC8L9HMnOgUDmjkIGEsNqIsSF/HWSSRUsN9ncVF3Uy3p8T2Z1bv8ax3P 49pRJNE54eS1xfGEpYuP8tL51prO1LewL/cYlO707/GjA7JG5SuhH5Pu/2ZJwmtzBIrp ytGlxh3uTl4oz6vrgFYnBwN4vyynaJJh+XFTBpS1rxx9r0fVy0V+zzfHmraqXGKJJMdW M3G6cT/HKhWM/ZmGCAdnMGJI0F71uMt/aSQkJxtwu5pFnn/SiYc4N11dpxosCed8OyDc 41lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ni1DLPfGBgVWGFdfiw8QjKBc7JajUqvf1fS0IRqthVc=; b=jCzkk79cAWAXzbn2tSMsH50DlZU2L5FCQcRj/USRaupYo5HBc0jE8fzBziQaLkWB1d FNHr4QtTDKxKz0cAGmkg2eBGUtxtGROo5OuVn8QDshG1pY6u7E/IjkDs+a9uiS95G2o9 WnlC2GG7cjcd8IENg6BACfNn42jOOQlDQMYGS5hisEEiPHz4hQSqB6t5lTC4fya1DKiy m0pDIj5iTwdqtjbi5MonOiIW+EjUSqySOO56meMaSfgi5KMIYaO7rn6xon1zAwRBp4+4 lGPlkgac3rQETP7xQwnWVmjIygsdTpWAkjpszmRvPsc0a9rbgCwhOz7fYK4s8XTyHrFC IjTA== X-Gm-Message-State: APjAAAUQydY85oWuaxlRQFPPcaKoaKsPQ4FcRZMeWEEhK4GciNDtXZFj 4j1zsKdTR04E943F996u/DI= X-Google-Smtp-Source: APXvYqwgblcySzQ6EZfoVkri0VLmJTA0lC+pR2ZwhGjXxzUmahTCjpBY9ARP/hhj+1iFImCYk+BFDQ== X-Received: by 2002:aed:2022:: with SMTP id 31mr2647861qta.321.1578668764152; Fri, 10 Jan 2020 07:06:04 -0800 (PST) Received: from eyalsoha.corp.google.com ([2620:0:1003:512:ad66:81e4:4335:3c9d]) by smtp.gmail.com with ESMTPSA id s20sm956258qkg.131.2020.01.10.07.06.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 07:06:03 -0800 (PST) From: Eyal Soha To: peff@peff.net, git@vger.kernel.org Cc: Eyal Soha Subject: [PATCH 2/3] color.c: Support bright aixterm colors Date: Fri, 10 Jan 2020 10:05:46 -0500 Message-Id: <20200110150547.221314-2-shawarmakarma@gmail.com> X-Mailer: git-send-email 2.24.1.591.g12029dc57d.dirty In-Reply-To: <20200110150547.221314-1-shawarmakarma@gmail.com> References: <20200110111516.GA474613@coredump.intra.peff.net> <20200110150547.221314-1-shawarmakarma@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org These colors are the bright variants of the 3-bit colors. Signed-off-by: Eyal Soha --- color.c | 30 +++++++++++++++++++++++------- t/t4026-color.sh | 8 ++++++++ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/color.c b/color.c index 0549501f47..4dbf12eff8 100644 --- a/color.c +++ b/color.c @@ -29,6 +29,7 @@ enum { COLOR_FOREGROUND_ANSI = 30, COLOR_FOREGROUND_RGB = 38, COLOR_FOREGROUND_256 = 38, + COLOR_FOREGROUND_BRIGHT_ANSI = 90, }; /* Ignore the RESET at the end when giving the size */ @@ -68,13 +69,32 @@ static int get_hex_color(const char *in, unsigned char *out) return 0; } -static int parse_color(struct color *out, const char *name, int len) +static int parse_ansi_color(struct color *out, const char *name, int len) { /* Positions in array must match ANSI color codes */ static const char * const color_names[] = { "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" }; + + int color_offset = COLOR_FOREGROUND_ANSI; + if (strncasecmp(name, "bright", 6) == 0) { + color_offset = COLOR_FOREGROUND_BRIGHT_ANSI; + name += 6; + len -= 6; + } + for (int i = 0; i < ARRAY_SIZE(color_names); i++) { + if (match_word(name, len, color_names[i])) { + out->type = COLOR_ANSI; + out->value = i + color_offset; + return 1; + } + } + return 0; +} + +static int parse_color(struct color *out, const char *name, int len) +{ char *end; int i; long val; @@ -96,12 +116,8 @@ static int parse_color(struct color *out, const char *name, int len) } /* Then pick from our human-readable color names... */ - for (i = 0; i < ARRAY_SIZE(color_names); i++) { - if (match_word(name, len, color_names[i])) { - out->type = COLOR_ANSI; - out->value = i + COLOR_FOREGROUND_ANSI; - return 0; - } + if (parse_ansi_color(out, name, len)) { + return 0; } /* And finally try a literal 256-color-mode number */ diff --git a/t/t4026-color.sh b/t/t4026-color.sh index 671e951ee5..78c69de90a 100755 --- a/t/t4026-color.sh +++ b/t/t4026-color.sh @@ -30,6 +30,14 @@ test_expect_success 'attribute before color name' ' color "bold red" "[1;31m" ' +test_expect_success 'aixterm bright fg color' ' + color "brightred" "[91m" +' + +test_expect_success 'aixterm bright bg color' ' + color "green brightblue" "[32;104m" +' + test_expect_success 'color name before attribute' ' color "red bold" "[1;31m" ' From patchwork Fri Jan 10 15:05:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eyal Soha X-Patchwork-Id: 11327625 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5A7D0138D for ; Fri, 10 Jan 2020 15:06:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 395242072E for ; Fri, 10 Jan 2020 15:06:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CGxr6Wpy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728245AbgAJPGM (ORCPT ); Fri, 10 Jan 2020 10:06:12 -0500 Received: from mail-qk1-f195.google.com ([209.85.222.195]:39345 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728141AbgAJPGM (ORCPT ); Fri, 10 Jan 2020 10:06:12 -0500 Received: by mail-qk1-f195.google.com with SMTP id c16so2085878qko.6 for ; Fri, 10 Jan 2020 07:06:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PSnjhvA55FZAe35aLhjH0fhzrLCsNijt3QeSM+UsyvY=; b=CGxr6WpyF114bcvKp9DiDrFSHE+ORd6cQQRt1O+6xFKnwaX13FQYehpRTPfUrYyyp8 tBS6+VKjIUzbvY3kdjF/zhlRANrI75xX7DK1i2YEiUchs1rHIBP8qKxoslftbK4ULA+Z GIcPZV3eGe80HuJkGiKY902eB7hwhKVP5RWSiSFA474O0IUvTJ6kaUFCObLM3ly6oV6J TrR/we2so9lt/cWpfMpgMx3p30BlQ2J16TrvSZPxVGZL/VMAY2Lgjs46/4b3Ixhnhu26 SBOR7rO7uqgHhTZOFu+uW6u7feWlT7CJdOA9BsZHeMUaTLRbIs1c86QK5Y0p6758HGHn //nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PSnjhvA55FZAe35aLhjH0fhzrLCsNijt3QeSM+UsyvY=; b=fTXmTx4RCijjF9HVFwG0ft6rgzgZmXAirqYr7FMkVwAIkcW/gDeorejmdBcna/ogUY pw2QNouS73/yrh0CjI0xHap4FB7p2N83fqEx3+g7Q3XQS46jinsvILKumLAbnHSKb2jV C5h3F+nrdRFa7QadK3ToCjVAh4FzEPRwkM8HS38gmqL/4k1J89WGsOoC2CTOU7i7Drks INHQwKr4PHfSYn6gp1f+J91nfhnce2ope1+dcVa/9wlC9G2nj5TK1bxxbLOBipWY53k/ C1s8Ylms/6L0ZcV70y0vFeMzmVPd8jCtbEnRk+FsGaBEgzEufbL5Lp4v/VvQuQgqKa64 xqiA== X-Gm-Message-State: APjAAAW2rtDiu7TJBub603Q7E4zotM9BEmXBvFmkf4gZCS5+B/BphpyT SmxEdDfBadET39UniG0ZMbhlyjgfkkQ= X-Google-Smtp-Source: APXvYqyxzo2qZBHk9MV+7eOQsnOTECU2nFRAsSE45iH6+UlEaLPar5/kGlK6hnEoj3M1yQSbO+vKpQ== X-Received: by 2002:a37:52d5:: with SMTP id g204mr3688233qkb.215.1578668770772; Fri, 10 Jan 2020 07:06:10 -0800 (PST) Received: from eyalsoha.corp.google.com ([2620:0:1003:512:ad66:81e4:4335:3c9d]) by smtp.gmail.com with ESMTPSA id s20sm956258qkg.131.2020.01.10.07.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 07:06:09 -0800 (PST) From: Eyal Soha To: peff@peff.net, git@vger.kernel.org Cc: Eyal Soha Subject: [PATCH 3/3] color.c: Alias RGB colors 8-15 to aixterm colors Date: Fri, 10 Jan 2020 10:05:47 -0500 Message-Id: <20200110150547.221314-3-shawarmakarma@gmail.com> X-Mailer: git-send-email 2.24.1.591.g12029dc57d.dirty In-Reply-To: <20200110150547.221314-1-shawarmakarma@gmail.com> References: <20200110111516.GA474613@coredump.intra.peff.net> <20200110150547.221314-1-shawarmakarma@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Eyal Soha --- color.c | 7 ++++++- t/t4026-color.sh | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/color.c b/color.c index 4dbf12eff8..7f9f929fb6 100644 --- a/color.c +++ b/color.c @@ -132,11 +132,16 @@ static int parse_color(struct color *out, const char *name, int len) else if (val < 0) { out->type = COLOR_NORMAL; return 0; - /* Rewrite low numbers as more-portable standard colors. */ + /* Rewrite 0-7 as more-portable standard colors. */ } else if (val < 8) { out->type = COLOR_ANSI; out->value = val + COLOR_FOREGROUND_ANSI; return 0; + /* Rewrite 8-15 as more-portable aixterm colors. */ + } else if (val < 16) { + out->type = COLOR_ANSI; + out->value = val - 8 + COLOR_FOREGROUND_BRIGHT_ANSI; + return 0; } else if (val < 256) { out->type = COLOR_256; out->value = val; diff --git a/t/t4026-color.sh b/t/t4026-color.sh index 78c69de90a..c0b642c1ab 100755 --- a/t/t4026-color.sh +++ b/t/t4026-color.sh @@ -82,6 +82,10 @@ test_expect_success '0-7 are aliases for basic ANSI color names' ' color "0 7" "[30;47m" ' +test_expect_success '8-15 are aliases for aixterm color names' ' + color "12 13" "[94;105m" +' + test_expect_success '256 colors' ' color "254 bold 255" "[1;38;5;254;48;5;255m" '