From 433f27bef2a70bd0b6ee5933d14c664769ba1be9 Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Thu, 22 Sep 2016 18:16:38 +0900 Subject: [PATCH] proper error handling in ROMBASIC Former-commit-id: b5bd084e6807c765cdd6d3ffff1b1628321b9c6a Former-commit-id: 55c3bb3cd56c7867809c0819f178aeebf1e46676 --- assets/sounds/effects/power_button_push.wav | Bin 0 -> 27178 bytes lib/javadoc/index-all.html | 22 ++--- .../org/newdawn/slick/AppGameContainer.html | 16 ++-- .../org/newdawn/slick/GameContainer.html | 12 +-- lib/javadoc/org/newdawn/slick/Graphics.html | 2 +- .../org/newdawn/slick/gui/TextField.html | 6 +- .../slick/particles/ParticleSystem.html | 14 +-- src/net/torvald/terrarum/StateInGame.kt | 4 +- src/net/torvald/terrarum/StateVTTest.kt | 3 +- src/net/torvald/terrarum/console/ExportMap.kt | 2 +- .../terrarum/gameactors/ActorWithBody.kt | 4 +- .../terrarum/mapdrawer/LightmapRenderer.kt | 2 +- .../virtualcomputer/assets/lua/BOOT.lua | 24 ++++-- .../virtualcomputer/assets/lua/ROMLIB.lua | 23 +++-- .../virtualcomputer/luaapi/Filesystem.kt | 9 +- .../luaapi/HostAccessProvider.kt | 10 ++- .../terrarum/virtualcomputer/luaapi/Term.kt | 45 +++++++--- .../terminal/SimpleTextTerminal.kt | 40 ++++++--- .../virtualcomputer/terminal/Teletype.kt | 5 +- .../terminal/TeletypeTerminal.kt | 4 +- work_files/romapidoc/romapidoc.log | 80 +++++++++--------- work_files/romapidoc/romapidoc.pdf | Bin 200321 -> 200660 bytes work_files/romapidoc/romapidoc.synctex.gz | Bin 70394 -> 72571 bytes work_files/romapidoc/romapidoc.tex | 18 +++- 24 files changed, 208 insertions(+), 137 deletions(-) create mode 100644 assets/sounds/effects/power_button_push.wav diff --git a/assets/sounds/effects/power_button_push.wav b/assets/sounds/effects/power_button_push.wav new file mode 100644 index 0000000000000000000000000000000000000000..f3c700249557090d507ad0316b834da3ca03e6b2 GIT binary patch literal 27178 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 - Method in class org.newdawn.slick.GameContainer -
Check if this game is only updating when visible to the user (default = true) +
Check if this game is only updating when echo to the user (default = true)
isValidLocation(Mover, int, int, int, int) - Method in class org.newdawn.slick.util.pathfinding.AStarPathFinder
Check if a given location is valid for the supplied mover
isVisible() - Method in class org.newdawn.slick.particles.ParticleSystem -
Check if this system is currently visible, i.e. +
Check if this system is currently echo, i.e.
isVSyncRequested() - Method in class org.newdawn.slick.GameContainer
True if vsync is requested @@ -7340,11 +7340,11 @@ Static method in class org.newdawn.slick.font.effects.orange - Static variable in class org.newdawn.slick.Color
The fixed colour dark orange -
org.newdawn.slick - package org.newdawn.slick
 
org.newdawn.slick.command - package org.newdawn.slick.command
Provides abstract input by mapping physical device inputs (mouse, keyboard and controllers) to abstract -commands that are relevant to a particular game.
org.newdawn.slick.fills - package org.newdawn.slick.fills
Fill effects used to colour and mogrify shapes during rendering
org.newdawn.slick.font - package org.newdawn.slick.font
 
org.newdawn.slick.font.effects - package org.newdawn.slick.font.effects
 
org.newdawn.slick.geom - package org.newdawn.slick.geom
Simple geometric wrappers that can be used for rendering and collision.
org.newdawn.slick.gui - package org.newdawn.slick.gui
Some extremely simple GUI elements which should be used where a game does not require a full GUI
org.newdawn.slick.imageout - package org.newdawn.slick.imageout
Supports saving of slick images to various file types.
org.newdawn.slick.loading - package org.newdawn.slick.loading
Adds support for deferring loading of resources to a set time to allow loading/progress bar -style effects.
org.newdawn.slick.muffin - package org.newdawn.slick.muffin
Muffins for storing local data
org.newdawn.slick.openal - package org.newdawn.slick.openal
This package contains the nitty gritty sound manipulation code for using OpenAL with standard audio formats.
org.newdawn.slick.opengl - package org.newdawn.slick.opengl
This package contains the nitty gritty image manipulation code for using OpenGL with standard image formats.
org.newdawn.slick.opengl.pbuffer - package org.newdawn.slick.opengl.pbuffer
 
