AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-19 04:06:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the fix

Browse Source
This commit is contained in:
Łukasz Magiera 2014-08-05 15:25:54 +02:00
parent 977f3bbfbe
commit c9d29b87de
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/resources/assets/opencomputers/loot/OpenOS/lib/term.lua
View File

@ -105,14 +105,17 @@ function term.read(history, dobreak, hint, prompt)
checkArg(1, history, "table", "nil")
history = history or {}
table.insert(history, "")
if type(prompt) == "function" then
pcall(prompt)
elseif type(prompt) == "string" then
term.write(prompt)
end
local offset = term.getCursor() - 1
local scrollX, scrollY = 0, #history - 1
local cursorX = 1
if type(prompt) == "function" then
pcall(prompt)
end
local function getCursor()
return cursorX, 1 + scrollY
end
@ -256,13 +259,22 @@ function term.read(history, dobreak, hint, prompt)
if type(after) == "string" then
local _, cby = getCursor()
history[cby] = after
elseif type(after) == "table" or type(after) == "function" then
elseif type(after) == "table" then
term.write("\n")
for _, name in type(after) == "table" and pairs(after) or (function()local _,v pcall(after) return v,v end) do
for _, name in pairs(after) do
term.write(name .. " ", true)
end
term.write("\n")
if type(prompt) == "function" then pcall(prompt)end
if type(prompt) == "function" then pcall(prompt)
elseif type(prompt) == "string" then term.write(prompt)end
elseif type(after) == "function" then
term.write("\n")
for name in after do --This is possibly not the best solution
term.write(name .. " ", true)
end
term.write("\n")
if type(prompt) == "function" then pcall(prompt)
elseif type(prompt) == "string" then term.write(prompt)end
end
redraw()
ende()