Author: kevans
Date: Thu Oct 24 04:05:53 2019
New Revision: 354010
URL: https://svnweb.freebsd.org/changeset/base/354010
Log:
MFC r352599, r352601: loader interp color reset fixes
r352599:
loader_4th: menu items need to reset color attribute, not switch to white
Forth menu kernel and BE entries, instead of resetting the color attribute,
are switching to white color.
r352601:
loader_lua: lua color changes should end with reset
The color change should have reset sequence, not switch to white.
Modified:
stable/12/stand/forth/menu.4th
stable/12/stand/forth/menu.rc
stable/12/stand/lua/color.lua
stable/12/stand/lua/logo-beastie.lua
stable/12/stand/lua/logo-orb.lua
stable/12/stand/lua/menu.lua
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/stand/forth/menu.4th
==============================================================================
--- stable/12/stand/forth/menu.4th Thu Oct 24 04:04:53 2019
(r354009)
+++ stable/12/stand/forth/menu.4th Thu Oct 24 04:05:53 2019
(r354010)
@@ -397,7 +397,7 @@ also menu-infrastructure definitions
setenv
\ Assign third to ansi_caption[x][y]
- kerncapbuf 0 s" @[1mK@[37mernel: " [char] @ escc! strcat
+ kerncapbuf 0 s" @[1mK@[mernel: " [char] @ escc! strcat
kernmenuidx @ [char] 0 = if
s" default/@[32m"
else
@@ -405,7 +405,7 @@ also menu-infrastructure definitions
then
[char] @ escc! strcat
2over strcat
- s" @[37m" [char] @ escc! strcat
+ s" @[m" [char] @ escc! strcat
kernidx @ kernmenuidx @ ansi_caption[x][y]
setenv
Modified: stable/12/stand/forth/menu.rc
==============================================================================
--- stable/12/stand/forth/menu.rc Thu Oct 24 04:04:53 2019
(r354009)
+++ stable/12/stand/forth/menu.rc Thu Oct 24 04:05:53 2019
(r354010)
@@ -72,7 +72,7 @@ s" currdev" getenv dup 0> [if] drop 4 s" zfs:" compare
set mainmenu_caption[7]="Select Boot [E]nvironment..."
set mainmenu_command[7]="3 goto_menu"
set mainmenu_keycode[7]=101
- set mainansi_caption[7]="Select Boot ^[1mE^[37mnvironment..."
+ set mainansi_caption[7]="Select Boot ^[1mE^[mnvironment..."
s" chain_disk" getenv? [if]
set mainmenu_caption[8]="Chain[L]oad ${chain_disk}"
Modified: stable/12/stand/lua/color.lua
==============================================================================
--- stable/12/stand/lua/color.lua Thu Oct 24 04:04:53 2019
(r354009)
+++ stable/12/stand/lua/color.lua Thu Oct 24 04:05:53 2019
(r354010)
@@ -42,7 +42,7 @@ color.MAGENTA = 5
color.CYAN = 6
color.WHITE = 7
-color.DEFAULT = 0
+color.DEFAULT = 9
color.BRIGHT = 1
color.DIM = 2
@@ -67,7 +67,7 @@ function color.resetfg()
if color.disabled then
return ''
end
- return color.escapefg(color.WHITE)
+ return color.escapefg(color.DEFAULT)
end
function color.escapebg(color_value)
@@ -81,7 +81,7 @@ function color.resetbg()
if color.disabled then
return ''
end
- return color.escapebg(color.BLACK)
+ return color.escapebg(color.DEFAULT)
end
function color.escape(fg_color, bg_color, attribute)
@@ -101,7 +101,7 @@ function color.default()
if color.disabled then
return ""
end
- return color.escape(color.WHITE, color.BLACK, color.DEFAULT)
+ return color.escape(color.DEFAULT, color.DEFAULT)
end
function color.highlight(str)
Modified: stable/12/stand/lua/logo-beastie.lua
==============================================================================
--- stable/12/stand/lua/logo-beastie.lua Thu Oct 24 04:04:53 2019
(r354009)
+++ stable/12/stand/lua/logo-beastie.lua Thu Oct 24 04:05:53 2019
(r354010)
@@ -48,7 +48,7 @@ local beastie_color = {
" \\ / /\\",
" \027[36m______\027[31m( (_ / \\______/",
" \027[36m,' ,-----' |",
-" `--{__________)\027[37m"
+" `--{__________)\027[m"
}
drawer.addLogo("beastie", {
Modified: stable/12/stand/lua/logo-orb.lua
==============================================================================
--- stable/12/stand/lua/logo-orb.lua Thu Oct 24 04:04:53 2019
(r354009)
+++ stable/12/stand/lua/logo-orb.lua Thu Oct 24 04:05:53 2019
(r354010)
@@ -44,7 +44,7 @@ local orb_color = {
" -- \027[31;1m-.\027[31m",
" `:` \027[31;1m`:`",
" \027[31;1m.-- `--.",
-" .---.....----.\027[37m"
+" .---.....----.\027[m"
}
drawer.addLogo("orb", {
Modified: stable/12/stand/lua/menu.lua
==============================================================================
--- stable/12/stand/lua/menu.lua Thu Oct 24 04:04:53 2019
(r354009)
+++ stable/12/stand/lua/menu.lua Thu Oct 24 04:05:53 2019
(r354010)
@@ -47,10 +47,10 @@ local return_menu_entry = {
local function OnOff(str, value)
if value then
return str .. color.escapefg(color.GREEN) .. "On" ..
- color.escapefg(color.WHITE)
+ color.resetfg()
else
return str .. color.escapefg(color.RED) .. "off" ..
- color.escapefg(color.WHITE)
+ color.resetfg()
end
end
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
