d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lualoader: Convert instances of KEYSTR_ESCAPE .. "[" -> KEYSTR_CSI

Browse Source
This commit is contained in:
Kyle Evans 2018-02-27 22:02:39 +00:00
parent 3049d4ccc0
commit 2bb86aefec
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=330087
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stand/lua/color.lua
View File

@ -62,14 +62,14 @@ function color.escapef(color_value)
if color.disabled then if color.disabled then
return color_value return color_value
end end
return core.KEYSTR_ESCAPE .. "[3" .. color_value .. "m" return core.KEYSTR_CSI .. "3" .. color_value .. "m"
end end
function color.escapeb(color_value) function color.escapeb(color_value)
if color.disabled then if color.disabled then
return color_value return color_value
end end
return core.KEYSTR_ESCAPE .. "[4" .. color_value .. "m" return core.KEYSTR_CSI .. "4" .. color_value .. "m"
end end
function color.escape(fg_color, bg_color, attribute) function color.escape(fg_color, bg_color, attribute)
@ -81,7 +81,7 @@ function color.escape(fg_color, bg_color, attribute)
else else
attribute = attribute .. ";" attribute = attribute .. ";"
end end
return core.KEYSTR_ESCAPE .. "[" .. attribute .. return core.KEYSTR_CSI .. attribute ..
"3" .. fg_color .. ";4" .. bg_color .. "m" "3" .. fg_color .. ";4" .. bg_color .. "m"
end end
@ -89,14 +89,14 @@ function color.default()
if color.disabled then if color.disabled then
return "" return ""
end end
return core.KEYSTR_ESCAPE .. "[0;37;40m" return core.KEYSTR_CSI .. "0;37;40m"
end end
function color.highlight(str) function color.highlight(str)
if color.disabled then if color.disabled then
return str return str
end end
return core.KEYSTR_ESCAPE .. "[1m" .. str .. core.KEYSTR_ESCAPE .. "[0m" return core.KEYSTR_CSI .. "1m" .. str .. core.KEYSTR_CSI .. "0m"
end end
return color return color

1
stand/lua/core.lua
View File

@ -47,6 +47,7 @@ core.KEY_ENTER = 13
core.KEY_DELETE = 127 core.KEY_DELETE = 127
core.KEYSTR_ESCAPE = "\027" core.KEYSTR_ESCAPE = "\027"
core.KEYSTR_CSI = core.KEYSTR_ESCAPE .. "["
core.MENU_RETURN = "return" core.MENU_RETURN = "return"
core.MENU_ENTRY = "entry" core.MENU_ENTRY = "entry"

14
stand/lua/screen.lua
View File

@ -38,7 +38,7 @@ function screen.clear()
if core.isSerialBoot() then if core.isSerialBoot() then
return return
end end
loader.printc(core.KEYSTR_ESCAPE .. "[H" .. core.KEYSTR_ESCAPE .. "[J") loader.printc(core.KEYSTR_CSI .. "H" .. core.KEYSTR_CSI .. "J")
end end
function screen.setcursor(x, y) function screen.setcursor(x, y)
@ -46,7 +46,7 @@ function screen.setcursor(x, y)
return return
end end
loader.printc(core.KEYSTR_ESCAPE .. "[" .. y .. ";" .. x .. "H") loader.printc(core.KEYSTR_CSI .. y .. ";" .. x .. "H")
end end
function screen.movecursor(dx, dy) function screen.movecursor(dx, dy)
@ -55,15 +55,15 @@ function screen.movecursor(dx, dy)
end end
if dx < 0 then if dx < 0 then
loader.printc(core.KEYSTR_ESCAPE .. "[" .. -dx .. "D") loader.printc(core.KEYSTR_CSI .. -dx .. "D")
elseif dx > 0 then elseif dx > 0 then
loader.printc(core.KEYSTR_ESCAPE .. "[" .. dx .. "C") loader.printc(core.KEYSTR_CSI .. dx .. "C")
end end
if dy < 0 then if dy < 0 then
loader.printc(core.KEYSTR_ESCAPE .. "[" .. -dy .. "A") loader.printc(core.KEYSTR_CSI .. -dy .. "A")
elseif dy > 0 then elseif dy > 0 then
loader.printc(core.KEYSTR_ESCAPE .. "[" .. dy .. "B") loader.printc(core.KEYSTR_CSI .. dy .. "B")
end end
end end
@ -89,7 +89,7 @@ function screen.defcursor()
if core.isSerialBoot() then if core.isSerialBoot() then
return return
end end
loader.printc(core.KEYSTR_ESCAPE .. "[25;0H") loader.printc(core.KEYSTR_CSI .. "25;0H")
end end
return screen return screen