Index: head/stand/lua/color.lua =================================================================== --- head/stand/lua/color.lua (revision 330083) +++ head/stand/lua/color.lua (revision 330084) @@ -1,102 +1,102 @@ -- -- SPDX-License-Identifier: BSD-2-Clause-FreeBSD -- -- Copyright (c) 2015 Pedro Souza -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without -- modification, are permitted provided that the following conditions -- are met: -- 1. Redistributions of source code must retain the above copyright -- notice, this list of conditions and the following disclaimer. -- 2. Redistributions in binary form must reproduce the above copyright -- notice, this list of conditions and the following disclaimer in the -- documentation and/or other materials provided with the distribution. -- -- THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- -- $FreeBSD$ -- local core = require("core") local color = {} -- Module exports color.BLACK = 0 color.RED = 1 color.GREEN = 2 color.YELLOW = 3 color.BLUE = 4 color.MAGENTA = 5 color.CYAN = 6 color.WHITE = 7 color.DEFAULT = 0 color.BRIGHT = 1 color.DIM = 2 function color.isEnabled() local c = loader.getenv("loader_color") if c ~= nil then if c:lower() == "no" or c == "0" then return false end end return not core.isSerialBoot() end color.disabled = not color.isEnabled() function color.escapef(color_value) if color.disabled then return color_value end - return "\027[3" .. color_value .. "m" + return core.KEYSTR_ESCAPE .. "[3" .. color_value .. "m" end function color.escapeb(color_value) if color.disabled then return color_value end - return "\027[4" .. color_value .. "m" + return core.KEYSTR_ESCAPE .. "[4" .. color_value .. "m" end function color.escape(fg_color, bg_color, attribute) if color.disabled then return "" end if attribute == nil then attribute = "" else attribute = attribute .. ";" end - return "\027[" .. attribute .. + return core.KEYSTR_ESCAPE .. "[" .. attribute .. "3" .. fg_color .. ";4" .. bg_color .. "m" end function color.default() if color.disabled then return "" end - return "\027[0;37;40m" + return core.KEYSTR_ESCAPE .. "[0;37;40m" end function color.highlight(str) if color.disabled then return str end - return "\027[1m" .. str .. "\027[0m" + return core.KEYSTR_ESCAPE .. "[1m" .. str .. core.KEYSTR_ESCAPE .. "[0m" end return color Index: head/stand/lua/screen.lua =================================================================== --- head/stand/lua/screen.lua (revision 330083) +++ head/stand/lua/screen.lua (revision 330084) @@ -1,95 +1,95 @@ -- -- SPDX-License-Identifier: BSD-2-Clause-FreeBSD -- -- Copyright (c) 2015 Pedro Souza -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without -- modification, are permitted provided that the following conditions -- are met: -- 1. Redistributions of source code must retain the above copyright -- notice, this list of conditions and the following disclaimer. -- 2. Redistributions in binary form must reproduce the above copyright -- notice, this list of conditions and the following disclaimer in the -- documentation and/or other materials provided with the distribution. -- -- THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- -- $FreeBSD$ -- local color = require("color") local core = require("core") local screen = {} -- Module exports function screen.clear() if core.isSerialBoot() then return end - loader.printc("\027[H\027[J") + loader.printc(core.KEYSTR_ESCAPE .. "[H" .. core.KEYSTR_ESCAPE .. "[J") end function screen.setcursor(x, y) if core.isSerialBoot() then return end - loader.printc("\027[" .. y .. ";" .. x .. "H") + loader.printc(core.KEYSTR_ESCAPE .. "[" .. y .. ";" .. x .. "H") end function screen.movecursor(dx, dy) if core.isSerialBoot() then return end if dx < 0 then - loader.printc("\027[" .. -dx .. "D") + loader.printc(core.KEYSTR_ESCAPE .. "[" .. -dx .. "D") elseif dx > 0 then - loader.printc("\027[" .. dx .. "C") + loader.printc(core.KEYSTR_ESCAPE .. "[" .. dx .. "C") end if dy < 0 then - loader.printc("\027[" .. -dy .. "A") + loader.printc(core.KEYSTR_ESCAPE .. "[" .. -dy .. "A") elseif dy > 0 then - loader.printc("\027[" .. dy .. "B") + loader.printc(core.KEYSTR_ESCAPE .. "[" .. dy .. "B") end end function screen.setforeground(color_value) if color.disabled then return color_value end loader.printc(color.escapef(color_value)) end function screen.setbackground(color_value) if color.disabled then return color_value end loader.printc(color.escapeb(color_value)) end function screen.defcolor() loader.printc(color.default()) end function screen.defcursor() if core.isSerialBoot() then return end - loader.printc("\027[25;0H") + loader.printc(core.KEYSTR_ESCAPE .. "[25;0H") end return screen