From nobody Sun Apr 12 13:44:10 2026 X-Original-To: dev-commits-src-branches@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 4ftsG32XFBz6ZMBG for ; Sun, 12 Apr 2026 13:44:11 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsG26nxDz3kZx for ; Sun, 12 Apr 2026 13:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001451; 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=9NipGTtetAxLciBQp9aIdVpK7x96yhUK7WEr4AssRBY=; b=iR/CnzLQ8LwiLw/q5sgXjCqX0dK4jPrLyxmRT7WEWd26IN+4TjSCc/7T9mQI7I079CDLos /3f2tAGUcIiczEGlR/LRkGXsgSlTYiGplhRAx0p7PGko6TD4kVbuckuJsjdDAs6i9PnVJM Lhpj1gjQYrVakhCeMU9cORopwcmy72ZBXo6eBS5vGzzOGbLjUQscEl3N+37N36KPhTCbli fK3V+JqPb0vBL65xDqKbfWmlBU56mrmEAy70dttPcLVKIlZo4n0Bi5PNghWsep133Hzt0O qld4KnuOkDqMy3+PIvaizBsM81aVBILrRRXBxOpddjIV5MqFqaBwVRRL6UYiPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001451; a=rsa-sha256; cv=none; b=PjfgM19M7tWzAO7XB+ZmMLgVu/ThgsEHh9qUGFRyGKTHsjWefY5XQ6Pwdf9CJiCkxO5XKe GG3AklwjEczpDAWlQdVDY7Bv8WZDUlRP7h8cwhbmdY0bf1KEgDnhS8Q/xrWaQhwi7LO3WE yo/65R510/KivwhBlDye2tJyvyNNq74TzkuhuGZEXuJw4Nf4CJAfotFL0n+89wEMh/ZYLj cKf8sLvRGgv1uE5IBap7LQGR97ZURdufmixPY6pJkOSr12kBTzlcMraILyzaGZ5K0RxY9o saZZ0t8o3c/hSQXnee30BQZaezP/XgtS/5OAzFHrWcPuzXdkvJrXQTWGKWvnmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001451; 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=9NipGTtetAxLciBQp9aIdVpK7x96yhUK7WEr4AssRBY=; b=fJDeJ/9BamrymSdbs2m/903TU6WKtLYX3NdUiNc00vuugOOVzFjpfbTF1OMEIQeEgawG5g vZkAsMElXfXSfF4fu1XguqTNFSdPUBKS9mTeNLxace0SORQ6CcoKCoZsqQUgVb0Idu9Y+a 6h6mRJLXJcDaagl8H1e5RdTLDcouaKxLwschwYv3UlBLcDWZfKkIacpxMGMpeIDUWDZQLt 06LSbGhTtwSZpLaVZ0VuxhRjfWG+l2v94AMXGUTHpfuqKs/KYSPMbuq0IRdWSyPuFGP2qd /+Hh9mBD0ZOJJz3px6UFOnIvGRSPb+XuoeOEF/xj1+ISDWo21uldL3h+RfXgMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG262Yzz4TM for ; Sun, 12 Apr 2026 13:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 439d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 14c8e003318b - stable/14 - stand: split fg/bg handling up a little further List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 14c8e003318b3c29f1b9a7a61092c9e3df5f2bc1 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:10 +0000 Message-Id: <69dba1aa.439d7.4ff8b5db@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=14c8e003318b3c29f1b9a7a61092c9e3df5f2bc1 commit 14c8e003318b3c29f1b9a7a61092c9e3df5f2bc1 Author: Kyle Evans AuthorDate: 2025-08-22 03:48:14 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:38 +0000 stand: split fg/bg handling up a little further These can be setup independently, so we should also check them and initialize each independently. This fixes a pre-existing bug where-in we may not pickup a bg color specified in the environment if a fg color wasn't set. The new version also ensures that we're hooking the color vars properly if we're using a value that was already there, as the console may need to adjust if something wants to switch them up again. Otherwise, a teken.fg_color set in loader could conceivably occur that only changes the color when you get to the kernel, which could be surprising. Reviewed by: imp (cherry picked from commit 95e6fd1fd85a448d2c68473b85a61fba24c9bc4f) --- stand/common/gfx_fb.c | 59 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index 9aa0431a04d6..687c081a1d5d 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -223,35 +223,60 @@ gfx_parse_mode_str(char *str, int *x, int *y, int *depth) return (true); } +/* + * Returns true if we set the color from pre-existing environment, false if + * just used existing defaults. + */ +static bool +gfx_fb_evalcolor(const char *envname, teken_color_t *cattr, + ev_sethook_t sethook, ev_unsethook_t unsethook) +{ + const char *ptr; + char env[10]; + bool from_env = false; + + ptr = getenv(envname); + if (ptr != NULL) { + *cattr = strtol(ptr, NULL, 10); + + /* + * If we can't unset the value, then it's probably hooked + * properly and we can just carry on. Otherwise, we want to + * reinitialize it so that we can hook it for the console that + * we're resetting defaults for. + */ + if (unsetenv(envname) != 0) + return (true); + from_env = true; + } + + snprintf(env, sizeof(env), "%d", *cattr); + env_setenv(envname, EV_VOLATILE, env, sethook, unsethook); + + return (from_env); +} + void gfx_fb_setcolors(teken_attr_t *attr, ev_sethook_t sethook, ev_unsethook_t unsethook) { const char *ptr; - char env[10]; + bool need_setattr = false; /* * On first run, we setup an environment hook to process any color * changes. If the env is already set, we pick up fg and bg color * values from the environment. */ - ptr = getenv("teken.fg_color"); - if (ptr != NULL) { - attr->ta_fgcolor = strtol(ptr, NULL, 10); - ptr = getenv("teken.bg_color"); - attr->ta_bgcolor = strtol(ptr, NULL, 10); - + if (gfx_fb_evalcolor("teken.fg_color", &attr->ta_fgcolor, + sethook, unsethook)) + need_setattr = true; + if (gfx_fb_evalcolor("teken.bg_color", &attr->ta_bgcolor, + sethook, unsethook)) + need_setattr = true; + + if (need_setattr) teken_set_defattr(&gfx_state.tg_teken, attr); - } else { - snprintf(env, sizeof(env), "%d", - attr->ta_fgcolor); - env_setenv("teken.fg_color", EV_VOLATILE, env, - sethook, unsethook); - snprintf(env, sizeof(env), "%d", - attr->ta_bgcolor); - env_setenv("teken.bg_color", EV_VOLATILE, env, - sethook, unsethook); - } } static uint32_t