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.
This commit is contained in:
parent
fcc491a3fe
commit
20a8167664
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=329696
@ -327,6 +327,8 @@ menu.welcome = {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
menu.default = menu.welcome
|
||||||
|
|
||||||
function menu.run(m)
|
function menu.run(m)
|
||||||
|
|
||||||
if menu.skip() then
|
if menu.skip() then
|
||||||
@ -335,7 +337,7 @@ function menu.run(m)
|
|||||||
end
|
end
|
||||||
|
|
||||||
if m == nil then
|
if m == nil then
|
||||||
m = menu.welcome
|
m = menu.default
|
||||||
end
|
end
|
||||||
|
|
||||||
-- redraw screen
|
-- redraw screen
|
||||||
@ -351,7 +353,7 @@ function menu.run(m)
|
|||||||
|
|
||||||
-- Special key behaviors
|
-- Special key behaviors
|
||||||
if (key == core.KEY_BACKSPACE or key == core.KEY_DELETE) and
|
if (key == core.KEY_BACKSPACE or key == core.KEY_DELETE) and
|
||||||
m ~= menu.welcome then
|
m ~= menu.default then
|
||||||
break
|
break
|
||||||
elseif key == core.KEY_ENTER then
|
elseif key == core.KEY_ENTER then
|
||||||
core.boot()
|
core.boot()
|
||||||
@ -387,7 +389,7 @@ function menu.run(m)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if m == menu.welcome then
|
if m == menu.default then
|
||||||
screen.defcursor()
|
screen.defcursor()
|
||||||
print("Exiting menu!")
|
print("Exiting menu!")
|
||||||
return false
|
return false
|
||||||
|
Loading…
Reference in New Issue
Block a user