2018-01-24 22:39:38 +00:00
|
|
|
_G.requireInjector(_ENV)
|
2016-12-11 19:24:52 +00:00
|
|
|
|
2018-11-06 22:28:21 +00:00
|
|
|
local Config = require('config')
|
|
|
|
local Packages = require('packages')
|
|
|
|
local Util = require('util')
|
2016-12-11 19:24:52 +00:00
|
|
|
|
2017-10-08 21:45:01 +00:00
|
|
|
local colors = _G.colors
|
|
|
|
local fs = _G.fs
|
2018-01-10 21:46:37 +00:00
|
|
|
local kernel = _G.kernel
|
2017-10-08 21:45:01 +00:00
|
|
|
local keys = _G.keys
|
|
|
|
local os = _G.os
|
|
|
|
local printError = _G.printError
|
2017-10-16 20:54:50 +00:00
|
|
|
local shell = _ENV.shell
|
2017-10-08 21:45:01 +00:00
|
|
|
local term = _G.term
|
|
|
|
local window = _G.window
|
2017-10-05 17:07:48 +00:00
|
|
|
|
2018-01-21 10:44:13 +00:00
|
|
|
local parentTerm = _G.device.terminal
|
2016-12-11 19:24:52 +00:00
|
|
|
local w,h = parentTerm.getSize()
|
2017-10-16 20:54:50 +00:00
|
|
|
local overviewId
|
2016-12-11 19:24:52 +00:00
|
|
|
local tabsDirty = false
|
2018-01-12 01:53:32 +00:00
|
|
|
local closeInd = Util.getVersion() >= 1.76 and '\215' or '*'
|
2018-01-14 23:28:23 +00:00
|
|
|
local multishell = { }
|
|
|
|
|
|
|
|
shell.setEnv('multishell', multishell)
|
2017-10-08 21:45:01 +00:00
|
|
|
|
2018-01-13 20:17:26 +00:00
|
|
|
multishell.term = parentTerm --deprecated
|
2016-12-11 19:24:52 +00:00
|
|
|
|
|
|
|
local config = {
|
2018-01-24 22:39:38 +00:00
|
|
|
standard = {
|
|
|
|
textColor = colors.lightGray,
|
|
|
|
tabBarTextColor = colors.lightGray,
|
|
|
|
focusTextColor = colors.white,
|
|
|
|
backgroundColor = colors.gray,
|
|
|
|
tabBarBackgroundColor = colors.gray,
|
|
|
|
focusBackgroundColor = colors.gray,
|
2018-10-31 04:05:29 +00:00
|
|
|
errorColor = colors.black,
|
2018-01-24 22:39:38 +00:00
|
|
|
},
|
|
|
|
color = {
|
|
|
|
textColor = colors.lightGray,
|
|
|
|
tabBarTextColor = colors.lightGray,
|
|
|
|
focusTextColor = colors.white,
|
|
|
|
backgroundColor = colors.gray,
|
|
|
|
tabBarBackgroundColor = colors.gray,
|
|
|
|
focusBackgroundColor = colors.gray,
|
2018-10-31 04:05:29 +00:00
|
|
|
errorColor = colors.red,
|
2018-01-24 22:39:38 +00:00
|
|
|
},
|
2016-12-11 19:24:52 +00:00
|
|
|
}
|
|
|
|
Config.load('multishell', config)
|
|
|
|
|
2018-01-12 01:53:32 +00:00
|
|
|
local _colors = parentTerm.isColor() and config.color or config.standard
|
2016-12-11 19:24:52 +00:00
|
|
|
|
|
|
|
local function redrawMenu()
|
2018-01-24 22:39:38 +00:00
|
|
|
if not tabsDirty then
|
|
|
|
os.queueEvent('multishell_redraw')
|
|
|
|
tabsDirty = true
|
|
|
|
end
|
2016-12-11 19:24:52 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function multishell.getFocus()
|
2018-01-24 22:39:38 +00:00
|
|
|
local currentTab = kernel.getFocused()
|
|
|
|
return currentTab.uid
|
2016-12-11 19:24:52 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function multishell.setFocus(tabId)
|
2018-01-24 22:39:38 +00:00
|
|
|
return kernel.raise(tabId)
|
2016-12-11 19:24:52 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function multishell.getTitle(tabId)
|
2018-01-24 22:39:38 +00:00
|
|
|
local tab = kernel.find(tabId)
|
|
|
|
return tab and tab.title
|
2016-12-11 19:24:52 +00:00
|
|
|
end
|
|
|
|
|
2017-10-15 23:55:05 +00:00
|
|
|
function multishell.setTitle(tabId, title)
|
2018-01-24 22:39:38 +00:00
|
|
|
local tab = kernel.find(tabId)
|
|
|
|
if tab then
|
|
|
|
tab.title = title
|
|
|
|
redrawMenu()
|
|
|
|
end
|
2016-12-11 19:24:52 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function multishell.getCurrent()
|
2018-01-24 22:39:38 +00:00
|
|
|
local runningTab = kernel.getCurrent()
|
|
|
|
return runningTab and runningTab.uid
|
2016-12-11 19:24:52 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function multishell.getTab(tabId)
|
2018-01-24 22:39:38 +00:00
|
|
|
return kernel.find(tabId)
|
2016-12-11 19:24:52 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function multishell.terminate(tabId)
|
2018-01-24 22:39:38 +00:00
|
|
|
os.queueEvent('multishell_terminate', tabId)
|
2016-12-11 19:24:52 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function multishell.getTabs()
|
2018-01-24 22:39:38 +00:00
|
|
|
return kernel.routines
|
2016-12-11 19:24:52 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function multishell.launch( tProgramEnv, sProgramPath, ... )
|
2018-01-24 22:39:38 +00:00
|
|
|
-- backwards compatibility
|
|
|
|
return multishell.openTab({
|
|
|
|
env = tProgramEnv,
|
|
|
|
path = sProgramPath,
|
|
|
|
args = { ... },
|
|
|
|
})
|
2016-12-11 19:24:52 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function multishell.openTab(tab)
|
2018-01-24 22:39:38 +00:00
|
|
|
if not tab.title and tab.path then
|
|
|
|
tab.title = fs.getName(tab.path):match('([^%.]+)')
|
|
|
|
end
|
|
|
|
tab.title = tab.title or 'untitled'
|
|
|
|
tab.window = tab.window or window.create(parentTerm, 1, 2, w, h - 1, false)
|
|
|
|
tab.terminal = tab.terminal or tab.window
|
|
|
|
|
|
|
|
local routine = kernel.newRoutine(tab)
|
|
|
|
|
|
|
|
routine.co = coroutine.create(function()
|
|
|
|
local result, err
|
|
|
|
|
|
|
|
if tab.fn then
|
|
|
|
result, err = Util.runFunction(routine.env, tab.fn, table.unpack(tab.args or { } ))
|
|
|
|
elseif tab.path then
|
|
|
|
result, err = Util.run(routine.env, tab.path, table.unpack(tab.args or { } ))
|
|
|
|
else
|
|
|
|
err = 'multishell: invalid tab'
|
|
|
|
end
|
|
|
|
|
|
|
|
if not result and err and err ~= 'Terminated' then
|
|
|
|
if err then
|
|
|
|
printError(tostring(err))
|
|
|
|
end
|
|
|
|
print('\nPress enter to close')
|
|
|
|
routine.isDead = true
|
|
|
|
routine.hidden = false
|
2018-10-24 10:50:16 +00:00
|
|
|
redrawMenu()
|
2018-01-24 22:39:38 +00:00
|
|
|
while true do
|
|
|
|
local e, code = os.pullEventRaw('key')
|
|
|
|
if e == 'terminate' or e == 'key' and code == keys.enter then
|
|
|
|
break
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end)
|
|
|
|
|
|
|
|
kernel.launch(routine)
|
|
|
|
|
|
|
|
if tab.focused then
|
|
|
|
multishell.setFocus(routine.uid)
|
|
|
|
else
|
|
|
|
redrawMenu()
|
|
|
|
end
|
|
|
|
return routine.uid
|
2016-12-11 19:24:52 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function multishell.hideTab(tabId)
|
2018-01-24 22:39:38 +00:00
|
|
|
local tab = kernel.find(tabId)
|
|
|
|
if tab then
|
|
|
|
tab.hidden = true
|
|
|
|
kernel.lower(tab.uid)
|
|
|
|
redrawMenu()
|
|
|
|
end
|
2016-12-11 19:24:52 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function multishell.unhideTab(tabId)
|
2018-01-24 22:39:38 +00:00
|
|
|
local tab = kernel.find(tabId)
|
|
|
|
if tab then
|
|
|
|
tab.hidden = false
|
|
|
|
redrawMenu()
|
|
|
|
end
|
2016-12-11 19:24:52 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function multishell.getCount()
|
2018-01-24 22:39:38 +00:00
|
|
|
return #kernel.routines
|
2016-12-11 19:24:52 +00:00
|
|
|
end
|
|
|
|
|
2018-01-12 01:53:32 +00:00
|
|
|
kernel.hook('kernel_focus', function(_, eventData)
|
2018-01-24 22:39:38 +00:00
|
|
|
local previous = eventData[2]
|
|
|
|
if previous then
|
|
|
|
local routine = kernel.find(previous)
|
|
|
|
if routine and routine.window then
|
|
|
|
routine.window.setVisible(false)
|
|
|
|
if routine.hidden then
|
|
|
|
kernel.lower(previous)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
local focused = kernel.find(eventData[1])
|
|
|
|
if focused and focused.window then
|
|
|
|
focused.window.setVisible(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
redrawMenu()
|
2018-01-12 01:53:32 +00:00
|
|
|
end)
|
|
|
|
|
|
|
|
kernel.hook('multishell_terminate', function(_, eventData)
|
2018-01-24 22:39:38 +00:00
|
|
|
local tab = kernel.find(eventData[1])
|
|
|
|
if tab and not tab.isOverview then
|
|
|
|
if coroutine.status(tab.co) ~= 'dead' then
|
|
|
|
tab:resume("terminate")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
return true
|
|
|
|
end)
|
|
|
|
|
|
|
|
kernel.hook('terminate', function()
|
|
|
|
return kernel.getFocused().isOverview
|
2016-12-11 19:24:52 +00:00
|
|
|
end)
|
|
|
|
|
2018-01-10 21:46:37 +00:00
|
|
|
kernel.hook('multishell_redraw', function()
|
2018-01-24 22:39:38 +00:00
|
|
|
tabsDirty = false
|
|
|
|
|
|
|
|
local function write(x, text, bg, fg)
|
|
|
|
parentTerm.setBackgroundColor(bg)
|
|
|
|
parentTerm.setTextColor(fg)
|
|
|
|
parentTerm.setCursorPos(x, 1)
|
|
|
|
parentTerm.write(text)
|
|
|
|
end
|
|
|
|
|
|
|
|
local bg = _colors.tabBarBackgroundColor
|
|
|
|
parentTerm.setBackgroundColor(bg)
|
|
|
|
parentTerm.setCursorPos(1, 1)
|
|
|
|
parentTerm.clearLine()
|
|
|
|
|
|
|
|
local currentTab = kernel.getFocused()
|
|
|
|
|
|
|
|
for _,tab in pairs(kernel.routines) do
|
|
|
|
if tab.hidden and tab ~= currentTab then
|
|
|
|
tab.width = 0
|
|
|
|
else
|
|
|
|
tab.width = #tab.title + 1
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
local function width()
|
|
|
|
local tw = 0
|
|
|
|
Util.each(kernel.routines, function(t) tw = tw + t.width end)
|
|
|
|
return tw
|
|
|
|
end
|
|
|
|
|
|
|
|
while width() > w - 3 do
|
|
|
|
local tab = select(2,
|
|
|
|
Util.spairs(kernel.routines, function(a, b) return a.width > b.width end)())
|
|
|
|
tab.width = tab.width - 1
|
|
|
|
end
|
|
|
|
|
|
|
|
local function compareTab(a, b)
|
|
|
|
if a.hidden then return false end
|
|
|
|
return b.hidden or a.uid < b.uid
|
|
|
|
end
|
|
|
|
|
|
|
|
local tabX = 0
|
|
|
|
for _,tab in Util.spairs(kernel.routines, compareTab) do
|
|
|
|
if tab.width > 0 then
|
|
|
|
tab.sx = tabX + 1
|
|
|
|
tab.ex = tabX + tab.width
|
|
|
|
tabX = tabX + tab.width
|
|
|
|
if tab ~= currentTab then
|
2018-10-24 10:50:16 +00:00
|
|
|
local textColor = tab.isDead and _colors.errorColor or _colors.textColor
|
2018-01-24 22:39:38 +00:00
|
|
|
write(tab.sx, tab.title:sub(1, tab.width - 1),
|
2018-10-24 10:50:16 +00:00
|
|
|
_colors.backgroundColor, textColor)
|
2018-01-24 22:39:38 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
if currentTab then
|
|
|
|
write(currentTab.sx - 1,
|
|
|
|
' ' .. currentTab.title:sub(1, currentTab.width - 1) .. ' ',
|
|
|
|
_colors.focusBackgroundColor, _colors.focusTextColor)
|
|
|
|
if not currentTab.isOverview then
|
|
|
|
write(w, closeInd, _colors.backgroundColor, _colors.focusTextColor)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
if currentTab and currentTab.window then
|
|
|
|
currentTab.window.restoreCursor()
|
|
|
|
end
|
|
|
|
|
|
|
|
return true
|
2017-10-15 06:36:54 +00:00
|
|
|
end)
|
|
|
|
|
2018-01-10 21:46:37 +00:00
|
|
|
kernel.hook('term_resize', function(_, eventData)
|
2018-01-24 22:39:38 +00:00
|
|
|
if not eventData[1] then --- TEST
|
|
|
|
w,h = parentTerm.getSize()
|
|
|
|
|
|
|
|
local windowHeight = h-1
|
|
|
|
|
|
|
|
for _,key in pairs(Util.keys(kernel.routines)) do
|
|
|
|
local tab = kernel.routines[key]
|
|
|
|
local x,y = tab.window.getCursorPos()
|
|
|
|
if y > windowHeight then
|
|
|
|
tab.window.scroll(y - windowHeight)
|
|
|
|
tab.window.setCursorPos(x, windowHeight)
|
|
|
|
end
|
|
|
|
tab.window.reposition(1, 2, w, windowHeight)
|
|
|
|
end
|
|
|
|
|
|
|
|
redrawMenu()
|
|
|
|
end
|
2017-10-15 06:36:54 +00:00
|
|
|
end)
|
|
|
|
|
2018-01-10 21:46:37 +00:00
|
|
|
kernel.hook('mouse_click', function(_, eventData)
|
2018-01-24 22:39:38 +00:00
|
|
|
local x, y = eventData[2], eventData[3]
|
|
|
|
|
|
|
|
if y == 1 then
|
|
|
|
if x == 1 then
|
|
|
|
multishell.setFocus(overviewId)
|
|
|
|
elseif x == w then
|
|
|
|
local currentTab = kernel.getFocused()
|
|
|
|
if currentTab then
|
|
|
|
multishell.terminate(currentTab.uid)
|
|
|
|
end
|
|
|
|
else
|
|
|
|
for _,tab in pairs(kernel.routines) do
|
|
|
|
if not tab.hidden and tab.sx then
|
|
|
|
if x >= tab.sx and x <= tab.ex then
|
|
|
|
multishell.setFocus(tab.uid)
|
|
|
|
break
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
eventData[3] = eventData[3] - 1
|
2017-10-15 06:36:54 +00:00
|
|
|
end)
|
|
|
|
|
2018-01-12 01:53:32 +00:00
|
|
|
kernel.hook({ 'mouse_up', 'mouse_drag' }, function(_, eventData)
|
2018-01-24 22:39:38 +00:00
|
|
|
eventData[3] = eventData[3] - 1
|
2017-10-15 06:36:54 +00:00
|
|
|
end)
|
|
|
|
|
2018-01-10 21:46:37 +00:00
|
|
|
kernel.hook('mouse_scroll', function(_, eventData)
|
2018-01-24 22:39:38 +00:00
|
|
|
if eventData[3] == 1 then
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
eventData[3] = eventData[3] - 1
|
2017-10-15 06:36:54 +00:00
|
|
|
end)
|
|
|
|
|
2016-12-11 19:24:52 +00:00
|
|
|
local function startup()
|
2018-01-24 22:39:38 +00:00
|
|
|
local success = true
|
|
|
|
|
|
|
|
local function runDir(directory, open)
|
|
|
|
if not fs.exists(directory) then
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
local files = fs.list(directory)
|
|
|
|
table.sort(files)
|
|
|
|
|
|
|
|
for _,file in ipairs(files) do
|
|
|
|
os.sleep(0)
|
|
|
|
local result, err = open(directory .. '/' .. file)
|
|
|
|
|
|
|
|
if result then
|
|
|
|
if term.isColor() then
|
|
|
|
term.setTextColor(colors.green)
|
|
|
|
end
|
|
|
|
term.write('[PASS] ')
|
|
|
|
term.setTextColor(colors.white)
|
|
|
|
term.write(fs.combine(directory, file))
|
|
|
|
print()
|
|
|
|
else
|
|
|
|
if term.isColor() then
|
|
|
|
term.setTextColor(colors.red)
|
|
|
|
end
|
|
|
|
term.write('[FAIL] ')
|
|
|
|
term.setTextColor(colors.white)
|
|
|
|
term.write(fs.combine(directory, file))
|
|
|
|
if err then
|
|
|
|
_G.printError('\n' .. err)
|
|
|
|
end
|
|
|
|
print()
|
|
|
|
success = false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
runDir('sys/autorun', shell.run)
|
2018-11-06 22:28:21 +00:00
|
|
|
for name in pairs(Packages:installed()) do
|
|
|
|
local packageDir = 'packages/' .. name .. '/autorun'
|
|
|
|
runDir(packageDir, shell.run)
|
|
|
|
end
|
2018-01-24 22:39:38 +00:00
|
|
|
runDir('usr/autorun', shell.run)
|
|
|
|
|
|
|
|
if not success then
|
|
|
|
multishell.setFocus(multishell.getCurrent())
|
|
|
|
printError('\nA startup program has errored')
|
|
|
|
os.pullEvent('terminate')
|
|
|
|
end
|
2016-12-11 19:24:52 +00:00
|
|
|
end
|
|
|
|
|
2018-01-15 21:28:10 +00:00
|
|
|
kernel.hook('kernel_ready', function()
|
2018-01-24 22:39:38 +00:00
|
|
|
overviewId = multishell.openTab({
|
|
|
|
path = 'sys/apps/Overview.lua',
|
|
|
|
isOverview = true,
|
|
|
|
focused = true,
|
|
|
|
title = '+',
|
|
|
|
})
|
|
|
|
|
|
|
|
multishell.openTab({
|
|
|
|
fn = startup,
|
|
|
|
title = 'Autorun',
|
|
|
|
})
|
2018-01-15 21:28:10 +00:00
|
|
|
end)
|