fixed terminal color

This commit is contained in:
2026-01-15 17:22:56 -05:00
parent 6b48e80157
commit c620c4f1ba
5 changed files with 40 additions and 40 deletions

View File

@@ -49,22 +49,22 @@ local function wrapPeripheral(name)
end end
local colors={ local colors={
[0]=0x000000, -- #000000 [0]=0x0001, -- #000000
0xFFFFFF, -- #FFFFFF 0x0002, -- #FFFFFF
0xFF0000, -- #FF0000 0x0004, -- #FF0000
0x00FF00, -- #00FF00 0x0008, -- #00FF00
0x0000FF, -- #0000FF 0x0010, -- #0000FF
0x00FFFF, -- #00FFFF 0x0020, -- #00FFFF
0xFF00FF, -- #FF00FF 0x0040, -- #FF00FF
0xFFFF00, -- #FFFF00 0x0080, -- #FFFF00
0xFF6D00, -- #FF6D00 0x0100, -- #FF6D00
0x6DFF55, -- #6DFF55 0x0200, -- #6DFF55
0x24FFFF, -- #24FFFF 0x0400, -- #24FFFF
0x924900, -- #924900 0x0800, -- #924900
0x6D6D55, -- #6D6D55 0x1000, -- #6D6D55
0xDBDBAA, -- #DBDBAA 0x2000, -- #DBDBAA
0x6D00FF, -- #6D00FF 0x4000, -- #6D00FF
0xB6FF00 -- #B6FF00 0x8000 -- #B6FF00
} }
local icolors={ local icolors={

View File

@@ -4,83 +4,83 @@ kernel.tty={}
kernel.tty.inst={} kernel.tty.inst={}
function kernel.tty.register(tty, ttyo) function kernel.tty.register(tty, ttyo)
kernel.tty[tty]=ttyo kernel.tty.inst[tty]=ttyo
end end
function kernel.tty.print(text) function kernel.tty.print(text)
local term=kernel.currentTask.term local term=kernel.currentTask.term
if term and kernel.tty[term] then if term and kernel.tty.inst[term] then
kernel.tty[term].print(text) kernel.tty.inst[term].print(text)
end end
end end
function kernel.tty.printInline(text) function kernel.tty.printInline(text)
local term=kernel.currentTask.term local term=kernel.currentTask.term
if term and kernel.tty[term] then if term and kernel.tty.inst[term] then
kernel.tty[term].printInline(text) kernel.tty.inst[term].printInline(text)
end end
end end
function kernel.tty.size() function kernel.tty.size()
local term=kernel.currentTask.term local term=kernel.currentTask.term
if term and kernel.tty[term] then if term and kernel.tty.inst[term] then
return kernel.tty[term].size() return kernel.tty.inst[term].size()
end end
end end
function kernel.tty.setCursorPos(x,y) function kernel.tty.setCursorPos(x,y)
local term=kernel.currentTask.term local term=kernel.currentTask.term
if term and kernel.tty[term] then if term and kernel.tty.inst[term] then
return kernel.tty[term].setCursorPos(x,y) return kernel.tty.inst[term].setCursorPos(x,y)
end end
end end
function kernel.tty.getCursorPos() function kernel.tty.getCursorPos()
local term=kernel.currentTask.term local term=kernel.currentTask.term
if term and kernel.tty[term] then if term and kernel.tty.inst[term] then
return kernel.tty[term].getCursorPos() return kernel.tty.inst[term].getCursorPos()
end end
end end
function kernel.tty.clear() function kernel.tty.clear()
local term=kernel.currentTask.term local term=kernel.currentTask.term
if term and kernel.tty[term] then if term and kernel.tty.inst[term] then
return kernel.tty[term].clear() return kernel.tty.inst[term].clear()
end end
end end
function kernel.tty.setTextColor(color) function kernel.tty.setTextColor(color)
local term=kernel.currentTask.term local term=kernel.currentTask.term
if term and kernel.tty[term] then if term and kernel.tty.inst[term] then
return kernel.tty[term].setTextColor(color) return kernel.tty.inst[term].setTextColor(color)
end end
end end
function kernel.tty.setBackgroundColor(color) function kernel.tty.setBackgroundColor(color)
local term=kernel.currentTask.term local term=kernel.currentTask.term
if term and kernel.tty[term] then if term and kernel.tty.inst[term] then
return kernel.tty[term].setBackgroundColor(color) return kernel.tty.inst[term].setBackgroundColor(color)
end end
end end
function kernel.tty.scroll(n) function kernel.tty.scroll(n)
local term=kernel.currentTask.term local term=kernel.currentTask.term
if term and kernel.tty[term] then if term and kernel.tty.inst[term] then
return kernel.tty[term].scroll(n) return kernel.tty.inst[term].scroll(n)
end end
end end
function kernel.tty.getTextColor() function kernel.tty.getTextColor()
local term=kernel.currentTask.term local term=kernel.currentTask.term
if term and kernel.tty[term] and kernel.tty[term].getTextColor then if term and kernel.tty.inst[term] and kernel.tty.inst[term].getTextColor then
return kernel.tty[term].getTextColor() return kernel.tty.inst[term].getTextColor()
end end
end end
function kernel.tty.getBackgroundColor() function kernel.tty.getBackgroundColor()
local term=kernel.currentTask.term local term=kernel.currentTask.term
if term and kernel.tty[term] and kernel.tty[term].getBackgroundColor then if term and kernel.tty.inst[term] and kernel.tty.inst[term].getBackgroundColor then
return kernel.tty[term].getBackgroundColor() return kernel.tty.inst[term].getBackgroundColor()
end end
end end
@@ -88,7 +88,7 @@ function kernel.tty.bind(ttyid)
if not ttyid then if not ttyid then
return false, "No TTY ID specified" return false, "No TTY ID specified"
end end
if not kernel.tty[ttyid] then if not kernel.tty.inst[ttyid] then
return false, "TTY "..tostring(ttyid).." not registered" return false, "TTY "..tostring(ttyid).." not registered"
end end
kernel.currentTask.term=ttyid kernel.currentTask.term=ttyid

View File

View File

View File