Merge branch 'repository' (for rwhateverwe'reon)

claw/repo-claw.lua

@@ -126,7 +126,7 @@ return {
  },
  ["app-metamachine"] = {
   desc = "Virtual machine",
-  v = 2,
+  v = 4,
   deps = {
    "neo",
    "zzz-license-pd"
@@ -202,7 +202,7 @@ return {
  },
  ["app-tapedeck"] = {
   desc = "Computronics Tape Drive interface",
-  v = 1,
+  v = 2,
   deps = {
    "neo",
    "zzz-license-pd"

repository/apps/app-metamachine.lua

@@ -65,6 +65,7 @@ local screensAll = {
 
 local tmpAddress = "k-tmpfs"
 local passthroughs = {}
+local fakeArch = _VERSION
 local components = {
  ["k-computer"] = {
   type = "computer",
@@ -83,6 +84,55 @@ local components = {
   getProgramLocations = function ()
    -- Entries of {"file", "lootdisk"}
    return {}
+  end,
+  getDeviceInfo = function ()
+   return {
+    ["k-computer"] = {
+     ["class"] = "system",
+     ["description"] = "Computer",
+     ["product"] = "Freeziflow Liquid-Cooling Unit",
+     ["vendor"] = "KDC Subsystems",
+     ["capacity"] = "10",
+     ["width"] = "",
+     ["clock"] = ""
+    },
+    ["k-processor"] = {
+     ["class"] = "processor",
+     ["description"] = "CPU",
+     ["product"] = "Celesti4 Quantum Computing System",
+     ["vendor"] = "KDC Subsystems",
+     ["capacity"] = "",
+     ["width"] = "",
+     ["clock"] = "9000"
+    },
+    ["k-memory"] = {
+     ["class"] = "memory",
+     ["description"] = "Memory bank",
+     ["product"] = "Lun4 Paging Subsystem",
+     ["vendor"] = "KDC Subsystems",
+     ["capacity"] = "",
+     ["width"] = "",
+     ["clock"] = "9000"
+    },
+    ["k-gpu"] = {
+     ["class"] = "display",
+     ["description"] = "Graphics controller",
+     ["product"] = "Tw1-l GPU Multiplexer",
+     ["vendor"] = "KDC Subsystems",
+     ["capacity"] = "8000",
+     ["width"] = "8",
+     ["clock"] = "9000"
+    }
+   }
+  end,
+  getArchitectures = function ()
+   return {fakeArch}
+  end,
+  setArchitecture = function (a)
+   fakeArch = a
+  end,
+  getArchitecture = function ()
+   return fakeArch
   end
  },
  ["k-gpu"] = libVGPU.newGPU(screensAll),
@@ -124,8 +174,8 @@ vmComponent = {
   return tk
  end,
  invoke = function (com, me, ...)
-  if not components[com] then error("no such component") end
+  if not components[com] then error("no such component " .. com) end
-  if not components[com][me] then error("no such method") end
+  if not components[com][me] then error("no such method " .. com .. "." .. me) end
   return components[com][me](...)
  end,
  proxy = function (com)
@@ -533,6 +583,9 @@ while ((not vmBaseCoroutine) or (coroutine.status(vmBaseCoroutine) ~= "dead")) a
      break
     elseif ev[3] == "line" then
      screensInt[id][2].line(ev[4])
+    elseif ev[3] == "clipboard" then
+     table.insert(signalStack, {ev[3], screensInt[id][1] .. "-kb", ev[4], "neo"})
+     break
     elseif ev[3] == "touch" or ev[3] == "drag" or ev[3] == "drop" or ev[3] == "scroll" then
      local x = ev[4]
      local y = ev[5]

repository/apps/app-tapedeck.lua

@@ -5,13 +5,10 @@
 -- Added note: Computerized record discs aren't available, so it can't be called vinylscratch.
 -- Authors: 20kdc
 
-local tapes = {}
-for v in neo.requireAccess("c.tape_drive", "tapedrives").list() do
- table.insert(tapes, v)
-end
-
 local tapeRate = 4096
 
+local tapeAccess = neo.requireAccess("c.tape_drive", "tapedrives")
+
 local event = require("event")(neo)
 local neoux = require("neoux")(event, neo)
 
@@ -35,10 +32,11 @@ local updateTick
 
 local downloadCancelled = false
 
-local genPlayer -- used to return to player
+local genPlayer, genList -- used to return to player
 
-local function genDownloading(inst)
+local function genDownloading(downloadText, inst)
- local lclLabelText = {"downloading..."}
+ downloadCancelled = false
+ local lclLabelText = {downloadText}
  local lclLabel = neoux.tcrawview(1, 1, lclLabelText)
  local thr = {
   "/",
@@ -48,7 +46,7 @@ local function genDownloading(inst)
  }
  local thri = 0
  updateTick = function ()
-  lclLabelText[1] = "downloading... " .. (inst.getPosition() / (1024 * 1024)) .. "MB " .. thr[(thri % #thr) + 1]
+  lclLabelText[1] = downloadText .. " " .. (inst.getPosition() / (1024 * 1024)) .. "MB " .. thr[(thri % #thr) + 1]
   thri = thri + 1
   lclLabel.update(window)
  end
@@ -59,14 +57,18 @@ local function genDownloading(inst)
  end, 0xFFFFFF, 0)
 end
 
+local function maybeSleep()
+ if math.random() > 0.98 then
+  event.sleepTo(os.uptime() + 0.05)
+ end
+end
+
 local function doINetThing(inet, url, inst)
  inet = inet.list()()
  assert(inet, "No available card")
  inst.stop()
  inst.seek(-inst.getSize())
- downloadCancelled = false
+ window.reset(genDownloading("downloading...", inst))
- downloadPercent = 0
- window.reset(genDownloading(inst))
  local req = assert(inet.request(url))
  req.finishConnect()
  local tapePos = 0
@@ -130,16 +132,15 @@ genPlayer = function (inst)
   window.reset(genPlayer(inst))
  end
  -- Common code for reading/writing tapes.
- -- Note that it tries to allow playback to resume later.
  local function rwButton(mode)
   local fh = neoux.fileDialog(mode)
   if not fh then return end
   inst.stop()
-  local sp = inst.getPosition()
   local tapeSize = inst.getSize()
   inst.seek(-tapeSize)
   local tapePos = 0
-  while tapePos < tapeSize do
+  window.reset(genDownloading("working...", inst))
+  while tapePos < tapeSize and not downloadCancelled do
    if mode then
     local data = inst.read(neo.readBufSize)
     if not data then break end
@@ -155,15 +156,15 @@ genPlayer = function (inst)
     tapePos = tapePos + #data
     inst.write(data)
    end
+   maybeSleep()
   end
   inst.seek(-tapeSize)
-  inst.seek(sp)
   fh.close()
+  window.reset(genPlayer(inst))
  end
  local elems = {
   neoux.tcrawview(1, 1, {
-   "Label:",
+   "Label:"
-   "Contents:"
   }),
   neoux.tcfield(7, 1, 34, function (tx)
    if tx then
@@ -245,14 +246,55 @@ genPlayer = function (inst)
    pausePlay()
   end),
   -- R/W buttons
-  neoux.tcbutton(11, 2, "Read", function (w)
+  neoux.tcbutton(1, 2, "Read", function (w)
    rwButton(true)
   end),
-  neoux.tcbutton(17, 2, "Write", function (w)
+  neoux.tcbutton(7, 2, "Write", function (w)
    rwButton(false)
   end),
-  neoux.tcbutton(24, 2, "Write From Web", function (w)
+  neoux.tcbutton(14, 2, "Write Web", function (w)
    w.reset(genWeb(inst))
+  end),
+  neoux.tcbutton(25, 2, "Copy", function (w)
+   w.reset(genList(function (inst2)
+    local ts1 = inst.getSize()
+    inst.stop()
+    inst.seek(-ts1)
+    local ts2 = inst2.getSize()
+    inst2.stop()
+    inst2.seek(-ts2)
+    if ts1 < ts2 then
+     w.reset(genDownloading("copying...", inst))
+    else
+     w.reset(genDownloading("copying...", inst2))
+    end
+    local pos = 0
+    while pos < ts1 and pos < ts2 and not downloadCancelled do
+     local dat = inst.read(neo.readBufSize)
+     inst2.write(dat)
+     pos = pos + #dat
+     maybeSleep()
+    end
+    inst.seek(-ts1)
+    inst2.seek(-ts2)
+    inst2.setLabel((inst.getLabel() or "") .. " Copy")
+    w.reset(genPlayer(inst))
+   end))
+  end),
+  neoux.tcbutton(31, 2, "Erase", function (w)
+   local ts1 = inst.getSize()
+   inst.stop()
+   inst.seek(-ts1)
+   w.reset(genDownloading("erasing...", inst))
+   local blank = ("\x00"):rep(neo.readBufSize)
+   local pos = 0
+   while pos < ts1 and not downloadCancelled do
+    inst.write(blank)
+    pos = pos + #blank
+    maybeSleep()
+   end
+   inst.seek(-ts1)
+   w.reset(genPlayer(inst))
   end)
  }
  updateTick = function ()
@@ -277,14 +319,25 @@ genPlayer = function (inst)
   return n(a, ...)
  end
 end
-local function genList()
+genList = function(callback)
+ updateTick = nil
  local elems = {}
+ local tapes = {}
+ for v in tapeAccess.list() do
+  table.insert(tapes, v)
+ end
  for k, v in ipairs(tapes) do
-  elems[k] = neoux.tcbutton(1, k, v.address:sub(1, 38), function (w)
+  -- There's 38 chars available...
-   window.reset(genPlayer(v))
+  local desc1 = neoux.pad(v.address, 13, false, true)
+  if v.isReady() then
+   desc1 = desc1 .. ": " .. neoux.pad(v.getLabel() or "", 23, false, true)
+  else
+   desc1 = desc1 .. " (no tape)"
+  end
+  elems[k] = neoux.tcbutton(1, k, desc1, function (w)
+   callback(v)
   end)
  end
- tapes = nil
  return 40, #elems, nil, neoux.tcwindow(40, #elems, elems, function (w)
   running = false
   w.close()
@@ -292,7 +345,9 @@ local function genList()
 end
 
 
-window = neoux.create(genList())
+window = neoux.create(genList(function (v)
+ window.reset(genPlayer(v))
+end))
 
 -- Timer for time update
 local function tick()