lualoader: Setup default color scheme if we're using colors

The console may have been set for different colors before lualoader kicks
in; notably, a black-on-white color scheme is not necessarily what we're
expecting.

While here, make color.default() a composition of color.escape() instead of
rewriting the escape sequence to make it more obvious what it's achieving: a
white-on-black color scheme with no attributes set.

Reported by:	emaste, whose eyes may rest easily
This commit is contained in:
Kyle Evans 2018-03-19 15:48:31 +00:00
parent d9d3a08ed4
commit 85efc91a3c
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=331211
2 changed files with 7 additions and 1 deletions

View File

@ -89,7 +89,7 @@ function color.default()
if color.disabled then
return ""
end
return core.KEYSTR_CSI .. "0;37;40m"
return color.escape(color.WHITE, color.BLACK, color.DEFAULT)
end
function color.highlight(str)

View File

@ -34,6 +34,7 @@
-- Other modules will also need some of the functions it defines to safely
-- execute loader commands.
require("cli")
local color = require("color")
local core = require("core")
local config = require("config")
local menu
@ -49,6 +50,11 @@ if result ~= nil then
end
config.load()
-- Our console may have been setup for a different color scheme before we get
-- here, so make sure we set the default.
if color.isEnabled() then
printc(color.default())
end
password.check()
-- menu might be disabled
if menu ~= nil then