Simplify attaching GUI components

Specify callbacks directly in attach function. This greatly improves
readability.

Author: elgopher

gui/gui.lua

@@ -50,32 +50,35 @@ local function start_test(item)
 
 	window { title = item.fullpath }
 
-	local text_area = attach_textarea(
-		gui,
-		{ x = 0, y = 97, width = width, height = 103 }
-	)
-
 	local function find_lua_file_in_text(text)
 		return text:match("[^ ]*%.lua:%d+")
 	end
 
-	function text_area:is_link(text)
-		return text != nil and find_lua_file_in_text(text) != nil
-	end
-
-	function text_area:link_click(text)
-		if text == nil then return end
-
-		local file = find_lua_file_in_text(text)
-		if file != nil then
-			file = file:gsub(":", "#")
-			-- TODO if file is already open in text editor then this
-			-- command does not go to the specific line number.
-			-- Please note though, that in case of an unhandled error,
-			-- Picotron also opens the text editor in the same way.
-			create_process("/system/util/open.lua", { argv = { file } })
-		end
-	end
+	local text_area = attach_textarea(
+		gui,
+		{
+			x = 0,
+			y = 97,
+			width = width,
+			height = 103,
+			is_link = function(text)
+				return text != nil and find_lua_file_in_text(text) != nil
+			end,
+			link_click = function(text)
+				if text == nil then return end
+
+				local file = find_lua_file_in_text(text)
+				if file != nil then
+					file = file:gsub(":", "#")
+					-- TODO if file is already open in text editor then this
+					-- command does not go to the specific line number.
+					-- Please note though, that in case of an unhandled error,
+					-- Picotron also opens the text editor in the same way.
+					create_process("/system/util/open.lua", { argv = { file } })
+				end
+			end
+		}
+	)
 
 	test_summary = attach_test_summary(
 		gui,
@@ -92,12 +95,17 @@ local function start_test(item)
 
 	lights = attach_lights(
 		gui,
-		{ x = 8, y = 115, width = 264, height = 78 }
+		{
+			x = 8,
+			y = 115,
+			width = 264,
+			height = 78,
+			select = function(selected_test)
+				select_test(selected_test)
+				test_tree:select_child(selected_test)
+			end
+		}
 	)
-	function lights:select(selected_test)
-		select_test(selected_test)
-		test_tree:select_child(selected_test)
-	end
 
 	test_tree = attach_tree(
 		gui,

gui/lights.lua

@@ -3,6 +3,7 @@
 
 -- lights is a gui component showing lights of different color :)
 
+---@param el {x:number,y:number,width:number,height:number,select:function}
 function attach_lights(parent, el)
 	local lights <const> = {}
 	local lights_max = 0
@@ -40,7 +41,7 @@ function attach_lights(parent, el)
 	function el:click(msg)
 		local light = light_at_cursor_pointer(msg)
 		if light != nil then
-			el:select(light)
+			el.select(light)
 		end
 	end
 

gui/test_summary.lua

@@ -1,6 +1,7 @@
 -- (c) 2024 Jacek Olszak
 -- This code is licensed under MIT license (see LICENSE for details)
 
+---@param el {x:number,y:number,width:number,height:number}
 function attach_test_summary(parent, el)
 	local succeeded, failed = 0, 0
 

gui/test_toolbar.lua

@@ -1,6 +1,7 @@
 -- (c) 2024 Jacek Olszak
 -- This code is licensed under MIT license (see LICENSE for details)
 
+---@param el {x:number,y:number,width:number,height:number,start_test:function,stop_test:function,is_running:function}
 function attach_toolbar(parent, el)
    local toolbar_color <const> = 6
    local disabled_color <const> = 13
@@ -14,13 +15,13 @@ function attach_toolbar(parent, el)
 
    local run_btn <const> = el:attach_button { x = 6, y = 4, width = 10 }
    function run_btn:click()
-      if not el:is_running() then
-         el:start_test()
+      if not el.is_running() then
+         el.start_test()
       end
    end
 
    function run_btn:update()
-      if el:is_running() then
+      if el.is_running() then
          self.cursor = nil
       else
          self.cursor = "pointer"
@@ -29,7 +30,7 @@ function attach_toolbar(parent, el)
 
    function run_btn:draw()
       local col = disabled_color
-      if not el:is_running() then
+      if not el.is_running() then
          col = enabled_color
       end
       pal(icon_color, col)
@@ -39,11 +40,11 @@ function attach_toolbar(parent, el)
 
    local stop_btn <const> = el:attach_button { x = 22, y = 4, width = 10 }
    function stop_btn:click()
-      el:stop_test()
+      el.stop_test()
    end
 
    function stop_btn:update()
-      if not el:is_running() then
+      if not el.is_running() then
          self.cursor = nil
       else
          self.cursor = "pointer"
@@ -52,7 +53,7 @@ function attach_toolbar(parent, el)
 
    function stop_btn:draw()
       local col = disabled_color
-      if el:is_running() then
+      if el.is_running() then
          col = enabled_color
       end
       pal(icon_color, col)

gui/textarea.lua

@@ -1,6 +1,7 @@
 -- (c) 2024 Jacek Olszak
 -- This code is licensed under MIT license (see LICENSE for details)
 
+---@param el {x:number,y:number,width:number,height:number,is_link:function,link_click:function}
 function attach_textarea(parent, el)
 	local line_height <const> = 10
 
@@ -17,7 +18,7 @@ function attach_textarea(parent, el)
 	end
 
 	local function is_link(text)
-		return el.is_link != nil and el:is_link(text)
+		return el.is_link != nil and el.is_link(text)
 	end
 
 	function text_area:update(msg)
@@ -33,7 +34,7 @@ function attach_textarea(parent, el)
 	function text_area:click(msg)
 		local text = text_at_mouse_position(msg)
 		if is_link(text) and el.link_click != nil then
-			el:link_click(text)
+			el.link_click(text)
 		end
 	end
 

gui/tree.lua

@@ -2,6 +2,7 @@
 -- (c) 2024 Jacek Olszak
 -- This code is licensed under MIT license (see LICENSE for details)
 
+---@param el {x:number,y:number,width:number,height:number,select:function}
 function attach_tree(parent_el, el)
 	local bg_color <const> = 7
 	local fg_color <const> = 13