diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -232,35 +232,60 @@ 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