#219 properly close out GUI on error on pocket and coordinator

pocket/renderer.lua

@@ -2,20 +2,22 @@
 -- Graphics Rendering Control
 --
 
-local main_view = require("pocket.ui.main")
-local style     = require("pocket.ui.style")
+local main_view  = require("pocket.ui.main")
+local style      = require("pocket.ui.style")
 
-local flasher   = require("graphics.flasher")
+local flasher    = require("graphics.flasher")
+
+local DisplayBox = require("graphics.elements.displaybox")
 
 local renderer = {}
 
 local ui = {
-    view = nil
+    display = nil
 }
 
 -- start the pocket GUI
 function renderer.start_ui()
-    if ui.view == nil then
+    if ui.display == nil then
         -- reset screen
         term.setTextColor(colors.white)
         term.setBackgroundColor(colors.black)
@@ -27,11 +29,12 @@ function renderer.start_ui()
             term.setPaletteColor(style.colors[i].c, style.colors[i].hex)
         end
 
+        -- init front panel view
+        ui.display = DisplayBox{window=term.current(),fg_bg=style.root}
+        main_view(ui.display)
+
         -- start flasher callback task
         flasher.run()
-
-        -- init front panel view
-        ui.view = main_view(term.current())
     end
 end
 
@@ -40,13 +43,13 @@ function renderer.close_ui()
     -- stop blinking indicators
     flasher.clear()
 
-    if ui.view ~= nil then
+    if ui.display ~= nil then
         -- hide to stop animation callbacks
-        ui.view.hide()
+        ui.display.hide()
     end
 
     -- clear root UI elements
-    ui.view = nil
+    ui.display = nil
 
     -- restore colors
     for i = 1, #style.colors do
@@ -64,12 +67,14 @@ end
 -- is the UI ready?
 ---@nodiscard
 ---@return boolean ready
-function renderer.ui_ready() return ui.view ~= nil end
+function renderer.ui_ready() return ui.display ~= nil end
 
 -- handle a mouse event
 ---@param event mouse_interaction
 function renderer.handle_mouse(event)
-    ui.view.handle_mouse(event)
+    if ui.display ~= nil then
+        ui.display.handle_mouse(event)
+    end
 end
 
 return renderer

pocket/startup.lua

@@ -17,7 +17,7 @@ local coreio       = require("pocket.coreio")
 local pocket       = require("pocket.pocket")
 local renderer     = require("pocket.renderer")
 
-local POCKET_VERSION = "alpha-v0.2.4"
+local POCKET_VERSION = "alpha-v0.2.5"
 
 local println = util.println
 local println_ts = util.println_ts

pocket/ui/main.lua

@@ -4,34 +4,31 @@
 
 local coreio        = require("pocket.coreio")
 
-local style         = require("pocket.ui.style")
+local style        = require("pocket.ui.style")
 
-local conn_waiting  = require("pocket.ui.components.conn_waiting")
+local conn_waiting = require("pocket.ui.components.conn_waiting")
 
-local home_page     = require("pocket.ui.components.home_page")
-local unit_page     = require("pocket.ui.components.unit_page")
-local reactor_page  = require("pocket.ui.components.reactor_page")
-local boiler_page   = require("pocket.ui.components.boiler_page")
-local turbine_page  = require("pocket.ui.components.turbine_page")
+local home_page    = require("pocket.ui.components.home_page")
+local unit_page    = require("pocket.ui.components.unit_page")
+local reactor_page = require("pocket.ui.components.reactor_page")
+local boiler_page  = require("pocket.ui.components.boiler_page")
+local turbine_page = require("pocket.ui.components.turbine_page")
 
-local core          = require("graphics.core")
+local core         = require("graphics.core")
 
-local DisplayBox    = require("graphics.elements.displaybox")
-local Div           = require("graphics.elements.div")
-local MultiPane     = require("graphics.elements.multipane")
-local TextBox       = require("graphics.elements.textbox")
+local Div          = require("graphics.elements.div")
+local MultiPane    = require("graphics.elements.multipane")
+local TextBox      = require("graphics.elements.textbox")
 
-local Sidebar       = require("graphics.elements.controls.sidebar")
+local Sidebar      = require("graphics.elements.controls.sidebar")
 
 local TEXT_ALIGN = core.graphics.TEXT_ALIGN
 
 local cpair = core.graphics.cpair
 
 -- create new main view
----@param monitor table main viewscreen
-local function init(monitor)
-    local main = DisplayBox{window=monitor,fg_bg=style.root}
-
+---@param main graphics_element main displaybox
+local function init(main)
     -- window header message
     TextBox{parent=main,y=1,text="",alignment=TEXT_ALIGN.LEFT,height=1,fg_bg=style.header}
 
@@ -97,8 +94,6 @@ local function init(monitor)
     local page_pane = MultiPane{parent=page_div,x=1,y=1,panes=panes}
 
     Sidebar{parent=main_pane,x=1,y=1,tabs=sidebar_tabs,fg_bg=cpair(colors.white,colors.gray),callback=page_pane.set_value}
-
-    return main
 end
 
 return init