From owner-svn-src-head@freebsd.org Fri Mar 27 17:37:41 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B6C9D27BDC2; Fri, 27 Mar 2020 17:37:41 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48ppw41h8Bz49Q7; Fri, 27 Mar 2020 17:37:40 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8042F2511B; Fri, 27 Mar 2020 17:37:32 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02RHbWR7080465; Fri, 27 Mar 2020 17:37:32 GMT (envelope-from freqlabs@FreeBSD.org) Received: (from freqlabs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02RHbV0d080460; Fri, 27 Mar 2020 17:37:31 GMT (envelope-from freqlabs@FreeBSD.org) Message-Id: <202003271737.02RHbV0d080460@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: freqlabs set sender to freqlabs@FreeBSD.org using -f From: Ryan Moeller Date: Fri, 27 Mar 2020 17:37:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359371 - in head/stand: forth lua X-SVN-Group: head X-SVN-Commit-Author: freqlabs X-SVN-Commit-Paths: in head/stand: forth lua X-SVN-Commit-Revision: 359371 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 17:37:42 -0000 Author: freqlabs Date: Fri Mar 27 17:37:31 2020 New Revision: 359371 URL: https://svnweb.freebsd.org/changeset/base/359371 Log: 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 Modified: head/stand/forth/loader.4th head/stand/forth/loader.rc head/stand/forth/screen.4th head/stand/lua/core.lua head/stand/lua/loader.lua Modified: head/stand/forth/loader.4th ============================================================================== --- head/stand/forth/loader.4th Fri Mar 27 17:06:24 2020 (r359370) +++ head/stand/forth/loader.4th Fri Mar 27 17:37:31 2020 (r359371) @@ -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 Modified: head/stand/forth/loader.rc ============================================================================== --- head/stand/forth/loader.rc Fri Mar 27 17:06:24 2020 (r359370) +++ head/stand/forth/loader.rc Fri Mar 27 17:37:31 2020 (r359371) @@ -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 Modified: head/stand/forth/screen.4th ============================================================================== --- head/stand/forth/screen.4th Fri Mar 27 17:06:24 2020 (r359370) +++ head/stand/forth/screen.4th Fri Mar 27 17:37:31 2020 (r359371) @@ -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 ; Modified: head/stand/lua/core.lua ============================================================================== --- head/stand/lua/core.lua Fri Mar 27 17:06:24 2020 (r359370) +++ head/stand/lua/core.lua Fri Mar 27 17:37:31 2020 (r359371) @@ -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" Modified: head/stand/lua/loader.lua ============================================================================== --- head/stand/lua/loader.lua Fri Mar 27 17:06:24 2020 (r359370) +++ head/stand/lua/loader.lua Fri Mar 27 17:37:31 2020 (r359371) @@ -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()