loader_lua: lua color changes should end with reset
The color change should have reset sequence, not switch to white.
This commit is contained in:
parent
2de5a21edc
commit
6dd078df19
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=352601
@ -42,7 +42,7 @@ color.MAGENTA = 5
|
|||||||
color.CYAN = 6
|
color.CYAN = 6
|
||||||
color.WHITE = 7
|
color.WHITE = 7
|
||||||
|
|
||||||
color.DEFAULT = 0
|
color.DEFAULT = 9
|
||||||
color.BRIGHT = 1
|
color.BRIGHT = 1
|
||||||
color.DIM = 2
|
color.DIM = 2
|
||||||
|
|
||||||
@ -67,7 +67,7 @@ function color.resetfg()
|
|||||||
if color.disabled then
|
if color.disabled then
|
||||||
return ''
|
return ''
|
||||||
end
|
end
|
||||||
return color.escapefg(color.WHITE)
|
return color.escapefg(color.DEFAULT)
|
||||||
end
|
end
|
||||||
|
|
||||||
function color.escapebg(color_value)
|
function color.escapebg(color_value)
|
||||||
@ -81,7 +81,7 @@ function color.resetbg()
|
|||||||
if color.disabled then
|
if color.disabled then
|
||||||
return ''
|
return ''
|
||||||
end
|
end
|
||||||
return color.escapebg(color.BLACK)
|
return color.escapebg(color.DEFAULT)
|
||||||
end
|
end
|
||||||
|
|
||||||
function color.escape(fg_color, bg_color, attribute)
|
function color.escape(fg_color, bg_color, attribute)
|
||||||
@ -101,7 +101,7 @@ function color.default()
|
|||||||
if color.disabled then
|
if color.disabled then
|
||||||
return ""
|
return ""
|
||||||
end
|
end
|
||||||
return color.escape(color.WHITE, color.BLACK, color.DEFAULT)
|
return color.escape(color.DEFAULT, color.DEFAULT)
|
||||||
end
|
end
|
||||||
|
|
||||||
function color.highlight(str)
|
function color.highlight(str)
|
||||||
|
@ -48,7 +48,7 @@ local beastie_color = {
|
|||||||
" \\ / /\\",
|
" \\ / /\\",
|
||||||
" \027[36m______\027[31m( (_ / \\______/",
|
" \027[36m______\027[31m( (_ / \\______/",
|
||||||
" \027[36m,' ,-----' |",
|
" \027[36m,' ,-----' |",
|
||||||
" `--{__________)\027[37m"
|
" `--{__________)\027[m"
|
||||||
}
|
}
|
||||||
|
|
||||||
drawer.addLogo("beastie", {
|
drawer.addLogo("beastie", {
|
||||||
|
@ -44,7 +44,7 @@ local orb_color = {
|
|||||||
" -- \027[31;1m-.\027[31m",
|
" -- \027[31;1m-.\027[31m",
|
||||||
" `:` \027[31;1m`:`",
|
" `:` \027[31;1m`:`",
|
||||||
" \027[31;1m.-- `--.",
|
" \027[31;1m.-- `--.",
|
||||||
" .---.....----.\027[37m"
|
" .---.....----.\027[m"
|
||||||
}
|
}
|
||||||
|
|
||||||
drawer.addLogo("orb", {
|
drawer.addLogo("orb", {
|
||||||
|
@ -47,10 +47,10 @@ local return_menu_entry = {
|
|||||||
local function OnOff(str, value)
|
local function OnOff(str, value)
|
||||||
if value then
|
if value then
|
||||||
return str .. color.escapefg(color.GREEN) .. "On" ..
|
return str .. color.escapefg(color.GREEN) .. "On" ..
|
||||||
color.escapefg(color.WHITE)
|
color.resetfg()
|
||||||
else
|
else
|
||||||
return str .. color.escapefg(color.RED) .. "off" ..
|
return str .. color.escapefg(color.RED) .. "off" ..
|
||||||
color.escapefg(color.WHITE)
|
color.resetfg()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user