Merge branch 'master' of github.com:kekcleader/FreeOberon

data/bin/link_console.bat

@@ -30,7 +30,7 @@ ECHO ON
   -I %OFRDIR%\Lib\Obj ^
   %ONAME%.c -o %ONAME%.exe ^
   %ARGS%^
-  %CURDIR%libFreeOberon.a ^
+  %CURDIR%FreeOberon.a ^
   %OFRDIR%\Lib\Ofront.a
 @SET RETCODE=%ERRORLEVEL%
 

data/bin/link_graph.bat

@@ -32,7 +32,7 @@ ECHO ON
   -I %OFRDIR%\Lib\Obj ^
   %ONAME%.c -o %ONAME%.exe ^
   %ARGS%^
-  %CURDIR%libFreeOberon.a ^
+  %CURDIR%FreeOberon.a ^
   %OFRDIR%\Lib\Ofront.a ^
   %SDL2Opts% -lSDL2_image
 @SET RETCODE=%ERRORLEVEL%

src/FreeOberon.Mod

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with Free Oberon.  If not, see <http://www.gnu.org/licenses/>.
 *)
 IMPORT G := Graph, T := Terminal, Files, Args, Utf8,
-       OV, Editor, Term, Config, Strings, Int, Out;
+       OV, Editor, Term, Config, Strings, Int, Out, Kernel;
 CONST
   version* = '1.0.4';
 

src/Terminal.Mod

@@ -184,6 +184,8 @@ END GoToXY;
 
 PROCEDURE MouseXY*(x, y: INTEGER);
 BEGIN needRedraw := TRUE;
+  IF x < 0 THEN x := 0 ELSIF x >= charsX THEN x := charsX - 1 END;
+  IF y < 0 THEN y := 0 ELSIF y >= charsY THEN y := charsY - 1 END;
   chars[mouseY, mouseX].updated := TRUE;
   mouseX := x; mouseY := y;
   chars[mouseY, mouseX].updated := TRUE

src/make.bat

@@ -14,13 +14,25 @@ SET CCFULL=%CC% -g3 -O0 -fno-exceptions -I %OFRDIR%\..\..\Mod\Lib -I %OFRDIR%\Li
 ECHO ON
 %OFR% -C Config_win32.Mod
 @IF ERRORLEVEL 1 GOTO ERR
+%OFR% -C Utf8.Mod
+@IF ERRORLEVEL 1 GOTO ERR
+%OFR% -C Strings.Mod
+@IF ERRORLEVEL 1 GOTO ERR
+%OFR% -C Reals.Mod
+@IF ERRORLEVEL 1 GOTO ERR
 %OFR% -C Int.Mod
 @IF ERRORLEVEL 1 GOTO ERR
-%OFR% -7 StrList.Mod
+%OFR% -C In.Mod
+@IF ERRORLEVEL 1 GOTO ERR
+%OFR% -C Out.Mod
+@IF ERRORLEVEL 1 GOTO ERR
+%OFR% -C Files.Mod
+@IF ERRORLEVEL 1 GOTO ERR
+%OFR% -7w StrList.Mod
 @IF ERRORLEVEL 1 GOTO ERR
-%OFR% -7 Dir.Mod
+%OFR% -7w Dir.Mod
 @IF ERRORLEVEL 1 GOTO ERR
-%OFR% -C -i SDL2.Mod
+%OFR% -Ci SDL2.Mod
 @IF ERRORLEVEL 1 GOTO ERR
 %OFR% -C Graph.Mod
 @IF ERRORLEVEL 1 GOTO ERR
@@ -34,19 +46,28 @@ ECHO ON
 @IF ERRORLEVEL 1 GOTO ERR
 %OFR% -C Editor.Mod
 @IF ERRORLEVEL 1 GOTO ERR
-%OFR% -C -m FreeOberon.Mod
+%OFR% -Cm FreeOberon.Mod
 @IF ERRORLEVEL 1 GOTO ERR
 windres resources.rc resources.o
 @REM                        -O0 change to -Os (?)   add -s (?)
+%CCFULL% -c Utf8.c
+%CCFULL% -c Strings.c
+%CCFULL% -c Reals.c
 %CCFULL% -c Int.c
+%CCFULL% -c In.c
+%CCFULL% -c Out.c
+%CCFULL% -c Files.c
 %CCFULL% -c StrList.c
 %CCFULL% -c Dir.c
 %CCFULL% -c SDL2.c
 %CCFULL% -c Graph.c
-%AR% -crs ..\data\bin\libFreeOberon.a Int.o StrList.o Dir.o SDL2.o Graph.o
+%AR% -crs ..\data\bin\FreeOberon.a ^
+  Utf8.o Strings.o Reals.o Int.o In.o Out.o Files.o ^
+  StrList.o Dir.o SDL2.o Graph.o
 
 %CCFULL% Config.c term\term_win32.c ^
-  Int.o StrList.o Dir.o SDL2.o Graph.o ^
+  Utf8.o Strings.o Reals.o Int.o In.o Out.o Files.o ^
+  StrList.o Dir.o SDL2.o Graph.o ^
   Term.c Terminal.c OV.c EditorText.c Editor.c ^
   %PROG%.c -o ..\%PROG%.exe resources.o ^
   %OFRDIR%\Lib\Ofront.a ^

src/make.sh

@@ -32,7 +32,7 @@ $OFR -7w StrList.Mod
 
 $OFR -7w Dir.Mod
 
-$OFR -C -i SDL2.Mod
+$OFR -Ci SDL2.Mod
 
 $OFR -C Graph.Mod
 
@@ -46,7 +46,7 @@ $OFR -C EditorText.Mod
 
 $OFR -C Editor.Mod
 
-$OFR -C -m FreeOberon.Mod
+$OFR -Cm FreeOberon.Mod