diff --git a/Zenitha b/Zenitha index 123e60be..ce22dfac 160000 --- a/Zenitha +++ b/Zenitha @@ -1 +1 @@ -Subproject commit 123e60be43c06f11b51c3073527061cf4be0eaf6 +Subproject commit ce22dfaccd26762673319f75d17a2cc52a1bf1b9 diff --git a/conf.lua b/conf.lua index e7d97a6c..76df47e6 100644 --- a/conf.lua +++ b/conf.lua @@ -1,3 +1,16 @@ +TerminalResult=require'terminal' + +if TerminalResult.bootDisabled then + function love.conf(t) + for k in next,t.modules do t.modules[k]=false end + t.window.vsync=0 + t.window.msaa=0 + t.window.depth=0 + t.window.stencil=0 + end + return +end + if love._os=='Web' then local oldRead=love.filesystem.read love.filesystem[('read')]=function(name,size) diff --git a/main.lua b/main.lua index 7c0806fc..828cb0c7 100644 --- a/main.lua +++ b/main.lua @@ -22,6 +22,11 @@ -- 5. Readability and Maintainability are not always put to the first place. Codes around hot spot could be optimized for better performance. sorry if it confused you; -- 6. 26 +if not love.window then + love[('run')]=function() return function() return true end end + return +end + ------------------------------------------------------------- -- Load Zenitha @@ -491,12 +496,21 @@ for _,v in next,love.filesystem.getDirectoryItems('assets/scene') do SCN.add(sceneName,FILE.load('assets/scene/'..v,'-lua')) end end +local appletSceneSet={} ---@type Set for _,v in next,love.filesystem.getDirectoryItems('assets/scene_app') do if FILE.isSafe('assets/scene_app/'..v) then local sceneName=v:sub(1,-5) + appletSceneSet[sceneName]=true SCN.add(sceneName,FILE.load('assets/scene_app/'..v,'-lua')) end end +if PROGRESS.get('main')>=3 and TerminalResult.launchApplet then + if appletSceneSet[TerminalResult.launchApplet] then + ZENITHA.setFirstScene(TerminalResult.launchApplet) + else + MSG('error',"Applet scene '"..TerminalResult.launchApplet.."' doesn't exist") + end +end for _,v in next,{ 'brik_template', -- Shouldn't be used diff --git a/terminal.lua b/terminal.lua new file mode 100644 index 00000000..b121bfd9 --- /dev/null +++ b/terminal.lua @@ -0,0 +1,113 @@ +-- [WARNING] Run before main.lua + +function simpRequire(path) + return function(module) return require(path..module) end +end +local _require=require +local require=simpRequire('Zenitha.') +STRING=require'stringExtend' +TABLE=require'tableExtend' +AE=require'escape' + +local stdout=io.stdout +function write(text) + stdout:write(text) + stdout:flush() +end +local function sleep(time) + if love._os=='Linux' then + os.execute('sleep '..time) + else + local fin=os.clock()+time + repeat until os.clock()>fin + end +end +local function feed(...) + local d={...} + for i=1,#d do + if type(d[i])=='number' then + sleep(d[i]) + else + write(d[i]) + end + end +end + +local rArg=TABLE.sub(arg,(arg[-2]=='love' or arg[-1]=='love') and 2 or 1) + +for k,v in next,rArg do print(k,v)end + +local result={} + +local commands={} +function commands.help() + result.bootDisabled=true + feed( + "\n", + AE[533].."TechOS"..AE.." help page\n", + .260, + "[no args] "..AE._d"Start default booting process\n", + "-h, --help "..AE._d"Show this help message then exit\n", + "-v, --version "..AE._d"Show version information then exit\n", + "-s, --shell "..AE._d"Start the interactive shell\n", + .120 + ) +end +function commands.version() + result.bootDisabled=true + sleep(.1) + print(("TechOS %s (%s)"):format(_require'version'.appVer,_require'version'.verCode)) +end +function commands.shell() + feed( + .000,AE[425].. " _____ _ _ "..AE._d" _ "..AE[005].." _____ _", + .260,AE[425].."\n|_ _|___ ___| |_ _____|_|___ ___ "..AE._d" |_| "..AE[005].." | __|___| |___ _ _ _ _", + .120,AE[425].."\n | | | -_| _| | | | | . | "..AE._d" _ "..AE[005].." | | | .'| | .'|_'_| | |", + .120,AE[425].."\n |_| |___|___|_|_|_|_|_|_|_|_|___| "..AE._d" |_| "..AE[005].." |_____|__,|_|__,|_,_|_ |", + .120,AE[533].."\n The ultra-improved version of Techmino, for YOU."..AE[005].. " |___|", + .620,AE.."\n\nWelcome to the TechOS shell!\n",.260 + ) + while true do + write("\n> ") + local input=io.read() + if input~='' then + local args=STRING.split(input,' ') + if args[1]=='help' then + feed( + "Available Commands:\n", + "help Show this help message\n", + "start Continue normal booting process\n", + "exit Interrupt booting process and exit shell\n" + ) + elseif args[1]=='start' then + if args[2]=='app' then + result.launchApplet=args[3] + end + feed(.1,"Starting application...\n",.1) + break + elseif args[1]=='exit' then + print("Exiting shell...") + result.bootDisabled=true + break + else + print("Unknown command. Try 'help'") + end + end + end +end +function commands.unknown() + print("Unknown switch. Run with '--help' for help.") + result.bootDisabled=true +end + +if rArg[1]=="-h" or rArg[1]=="--help" then + commands.help() +elseif rArg[1]=='-s' or rArg[1]=='--shell' then + commands.shell() +elseif rArg[1]=='-v' or rArg[1]=='--version' then + commands.version() +else + commands.unknown() +end + +return result