color works now \o/

src/lua/core/textgpu.lua

@@ -45,23 +45,36 @@ local fg = 256
 local bg = 1
 local w, h = 1, 1
 
-local unsub
-local function set(x, y, text, f, b)
+local function rgb(i)
+  return i>>16&0xFF, i>>8&0xFF, i&0xFF
+end
+
+local unsub, fullRefresh
+local function set(x, y, text, f, b, safe)
   if x > w or x < 1 or y > h or y < 1 or not tbuffer[y] then
+    if safe then
+      return
+    else
       error("index out of bounds: " .. y, 3)
     end
+  end
+  if not text then return end
   f = f or fg
   b = b or bg
   local len = utf8.len(text)
   if x + len > w then
-    text = unsub(text, 1, -1 - ((x + len) - w))
+    --len = (x + len) - w
+    --text = unsub(text, 1, len)
   end
-  tbuffer[y] = tbuffer[y]:sub(1, x - 1) ..
-    text .. tbuffer[y]:sub(x + len)
+  tbuffer[y] = unsub(tbuffer[y], 1, x - 1) ..
+    text .. unsub(tbuffer[y], x + len)
   if type(f) == "string" then
     fbuffer[y] = fbuffer[y]:sub(1, x - 1) ..
       f .. fbuffer[y]:sub(x + len)
   else
+    local F = mapping[f]
+    local r, g, _b = rgb(F)
+    write("\27[38;2;", r, ";", g, ";", _b, "m")
     fbuffer[y] = fbuffer[y]:sub(1, x - 1) ..
      string.rep(string.char(f - 1), len) .. fbuffer[y]:sub(x + len)
   end
@@ -69,16 +82,17 @@ local function set(x, y, text, f, b)
     bbuffer[y] = bbuffer[y]:sub(1, x - 1) ..
       b .. bbuffer[y]:sub(x + len)
   else
-    bbuffer[y] = fbuffer[y]:sub(1, x - 1) ..
+    local B = mapping[b]
+    local r, g, _b = rgb(B)
+    write("\27[48;2;", r, ";", g, ";", _b, "m")
+    bbuffer[y] = bbuffer[y]:sub(1, x - 1) ..
       string.rep(string.char(b - 1), len) .. bbuffer[y]:sub(x + len)
   end
-  local F, B = mapping[f], mapping[b]
-  write("\27[38;2;", F&0xFF0000, ";", F&0x00FF00, ";", F&0x0000FF, "m")
-  write("\27[48;2;", B&0xFF0000, ";", B&0x00FF00, ";", B&0x0000FF, "m")
-  write("\27[", x, ";", y, "H", text)
+  write("\27[", y, ";", x, "H", text)
+  flush()
 end
 
-local function fullRefresh()
+fullRefresh = function()
   for i=1, h, 1 do
     local text = tbuffer[i]
     local fgt = fbuffer[i]
@@ -89,30 +103,37 @@ local function fullRefresh()
       local str = ""
       if bc ~= pb then
         pb = bc
-        local B = mapping[bc]
+        local B = mapping[bc:byte() + 1]
         str = str .. string.format("\27[48;2;%d;%d;%dm",
-          B&0xFF0000, B&0x00FF00, B&0x0000FF)
+          rgb(B))
       end
       if fc ~= pf then
         pf = fc
-        local F = mapping[fc]
+        local F = mapping[fc:byte() + 1]
         str = str .. string.format("\27[38;2;%d;%d;%dm",
-          F&0xFF0000, F&0x00FF00, F&0x0000FF)
+          rgb(F))
       end
       str = str .. tc
       return str
     end)
-    write("\27[", h, ";1H", fgt)
+    write("\27[", i, ";1H", fgt)
+  end
   flush()
 end
-end
 
-local function get(x, y, len)
+local function get(x, y, len, safe)
   if x < 1 or x > w or y < 1 or y > h then
+    if safe then
+      return
+    else
       error("index out of bounds: " .. y, 3)
     end
+  end
   len = (len or 1) - 1
-  local txt = unsub(tbuffer[y], x, x + len)
+  if x + len > w then
+    len = (x + len) - w
+  end
+  local text = unsub(tbuffer[y], x, x + len)
   if len == 0 then
     return text,
       mapping[fbuffer[y]:sub(x, x):byte() + 1],
@@ -208,6 +229,7 @@ function textgpu.start()
     checkArg(2, y, "number")
     checkArg(3, text, "string")
     checkArg(4, vert, "boolean", "nil")
+    vert = false
     if vert then
       local i = 1
       local len = utf8.len(text)
@@ -218,6 +240,7 @@ function textgpu.start()
       return true
     else
       set(x, y, text)
+      return true
     end
   end
 
@@ -236,8 +259,8 @@ function textgpu.start()
     c = unsub(c, 1, 1)
     if #c == 0 then return true end
     local str = c:rep(W)
-    for i=1, h, 1 do
-      set(x, y + i - 1, str)
+    for i=1, H, 1 do
+      set(x, y + i - 1, str, nil, nil, true)
     end
     return true
   end
@@ -249,15 +272,18 @@ function textgpu.start()
     checkArg(4, H, "number")
     checkArg(5, xd, "number")
     checkArg(6, yd, "number")
+    if xd == 0 and yd == 0 then return true end -- hah
     local start, stop, step
-    if yd > 0 then -- moving up - copy from the top down
+    if yd < 0 then -- moving up - copy from the top down
       start, stop, step = y, y + H, 1
     else -- moving down - copy from the bottom up
       start, stop, step = y + H, y, -1
     end
     for i=start, stop, step do
-      local str, fstr, bstr = get(x, i, W)
-      set(x + xd, i + yd, str, fstr, bstr)
+      local str, fstr, bstr = get(x, i, W, true)
+      if str and fstr and bstr then
+        set(x + xd, i + yd, str, fstr, bstr, true)
+      end
     end
     fullRefresh()
     return true
@@ -268,7 +294,7 @@ function textgpu.start()
     return screenAddr
   end
 
-  function gpu.bind() end
+  function gpu.bind() --[[STUB]] end
 
   if not termutils.init() then
     return nil, "Cannot initialize terminal based gpu"
@@ -277,6 +303,7 @@ function textgpu.start()
 
   w, h = gpu.getResolution()
   prep(w, h)
+  fullRefresh()
 
   gpu.setForeground(0xFFFFFF)
   gpu.setBackground(0x000000)