From nobody Sat Mar 12 14:22:11 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1EFC81A1BBEE; Sat, 12 Mar 2022 14:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KG4kX0Pncz3r7X; Sat, 12 Mar 2022 14:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647094932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J0OEvbh05TjAIoex/aiBQKaEhZZRtpRreDGLMKgSnhs=; b=Q4gHGb5ML0ICUauDnDATKk84PaJ1yp/B3A1hrOyGEf6m7jokiPi4Wp5A0Wv0ayCjF4pHH3 FsPGNEKnjZbnHemWFNR3mmIOtw/ElSFWWbBBOc6BUDCfL0QWyo0fpf52WchwpaH0IjQQSX R6W/IC7qgzpdtzHidSp9Lv2J2b6iJYXrDTprLG8i4tKjRehtVDrmFjPYOiFjx6ZWCbM5BP KRE88Cna5Z7+hg2Gn8pFVQHlv/pigbIOTnJylJeC8G+1hrJZ33/fTG1alin3fPxrIXOY0D /NY4OVJKJ3rnfn4e1yIMIqaOy4V9k2ATHd07zm3cjhOzdP3fjaXgi+jNw6GTAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E1FEE2EB89; Sat, 12 Mar 2022 14:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22CEMBYJ053277; Sat, 12 Mar 2022 14:22:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22CEMBCp053276; Sat, 12 Mar 2022 14:22:11 GMT (envelope-from git) Date: Sat, 12 Mar 2022 14:22:11 GMT Message-Id: <202203121422.22CEMBCp053276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: cf8880d52b89 - main - teken: color #3 is yellow not brown - use TC_YELLOW as the name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf8880d52b8962edeb807a8ee1811d342fafa26d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647094932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J0OEvbh05TjAIoex/aiBQKaEhZZRtpRreDGLMKgSnhs=; b=bKml78h/5td2OtiDrYcBTySIbe+9jnnKbwvV4d7csaAslZJKAg9IFgeZBaewYXcysEitga Voz0XSB7jXRBPXH2oLEwrkVzU7Y9H9lIxwWNbsoKeYah9wiubWoXzftM2mlYHWFBbhtw9i r72oeDKRxI5mnFdFn8q7uGCEuW1gqnmBTQogD+J2WYZdYAr/5UqiyCaAFZXY8jrWtvai5e OClZniyz8n/4uKjmliwg1kBPLyo2XRDcbmguOCL4/mmEbjERm1vYHINaEIpQ4c8poDd0/r 8yFMdFtMMCMUcPv7Vc8BplprWV0RT7pIgGUmbggxdfHQQXKEi6kkVv3CA2Pd/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647094932; a=rsa-sha256; cv=none; b=c6qYQvzd7Bm/nai1lMyLxqGPvddwE95xwkVDuR/aeQ1a8HJ1wwT6JtAHoNmBsyAubI+tWw hj/S8NnuUJ9EDXbuPGQ/6XPBrOST3dacp7wxflpJrCghD0nLO5RpWmuS13wGYJ9/TueoFj OwERrqU48UxXZC6tTTHmpkBGaCA6//IPGan0/vI62PJpl/GRgJHcd3O6KrVNT1ah7K4GjD TizKnm37s4+T+oG+8a1JMV6UD1OrNgefSI5E3eloFrf/MJwaEpVdF9Sz0I5fcE6vv2xkqc 6ZBlih6HAM47Q+zEBsGidaZMPeFP03UmZejSQGdoTFH3LOB76V0Y4UxYXiWwOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cf8880d52b8962edeb807a8ee1811d342fafa26d commit cf8880d52b8962edeb807a8ee1811d342fafa26d Author: Ed Maste AuthorDate: 2022-03-11 21:37:03 +0000 Commit: Ed Maste CommitDate: 2022-03-12 14:17:29 +0000 teken: color #3 is yellow not brown - use TC_YELLOW as the name The console escape code standard (ECMA-48) specifies color #3 (escape code 33) as yellow. A brown console color is an artifact of the VGA palette, which replaces dim (but not bright) yellow with brown. Reviewed by: adrian, imp MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34531 --- stand/efi/libefi/efi_console.c | 2 +- stand/i386/libi386/vidconsole.c | 2 +- sys/dev/syscons/scterm-teken.c | 2 +- sys/sys/terminal.h | 8 ++++---- sys/teken/teken.c | 4 ++-- sys/teken/teken.h | 2 +- sys/teken/teken_subr_compat.h | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/stand/efi/libefi/efi_console.c b/stand/efi/libefi/efi_console.c index de4c26b2fd72..7166b7a3cfbe 100644 --- a/stand/efi/libefi/efi_console.c +++ b/stand/efi/libefi/efi_console.c @@ -458,7 +458,7 @@ color_name_to_teken(const char *name, int *val) return (true); } if (strcasecmp(name, "yellow") == 0 || strcasecmp(name, "brown") == 0) { - *val = TC_BROWN | light; + *val = TC_YELLOW | light; return (true); } if (strcasecmp(name, "blue") == 0) { diff --git a/stand/i386/libi386/vidconsole.c b/stand/i386/libi386/vidconsole.c index 4f1f22234dc3..1ec6b4f5393a 100644 --- a/stand/i386/libi386/vidconsole.c +++ b/stand/i386/libi386/vidconsole.c @@ -545,7 +545,7 @@ color_name_to_teken(const char *name, int *val) return (true); } if (strcasecmp(name, "yellow") == 0 || strcasecmp(name, "brown") == 0) { - *val = TC_BROWN | light; + *val = TC_YELLOW | light; return (true); } if (strcasecmp(name, "blue") == 0) { diff --git a/sys/dev/syscons/scterm-teken.c b/sys/dev/syscons/scterm-teken.c index b575b4ec3119..ed287a74b8f9 100644 --- a/sys/dev/syscons/scterm-teken.c +++ b/sys/dev/syscons/scterm-teken.c @@ -317,7 +317,7 @@ scteken_nop(void) static const teken_color_t sc_to_te_color[] = { TC_BLACK, TC_BLUE, TC_GREEN, TC_CYAN, - TC_RED, TC_MAGENTA, TC_BROWN, TC_WHITE, + TC_RED, TC_MAGENTA, TC_YELLOW, TC_WHITE, }; static const unsigned char te_to_sc_color[] = { diff --git a/sys/sys/terminal.h b/sys/sys/terminal.h index a77c985e85ca..7a6ee7530294 100644 --- a/sys/sys/terminal.h +++ b/sys/sys/terminal.h @@ -94,7 +94,7 @@ typedef teken_color_t term_color_t; #define FG_CYAN TCOLOR_FG(TC_CYAN) #define FG_RED TCOLOR_FG(TC_RED) #define FG_MAGENTA TCOLOR_FG(TC_MAGENTA) -#define FG_BROWN TCOLOR_FG(TC_BROWN) +#define FG_BROWN TCOLOR_FG(TC_YELLOW) #define FG_LIGHTGREY TCOLOR_FG(TC_WHITE) #define FG_DARKGREY (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_BLACK)) #define FG_LIGHTBLUE (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_BLUE)) @@ -102,7 +102,7 @@ typedef teken_color_t term_color_t; #define FG_LIGHTCYAN (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_CYAN)) #define FG_LIGHTRED (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_RED)) #define FG_LIGHTMAGENTA (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_MAGENTA)) -#define FG_YELLOW (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_BROWN)) +#define FG_YELLOW (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_YELLOW)) #define FG_WHITE (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_WHITE)) #define FG_BLINK TFORMAT(TF_BLINK) @@ -113,7 +113,7 @@ typedef teken_color_t term_color_t; #define BG_CYAN TCOLOR_BG(TC_CYAN) #define BG_RED TCOLOR_BG(TC_RED) #define BG_MAGENTA TCOLOR_BG(TC_MAGENTA) -#define BG_BROWN TCOLOR_BG(TC_BROWN) +#define BG_BROWN TCOLOR_BG(TC_YELLOW) #define BG_LIGHTGREY TCOLOR_BG(TC_WHITE) #define BG_DARKGREY (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_BLACK)) #define BG_LIGHTBLUE (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_BLUE)) @@ -121,7 +121,7 @@ typedef teken_color_t term_color_t; #define BG_LIGHTCYAN (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_CYAN)) #define BG_LIGHTRED (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_RED)) #define BG_LIGHTMAGENTA (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_MAGENTA)) -#define BG_YELLOW (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_BROWN)) +#define BG_YELLOW (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_YELLOW)) #define BG_WHITE (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_WHITE)) #ifndef TERMINAL_NORM_ATTR diff --git a/sys/teken/teken.c b/sys/teken/teken.c index cdd9ab4c8419..590e992fb238 100644 --- a/sys/teken/teken.c +++ b/sys/teken/teken.c @@ -494,7 +494,7 @@ teken_state_numbers(teken_t *t, teken_char_t c) #define k TC_BLACK #define b TC_BLUE -#define y TC_BROWN +#define y TC_YELLOW #define c TC_CYAN #define g TC_GREEN #define m TC_MAGENTA @@ -502,7 +502,7 @@ teken_state_numbers(teken_t *t, teken_char_t c) #define w TC_WHITE #define K (TC_BLACK | TC_LIGHT) #define B (TC_BLUE | TC_LIGHT) -#define Y (TC_BROWN | TC_LIGHT) +#define Y (TC_YELLOW | TC_LIGHT) #define C (TC_CYAN | TC_LIGHT) #define G (TC_GREEN | TC_LIGHT) #define M (TC_MAGENTA | TC_LIGHT) diff --git a/sys/teken/teken.h b/sys/teken/teken.h index 994298b0dbc6..7545db9b9cdf 100644 --- a/sys/teken/teken.h +++ b/sys/teken/teken.h @@ -53,7 +53,7 @@ typedef unsigned char teken_color_t; #define TC_BLACK 0 #define TC_RED 1 #define TC_GREEN 2 -#define TC_BROWN 3 +#define TC_YELLOW 3 #define TC_BLUE 4 #define TC_MAGENTA 5 #define TC_CYAN 6 diff --git a/sys/teken/teken_subr_compat.h b/sys/teken/teken_subr_compat.h index 4cf4f5e98c7b..c71fcea6ce9f 100644 --- a/sys/teken/teken_subr_compat.h +++ b/sys/teken/teken_subr_compat.h @@ -65,7 +65,7 @@ teken_subr_cons25_set_local_cursor_type(const teken_t *t, unsigned int type) } static const teken_color_t cons25_colors[8] = { TC_BLACK, TC_BLUE, - TC_GREEN, TC_CYAN, TC_RED, TC_MAGENTA, TC_BROWN, TC_WHITE }; + TC_GREEN, TC_CYAN, TC_RED, TC_MAGENTA, TC_YELLOW, TC_WHITE }; static void teken_subr_cons25_set_default_background(teken_t *t, unsigned int c)