Legacy-CC/sPhone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update sPhone.lua

Browse source
This commit is contained in:
Ale32bit 2016-11-20 17:07:09 +01:00 committed by GitHub
parent 81163fb65a
commit 20b4071247
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/sPhone.lua
View file

@ -1,6 +1,6 @@
local function kernel(...) local function kernel(...)
_G.sPhone = { _G.sPhone = {
version = "Alpha Pi", version = "Beta 1",
user = "Guest", user = "Guest",
devMode = false, devMode = false,
mainTerm = term.current(), mainTerm = term.current(),
@ -301,7 +301,12 @@ local function kernel(...)
local str = items[i] local str = items[i]
if str then if str then
term.setCursorPos(2, 1 + i - scroll) term.setCursorPos(2, 1 + i - scroll)
local isDir = fs.isDir(fs.combine(path, str)) local isDir
if not pairs then
isDir = fs.isDir(fs.combine(path, str))
else
isDir = false
end
term.setTextColor(isDir and opt.fg1b or opt.fg1) term.setTextColor(isDir and opt.fg1b or opt.fg1)
local _w = w - (isDir and 2 or 1) local _w = w - (isDir and 2 or 1)
if #str > _w then if #str > _w then
@ -342,8 +347,8 @@ local function kernel(...)
return nil return nil
elseif ev[1] == "mouse_scroll" and ev[4] > 1 then elseif ev[1] == "mouse_scroll" and ev[4] > 1 then
scroll = scroll + ev[2] scroll = scroll + ev[2]
elseif ev[1] == "mouse_click" and ev[2] == 1 then elseif ev[1] == "mouse_click" then
if ev[3] == w then if ev[3] == w and ev[2] == 1 then
if ev[4] == 1 then if ev[4] == 1 then
return nil return nil
elseif ev[4] == 2 then elseif ev[4] == 2 then
@ -351,7 +356,7 @@ local function kernel(...)
elseif ev[4] == h then elseif ev[4] == h then
scroll = scroll + 1 scroll = scroll + 1
end end
elseif ev[3] < w and ev[4] == 1 then elseif ev[3] < w and ev[4] == 1 and ev[2] == 1 then
path = fs.getDir(path) path = fs.getDir(path)
if path == ".." then if path == ".." then
path = "" path = ""
@ -367,9 +372,9 @@ local function kernel(...)
else else
if opt.output then if opt.output then
if opt.pairs then if opt.pairs then
return cho[fullPath], fullPath return cho[fullPath], fullPath, ev[2]
end end
return fullPath return fullPath, ev[2]
end end
end end
end end
@ -1264,7 +1269,9 @@ end
local skipped = false local skipped = false
sPhone.firstBoot = true sPhone.firstBoot = true
sPhone.install("/.sPhone/apps/home.spk") for k,v in ipairs(fs.list("/.sPhone/apps/system")) do
sPhone.install("/.sPhone/apps/system/"..v)
end
while not skipped do while not skipped do