From nobody Fri Aug 22 03:48:57 2025 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 4c7R4n4KgWz64wc2; Fri, 22 Aug 2025 03:48:57 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7R4n1Pjjz3bfG; Fri, 22 Aug 2025 03:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755834537; 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=TK8U2u6+255YC+1Vky7mgsNeEuXPnsCV29YebAnF3tw=; b=NHA3Awf5k0FhNJkZvIfOeSu/Q70VeimnEX808l5kYCQw2lL+dq6xjtknjsH0BUfmJBwZ48 nKjj3gyrCo+Otfp/paoCfhgGct4JG/WzjZns7cL+nTU8ZXUKgxAdCZzaUnVv/A1I33e07d cyBa/0IrHY2hzeAyzzDRmIyMx0HM3HQ7+8P8/gdNlyKI5xBtkojmKPISADWFrgaPmqt8ZI O70ii1/h2Lrn7Pb8sZY194JXXaxK5GOYsIS0JdzxEV/oAvDNr+ZuWDmpoEoxlMTTfCoenx 6zs0KZYodTN8CnDUxOvwt9hefxBwkA5fDH7xA55pomCR6LHWcWzS85lzdeLvEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755834537; 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=TK8U2u6+255YC+1Vky7mgsNeEuXPnsCV29YebAnF3tw=; b=c/25FeNrtVjADQfktEHgwSyfUzRJ67/vq44xtiTDD7PMkGiQAA9rfGChKaMaFyOM46vVmb tEQH1A5OkAuU9y2Kat24hBabpuJNP9lpsODuLP4POlVNzzyKZLeL67nCElVlovJ8xPdUQ6 nKq5lR7IA1zT4KNbyLJyWdB8K5ulqqeQBYQ0rlECsHAELMz6JDNIJgs9V4InWATUf/Jt2E oOyWsa+WRNCVFqBwswGY4CB2CUsY7yRLRgYZuvbna0nRGVE0/Z3gD5mZBFLvGIScuspEBf QuDOMFyrEIkNVRodYQlYlcq8IAXcRX4Wvi+G29K+FreTlGMSGtxHHtEcpv51Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755834537; a=rsa-sha256; cv=none; b=En4+CqYdxo6rPRHk2SpYN8KEAP1AxhDnwEJFiCNe3a1FilznMuWuNeAbehv+KLnRO9ZmIQ forKGwYerO0ohT56raVr0MIDtFlgPxLphljcOHF6dSkEgw9s070q7dahrgBlYzoeo87FWf K01NeQUwQWLWHwA4DNFlIieGSJQC3Xuj6fxE0mzBXdHEXVprgcbRoOKQZ5Eki5O2E8+ijF pTVEYRwvN8Wa4ek0Eu6PVbN7qqVIkR/n1L1AVNm6lmf79E7kl+MahkcscpBGHQ6O9i2Yoh Thzki/VOCdXb099WmFuXDoA8UbpZrRC4OdsbqFdo8grtIat50wuDJr/ha4gYvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7R4n0tsFzCkP; Fri, 22 Aug 2025 03:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57M3mvRk001069; Fri, 22 Aug 2025 03:48:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57M3mvhV001066; Fri, 22 Aug 2025 03:48:57 GMT (envelope-from git) Date: Fri, 22 Aug 2025 03:48:57 GMT Message-Id: <202508220348.57M3mvhV001066@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 95e6fd1fd85a - main - stand: split fg/bg handling up a little further 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 95e6fd1fd85a448d2c68473b85a61fba24c9bc4f Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=95e6fd1fd85a448d2c68473b85a61fba24c9bc4f commit 95e6fd1fd85a448d2c68473b85a61fba24c9bc4f Author: Kyle Evans AuthorDate: 2025-08-22 03:48:14 +0000 Commit: Kyle Evans CommitDate: 2025-08-22 03:48:28 +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 Differential Revision: https://reviews.freebsd.org/D50887 --- 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 1d2f22649955..e9a343f2985a 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -232,35 +232,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