diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 9641bc30..ecd383f8 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/BIN/GOPHER.S.txt b/BIN/GOPHER.S.txt index 4dce7e9a..f39371ee 100644 --- a/BIN/GOPHER.S.txt +++ b/BIN/GOPHER.S.txt @@ -34,7 +34,6 @@ hFrame .BS 1 TimeOut .BS 1 -bScreen .BS 1 hCTX .BS 1 hSCR .BS 1 hTBOX .BS 1 @@ -104,8 +103,6 @@ CS.RUN jsr CS.Net.Init jsr CS.Scr.Init bcs CS.INIT.RTS - dec bScreen - >LDYAI BUFSIZE >SYSCALL GetMem bcs CS.INIT.RTS @@ -156,8 +153,8 @@ CS.DOEVENT lda (pEvent) .9 sec do not discard TIMER event rts *-------------------------------------- -CS.QUIT bit bScreen - bpl .10 +CS.QUIT lda hCTX + beq .10 >LIBCALL hLIBTUI,LIBTUI.Close @@ -597,7 +594,7 @@ CS.Scr.Init >LIBCALL hLIBTUI,LIBTUI.Init >PUSHBI 0 Y1 >PUSHBI 80 W >PUSHBI 22 H - >PUSHBI S.OBJ.F.bEdit F + >PUSHBI 0 F lda hBuf >SYSCALL GetMemPtr >PUSHYA @@ -646,7 +643,7 @@ hLIBTCPIP .BS 1 LIBTUI .AZ "libtui" hLIBTUI .BS 1 *-------------------------------------- -MSG.ScrTitle .CZ "A2osX-GOPHER %s:%D/%s : Exit" +MSG.ScrTitle .CZ "A2osX-GOPHER %s:%D/%s : Quit" *-------------------------------------- MSG.IPKO .CZ "TCP/IP Not Loaded/Configured.\r\n" MSG.USAGE .CZ "Usage : GOPHER [port]\r\n" diff --git a/INC/LIBTUI.I.txt b/INC/LIBTUI.I.txt index 7536a327..17bcb803 100644 --- a/INC/LIBTUI.I.txt +++ b/INC/LIBTUI.I.txt @@ -25,9 +25,12 @@ S.CTX.hSCRN .EQ 0 S.CTX.hClipBrd .EQ 1 S.CTX.W .EQ 2 S.CTX.H .EQ 3 + + + + S.CTX.bEscMode .EQ 14 S.CTX.InBufPtr .EQ 15 -* S.CTX.InBuf .EQ 16 S.CTX.EndBuf .EQ 31 * @@ -105,9 +108,8 @@ S.TBOX.BufPtr .EQ S.OBJ+8 S.TBOX.BufCnt .EQ S.OBJ+10 S.TBOX.SelBegin .EQ S.OBJ+12 S.TBOX.SelEnd .EQ S.OBJ+14 -S.TBOX.bSelect .EQ S.OBJ+16 * -S.TBOX .EQ S.OBJ+17 +S.TBOX .EQ S.OBJ+16 *-------------------------------------- S.LBOX.Idx .EQ S.OBJ+0 S.LBOX.VScroll .EQ S.OBJ+1 diff --git a/LIB/LIBTUI.S.BUT.txt b/LIB/LIBTUI.S.BUT.txt index 9cb5dfae..82e9a366 100644 --- a/LIB/LIBTUI.S.BUT.txt +++ b/LIB/LIBTUI.S.BUT.txt @@ -39,7 +39,7 @@ BUT.New lda #S.OBJ.T.BUT jsr OBJ.PullY1X1hParent - jsr OBJ.Insert + jsr CONT.Insert bcs .99 lda hObj @@ -50,9 +50,6 @@ BUT.New lda #S.OBJ.T.BUT .99 rts *-------------------------------------- -BUT.Destroy clc - rts -*-------------------------------------- BUT.Run lda (pStack) Event ldy #S.BUT.HotKey cmp (ZPObjPtr),y diff --git a/LIB/LIBTUI.S.CBOX.txt b/LIB/LIBTUI.S.CBOX.txt index b7143d3c..a9c8f6bd 100644 --- a/LIB/LIBTUI.S.CBOX.txt +++ b/LIB/LIBTUI.S.CBOX.txt @@ -45,7 +45,7 @@ CBOX.New lda #S.OBJ.T.CBOX jsr OBJ.PullY1X1hParent - jsr OBJ.Insert + jsr CONT.Insert bcs .99 lda hObj @@ -56,9 +56,6 @@ CBOX.New lda #S.OBJ.T.CBOX .99 rts *-------------------------------------- -CBOX.Destroy clc - rts -*-------------------------------------- CBOX.Run ldy #S.BUT.HotKey cmp (ZPObjPtr),y beq .8 diff --git a/LIB/LIBTUI.S.CONT.txt b/LIB/LIBTUI.S.CONT.txt index dd367384..d854cfd8 100644 --- a/LIB/LIBTUI.S.CONT.txt +++ b/LIB/LIBTUI.S.CONT.txt @@ -33,8 +33,47 @@ CONT.New jsr OBJ.Create A = Class .9 >POP 2 rts *-------------------------------------- -CONT.Destroy clc +CONT.Insert >SYSCALL2 GetMemPtr A = hParent + >STYA ZPPtr2 + + ldy #S.OBJ.Childs + +.1 lda (ZPPtr2),y + beq .2 + + iny + cpy #S.OBJ + bcc .1 + + lda #E.OOH +* sec rts + +.2 lda hObj + sta (ZPPtr2),y + + ldy #S.OBJ.S + lda (ZPPtr2),y + ora #S.OBJ.S.bHasChilds + sta (ZPPtr2),y + + ldy #S.OBJ.InnerX + lda (ZPPtr2),y + + ldy #S.OBJ.X1 + clc + adc (ZPObjPtr),y + sta (ZPObjPtr),y + + ldy #S.OBJ.InnerY + lda (ZPPtr2),y + + ldy #S.OBJ.Y1 + clc + adc (ZPObjPtr),y + sta (ZPObjPtr),y + + jmp OBJ.SetX2Y2 *-------------------------------------- CONT.Run lda (pStack) Event cmp #C.TAB @@ -108,10 +147,7 @@ CONT.Draw ldy #S.OBJ.InnerW .1 jsr LB.COut dex bne .1 -*-------------------------------------- -CONT.Activate -*-------------------------------------- -CONT.Deactivate + clc rts *-------------------------------------- diff --git a/LIB/LIBTUI.S.CTX.txt b/LIB/LIBTUI.S.CTX.txt index 0c5f9b6f..c1ead8ba 100644 --- a/LIB/LIBTUI.S.CTX.txt +++ b/LIB/LIBTUI.S.CTX.txt @@ -86,7 +86,18 @@ CTX.Init >LDYA L.SEQ.INIT * ## RETURN VALUE * CC = success *\-------------------------------------- -CTX.Close >SYSCALL2 FreeMem +CTX.Close pha + + >SYSCALL2 GetMemPtr + >STYA ZPCtxPtr + + lda (ZPCtxPtr) S.CTX.hSCRN + beq .1 + >DEBUG + jsr LIB.Destroy + +.1 pla + >SYSCALL2 FreeMem >LDYA L.SEQ.CLOSE jsr CTX.fputs diff --git a/LIB/LIBTUI.S.DLG.txt b/LIB/LIBTUI.S.DLG.txt index a92dbd98..a061556c 100644 --- a/LIB/LIBTUI.S.DLG.txt +++ b/LIB/LIBTUI.S.DLG.txt @@ -51,17 +51,6 @@ DLG.New lda #S.OBJ.T.DLG .9 >POP 5 rts *-------------------------------------- -DLG.Destroy clc - rts -*-------------------------------------- -DLG.Run .EQ CONT.Run -*-------------------------------------- -DLG.Draw .EQ CONT.Draw -*-------------------------------------- -DLG.Activate .EQ CONT.Activate -*-------------------------------------- -DLG.Deactivate .EQ CONT.Deactivate -*-------------------------------------- MAN SAVE usr/src/lib/libtui.s.dlg LOAD usr/src/lib/libtui.s diff --git a/LIB/LIBTUI.S.LABEL.txt b/LIB/LIBTUI.S.LABEL.txt index f992d4d5..abfdbaca 100644 --- a/LIB/LIBTUI.S.LABEL.txt +++ b/LIB/LIBTUI.S.LABEL.txt @@ -21,7 +21,7 @@ LABEL.New lda #S.OBJ.T.LABEL jsr OBJ.PullY1X1hParent - jsr OBJ.Insert + jsr CONT.Insert bcs .99 lda hObj @@ -49,8 +49,6 @@ LABEL.Draw ldy #S.LABEL.pLabel .8 *-------------------------------------- -LABEL.Destroy -*-------------------------------------- LABEL.Run *-------------------------------------- LABEL.Activate diff --git a/LIB/LIBTUI.S.LBOX.txt b/LIB/LIBTUI.S.LBOX.txt index 5afb2ecd..8e5a5fb4 100644 --- a/LIB/LIBTUI.S.LBOX.txt +++ b/LIB/LIBTUI.S.LBOX.txt @@ -22,7 +22,7 @@ LBOX.New lda #S.OBJ.T.LBOX jsr OBJ.PullY1X1hParent - jsr OBJ.Insert + jsr CONT.Insert bcs .99 lda hObj @@ -33,10 +33,6 @@ LBOX.New lda #S.OBJ.T.LBOX .99 rts *-------------------------------------- -LBOX.Destroy - clc - rts -*-------------------------------------- LBOX.Run ldy #S.OBJ.S lda (ZPObjPtr),y bpl .9 diff --git a/LIB/LIBTUI.S.OBJ.txt b/LIB/LIBTUI.S.OBJ.txt index b5257666..50b96828 100644 --- a/LIB/LIBTUI.S.OBJ.txt +++ b/LIB/LIBTUI.S.OBJ.txt @@ -74,46 +74,6 @@ OBJ.PullY1X1hParent rts *-------------------------------------- -OBJ.Insert >SYSCALL2 GetMemPtr A = hParent - >STYA ZPPtr2 - - ldy #S.OBJ.Childs - -.1 lda (ZPPtr2),y - beq .2 - - iny - cpy #S.OBJ - bcc .1 - - lda #E.OOH -* sec - rts - -.2 lda hObj - sta (ZPPtr2),y - - ldy #S.OBJ.S - lda (ZPPtr2),y - ora #S.OBJ.S.bHasChilds - sta (ZPPtr2),y - - ldy #S.OBJ.InnerX - lda (ZPPtr2),y - - ldy #S.OBJ.X1 - clc - adc (ZPObjPtr),y - sta (ZPObjPtr),y - - ldy #S.OBJ.InnerY - lda (ZPPtr2),y - - ldy #S.OBJ.Y1 - clc - adc (ZPObjPtr),y - sta (ZPObjPtr),y -*-------------------------------------- OBJ.SetX2Y2 ldy #S.OBJ.X1 jsr .7 @@ -246,46 +206,8 @@ OBJ.Exec >PUSHA hOBJ .99 rts *-------------------------------------- -OBJ.Destroy ldx ZPObjPtr - phx - ldx ZPObjPtr+1 - phx - - pha - jsr LIB.GetOBJ - - ldy #S.OBJ.Childs - -.1 lda (ZPObjPtr),y - beq .2 - - phy - jsr OBJ.Destroy - ply - -.2 iny - cpy #S.OBJ - bcc .1 - - pla - pha - jsr LIB.GetOBJ - - jsr .7 - - pla - >SYSCALL2 FreeMem - - plx - stx ZPObjPtr+1 - plx - stx ZPObjPtr - +OBJ.Destroy clc rts - -.7 lda (ZPObjPtr) S.OBJ.T - tax - jmp (J.ObjDestroy,x) *-------------------------------------- OBJ.Run ldx ZPObjPtr phx diff --git a/LIB/LIBTUI.S.RADIO.txt b/LIB/LIBTUI.S.RADIO.txt index 3e125774..e381d764 100644 --- a/LIB/LIBTUI.S.RADIO.txt +++ b/LIB/LIBTUI.S.RADIO.txt @@ -67,7 +67,7 @@ RADIO.New lda #S.OBJ.T.RADIO jsr OBJ.PullY1X1hParent - jsr OBJ.Insert + jsr CONT.Insert bcs .9 lda hObj @@ -78,9 +78,6 @@ RADIO.New lda #S.OBJ.T.RADIO rts *-------------------------------------- -RADIO.Destroy clc - rts -*-------------------------------------- RADIO.Run ldy #S.OBJ.S lda (ZPObjPtr),y bpl .9 diff --git a/LIB/LIBTUI.S.SCRN.txt b/LIB/LIBTUI.S.SCRN.txt index f4960b34..4a45ff26 100644 --- a/LIB/LIBTUI.S.SCRN.txt +++ b/LIB/LIBTUI.S.SCRN.txt @@ -17,7 +17,10 @@ SCRN.New lda #S.OBJ.T.SCRN sta (ZPObjPtr),y >SYSCALL2 GetMemPtr - >STYA ZPPtr2 + >STYA ZPPtr2 CTX + + lda hObj + sta (ZPPtr2) S.CTX.hSCRN ldy #S.CTX.W lda (ZPPtr2),y @@ -31,23 +34,14 @@ SCRN.New lda #S.OBJ.T.SCRN jsr OBJ.SetX2Y2 + + lda hObj * clc rts .9 >POP 2 - rts -*-------------------------------------- -SCRN.Destroy clc - rts -*-------------------------------------- -SCRN.Run .EQ CONT.Run -*-------------------------------------- -SCRN.Draw .EQ CONT.Draw -*-------------------------------------- -SCRN.Activate .EQ CONT.Activate -*-------------------------------------- -SCRN.Deactivate .EQ CONT.Deactivate +.99 rts *-------------------------------------- MAN SAVE usr/src/lib/libtui.s.scrn diff --git a/LIB/LIBTUI.S.TBOX.txt b/LIB/LIBTUI.S.TBOX.txt index fa4bfb21..4dd0c4f6 100644 --- a/LIB/LIBTUI.S.TBOX.txt +++ b/LIB/LIBTUI.S.TBOX.txt @@ -18,7 +18,7 @@ TBOX.New lda #S.OBJ.T.TBOX jsr OBJ.PullY1X1hParent - jsr OBJ.Insert + jsr CONT.Insert bcs .99 lda hObj @@ -29,9 +29,6 @@ TBOX.New lda #S.OBJ.T.TBOX .99 rts *-------------------------------------- -TBOX.Destroy clc - rts -*-------------------------------------- TBOX.Run ldy #S.OBJ.S lda (ZPObjPtr),y bpl TBOX.RUN.Ignore @@ -94,7 +91,7 @@ TBOX.RUN.SelBegin dey sta (ZPObjPtr),y - bra TBOX.RUN.Sel + rts *-------------------------------------- TBOX.RUN.SelEnd ldy #S.TBOX.BufPtr lda (ZPObjPtr),y @@ -108,29 +105,6 @@ TBOX.RUN.SelEnd ldy #S.TBOX.BufPtr dey sta (ZPObjPtr),y -TBOX.RUN.Sel ldy #S.TBOX.SelEnd - lda (ZPObjPtr),y - ldy #S.TBOX.SelBegin - cmp (ZPObjPtr),y - - ldy #S.TBOX.SelEnd+1 - lda (ZPObjPtr),y - ldy #S.TBOX.SelBegin+1 - sbc (ZPObjPtr),y - - ldy #S.TBOX.bSelect - lda #0 - ror - pha - eor (ZPObjPtr),y - bpl .1 - - pla - sta (ZPObjPtr),y - jmp TBOX.SetViewPort - -.1 pla - clc rts *-------------------------------------- TBOX.RUN.BS ldy #S.TBOX.BufPtr+1 @@ -283,7 +257,7 @@ TBOX.RUN.EOL jsr TBOX.GetCurlineInAX ldy #S.TBOX.BufPtr clc - adc TempC BufPtr at SOL + adc TempC BufPtr at SOL+LineLen sta (ZPObjPtr),y iny txa @@ -311,7 +285,7 @@ TBOX.RUN.CR jsr TBOX.GetBuf sta (ZPObjPtr),y jsr TBOX.RUN.LF1 - + jsr OBJ.CurUpdPos bit bRepaintAll @@ -449,6 +423,8 @@ TBOX.DrawCurLine jmp OBJ.Draw.Lines *-------------------------------------- +* hyperlinks: [[text to show|targetUrl]] +*-------------------------------------- TBOX.Draw ldy #S.TBOX.VScroll lda (ZPObjPtr),y clc @@ -481,7 +457,11 @@ TBOX.Draw ldy #S.TBOX.VScroll lda (ZPObjPtr),y tax -.2 jsr TBOX.GetLineChar + stz bTemp reset selection + +.2 jsr TBOX.CheckSel + + jsr TBOX.GetLineChar beq .3 cmp #C.CR @@ -501,7 +481,9 @@ TBOX.Draw ldy #S.TBOX.VScroll lda (ZPObjPtr),y tax -.6 lda #C.SPACE +.6 jsr TBOX.ResetSel + + lda #C.SPACE .7 jsr LB.COut dex @@ -594,18 +576,53 @@ TBOX.GetLineAX stx TempW .8 clc rts *-------------------------------------- -TBOX.GetLineChar - ldy #S.TBOX.bSelect +* TempC charPos +*-------------------------------------- +TBOX.CheckSel bit bTemp + bmi .1 + + ldy #S.TBOX.SelBegin lda (ZPObjPtr),y - bpl .5 + cmp TempC + iny + lda (ZPObjPtr),y + sbc TempC+1 + bcc .8 + phx + ldx #SEQ.INVERSE-SEQS + jsr LB.SeqOut + plx + rts -.5 clc - .HS B0 BCS +.1 ldy #S.TBOX.SelEnd + lda (ZPObjPtr),y + cmp TempC -.6 sec + iny + lda (ZPObjPtr),y + sbc TempC+1 + bcc .8 + phx + ldx #SEQ.NORMAL-SEQS + jsr LB.SeqOut + plx + +.8 rts +*-------------------------------------- +TBOX.ResetSel bit bTemp + bpl .8 + + phx + ldx #SEQ.NORMAL-SEQS + jsr LB.SeqOut + plx + +.8 rts +*-------------------------------------- +TBOX.GetLineChar lda (ZPPtr1) beq .8 diff --git a/LIB/LIBTUI.S.TLINE.txt b/LIB/LIBTUI.S.TLINE.txt index 552a0ce9..b5ca7403 100644 --- a/LIB/LIBTUI.S.TLINE.txt +++ b/LIB/LIBTUI.S.TLINE.txt @@ -27,7 +27,7 @@ TLINE.New lda #S.OBJ.T.TLINE jsr OBJ.PullY1X1hParent - jsr OBJ.Insert + jsr CONT.Insert bcs .99 lda hObj @@ -38,9 +38,6 @@ TLINE.New lda #S.OBJ.T.TLINE .99 rts *-------------------------------------- -TLINE.Destroy clc - rts -*-------------------------------------- TLINE.Run ldy #S.OBJ.S lda (ZPObjPtr),y bpl .9 S.OBJ.S.bActive diff --git a/LIB/LIBTUI.S.txt b/LIB/LIBTUI.S.txt index 56c0264f..ea37992d 100644 --- a/LIB/LIBTUI.S.txt +++ b/LIB/LIBTUI.S.txt @@ -16,13 +16,13 @@ NEW ZPCtxPtr .BS 2 ZPObjPtr .BS 2 - ZPLineBufPtr .BS 2 ZPLineBufCnt .BS 2 ZPPtr1 .BS 2 ZPPtr2 .BS 2 ZPPtr3 .BS 2 +bTemp .BS 1 TempW .BS 2 TempC .BS 2 @@ -62,7 +62,7 @@ CS.START cld .DA BUT.New .DA RADIO.New .DA OBJ.Exec - .DA OBJ.Destroy + .DA LIB.Destroy .DA OBJ.Run .DA OBJ.Draw .DA OBJ.GetProp @@ -70,18 +70,18 @@ CS.START cld .DA OBJ.Activate .DA OBJ.Deactivate *-------------------------------------- -J.ObjDestroy .DA SCRN.Destroy - .DA DLG.Destroy - .DA LABEL.Destroy - .DA TLINE.Destroy - .DA TBOX.Destroy - .DA LBOX.Destroy - .DA CBOX.Destroy - .DA BUT.Destroy - .DA RADIO.Destroy +J.ObjDestroy .DA OBJ.Destroy + .DA OBJ.Destroy + .DA OBJ.Destroy + .DA OBJ.Destroy + .DA OBJ.Destroy + .DA OBJ.Destroy + .DA OBJ.Destroy + .DA OBJ.Destroy + .DA OBJ.Destroy *-------------------------------------- -J.ObjRun .DA SCRN.Run - .DA DLG.Run +J.ObjRun .DA CONT.Run + .DA CONT.Run .DA LABEL.Run .DA TLINE.Run .DA TBOX.Run @@ -90,8 +90,8 @@ J.ObjRun .DA SCRN.Run .DA BUT.Run .DA RADIO.Run *-------------------------------------- -J.ObjDraw .DA SCRN.Draw - .DA DLG.Draw +J.ObjDraw .DA CONT.Draw + .DA CONT.Draw .DA LABEL.Draw .DA TLINE.Draw .DA TBOX.Draw @@ -100,8 +100,8 @@ J.ObjDraw .DA SCRN.Draw .DA BUT.Draw .DA RADIO.Draw *-------------------------------------- -J.ObjActivate .DA SCRN.Activate - .DA DLG.Activate +J.ObjActivate .DA OBJ.Activate + .DA OBJ.Activate .DA LABEL.Activate .DA TLINE.Activate .DA TBOX.Activate @@ -110,8 +110,8 @@ J.ObjActivate .DA SCRN.Activate .DA BUT.Activate .DA RADIO.Activate *-------------------------------------- -J.ObjDeactivate .DA SCRN.Deactivate - .DA DLG.Deactivate +J.ObjDeactivate .DA OBJ.Deactivate + .DA OBJ.Deactivate .DA LABEL.Deactivate .DA TLINE.Deactivate .DA TBOX.Deactivate @@ -185,6 +185,56 @@ LIB.UNLOAD dec LibCnt .8 clc rts *-------------------------------------- +LIB.Destroy ldx ZPObjPtr + phx + ldx ZPObjPtr+1 + phx + + pha + jsr LIB.GetOBJ + + ldy #S.OBJ.S + lda (ZPObjPtr),y + and #S.OBJ.S.bHasChilds + beq .3 + + ldy #S.OBJ.Childs + +.1 lda (ZPObjPtr),y + beq .2 + + phy + pha + jsr OBJ.Destroy + + pla + >SYSCALL FreeMem + ply + +.2 iny + cpy #S.OBJ + bcc .1 + + pla + pha + jsr LIB.GetOBJ + +.3 jsr .7 + + pla + >SYSCALL FreeMem + + plx + stx ZPObjPtr+1 + plx + stx ZPObjPtr + + rts + +.7 lda (ZPObjPtr) S.OBJ.T + tax + jmp (J.ObjDestroy,x) +*-------------------------------------- LIB.GetCTX ldy #S.OBJ.hParent lda (ZPObjPtr),y diff --git a/SBIN/CIFSD.S.CORE.txt b/SBIN/CIFSD.S.CORE.txt index 2b9a1621..2092fc73 100644 --- a/SBIN/CIFSD.S.CORE.txt +++ b/SBIN/CIFSD.S.CORE.txt @@ -144,9 +144,9 @@ CORE.AppendTypePtr2 tax .6 lda PRODOS.FT.TXT,x - sta (ZPPtr2),y beq .8 + sta (ZPPtr2),y inx iny bra .6 diff --git a/SBIN/CIFSD.S.IO.txt b/SBIN/CIFSD.S.IO.txt index 3e7e391a..9722ae46 100644 --- a/SBIN/CIFSD.S.IO.txt +++ b/SBIN/CIFSD.S.IO.txt @@ -739,6 +739,9 @@ IO.Q.FOpen >STYA pPath resolved path .2 ply + lda #0 ending \0 + sta (ZPPtr2),y + jsr CORE.AddYReqLen tya @@ -746,7 +749,7 @@ IO.Q.FOpen >STYA pPath resolved path ldy #S.NETBIOS+S.SMB.H+6 NameLength sta (ZPReqPtr),y - inc +1 for \0 +* inc +1 for \0 jsr CORE.Add2ByteCount ldx #1 FILE_OPEN @@ -1657,6 +1660,8 @@ IO.FileInfo2StatBufDT and #$E0 sta StatBuf+S.TIME.MINUTE,x + iny + lda (ZPPtr1),y lsr ror StatBuf+S.TIME.MINUTE,x diff --git a/SHARED/X.CPMVRM.S.txt b/SHARED/X.CPMVRM.S.txt index 9e1b6a57..c112ecd3 100644 --- a/SHARED/X.CPMVRM.S.txt +++ b/SHARED/X.CPMVRM.S.txt @@ -357,22 +357,28 @@ CS.RUN.Copy >PUSHB hSrcFile clc bra CS.RUN.CopyEnd -.1 pha +.1 sta ZPPtr2+1 >PUSHB hDstFile >PUSHW ZPPtr1 Src Ptr - pla + lda ZPPtr2+1 >PUSHYA Bytes To Write >SYSCALL FWrite bcs CS.RUN.CopyEnd bit bQuiet - bmi .8 + bmi .2 lda #'.' >SYSCALL PutChar -.8 jsr CS.RUN.CheckKey - bcc CS.RUN.Copy +.2 jsr CS.RUN.CheckKey + bcs CS.RUN.CopyEnd + + lda ZPPtr2+1 + cmp PageCount + bcs CS.RUN.Copy + +* clc *-------------------------------------- CS.RUN.CopyEnd php pha