From owner-svn-src-head@freebsd.org Wed Feb 21 03:37:47 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 873FDF269F1; Wed, 21 Feb 2018 03:37:47 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3963682495; Wed, 21 Feb 2018 03:37:47 +0000 (UTC) (envelope-from kevans@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 3472413152; Wed, 21 Feb 2018 03:37:47 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1L3blqn070979; Wed, 21 Feb 2018 03:37:47 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1L3bluq070978; Wed, 21 Feb 2018 03:37:47 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802210337.w1L3bluq070978@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 21 Feb 2018 03:37:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329696 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 329696 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.25 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: Wed, 21 Feb 2018 03:37:47 -0000 Author: kevans Date: Wed Feb 21 03:37:46 2018 New Revision: 329696 URL: https://svnweb.freebsd.org/changeset/base/329696 Log: lualoader: Add "menu.default", initialized to menu.welcome The intent here is to abstract away the name of the default menu. The default menu is still the welcome menu, but this detail doesn't need to matter to things outside of the menu module. You may change the default menu, but one would need to modify a specific menu. Modified: head/stand/lua/menu.lua Modified: head/stand/lua/menu.lua ============================================================================== --- head/stand/lua/menu.lua Wed Feb 21 03:34:33 2018 (r329695) +++ head/stand/lua/menu.lua Wed Feb 21 03:37:46 2018 (r329696) @@ -327,6 +327,8 @@ menu.welcome = { }, } +menu.default = menu.welcome + function menu.run(m) if menu.skip() then @@ -335,7 +337,7 @@ function menu.run(m) end if m == nil then - m = menu.welcome + m = menu.default end -- redraw screen @@ -351,7 +353,7 @@ function menu.run(m) -- Special key behaviors if (key == core.KEY_BACKSPACE or key == core.KEY_DELETE) and - m ~= menu.welcome then + m ~= menu.default then break elseif key == core.KEY_ENTER then core.boot() @@ -387,7 +389,7 @@ function menu.run(m) end end - if m == menu.welcome then + if m == menu.default then screen.defcursor() print("Exiting menu!") return false