From e159dbb85065cebb3c80a36d9faa5ce91d4cf760 Mon Sep 17 00:00:00 2001
From: Mikayla Fischler <mikayla@ky8.io>
Date: Thu, 11 May 2023 20:06:41 -0400
Subject: [PATCH] #184 updated supervisor for new mouse events

---
 supervisor/panel/front_panel.lua |  6 +++---
 supervisor/panel/style.lua       |  2 +-
 supervisor/renderer.lua          |  4 ++--
 supervisor/startup.lua           | 13 +++----------
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/supervisor/panel/front_panel.lua b/supervisor/panel/front_panel.lua
index 0098a6e..21d631b 100644
--- a/supervisor/panel/front_panel.lua
+++ b/supervisor/panel/front_panel.lua
@@ -22,10 +22,10 @@ local LED        = require("graphics.elements.indicators.led")
 local LEDPair    = require("graphics.elements.indicators.ledpair")
 local RGBLED     = require("graphics.elements.indicators.ledrgb")
 
-local TEXT_ALIGN = core.graphics.TEXT_ALIGN
+local TEXT_ALIGN = core.TEXT_ALIGN
 
-local cpair = core.graphics.cpair
-local border = core.graphics.border
+local cpair = core.cpair
+local border = core.border
 
 -- create new main view
 ---@param panel graphics_element main displaybox
diff --git a/supervisor/panel/style.lua b/supervisor/panel/style.lua
index 31039d4..996453c 100644
--- a/supervisor/panel/style.lua
+++ b/supervisor/panel/style.lua
@@ -6,7 +6,7 @@ local core = require("graphics.core")
 
 local style = {}
 
-local cpair = core.graphics.cpair
+local cpair = core.cpair
 
 -- GLOBAL --
 
diff --git a/supervisor/renderer.lua b/supervisor/renderer.lua
index ca49946..5dfb7d1 100644
--- a/supervisor/renderer.lua
+++ b/supervisor/renderer.lua
@@ -70,9 +70,9 @@ end
 function renderer.ui_ready() return ui.display ~= nil end
 
 -- handle a mouse event
----@param event mouse_interaction
+---@param event mouse_interaction|nil
 function renderer.handle_mouse(event)
-    if ui.display ~= nil then
+    if ui.display ~= nil and event ~= nil then
         ui.display.handle_mouse(event)
     end
 end
diff --git a/supervisor/startup.lua b/supervisor/startup.lua
index 57888e5..ce18670 100644
--- a/supervisor/startup.lua
+++ b/supervisor/startup.lua
@@ -174,16 +174,9 @@ local function main()
                 -- got a packet
                 local packet = superv_comms.parse_packet(param1, param2, param3, param4, param5)
                 superv_comms.handle_packet(packet)
-            elseif event == "mouse_click" then
-                -- handle a monitor touch event
-                renderer.handle_mouse(core.events.touch(param1, param2, param3))
-                log.debug(util.sprintf("mouse_click: %s [%d, %d]", param1, param2, param3))
-            elseif event == "mouse_drag" then
-                log.debug(util.sprintf("mouse_drag: %s [%d, %d]", param1, param2, param3))
-            elseif event == "mouse_scroll" then
-                log.debug(util.sprintf("mouse_scroll: %s [%d, %d]", param1, param2, param3))
-            elseif event == "mouse_up" then
-                log.debug(util.sprintf("mouse_up: %s [%d, %d]", param1, param2, param3))
+            elseif event == "mouse_click" or event == "mouse_up" or event == "mouse_drag" or event == "mouse_scroll" then
+                -- handle a mouse event
+                renderer.handle_mouse(core.events.new_mouse_event(event, param1, param2, param3))
             end
 
             -- check for termination request