Skip to content

restore fix, term open, and term palette color support #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gamax92 merged 2 commits into from
Apr 4, 2016
Merged

restore fix, term open, and term palette color support #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d08b0c1
restore fix, term open, and term palette color support
payonel Apr 2, 2016
af17596
the latest term fixes make nowrap a good solution for wocchat
payonel Apr 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions wocchat/wocchat.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ local function saveScreen()
end

local function restoreScreen()
term.setCursor(1,screen.height)
gpu.setBackground(table.unpack(screen.bg))
gpu.setForeground(table.unpack(screen.fg))
print("Restoring screen ...")
for i = 0,15 do
gpu.setPaletteColor(i,screen.palette[i])
end
term.setCursor(1,screen.height)
gpu.setBackground(table.unpack(screen.bg))
gpu.setForeground(table.unpack(screen.fg))
end

local function loadConfig()
Expand Down Expand Up @@ -439,13 +439,7 @@ local function drawTextbar(x,y,width,text)
end

local customGPU={}
if newterm then
-- New term does not handle palette colors properly yet, hack around this.
customGPU.gpu = {
setForeground = function(color) gpu.setForeground(color, true) end,
setBackground = function(color) gpu.setBackground(color, true) end,
}
else
if not newterm then
customGPU.gpu = {
set = function(x,y,s,v) return gpu.set(x+customGPU.x-1,y+customGPU.y-1,s,v ~= nil and v) end,
get = function(x,y) return gpu.get(x+customGPU.x-1,y+customGPU.y-1) end,
Expand Down Expand Up @@ -1476,7 +1470,7 @@ local function main()
helper.joinServer(k)
end
end
local history = {}
local history = {nowrap=true}
while true do
if dirty.blocks or dirty.title or dirty.window or dirty.nicks then
redraw()
Expand Down Expand Up @@ -1553,8 +1547,7 @@ if newterm then
end

local window = term.internal.open()
-- TODO: window will eventually be moved to the end in later updates.
term.bind(window, customGPU.gpu, term.screen(), term.keyboard())
term.bind(customGPU.gpu, term.screen(), term.keyboard(), window)
process.info().data.window = window
customGPU.window = window
else
Expand Down