Index: head/stand/forth/loader.4th =================================================================== --- head/stand/forth/loader.4th +++ head/stand/forth/loader.4th @@ -72,6 +72,12 @@ only forth definitions +: maybe-resetcons ( -- ) + loader_color? if + ris + then +; + : bootmsg ( -- ) loader_color? dup ( -- bool bool ) if 7 fg 4 bg then Index: head/stand/forth/loader.rc =================================================================== --- head/stand/forth/loader.rc +++ head/stand/forth/loader.rc @@ -14,6 +14,7 @@ start maybe-efi-resizecons +maybe-resetcons \ Tests for password -- executes autoboot first if a password was defined check-password Index: head/stand/forth/screen.4th =================================================================== --- head/stand/forth/screen.4th +++ head/stand/forth/screen.4th @@ -39,6 +39,9 @@ \ clear screen : clear ( -- ) ho cld ; +\ reset to initial state +: ris ( -- ) 27 emit [char] c emit ; + \ move cursor to x rows, y cols (1-based coords) ( Esc-[%d;%dH ) : at-xy ( x y -- ) escc .# [char] ; emit .# [char] H emit ; Index: head/stand/lua/core.lua =================================================================== --- head/stand/lua/core.lua +++ head/stand/lua/core.lua @@ -103,6 +103,7 @@ -- other contexts (outside of Lua) may mean 'octal' core.KEYSTR_ESCAPE = "\027" core.KEYSTR_CSI = core.KEYSTR_ESCAPE .. "[" +core.KEYSTR_RESET = core.KEYSTR_ESCAPE .. "c" core.MENU_RETURN = "return" core.MENU_ENTRY = "entry" Index: head/stand/lua/loader.lua =================================================================== --- head/stand/lua/loader.lua +++ head/stand/lua/loader.lua @@ -38,28 +38,21 @@ local core = require("core") local config = require("config") local password = require("password") --- The menu module will be brought in after config has loaded if we actually --- need it. -local menu 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 -try_include("local") -if not core.isMenuSkipped() then - menu = require("menu") -end if core.isUEFIBoot() then loader.perform("efi-autoresizecons") end +-- Our console may have been setup with different settings before we get +-- here, so make sure we reset everything back to default. +if color.isEnabled() then + printc(core.KEYSTR_RESET) +end +try_include("local") password.check() --- menu might be disabled -if menu ~= nil then - menu.run() +if not core.isMenuSkipped() then + require("menu").run() else -- Load kernel/modules before we go config.loadelf()