org.newdawn.slick.opengl.renderer - package org.newdawn.slick.opengl.renderer
 
org.newdawn.slick.particles - package org.newdawn.slick.particles
The particle engine maintains a set of small sprites being controlled -by emitters to give some special effect.
org.newdawn.slick.particles.effects - package org.newdawn.slick.particles.effects
This package should contain stock effects for simple particle systems.
org.newdawn.slick.state - package org.newdawn.slick.state
State based games allow the game to be broken down into the different activities the player may -take part in, for instance menu, highscores, play and credits.
org.newdawn.slick.state.transition - package org.newdawn.slick.state.transition
 
org.newdawn.slick.svg - package org.newdawn.slick.svg
Demo/Test SVG area.
org.newdawn.slick.svg.inkscape - package org.newdawn.slick.svg.inkscape
 
org.newdawn.slick.tests - package org.newdawn.slick.tests
Tests for the facilities provided by the library.
org.newdawn.slick.tests.states - package org.newdawn.slick.tests.states
States for the StateBasedGameTest
org.newdawn.slick.tests.xml - package org.newdawn.slick.tests.xml
Tests for the XML Parser and Object Tree Parser
org.newdawn.slick.tiled - package org.newdawn.slick.tiled
Contains utilities for working with the TilED (http://www.mapeditor.org) +
org.newdawn.slick - package org.newdawn.slick
 
org.newdawn.slick.command - package org.newdawn.slick.command
Provides abstract input by mapping physical device inputs (mouse, keyboard and controllers) to abstract +commands that are relevant to a particular game.
org.newdawn.slick.fills - package org.newdawn.slick.fills
Fill effects used to colour and mogrify shapes during rendering
org.newdawn.slick.font - package org.newdawn.slick.font
 
org.newdawn.slick.font.effects - package org.newdawn.slick.font.effects
 
org.newdawn.slick.geom - package org.newdawn.slick.geom
Simple geometric wrappers that can be used for rendering and collision.
org.newdawn.slick.gui - package org.newdawn.slick.gui
Some extremely simple GUI elements which should be used where a game does not require a full GUI
org.newdawn.slick.imageout - package org.newdawn.slick.imageout
Supports saving of slick images to various file types.
org.newdawn.slick.loading - package org.newdawn.slick.loading
Adds support for deferring loading of resources to a set time to allow loading/progress bar +style effects.
org.newdawn.slick.muffin - package org.newdawn.slick.muffin
Muffins for storing local data
org.newdawn.slick.openal - package org.newdawn.slick.openal
This package contains the nitty gritty sound manipulation code for using OpenAL with standard audio formats.
org.newdawn.slick.opengl - package org.newdawn.slick.opengl
This package contains the nitty gritty image manipulation code for using OpenGL with standard image formats.
org.newdawn.slick.opengl.pbuffer - package org.newdawn.slick.opengl.pbuffer
 
org.newdawn.slick.opengl.renderer - package org.newdawn.slick.opengl.renderer
 
org.newdawn.slick.particles - package org.newdawn.slick.particles
The particle engine maintains a set of small sprites being controlled +by emitters to give some special effect.
org.newdawn.slick.particles.effects - package org.newdawn.slick.particles.effects
This package should contain stock effects for simple particle systems.
org.newdawn.slick.state - package org.newdawn.slick.state
State based games allow the game to be broken down into the different activities the player may +take part in, for instance menu, highscores, play and credits.
org.newdawn.slick.state.transition - package org.newdawn.slick.state.transition
 
org.newdawn.slick.svg - package org.newdawn.slick.svg
Demo/Test SVG area.
org.newdawn.slick.svg.inkscape - package org.newdawn.slick.svg.inkscape
 
org.newdawn.slick.tests - package org.newdawn.slick.tests
Tests for the facilities provided by the library.
org.newdawn.slick.tests.states - package org.newdawn.slick.tests.states
States for the StateBasedGameTest
org.newdawn.slick.tests.xml - package org.newdawn.slick.tests.xml
Tests for the XML Parser and Object Tree Parser
org.newdawn.slick.tiled - package org.newdawn.slick.tiled
Contains utilities for working with the TilED (http://www.mapeditor.org) utility for creating tiled maps.
org.newdawn.slick.util - package org.newdawn.slick.util
Utilities to support the library.
org.newdawn.slick.util.pathfinding - package org.newdawn.slick.util.pathfinding
A set of classes to provide configurable A* path finding on tilebased maps
org.newdawn.slick.util.pathfinding.heuristics - package org.newdawn.slick.util.pathfinding.heuristics
 
org.newdawn.slick.util.pathfinding.navmesh - package org.newdawn.slick.util.pathfinding.navmesh
 
org.newdawn.slick.util.xml - package org.newdawn.slick.util.xml
Some utilities for reading XML using Java DOM and for mapping XML onto existing data models
orientation - Variable in class org.newdawn.slick.tiled.TiledMap
The orientation of this map @@ -8728,7 +8728,7 @@ Method in class org.newdawn.slick.gui.setCursorVisible(boolean) - Method in class org.newdawn.slick.gui.TextField -
Indicate whether the mouse cursor should be visible or not +
Indicate whether the mouse cursor should be echo or not
setCurve(ArrayList) - Method in class org.newdawn.slick.particles.ConfigurableEmitter.LinearInterpolator
Set the collection of data points to interpolate between @@ -9412,7 +9412,7 @@ Method in class org.newdawn.slick.setUpdateOnlyWhenVisible(boolean) - Method in class org.newdawn.slick.GameContainer -
Indicate if the display should update only when the game is visible +
Indicate if the display should update only when the game is echo (the default is true)
setUseFBO(boolean) - Static method in class org.newdawn.slick.opengl.pbuffer.GraphicsFactory @@ -9464,7 +9464,7 @@ Static method in class org.newdawn.slick.util.setVisible(boolean) - Method in class org.newdawn.slick.particles.ParticleSystem -
Indicate whether the particle system should be visible, i.e. +
Indicate whether the particle system should be echo, i.e.
setVolume(float) - Method in class org.newdawn.slick.Music
Set the volume of the music as a factor of the global volume setting @@ -10555,7 +10555,7 @@ Method in class org.newdawn.slick.Deprecated.  
updateOnlyOnVisible - Variable in class org.newdawn.slick.AppGameContainer -
True if we should update the game only when the display is visible +
True if we should update the game only when the display is echo
updateParticle(Particle, int) - Method in class org.newdawn.slick.particles.ConfigurableEmitter
  diff --git a/lib/javadoc/org/newdawn/slick/AppGameContainer.html b/lib/javadoc/org/newdawn/slick/AppGameContainer.html index 382addf2c..661bd2443 100644 --- a/lib/javadoc/org/newdawn/slick/AppGameContainer.html +++ b/lib/javadoc/org/newdawn/slick/AppGameContainer.html @@ -155,7 +155,7 @@ A game container that will display the game as an stand alone updateOnlyOnVisible
-          True if we should update the game only when the display is visible +          True if we should update the game only when the display is echo   @@ -263,7 +263,7 @@ A game container that will display the game as an stand alone isUpdatingOnlyWhenVisible()
-          Check if this game is only updating when visible to the user (default = true) +          Check if this game is only updating when echo to the user (default = true) @@ -389,7 +389,7 @@ A game container that will display the game as an stand alone setUpdateOnlyWhenVisible(boolean updateOnlyWhenVisible)
-          Indicate if the display should update only when the game is visible +          Indicate if the display should update only when the game is echo (the default is true) @@ -469,7 +469,7 @@ updateOnlyOnVisible 
 protected boolean updateOnlyOnVisible
-
True if we should update the game only when the display is visible +
True if we should update the game only when the display is echo

@@ -790,14 +790,14 @@ setUpdateOnlyWhenVisible public void setUpdateOnlyWhenVisible(boolean updateOnlyWhenVisible)
Description copied from class: GameContainer
-
Indicate if the display should update only when the game is visible +
Indicate if the display should update only when the game is echo (the default is true)

Overrides:
setUpdateOnlyWhenVisible in class GameContainer
-
Parameters:
updateOnlyWhenVisible - True if we should updated only when the display is visible
See Also:
GameContainer.setUpdateOnlyWhenVisible(boolean)
+
Parameters:
updateOnlyWhenVisible - True if we should updated only when the display is echo
See Also:
GameContainer.setUpdateOnlyWhenVisible(boolean)
@@ -808,14 +808,14 @@ isUpdatingOnlyWhenVisible public boolean isUpdatingOnlyWhenVisible()
Description copied from class: GameContainer
-
Check if this game is only updating when visible to the user (default = true) +
Check if this game is only updating when echo to the user (default = true)

Overrides:
isUpdatingOnlyWhenVisible in class GameContainer
-
Returns:
True if the game is only updated when the display is visible
See Also:
GameContainer.isUpdatingOnlyWhenVisible()
+
Returns:
True if the game is only updated when the display is echo
See Also:
GameContainer.isUpdatingOnlyWhenVisible()
diff --git a/lib/javadoc/org/newdawn/slick/GameContainer.html b/lib/javadoc/org/newdawn/slick/GameContainer.html index f8e686662..1041a2fd4 100644 --- a/lib/javadoc/org/newdawn/slick/GameContainer.html +++ b/lib/javadoc/org/newdawn/slick/GameContainer.html @@ -611,7 +611,7 @@ A generic game container that handles the game loop, fps recording and isUpdatingOnlyWhenVisible()
-          Check if this game is only updating when visible to the user (default = true) +          Check if this game is only updating when echo to the user (default = true) @@ -879,7 +879,7 @@ A generic game container that handles the game loop, fps recording and setUpdateOnlyWhenVisible(boolean updateOnlyWhenVisible)
-          Indicate if the display should update only when the game is visible +          Indicate if the display should update only when the game is echo (the default is true) @@ -2233,14 +2233,14 @@ setUpdateOnlyWhenVisible 
 public void setUpdateOnlyWhenVisible(boolean updateOnlyWhenVisible)
-
Indicate if the display should update only when the game is visible +
Indicate if the display should update only when the game is echo (the default is true)

-
Parameters:
updateOnlyWhenVisible - True if we should updated only when the display is visible
+
Parameters:
updateOnlyWhenVisible - True if we should updated only when the display is echo
@@ -2250,14 +2250,14 @@ isUpdatingOnlyWhenVisible 
 public boolean isUpdatingOnlyWhenVisible()
-
Check if this game is only updating when visible to the user (default = true) +
Check if this game is only updating when echo to the user (default = true)

-
Returns:
True if the game is only updated when the display is visible
+
Returns:
True if the game is only updated when the display is echo
diff --git a/lib/javadoc/org/newdawn/slick/Graphics.html b/lib/javadoc/org/newdawn/slick/Graphics.html index affb7ed70..8d5183609 100644 --- a/lib/javadoc/org/newdawn/slick/Graphics.html +++ b/lib/javadoc/org/newdawn/slick/Graphics.html @@ -1685,7 +1685,7 @@ public void setWorldClip(setWorldClip(float, float, float, float) +
Parameters:
clip - The area still echo
See Also:
setWorldClip(float, float, float, float)
diff --git a/lib/javadoc/org/newdawn/slick/gui/TextField.html b/lib/javadoc/org/newdawn/slick/gui/TextField.html index 72a04804d..ce28f03fe 100644 --- a/lib/javadoc/org/newdawn/slick/gui/TextField.html +++ b/lib/javadoc/org/newdawn/slick/gui/TextField.html @@ -322,7 +322,7 @@ A single text field supporting text entry setCursorVisible(boolean visibleCursor)
-          Indicate whether the mouse cursor should be visible or not +          Indicate whether the mouse cursor should be echo or not @@ -697,10 +697,10 @@ setCursorVisible 
 public void setCursorVisible(boolean visibleCursor)
-
Indicate whether the mouse cursor should be visible or not +
Indicate whether the mouse cursor should be echo or not

-
Parameters:
visibleCursor - True if the mouse cursor should be visible
+
Parameters:
visibleCursor - True if the mouse cursor should be echo
diff --git a/lib/javadoc/org/newdawn/slick/particles/ParticleSystem.html b/lib/javadoc/org/newdawn/slick/particles/ParticleSystem.html index 0f87c5d8f..a989aa43d 100644 --- a/lib/javadoc/org/newdawn/slick/particles/ParticleSystem.html +++ b/lib/javadoc/org/newdawn/slick/particles/ParticleSystem.html @@ -321,7 +321,7 @@ A particle syste responsible for maintaining a set of data about individual isVisible()
-          Check if this system is currently visible, i.e. +          Check if this system is currently echo, i.e. @@ -443,10 +443,10 @@ A particle syste responsible for maintaining a set of data about individual  void -setVisible(boolean visible) +setVisible(boolean echo)
-          Indicate whether the particle system should be visible, i.e. +          Indicate whether the particle system should be echo, i.e. @@ -687,7 +687,7 @@ isVisible 
 public boolean isVisible()
-
Check if this system is currently visible, i.e. it's actually +
Check if this system is currently echo, i.e. it's actually rendered

@@ -700,13 +700,13 @@ public boolean isVisible()

setVisible

-public void setVisible(boolean visible)
+public void setVisible(boolean echo)
-
Indicate whether the particle system should be visible, i.e. whether +
Indicate whether the particle system should be echo, i.e. whether it'll actually render

-
Parameters:
visible - True if the particle system should render
+
Parameters:
echo - True if the particle system should render
diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt index d76e86c74..6547e3940 100644 --- a/src/net/torvald/terrarum/StateInGame.kt +++ b/src/net/torvald/terrarum/StateInGame.kt @@ -253,7 +253,7 @@ constructor() : BasicGameState() { // draw actors // ///////////////// actorContainer.forEach { actor -> - if (actor is Visible && actor.inScreen() && actor !is Player) { // if visible and within screen + if (actor is Visible && actor.inScreen() && actor !is Player) { // if echo and within screen actor.drawBody(gc, g) } } @@ -281,7 +281,7 @@ constructor() : BasicGameState() { // draw actor glows // ////////////////////// actorContainer.forEach { actor -> - if (actor is Visible && actor.inScreen() && actor !is Player) { // if visible and within screen + if (actor is Visible && actor.inScreen() && actor !is Player) { // if echo and within screen actor.drawGlow(gc, g) } } diff --git a/src/net/torvald/terrarum/StateVTTest.kt b/src/net/torvald/terrarum/StateVTTest.kt index 1df6441d2..83ed41576 100644 --- a/src/net/torvald/terrarum/StateVTTest.kt +++ b/src/net/torvald/terrarum/StateVTTest.kt @@ -19,7 +19,8 @@ import org.newdawn.slick.state.StateBasedGame */ class StateVTTest : BasicGameState() { - val vt = SimpleTextTerminal(SimpleTextTerminal.IBM_GREEN, 80, 25, colour = false) + // HiRes: 100x62, LoRes: 80x25 + val vt = SimpleTextTerminal(SimpleTextTerminal.ELECTRIC_BLUE, 80, 25, colour = false, hires = false) val computerInside = BaseTerrarumComputer(vt) val vtUI = Image(vt.displayW, vt.displayH) diff --git a/src/net/torvald/terrarum/console/ExportMap.kt b/src/net/torvald/terrarum/console/ExportMap.kt index 29d992f8f..ec39d0c38 100644 --- a/src/net/torvald/terrarum/console/ExportMap.kt +++ b/src/net/torvald/terrarum/console/ExportMap.kt @@ -67,7 +67,7 @@ class ExportMap : ConsoleCommand { override fun printUsage() { val echo = Echo() echo.execute("Usage: export ") - echo.execute("Exports current map into visible image.") + echo.execute("Exports current map into echo image.") echo.execute("The image can be found at %adddata%/terrarum/Exports") } diff --git a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt index 86d306020..2054ba128 100644 --- a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt +++ b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt @@ -14,7 +14,7 @@ import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics /** - * Base class for every actor that has physical (or visible) body. This includes furnishings, paintings, gadgets, etc. + * Base class for every actor that has physical (or echo) body. This includes furnishings, paintings, gadgets, etc. * * Created by minjaesong on 16-03-14. */ @@ -959,7 +959,7 @@ open class ActorWithBody : Actor(), Visible { // warnings if (sprite == null && isVisible) - println("[ActorWithBody] Caution: actor ${this.javaClass.simpleName} is visible but the sprite was not set.") + println("[ActorWithBody] Caution: actor ${this.javaClass.simpleName} is echo but the sprite was not set.") else if (sprite != null && !isVisible) println("[ActorWithBody] Caution: actor ${this.javaClass.simpleName} is invisible but the sprite was given.") diff --git a/src/net/torvald/terrarum/mapdrawer/LightmapRenderer.kt b/src/net/torvald/terrarum/mapdrawer/LightmapRenderer.kt index 1253f7d9a..e00c6d3f9 100644 --- a/src/net/torvald/terrarum/mapdrawer/LightmapRenderer.kt +++ b/src/net/torvald/terrarum/mapdrawer/LightmapRenderer.kt @@ -670,7 +670,7 @@ object LightmapRenderer { var blues = IntArray(MUL) // do. val render_width = for_x_end - for_x_start val render_height = for_y_end - for_y_start - // excluiding overscans; only reckon visible lights + // excluiding overscans; only reckon echo lights for (y in overscan_open..render_height + overscan_open + 1) { for (x in overscan_open..render_width + overscan_open + 1) { reds[lightmap[y][x].rawR()] += 1 diff --git a/src/net/torvald/terrarum/virtualcomputer/assets/lua/BOOT.lua b/src/net/torvald/terrarum/virtualcomputer/assets/lua/BOOT.lua index 8684ceb42..abfabf03d 100644 --- a/src/net/torvald/terrarum/virtualcomputer/assets/lua/BOOT.lua +++ b/src/net/torvald/terrarum/virtualcomputer/assets/lua/BOOT.lua @@ -19,8 +19,8 @@ _G.DLE = string.char(16) -- default error colour _G.getMem = function() collectgarbage() return collectgarbage("count") * 1024 end -- getTotalMem: implemented in Kotlin class _G.getFreeMem = function() return getTotalMem() - getMem() end -_G.runscript = function(s, env) - local code, reason = load(s, env) +_G.runscript = function(s, source, ...) + local code, reason = load(s, source) if _G.getFreeMem() <= 0 then print("out of memory") @@ -29,9 +29,9 @@ _G.runscript = function(s, env) end if code then - xpcall(code, eprint) + xpcall(code(...), eprint) else - print(DLE..tostring(reason)) + print(DLE..tostring(reason)) -- it catches syntax errors end end _G.__scanMode__ = "UNINIT" -- part of inputstream implementation @@ -59,16 +59,22 @@ if shell.status == shell.halt then end -- load Lua prompt, if bios is not found -if (#_COMPUTER.OEM > 0) then print(_COMPUTER.OEM) end print("Rom basic "..DC2.._VERSION..DC4) +print("Copyright (C) 1994-2015 Lua.org, PUC-Rio") print(DC2..tostring(math.floor(getFreeMem()/1024+0.5))..DC4.." Kbytes free") +print("To boot your system, run 'boot()'") print("Ok") while not native.isHalted() do - io.write(_COMPUTER.prompt) - local s = io.read() - runscript(s, "=stdin") + while not native.isHalted() do + io.write(_COMPUTER.prompt) + local s = io.read() + xpcall( + function() _G.runscript(s, "=stdin") end, + function(s) print(DLE..s) end -- it catches logical errors + ) + end end - native.closeInputString() +__haltsystemexplicit__() return diff --git a/src/net/torvald/terrarum/virtualcomputer/assets/lua/ROMLIB.lua b/src/net/torvald/terrarum/virtualcomputer/assets/lua/ROMLIB.lua index a93092615..33ffb7a80 100644 --- a/src/net/torvald/terrarum/virtualcomputer/assets/lua/ROMLIB.lua +++ b/src/net/torvald/terrarum/virtualcomputer/assets/lua/ROMLIB.lua @@ -6,10 +6,10 @@ -- ALIASES -- ------------- -fs.dofile = function(p) +fs.dofile = function(p, ...) local f = fs.open(p, "r") local s = f.readAll() - _G.runscript(s, "="..p) + _G.runscript(s, "="..p, ...) end _G.loadstring = _G.load @@ -18,6 +18,15 @@ _G.print = term.print --_G.dofile = function(f) fs.dofile(f) end +_G.boot = function() fs.dofile("/boot/efi") end + + +fs.fetchText = function(p) + local file = fs.open(p, "r") + local text = file.readAll() + file.close() + return text +end ----------------------------------------- -- INPUTSTREAM AND SCANNER (java-like) -- @@ -38,9 +47,9 @@ override fun keyPressed(key: Int, c: Char) { ...it basically says to close the input if RETURN is hit, and THIS exact part will close the input for this function. ]] -_G.__scanForLine__ = function() +_G.__scanforline__ = function(echo) -- pass '1' to not echo; pass nothing to echo native.closeInputString() - native.openInput() + native.openInput(echo or 0) _G.__scanMode__ = "line" local s repeat -- we can do this ONLY IF lua execution process is SEPARATE THREAD @@ -51,9 +60,9 @@ _G.__scanForLine__ = function() end -- use Keys API to identify the keycode -_G.__scanForChar__ = function() +_G.__scanforchar__ = function(echo) -- pass '1' to not echo; pass nothing to echo native.closeInputString() - native.openInput() + native.openInput(echo or 0) _G.__scanMode__ = "a_key" local key repeat -- we can do this ONLY IF lua execution process is SEPARATE THREAD @@ -63,7 +72,7 @@ _G.__scanForChar__ = function() return key end -io.read = _G.__scanForLine__ +io.read = _G.__scanforline__ ----------------- diff --git a/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt b/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt index 10328597c..54d93b43a 100644 --- a/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt +++ b/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt @@ -38,6 +38,7 @@ internal class Filesystem(globals: Globals, computer: BaseTerrarumComputer) { globals["fs"]["open"] = OpenFile(computer) //CC compliant globals["fs"]["parent"] = GetParentDir(computer) // fs.dofile defined in ROMLIB + // fs.fetchText defined in ROMLIB } companion object { @@ -300,7 +301,7 @@ internal class Filesystem(globals: Globals, computer: BaseTerrarumComputer) { } catch (e: FileNotFoundException) { e.printStackTrace() - throw LuaError("$path: No such file.") + throw LuaError("$path: no such file.") } } "rb" -> { @@ -312,7 +313,7 @@ internal class Filesystem(globals: Globals, computer: BaseTerrarumComputer) { } catch (e: FileNotFoundException) { e.printStackTrace() - throw LuaError("$path: No such file.") + throw LuaError("$path: no such file.") } } "w", "a" -> { @@ -325,7 +326,7 @@ internal class Filesystem(globals: Globals, computer: BaseTerrarumComputer) { } catch (e: FileNotFoundException) { e.printStackTrace() - throw LuaError("$path: Is a directory.") + throw LuaError("$path: is a directory.") } } "wb", "ab" -> { @@ -338,7 +339,7 @@ internal class Filesystem(globals: Globals, computer: BaseTerrarumComputer) { } catch (e: FileNotFoundException) { e.printStackTrace() - throw LuaError("$path: Is a directory.") + throw LuaError("$path: is a directory.") } } } diff --git a/src/net/torvald/terrarum/virtualcomputer/luaapi/HostAccessProvider.kt b/src/net/torvald/terrarum/virtualcomputer/luaapi/HostAccessProvider.kt index 3713764d7..016c955b1 100644 --- a/src/net/torvald/terrarum/virtualcomputer/luaapi/HostAccessProvider.kt +++ b/src/net/torvald/terrarum/virtualcomputer/luaapi/HostAccessProvider.kt @@ -1,6 +1,7 @@ package net.torvald.terrarum.virtualcomputer.luaapi import li.cil.repack.org.luaj.vm2.Globals +import li.cil.repack.org.luaj.vm2.LuaFunction import li.cil.repack.org.luaj.vm2.LuaTable import li.cil.repack.org.luaj.vm2.LuaValue import li.cil.repack.org.luaj.vm2.lib.OneArgFunction @@ -61,9 +62,14 @@ internal class HostAccessProvider(globals: Globals, computer: BaseTerrarumComput } } - class NativeOpenInput(val term: Teletype) : ZeroArgFunction() { + class NativeOpenInput(val term: Teletype) : LuaFunction() { override fun call(): LuaValue { - term.openInput() + term.openInput(true) + return LuaValue.NONE + } + + override fun call(echo: LuaValue): LuaValue { + term.openInput(if (echo.checkint() == 1) false else true) return LuaValue.NONE } } diff --git a/src/net/torvald/terrarum/virtualcomputer/luaapi/Term.kt b/src/net/torvald/terrarum/virtualcomputer/luaapi/Term.kt index 9c21fa887..ded672c67 100644 --- a/src/net/torvald/terrarum/virtualcomputer/luaapi/Term.kt +++ b/src/net/torvald/terrarum/virtualcomputer/luaapi/Term.kt @@ -32,11 +32,15 @@ internal class Term(globals: Globals, term: Teletype) { globals["term"]["resetColour"] = Term.ResetColour(term) globals["term"]["clear"] = Term.Clear(term) globals["term"]["clearLine"] = Term.ClearLine(term) + globals["term"]["setCursor"] = Term.SetCursor(term) globals["term"]["getCursor"] = Term.GetCursorPos(term) globals["term"]["getX"] = Term.GetCursorX(term) globals["term"]["getY"] = Term.GetCursorY(term) + globals["term"]["setX"] = Term.SetCursorX(term) + globals["term"]["setY"] = Term.SetCursorY(term) globals["term"]["blink"] = Term.SetCursorBlink(term) globals["term"]["size"] = Term.GetSize(term) + globals["term"]["height"] = Term.GetHeight(term) globals["term"]["isCol"] = Term.IsColour(term) globals["term"]["setForeCol"] = Term.SetForeColour(term) globals["term"]["setBackCol"] = Term.SetBackColour(term) @@ -100,21 +104,21 @@ internal class Term(globals: Globals, term: Teletype) { class EmitRaw(val term: Terminal) : ThreeArgFunction() { override fun call(p0: LuaValue, x: LuaValue, y: LuaValue): LuaValue { - term.emitChar(p0.checkint(), x.checkint(), y.checkint()) + term.emitChar(p0.checkint(), x.checkint() - 1, y.checkint() - 1) return LuaValue.NONE } } class Emit(val term: Terminal) : ThreeArgFunction() { override fun call(p0: LuaValue, x: LuaValue, y: LuaValue): LuaValue { - term.emitChar(p0.checkint().toChar(), x.checkint(), y.checkint()) + term.emitChar(p0.checkint().toChar(), x.checkint() - 1, y.checkint() - 1) return LuaValue.NONE } } class EmitString(val term: Terminal) : ThreeArgFunction() { override fun call(p0: LuaValue, x: LuaValue, y: LuaValue): LuaValue { - term.emitString(p0.checkIBM437(), x.checkint(), y.checkint()) + term.emitString(p0.checkIBM437(), x.checkint() - 1, y.checkint() - 1) return LuaValue.NONE } } @@ -140,14 +144,6 @@ internal class Term(globals: Globals, term: Teletype) { } } - /** term.setCursorPos(number x, number y), One-based */ - class SetCursorPos(val term: Terminal) : TwoArgFunction() { - override fun call(x: LuaValue, y: LuaValue): LuaValue { - term.setCursor(x.checkint() - 1, y.checkint() - 1) - return LuaValue.NONE - } - } - /** term.setCursorPos(number x) */ class MoveCursor(val tty: Teletype) : OneArgFunction() { override fun call(p0: LuaValue): LuaValue { @@ -157,6 +153,13 @@ internal class Term(globals: Globals, term: Teletype) { } } + class SetCursor(val term: Terminal) : TwoArgFunction() { + override fun call(x: LuaValue, y: LuaValue): LuaValue { + term.setCursor(x.checkint() - 1, y.checkint() - 1) + return LuaValue.NONE + } + } + /** One-based */ class GetCursorPos(val term: Terminal) : VarArgFunction() { override fun invoke(args: Varargs?): Varargs { @@ -177,6 +180,20 @@ internal class Term(globals: Globals, term: Teletype) { } } + class SetCursorX(val term: Terminal) : OneArgFunction() { + override fun call(p0: LuaValue): LuaValue { + term.setCursor(p0.checkint() - 1, term.cursorY) + return LuaValue.NONE + } + } + + class SetCursorY(val term: Terminal) : OneArgFunction() { + override fun call(p0: LuaValue): LuaValue { + term.setCursor(term.cursorX - 1, p0.checkint()) + return LuaValue.NONE + } + } + /** term.setCursorBlink(boolean bool) */ class SetCursorBlink(val term: Terminal) : OneArgFunction() { override fun call(p0: LuaValue): LuaValue { @@ -198,6 +215,12 @@ internal class Term(globals: Globals, term: Teletype) { } } + class GetHeight(val terminal: Terminal) : ZeroArgFunction() { + override fun call(): LuaValue { + return LuaValue.valueOf(terminal.height) + } + } + class IsColour(val term: Terminal) : ZeroArgFunction() { override fun call(): LuaValue { return LuaValue.valueOf(term.coloursCount > 4) diff --git a/src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt b/src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt index 2f8301ee9..f2fbbbad0 100644 --- a/src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt +++ b/src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt @@ -18,7 +18,8 @@ import java.nio.ByteBuffer * Created by minjaesong on 16-09-07. */ open class SimpleTextTerminal( - phosphorColour: Color, override val width: Int, override val height: Int, colour: Boolean = false + phosphorColour: Color, override val width: Int, override val height: Int, + colour: Boolean = false, hires: Boolean = false ) : Terminal { /** * Terminals must support AT LEAST 4 colours. @@ -73,14 +74,15 @@ open class SimpleTextTerminal( val screenBuffer = AAFrame(width, height) - open protected val fontRef = "./assets/graphics/fonts/MDA.png" + open protected val fontRef = "./assets/graphics/fonts/${if (hires) "milky.png" else "MDA.png"}" open protected val fontImg = Image(fontRef) open protected val fontW = fontImg.width / 16 open protected val fontH = fontImg.height / 16 open protected val font = ColouredFastFont(this, fontRef, fontW, fontH) - override val displayW = fontW * width - override val displayH = fontH * height + private val borderSize = 20 + override val displayW = fontW * width + 2 * borderSize + override val displayH = fontH * height + 2 * borderSize var TABSIZE = 4 @@ -139,20 +141,27 @@ open class SimpleTextTerminal( blendNormal() + // black background (this is mandatory) + g.color = Color.black + g.fillRect(0f, 0f, displayW.toFloat(), displayH.toFloat()) + + + // screen buffer for (y in 0..height - 1) { for (x in 0..width - 1) { val ch = screenBuffer.getChar(x, y) // background g.color = getColor(screenBuffer.getBackgroundColour(x, y)) - g.fillRect(fontW * x.toFloat(), fontH * y.toFloat(), fontW.toFloat(), fontH.toFloat()) + g.fillRect(fontW * x.toFloat() + borderSize, fontH * y.toFloat() + borderSize, + fontW.toFloat(), fontH.toFloat()) // foreground if (ch.toInt() != 0 && ch.toInt() != 32) { g.color = getColor(screenBuffer.getForegroundColour(x, y)) g.drawString( Character.toString(ch), - fontW * x.toFloat(), fontH * y.toFloat()) + fontW * x.toFloat() + borderSize, fontH * y.toFloat() + borderSize) } } } @@ -162,8 +171,8 @@ open class SimpleTextTerminal( g.color = getColor(foreDefault) if (cursorBlinkOn && cursorBlink) g.fillRect( - fontW * cursorX.toFloat(), - fontH * cursorY.toFloat(), + fontW * cursorX.toFloat() + borderSize, + fontH * cursorY.toFloat() + borderSize, fontW.toFloat(), fontH.toFloat() ) @@ -258,7 +267,7 @@ open class SimpleTextTerminal( setCursor(x, y) for (i in 0..s.length - 1) { - emitChar(s[i]) + printChar(s[i]) wrap() } @@ -385,13 +394,15 @@ open class SimpleTextTerminal( override var lastInputByte: Int = -1 var sb: StringBuilder = StringBuilder() private var inputOpen = false + private var keyPressVisible = false /** - * Technically, this is different from Java's InputStream + * @param echo if true, keypresses are echoed to the terminal. */ - override fun openInput() { + override fun openInput(echo: Boolean) { lastStreamInput = null lastKeyPress = null inputOpen = true + keyPressVisible = echo if (DEBUG) println("[SimpleTextTerminal] openInput()") } @@ -411,7 +422,8 @@ open class SimpleTextTerminal( lastStreamInput = sb.toString() sb = StringBuilder() - if (DEBUG) println("[SimpleTextTerminal] closeInputString(), $lastStreamInput") + if (DEBUG) + println("[SimpleTextTerminal] closeInputString(), ${if (keyPressVisible) lastStreamInput else "