From 73531a2abd8de866a3581d556b026b278fdedffa Mon Sep 17 00:00:00 2001
From: Ryan Moeller <freqlabs@FreeBSD.org>
Date: Fri, 27 Mar 2020 17:37:31 +0000
Subject: [PATCH] loader: Fully reset terminal settings, not just colors

Reviewed by:	kevans
Reviewed by:	tsoome
Approved by:	mav (mentor)
MFC after:	1 week
Sponsored by:	iXsystems, Inc.
Differential Revision:	https://reviews.freebsd.org/D21733
---
 stand/forth/loader.4th |  6 ++++++
 stand/forth/loader.rc  |  1 +
 stand/forth/screen.4th |  3 +++
 stand/lua/core.lua     |  1 +
 stand/lua/loader.lua   | 23 ++++++++---------------
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/stand/forth/loader.4th b/stand/forth/loader.4th
index 89d532fda317..89ea9efc4171 100644
--- a/stand/forth/loader.4th
+++ b/stand/forth/loader.4th
@@ -72,6 +72,12 @@ include /boot/check-password.4th
 
 only forth definitions
 
+: maybe-resetcons ( -- )
+  loader_color? if
+    ris
+  then
+;
+
 : bootmsg ( -- )
   loader_color? dup ( -- bool bool )
   if 7 fg 4 bg then
diff --git a/stand/forth/loader.rc b/stand/forth/loader.rc
index d898a7de6354..c15b0f5ce23b 100644
--- a/stand/forth/loader.rc
+++ b/stand/forth/loader.rc
@@ -14,6 +14,7 @@ try-include /boot/loader.rc.local
 start
 
 maybe-efi-resizecons
+maybe-resetcons
 
 \ Tests for password -- executes autoboot first if a password was defined
 check-password
diff --git a/stand/forth/screen.4th b/stand/forth/screen.4th
index e0af82b3a8b8..e27482248b57 100644
--- a/stand/forth/screen.4th
+++ b/stand/forth/screen.4th
@@ -39,6 +39,9 @@ marker task-screen.4th
 \ 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 ;
 
diff --git a/stand/lua/core.lua b/stand/lua/core.lua
index 5b8266c74510..448215d97d03 100644
--- a/stand/lua/core.lua
+++ b/stand/lua/core.lua
@@ -103,6 +103,7 @@ core.KEY_DELETE		= 127
 -- 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"
diff --git a/stand/lua/loader.lua b/stand/lua/loader.lua
index dacabe96e62f..0008cae93641 100644
--- a/stand/lua/loader.lua
+++ b/stand/lua/loader.lua
@@ -38,28 +38,21 @@ local color = require("color")
 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()