lualoader: Further screen cleanup

- Add screen.default_x and screen.default_y to determine where
  screen.defcursor resets the cursor to.
- Use screen.setcursor in screen.defcursor instead of rewriting the escape
  sequence.
- Use screen.default_y when resetting the cursor after writing the new
  twiddle character, add a comment verbally describing the position just in
  case.
This commit is contained in:
Kyle Evans 2018-02-28 04:31:19 +00:00
parent 0901ba3aa1
commit ed1d0954ca
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=330099
2 changed files with 6 additions and 2 deletions

View File

@ -47,7 +47,8 @@ function password.read(prompt_length)
local function draw_twiddle()
loader.printc(" " .. twiddle_chars[twiddle_pos])
screen.setcursor(prompt_length + 2, 25)
-- Reset cursor to just after the password prompt
screen.setcursor(prompt_length + 2, screen.default_y)
twiddle_pos = (twiddle_pos % #twiddle_chars) + 1
end

View File

@ -34,6 +34,9 @@ local core = require("core")
local screen = {}
-- Module exports
screen.default_x = 0
screen.default_y = 25
function screen.clear()
if core.isSerialBoot() then
return
@ -71,7 +74,7 @@ function screen.defcursor()
if core.isSerialBoot() then
return
end
loader.printc(core.KEYSTR_CSI .. "25;0H")
screen.setcursor(screen.default_x, screen.default_y)
end
return screen