GFX update :D

Src/Hyperion-firmware-cct/data/lib/modules/cc-tweaked/25_mouse.kmod

@@ -0,0 +1,25 @@
+--:Minify:--
+local kernel=...
+local fifo=kernel.newFifo()
+kernel.devfs.data["input"]["mouse1"] = function(op, mode)
+    if op=="type" then
+        return "Mouse"
+    elseif op=="open" then
+        local h = {
+            read=function(amount)
+                local rv=""
+                for i=1, amount or 1 do
+                    local event = {fifo.pop()}
+                    if event[1] then
+                        rv=rv..event[1]
+                    end
+                end
+                ---@diagnostic disable-next-line: cast-local-type
+                if rv=="" then rv=nil end
+                return rv
+            end
+        }
+        return h
+    end
+end
+kernel.cct.mouse={fifo=fifo}

Src/Hyperion-firmware-cct/data/lib/modules/cc-tweaked/25_tty.kmod

@@ -1,6 +1,8 @@
 --:Minify:--
 local kernel = ...
 local peripheral=kernel.cct.peripheral
+kernel.cct.gfx={}
+kernel.cct.term={}
 
 local colors = {
     [0xFFFFFF]=0x0001,
@@ -155,6 +157,7 @@ local function serializeBool(bool)
 end
 
 local function newtty(obj, id, ev)
+    kernel.cct.term[id]=obj
     obj.setPaletteColor(0x1,    0xFFFFFF) -- #000000
     obj.setPaletteColor(0x2,    0xFF0000) -- #FFFFFF
     obj.setPaletteColor(0x4,    0x00FF00) -- #FF0000
@@ -176,17 +179,6 @@ local function newtty(obj, id, ev)
             return "Terminal"
         elseif op=="open" then
             local h = {
-                read=function(amount)
-                    local rv=""
-                    for i=1, amount or 1 do
-                        local event = {ev()}
-                        if event[1] then
-                            rv=rv..event[1]
-                        end
-                    end
-                    if rv=="" then rv=nil end
-                    return rv
-                end,
                 write=function(content)
                     write(content, obj)
                 end,
@@ -221,18 +213,16 @@ local function newtty(obj, id, ev)
                     return false
                 end,
                 gplt=function()
-                    return plt
+                    return table.deepcopy(plt)
+                end,
+                gfx=function(...)
+                    if kernel.cct.gfx[id] then return kernel.cct.gfx[id] else return false end
+                end,
+                id=function()
+                    return id
                 end
             }
-            if mode=="rw" then
-                return h
-            elseif mode=="r" then
-                h["write"]=nil
-                return h
-            elseif mode=="w" then
-                h["read"]=nil
-                return h
-            end
+            return h
         end
     end
 end
@@ -259,23 +249,14 @@ kernel.devfs.data["input"]["keyboard1"] = function(op, mode)
                         rv=rv..event[1]
                     end
                 end
+                ---@diagnostic disable-next-line: cast-local-type
                 if rv=="" then rv=nil end
                 return rv
             end,
-            write=function(content)
-            end,
             gctrl=function()
                 return serializeBool(kernel.cct.ctrl)..";"..serializeBool(kernel.cct.alt)
             end
         }
-        if mode=="rw" then
-            return h
-        elseif mode=="r" then
-            h["write"]=nil
-            return h
-        elseif mode=="w" then
-            h["read"]=nil
-            return h
-        end
+        return h
     end
 end

Src/Hyperion-firmware-cct/data/lib/modules/cc-tweaked/30_daemon.kmod

@@ -71,8 +71,10 @@ kernel.processes.cctdaemon = function()
             elseif eventType == "mouse_scroll" then
                 if event[2] == 1 then
                     kernel.cct.fifo.push("S")
+                    kernel.cct.mouse.fifo.push("S")
                 else
                     kernel.cct.fifo.push("T")
+                    kernel.cct.mouse.fifo.push("T")
                 end
             elseif eventType == "http_success" then
                 if kernel.cct.httpqueue[event[2]] then
@@ -85,6 +87,16 @@ kernel.processes.cctdaemon = function()
                     kernel.cct.httperror[event[2]]=event[3]
                     kernel.cct.httpresponse[event[2]]=event[4]
                 end
+            elseif eventType == "mouse_click" then
+                --";X;Y;C"
+                -- 1 = left
+                -- 2 = right
+                -- 3 = middle
+                kernel.cct.mouse.fifo.push(";"..tostring(event[3])..";"..tostring(event[4])..";"..tostring(event[2]))
+            elseif eventType == "mouse_drag" then
+                kernel.cct.mouse.fifo.push(";"..tostring(event[3])..";"..tostring(event[4])..";"..tostring(event[2]))
+            elseif eventType == "mouse_up" then
+                kernel.cct.mouse.fifo.push(";"..tostring(event[3])..";"..tostring(event[4])..";"..tostring(event[2]))
             else
                 if kernel.cct.eventhooks[eventType] then
                     local ok,err = xpcall(kernel.cct.eventhooks[eventType], debug.traceback, table.unpack(event))

Src/Hyperion-firmware-cct/data/lib/modules/cc-tweaked/46_scheduler.kmod

@@ -35,6 +35,14 @@ function kernel.main()
         local totalTaskTime = 0
         local taskTimes    = {}
 
+        for id,hook in ipairs(kernel.mainHooks) do
+            local ok,err = xpcall(hook, debug.traceback)
+            if not ok then
+                kernel.log("[MAIN HOOK ERR]: "..err, "ERROR", 0xFF0000)
+                kernel.mainHooks[id]=nil
+            end
+        end
+
         for pid, task in pairs(kernel.tasks) do
             if kernel.exitMain then break end
 
@@ -42,7 +50,7 @@ function kernel.main()
                 for id,hook in ipairs(list) do
                     local ok,err = xpcall(hook, debug.traceback, task, pid)
                     if not ok then
-                        kernel.log("[MAIN HOOK ERR]: "..err, "ERROR", 0xFF0000)
+                        kernel.log("[TASK HOOK ERR]: "..err, "ERROR", 0xFF0000)
                         list[id]=nil
                     end
                 end
@@ -148,4 +156,6 @@ function kernel.main()
             kernel.saveLog()
         end
     end
+    kernel.log("Exited main")
+    kernel.saveLog()
 end