svn commit: r331211 - head/stand/lua

[Kyle Evans]

Author: kevans
Date: Mon Mar 19 15:48:31 2018
New Revision: 331211
URL: https://svnweb.freebsd.org/changeset/base/331211

Log:
  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

Modified:
  head/stand/lua/color.lua
  head/stand/lua/loader.lua

Modified: head/stand/lua/color.lua
==============================================================================
--- head/stand/lua/color.lua	Mon Mar 19 15:35:26 2018	(r331210)
+++ head/stand/lua/color.lua	Mon Mar 19 15:48:31 2018	(r331211)
@@ -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)

Modified: head/stand/lua/loader.lua
==============================================================================
--- head/stand/lua/loader.lua	Mon Mar 19 15:35:26 2018	(r331210)
+++ head/stand/lua/loader.lua	Mon Mar 19 15:48:31 2018	(r331211)
@@ -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