Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Feb 2018 03:37:47 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r329696 - head/stand/lua
Message-ID:  <201802210337.w1L3bluq070978@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802210337.w1L3bluq070978>