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

add proper support for \b and \r. ignore \15

Browse Source 
closes #2971
This commit is contained in:
payonel 2018-10-29 21:59:58 -07:00
parent ad8218a2ea
commit e7eddad588
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/resources/assets/opencomputers/loot/openos/lib/tty.lua
View File

@ -103,7 +103,7 @@ function tty.stream:write(value)
local x, y = tty.getCursor() local x, y = tty.getCursor()
local _, ei, delim = unicode.sub(window.output_buffer, 1, window.width):find("([\27\t\r\n\a])") local _, ei, delim = unicode.sub(window.output_buffer, 1, window.width):find("([\27\t\r\n\a\b\15])")
local segment = ansi_print .. (ei and window.output_buffer:sub(1, ei - 1) or window.output_buffer) local segment = ansi_print .. (ei and window.output_buffer:sub(1, ei - 1) or window.output_buffer)
if segment ~= "" then if segment ~= "" then
@ -132,9 +132,13 @@ function tty.stream:write(value)
if delim == "\t" then if delim == "\t" then
x = ((x-1) - ((x-1) % 8)) + 9 x = ((x-1) - ((x-1) % 8)) + 9
elseif delim == "\r" or (delim == "\n" and not window.cr_last) then elseif delim == "\r" then
x = 1
elseif delim == "\n" then
x = 1 x = 1
y = y + 1 y = y + 1
elseif delim == "\b" then
x = x - 1
elseif delim == "\a" and not beeped then elseif delim == "\a" and not beeped then
computer.beep() computer.beep()
beeped = true beeped = true
@ -143,7 +147,6 @@ function tty.stream:write(value)
end end
tty.setCursor(x, y) tty.setCursor(x, y)
window.cr_last = delim == "\r"
end end
return cursor.sy return cursor.sy
end end