diff --git a/.Floppies/A2OSX.BOOTlc.po b/.Floppies/A2OSX.BOOTlc.po index f33ffc47..6d307f12 100644 Binary files a/.Floppies/A2OSX.BOOTlc.po and b/.Floppies/A2OSX.BOOTlc.po differ diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 4f792d4c..15b79eac 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/BIN/EDIT.S.DLG.txt b/BIN/EDIT.S.DLG.txt index 747efb9d..d3e26abb 100644 --- a/BIN/EDIT.S.DLG.txt +++ b/BIN/EDIT.S.DLG.txt @@ -185,7 +185,15 @@ DLG.Close ldy #S.DLG.Y ldy #S.DLG.H lda (ZPPTR1),y - jmp SCRN.UpdateMain.1 + jsr SCRN.UpdateMain.1 + bcs .9 + + >LDA.G hDLG + >SYSCALL freemem + + >STZ.G hDLG + clc +.9 rts *-------------------------------------- DLG.CTRL.Draw sta TmpByte A=CtrlID tay diff --git a/BIN/EDIT.S.SCRN.txt b/BIN/EDIT.S.SCRN.txt index c9ce1ed5..30312357 100644 --- a/BIN/EDIT.S.SCRN.txt +++ b/BIN/EDIT.S.SCRN.txt @@ -180,13 +180,7 @@ SCRN.UpdateLineAtALenY ldy #$ff -.10 iny - lda SEQ.CEOL,y - beq .11 - jsr SCRN.ToLineBuf - bra .10 - -.11 >LDA.G ScreenW + >LDA.G ScreenW tax >LDA.G ScreenX cmp TmpLen @@ -248,16 +242,18 @@ SCRN.UpdateLineAtALenY .80 jmp SCRN.LineBufOut .9 rts *-------------------------------------- -SCRN.ToggleSel ldy #0 +SCRN.ToggleSel ldy #SEQ.NORM-SEQS + lda bSelected eor #$ff sta bSelected bpl .1 - ldy #6 + ldy #SEQ.INV-SEQS -.1 lda SEQ.NORM,y +.1 lda SEQS,y beq .8 + jsr SCRN.ToLineBuf iny bra .1 diff --git a/BIN/EDIT.S.txt b/BIN/EDIT.S.txt index ed11b59b..5198749f 100644 --- a/BIN/EDIT.S.txt +++ b/BIN/EDIT.S.txt @@ -413,9 +413,9 @@ SEQ.DLG .AS "\e[30;46m" SEQ.DLG.RIGHT .AS "\e[37;40m" .DA #C.SO,#'x',#C.SI .DA #0 -SEQ.DLG.BUT .AS "\e[93;44m" +SEQ.DLG.BUT .AS "\e[93;44m" +INV SEQ.INV .AZ "\e[7m" -SEQ.EDIT .AZ "\e[93;44m" +SEQ.EDIT .AS "\e[0m\e[93;44m" +CEOL SEQ.CEOL .AZ "\e[K" SEQ.NORM .AZ "\e[0m" *-------------------------------------- @@ -433,15 +433,15 @@ MSG.TXTCR .AZ "TXT/CR" MSG.TXTCRLF .AZ "TXT/CRLF" MSG.TXTASM .AZ "S-C/ASM" MSG.STATUSBAR .AZ "Press Ctrl-A For Help Len: %5D Pos: %5D Col: %3d Line: %5D" -MSG.STATUSBAR.H .AZ "Press any key to exit this screen:" +MSG.STATUSBAR.H .AZ "Press any key to exit this screen" MSG.STATUSBAR.F .AZ "Find:%s" MSG.STATUSBAR.R .AZ "Replace:%s" MSG.STATUSBAR.S .AZ "Save (Ctrl-C):%s" MSG.STATUSBAR.E .AZ "Error:%h" MSG.GOTOXY .AZ "\e[%d;%dH" -MSG.HELPLINE .AZ "\e[93;44m%S\e[K" -MSG.HELP >PSTR "All commands: (* = Not yet implemented)" - >PSTR "------------" +MSG.HELPLINE .AZ "\e[0m\e[93;44m%S\e[K" +MSG.HELP >PSTR "All commands:" + >PSTR "-------------" >PSTR " Ctrl-A : This help screen" >PSTR " Ctrl-B : Mark beginning of selection" >PSTR " Ctrl-C : Copy selection to clipboard" diff --git a/BIN/IPCONFIG.S.txt b/BIN/IPCONFIG.S.txt index 22d82a24..cfe87002 100644 --- a/BIN/IPCONFIG.S.txt +++ b/BIN/IPCONFIG.S.txt @@ -1,10 +1,9 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 .LIST OFF .OP 65C02 .OR $2000 - .TF BIN/IPCONFIG + .TF bin/ipconfig *-------------------------------------- .INB INC/MACROS.I .INB INC/A2OSX.I @@ -384,9 +383,9 @@ MSG.CFG .AZ "IPCONFIG:Reading %s..." MSG.CFG.KO .AZ "Not Found. [%h]\r\n" MSG.CFG.OK .AZ "OK." *-------------------------------------- -HOSTNAME .AZ "${ROOT}ETC/HOSTNAME" -TCPIP.CONF .AZ "${ROOT}ETC/TCPIP.CONF" -HOSTS .AZ "${ROOT}ETC/HOSTS" +HOSTNAME .AZ "${ROOT}etc/hostname" +TCPIP.CONF .AZ "${ROOT}etc/tcpip.conf" +HOSTS .AZ "${ROOT}etc/hosts" *-------------------------------------- CFG.DefaultHost .AZ "a2osx-%H" CFG.Keywords >PSTR "address" diff --git a/BIN/SH.S.txt b/BIN/SH.S.txt index 753cb55e..f7c4692c 100644 --- a/BIN/SH.S.txt +++ b/BIN/SH.S.txt @@ -3,7 +3,7 @@ NEW .LIST OFF .OP 65C02 .OR $2000 - .TF BIN/SH + .TF bin/sh *-------------------------------------- HISTORY.MAX .EQ 256 CORE.STACK.MAX .EQ 128 @@ -545,7 +545,7 @@ FMT.DATE .AZ "%A, %B %d %Y %H:%M:%S" FMT.Long .AZ "%L" FMT.Byte .AZ "%d" *-------------------------------------- -HOME.PROFILE .AZ "${HOME}PROFILE" +HOME.PROFILE .AZ "${HOME}profile" .HS 00 To Make It ArgV PS1 .AZ "${PS1}" HOME .AZ "${HOME}" diff --git a/SBIN/NETWORKD.S.txt b/SBIN/NETWORKD.S.txt index 98e2743b..2c65ba25 100644 --- a/SBIN/NETWORKD.S.txt +++ b/SBIN/NETWORKD.S.txt @@ -3,7 +3,7 @@ NEW .LIST OFF .OP 65C02 .OR $2000 - .TF SBIN/NETWORKD + .TF sbin/networkd *-------------------------------------- LIB.MAX .EQ 4 *-------------------------------------- @@ -258,7 +258,7 @@ MSG.DEV.KO .AZ "NETWORKD:No Device Found, exiting." MSG.DEV.OK .AZ "NETWORKD:Bound To Device : %s\r\n" MSG.LIB .AZ "NETWORKD:Loading %s ...\r\n" MSG.EXEC .AZ "NETWORKD:Running %s ...\r\n" -ETCNETWORK .AZ "${BOOT}ETC/NETWORK" +ETCNETWORK .AZ "${BOOT}etc/network" *-------------------------------------- DevID .BS 1 LibCnt .BS 1