CIFS:bugfix

LIBTUI:wip
GOPGHER:correct exit key
WHICH:new command
This commit is contained in:
burniouf 2023-02-10 19:19:29 +01:00
parent ef7403f937
commit e0d317e793
19 changed files with 218 additions and 207 deletions

Binary file not shown.

View File

@ -34,7 +34,6 @@ hFrame .BS 1
TimeOut .BS 1 TimeOut .BS 1
bScreen .BS 1
hCTX .BS 1 hCTX .BS 1
hSCR .BS 1 hSCR .BS 1
hTBOX .BS 1 hTBOX .BS 1
@ -104,8 +103,6 @@ CS.RUN jsr CS.Net.Init
jsr CS.Scr.Init jsr CS.Scr.Init
bcs CS.INIT.RTS bcs CS.INIT.RTS
dec bScreen
>LDYAI BUFSIZE >LDYAI BUFSIZE
>SYSCALL GetMem >SYSCALL GetMem
bcs CS.INIT.RTS bcs CS.INIT.RTS
@ -156,8 +153,8 @@ CS.DOEVENT lda (pEvent)
.9 sec do not discard TIMER event .9 sec do not discard TIMER event
rts rts
*-------------------------------------- *--------------------------------------
CS.QUIT bit bScreen CS.QUIT lda hCTX
bpl .10 beq .10
>LIBCALL hLIBTUI,LIBTUI.Close >LIBCALL hLIBTUI,LIBTUI.Close
@ -597,7 +594,7 @@ CS.Scr.Init >LIBCALL hLIBTUI,LIBTUI.Init
>PUSHBI 0 Y1 >PUSHBI 0 Y1
>PUSHBI 80 W >PUSHBI 80 W
>PUSHBI 22 H >PUSHBI 22 H
>PUSHBI S.OBJ.F.bEdit F >PUSHBI 0 F
lda hBuf lda hBuf
>SYSCALL GetMemPtr >SYSCALL GetMemPtr
>PUSHYA >PUSHYA
@ -646,7 +643,7 @@ hLIBTCPIP .BS 1
LIBTUI .AZ "libtui" LIBTUI .AZ "libtui"
hLIBTUI .BS 1 hLIBTUI .BS 1
*-------------------------------------- *--------------------------------------
MSG.ScrTitle .CZ "A2osX-GOPHER %s:%D/%s <Ctrl-X> : Exit" MSG.ScrTitle .CZ "A2osX-GOPHER %s:%D/%s <Ctrl-Q> : Quit"
*-------------------------------------- *--------------------------------------
MSG.IPKO .CZ "TCP/IP Not Loaded/Configured.\r\n" MSG.IPKO .CZ "TCP/IP Not Loaded/Configured.\r\n"
MSG.USAGE .CZ "Usage : GOPHER <ip|host> [port]\r\n" MSG.USAGE .CZ "Usage : GOPHER <ip|host> [port]\r\n"

View File

@ -25,9 +25,12 @@ S.CTX.hSCRN .EQ 0
S.CTX.hClipBrd .EQ 1 S.CTX.hClipBrd .EQ 1
S.CTX.W .EQ 2 S.CTX.W .EQ 2
S.CTX.H .EQ 3 S.CTX.H .EQ 3
S.CTX.bEscMode .EQ 14 S.CTX.bEscMode .EQ 14
S.CTX.InBufPtr .EQ 15 S.CTX.InBufPtr .EQ 15
*
S.CTX.InBuf .EQ 16 S.CTX.InBuf .EQ 16
S.CTX.EndBuf .EQ 31 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.BufCnt .EQ S.OBJ+10
S.TBOX.SelBegin .EQ S.OBJ+12 S.TBOX.SelBegin .EQ S.OBJ+12
S.TBOX.SelEnd .EQ S.OBJ+14 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.Idx .EQ S.OBJ+0
S.LBOX.VScroll .EQ S.OBJ+1 S.LBOX.VScroll .EQ S.OBJ+1

View File

@ -39,7 +39,7 @@ BUT.New lda #S.OBJ.T.BUT
jsr OBJ.PullY1X1hParent jsr OBJ.PullY1X1hParent
jsr OBJ.Insert jsr CONT.Insert
bcs .99 bcs .99
lda hObj lda hObj
@ -50,9 +50,6 @@ BUT.New lda #S.OBJ.T.BUT
.99 rts .99 rts
*-------------------------------------- *--------------------------------------
BUT.Destroy clc
rts
*--------------------------------------
BUT.Run lda (pStack) Event BUT.Run lda (pStack) Event
ldy #S.BUT.HotKey ldy #S.BUT.HotKey
cmp (ZPObjPtr),y cmp (ZPObjPtr),y

View File

@ -45,7 +45,7 @@ CBOX.New lda #S.OBJ.T.CBOX
jsr OBJ.PullY1X1hParent jsr OBJ.PullY1X1hParent
jsr OBJ.Insert jsr CONT.Insert
bcs .99 bcs .99
lda hObj lda hObj
@ -56,9 +56,6 @@ CBOX.New lda #S.OBJ.T.CBOX
.99 rts .99 rts
*-------------------------------------- *--------------------------------------
CBOX.Destroy clc
rts
*--------------------------------------
CBOX.Run ldy #S.BUT.HotKey CBOX.Run ldy #S.BUT.HotKey
cmp (ZPObjPtr),y cmp (ZPObjPtr),y
beq .8 beq .8

View File

@ -33,8 +33,47 @@ CONT.New jsr OBJ.Create A = Class
.9 >POP 2 .9 >POP 2
rts 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 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 CONT.Run lda (pStack) Event
cmp #C.TAB cmp #C.TAB
@ -108,10 +147,7 @@ CONT.Draw ldy #S.OBJ.InnerW
.1 jsr LB.COut .1 jsr LB.COut
dex dex
bne .1 bne .1
*--------------------------------------
CONT.Activate
*--------------------------------------
CONT.Deactivate
clc clc
rts rts
*-------------------------------------- *--------------------------------------

View File

@ -86,7 +86,18 @@ CTX.Init >LDYA L.SEQ.INIT
* ## RETURN VALUE * ## RETURN VALUE
* CC = success * 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 >LDYA L.SEQ.CLOSE
jsr CTX.fputs jsr CTX.fputs

View File

@ -51,17 +51,6 @@ DLG.New lda #S.OBJ.T.DLG
.9 >POP 5 .9 >POP 5
rts 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 MAN
SAVE usr/src/lib/libtui.s.dlg SAVE usr/src/lib/libtui.s.dlg
LOAD usr/src/lib/libtui.s LOAD usr/src/lib/libtui.s

View File

@ -21,7 +21,7 @@ LABEL.New lda #S.OBJ.T.LABEL
jsr OBJ.PullY1X1hParent jsr OBJ.PullY1X1hParent
jsr OBJ.Insert jsr CONT.Insert
bcs .99 bcs .99
lda hObj lda hObj
@ -49,8 +49,6 @@ LABEL.Draw ldy #S.LABEL.pLabel
.8 .8
*-------------------------------------- *--------------------------------------
LABEL.Destroy
*--------------------------------------
LABEL.Run LABEL.Run
*-------------------------------------- *--------------------------------------
LABEL.Activate LABEL.Activate

View File

@ -22,7 +22,7 @@ LBOX.New lda #S.OBJ.T.LBOX
jsr OBJ.PullY1X1hParent jsr OBJ.PullY1X1hParent
jsr OBJ.Insert jsr CONT.Insert
bcs .99 bcs .99
lda hObj lda hObj
@ -33,10 +33,6 @@ LBOX.New lda #S.OBJ.T.LBOX
.99 rts .99 rts
*-------------------------------------- *--------------------------------------
LBOX.Destroy
clc
rts
*--------------------------------------
LBOX.Run ldy #S.OBJ.S LBOX.Run ldy #S.OBJ.S
lda (ZPObjPtr),y lda (ZPObjPtr),y
bpl .9 bpl .9

View File

@ -74,46 +74,6 @@ OBJ.PullY1X1hParent
rts 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 OBJ.SetX2Y2 ldy #S.OBJ.X1
jsr .7 jsr .7
@ -246,46 +206,8 @@ OBJ.Exec >PUSHA hOBJ
.99 rts .99 rts
*-------------------------------------- *--------------------------------------
OBJ.Destroy ldx ZPObjPtr OBJ.Destroy clc
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
rts rts
.7 lda (ZPObjPtr) S.OBJ.T
tax
jmp (J.ObjDestroy,x)
*-------------------------------------- *--------------------------------------
OBJ.Run ldx ZPObjPtr OBJ.Run ldx ZPObjPtr
phx phx

View File

@ -67,7 +67,7 @@ RADIO.New lda #S.OBJ.T.RADIO
jsr OBJ.PullY1X1hParent jsr OBJ.PullY1X1hParent
jsr OBJ.Insert jsr CONT.Insert
bcs .9 bcs .9
lda hObj lda hObj
@ -78,9 +78,6 @@ RADIO.New lda #S.OBJ.T.RADIO
rts rts
*-------------------------------------- *--------------------------------------
RADIO.Destroy clc
rts
*--------------------------------------
RADIO.Run ldy #S.OBJ.S RADIO.Run ldy #S.OBJ.S
lda (ZPObjPtr),y lda (ZPObjPtr),y
bpl .9 bpl .9

View File

@ -17,7 +17,10 @@ SCRN.New lda #S.OBJ.T.SCRN
sta (ZPObjPtr),y sta (ZPObjPtr),y
>SYSCALL2 GetMemPtr >SYSCALL2 GetMemPtr
>STYA ZPPtr2 >STYA ZPPtr2 CTX
lda hObj
sta (ZPPtr2) S.CTX.hSCRN
ldy #S.CTX.W ldy #S.CTX.W
lda (ZPPtr2),y lda (ZPPtr2),y
@ -31,23 +34,14 @@ SCRN.New lda #S.OBJ.T.SCRN
jsr OBJ.SetX2Y2 jsr OBJ.SetX2Y2
lda hObj lda hObj
* clc * clc
rts rts
.9 >POP 2 .9 >POP 2
rts .99 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
*-------------------------------------- *--------------------------------------
MAN MAN
SAVE usr/src/lib/libtui.s.scrn SAVE usr/src/lib/libtui.s.scrn

View File

@ -18,7 +18,7 @@ TBOX.New lda #S.OBJ.T.TBOX
jsr OBJ.PullY1X1hParent jsr OBJ.PullY1X1hParent
jsr OBJ.Insert jsr CONT.Insert
bcs .99 bcs .99
lda hObj lda hObj
@ -29,9 +29,6 @@ TBOX.New lda #S.OBJ.T.TBOX
.99 rts .99 rts
*-------------------------------------- *--------------------------------------
TBOX.Destroy clc
rts
*--------------------------------------
TBOX.Run ldy #S.OBJ.S TBOX.Run ldy #S.OBJ.S
lda (ZPObjPtr),y lda (ZPObjPtr),y
bpl TBOX.RUN.Ignore bpl TBOX.RUN.Ignore
@ -94,7 +91,7 @@ TBOX.RUN.SelBegin
dey dey
sta (ZPObjPtr),y sta (ZPObjPtr),y
bra TBOX.RUN.Sel rts
*-------------------------------------- *--------------------------------------
TBOX.RUN.SelEnd ldy #S.TBOX.BufPtr TBOX.RUN.SelEnd ldy #S.TBOX.BufPtr
lda (ZPObjPtr),y lda (ZPObjPtr),y
@ -108,29 +105,6 @@ TBOX.RUN.SelEnd ldy #S.TBOX.BufPtr
dey dey
sta (ZPObjPtr),y 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 rts
*-------------------------------------- *--------------------------------------
TBOX.RUN.BS ldy #S.TBOX.BufPtr+1 TBOX.RUN.BS ldy #S.TBOX.BufPtr+1
@ -283,7 +257,7 @@ TBOX.RUN.EOL jsr TBOX.GetCurlineInAX
ldy #S.TBOX.BufPtr ldy #S.TBOX.BufPtr
clc clc
adc TempC BufPtr at SOL adc TempC BufPtr at SOL+LineLen
sta (ZPObjPtr),y sta (ZPObjPtr),y
iny iny
txa txa
@ -311,7 +285,7 @@ TBOX.RUN.CR jsr TBOX.GetBuf
sta (ZPObjPtr),y sta (ZPObjPtr),y
jsr TBOX.RUN.LF1 jsr TBOX.RUN.LF1
jsr OBJ.CurUpdPos jsr OBJ.CurUpdPos
bit bRepaintAll bit bRepaintAll
@ -449,6 +423,8 @@ TBOX.DrawCurLine
jmp OBJ.Draw.Lines jmp OBJ.Draw.Lines
*-------------------------------------- *--------------------------------------
* hyperlinks: [[text to show|targetUrl]]
*--------------------------------------
TBOX.Draw ldy #S.TBOX.VScroll TBOX.Draw ldy #S.TBOX.VScroll
lda (ZPObjPtr),y lda (ZPObjPtr),y
clc clc
@ -481,7 +457,11 @@ TBOX.Draw ldy #S.TBOX.VScroll
lda (ZPObjPtr),y lda (ZPObjPtr),y
tax tax
.2 jsr TBOX.GetLineChar stz bTemp reset selection
.2 jsr TBOX.CheckSel
jsr TBOX.GetLineChar
beq .3 beq .3
cmp #C.CR cmp #C.CR
@ -501,7 +481,9 @@ TBOX.Draw ldy #S.TBOX.VScroll
lda (ZPObjPtr),y lda (ZPObjPtr),y
tax tax
.6 lda #C.SPACE .6 jsr TBOX.ResetSel
lda #C.SPACE
.7 jsr LB.COut .7 jsr LB.COut
dex dex
@ -594,18 +576,53 @@ TBOX.GetLineAX stx TempW
.8 clc .8 clc
rts rts
*-------------------------------------- *--------------------------------------
TBOX.GetLineChar * TempC charPos
ldy #S.TBOX.bSelect *--------------------------------------
TBOX.CheckSel bit bTemp
bmi .1
ldy #S.TBOX.SelBegin
lda (ZPObjPtr),y 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 .1 ldy #S.TBOX.SelEnd
.HS B0 BCS 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) lda (ZPPtr1)
beq .8 beq .8

View File

@ -27,7 +27,7 @@ TLINE.New lda #S.OBJ.T.TLINE
jsr OBJ.PullY1X1hParent jsr OBJ.PullY1X1hParent
jsr OBJ.Insert jsr CONT.Insert
bcs .99 bcs .99
lda hObj lda hObj
@ -38,9 +38,6 @@ TLINE.New lda #S.OBJ.T.TLINE
.99 rts .99 rts
*-------------------------------------- *--------------------------------------
TLINE.Destroy clc
rts
*--------------------------------------
TLINE.Run ldy #S.OBJ.S TLINE.Run ldy #S.OBJ.S
lda (ZPObjPtr),y lda (ZPObjPtr),y
bpl .9 S.OBJ.S.bActive bpl .9 S.OBJ.S.bActive

View File

@ -16,13 +16,13 @@ NEW
ZPCtxPtr .BS 2 ZPCtxPtr .BS 2
ZPObjPtr .BS 2 ZPObjPtr .BS 2
ZPLineBufPtr .BS 2 ZPLineBufPtr .BS 2
ZPLineBufCnt .BS 2 ZPLineBufCnt .BS 2
ZPPtr1 .BS 2 ZPPtr1 .BS 2
ZPPtr2 .BS 2 ZPPtr2 .BS 2
ZPPtr3 .BS 2 ZPPtr3 .BS 2
bTemp .BS 1
TempW .BS 2 TempW .BS 2
TempC .BS 2 TempC .BS 2
@ -62,7 +62,7 @@ CS.START cld
.DA BUT.New .DA BUT.New
.DA RADIO.New .DA RADIO.New
.DA OBJ.Exec .DA OBJ.Exec
.DA OBJ.Destroy .DA LIB.Destroy
.DA OBJ.Run .DA OBJ.Run
.DA OBJ.Draw .DA OBJ.Draw
.DA OBJ.GetProp .DA OBJ.GetProp
@ -70,18 +70,18 @@ CS.START cld
.DA OBJ.Activate .DA OBJ.Activate
.DA OBJ.Deactivate .DA OBJ.Deactivate
*-------------------------------------- *--------------------------------------
J.ObjDestroy .DA SCRN.Destroy J.ObjDestroy .DA OBJ.Destroy
.DA DLG.Destroy .DA OBJ.Destroy
.DA LABEL.Destroy .DA OBJ.Destroy
.DA TLINE.Destroy .DA OBJ.Destroy
.DA TBOX.Destroy .DA OBJ.Destroy
.DA LBOX.Destroy .DA OBJ.Destroy
.DA CBOX.Destroy .DA OBJ.Destroy
.DA BUT.Destroy .DA OBJ.Destroy
.DA RADIO.Destroy .DA OBJ.Destroy
*-------------------------------------- *--------------------------------------
J.ObjRun .DA SCRN.Run J.ObjRun .DA CONT.Run
.DA DLG.Run .DA CONT.Run
.DA LABEL.Run .DA LABEL.Run
.DA TLINE.Run .DA TLINE.Run
.DA TBOX.Run .DA TBOX.Run
@ -90,8 +90,8 @@ J.ObjRun .DA SCRN.Run
.DA BUT.Run .DA BUT.Run
.DA RADIO.Run .DA RADIO.Run
*-------------------------------------- *--------------------------------------
J.ObjDraw .DA SCRN.Draw J.ObjDraw .DA CONT.Draw
.DA DLG.Draw .DA CONT.Draw
.DA LABEL.Draw .DA LABEL.Draw
.DA TLINE.Draw .DA TLINE.Draw
.DA TBOX.Draw .DA TBOX.Draw
@ -100,8 +100,8 @@ J.ObjDraw .DA SCRN.Draw
.DA BUT.Draw .DA BUT.Draw
.DA RADIO.Draw .DA RADIO.Draw
*-------------------------------------- *--------------------------------------
J.ObjActivate .DA SCRN.Activate J.ObjActivate .DA OBJ.Activate
.DA DLG.Activate .DA OBJ.Activate
.DA LABEL.Activate .DA LABEL.Activate
.DA TLINE.Activate .DA TLINE.Activate
.DA TBOX.Activate .DA TBOX.Activate
@ -110,8 +110,8 @@ J.ObjActivate .DA SCRN.Activate
.DA BUT.Activate .DA BUT.Activate
.DA RADIO.Activate .DA RADIO.Activate
*-------------------------------------- *--------------------------------------
J.ObjDeactivate .DA SCRN.Deactivate J.ObjDeactivate .DA OBJ.Deactivate
.DA DLG.Deactivate .DA OBJ.Deactivate
.DA LABEL.Deactivate .DA LABEL.Deactivate
.DA TLINE.Deactivate .DA TLINE.Deactivate
.DA TBOX.Deactivate .DA TBOX.Deactivate
@ -185,6 +185,56 @@ LIB.UNLOAD dec LibCnt
.8 clc .8 clc
rts 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 LIB.GetCTX ldy #S.OBJ.hParent
lda (ZPObjPtr),y lda (ZPObjPtr),y

View File

@ -144,9 +144,9 @@ CORE.AppendTypePtr2
tax tax
.6 lda PRODOS.FT.TXT,x .6 lda PRODOS.FT.TXT,x
sta (ZPPtr2),y
beq .8 beq .8
sta (ZPPtr2),y
inx inx
iny iny
bra .6 bra .6

View File

@ -739,6 +739,9 @@ IO.Q.FOpen >STYA pPath resolved path
.2 ply .2 ply
lda #0 ending \0
sta (ZPPtr2),y
jsr CORE.AddYReqLen jsr CORE.AddYReqLen
tya tya
@ -746,7 +749,7 @@ IO.Q.FOpen >STYA pPath resolved path
ldy #S.NETBIOS+S.SMB.H+6 NameLength ldy #S.NETBIOS+S.SMB.H+6 NameLength
sta (ZPReqPtr),y sta (ZPReqPtr),y
inc +1 for \0 * inc +1 for \0
jsr CORE.Add2ByteCount jsr CORE.Add2ByteCount
ldx #1 FILE_OPEN ldx #1 FILE_OPEN
@ -1657,6 +1660,8 @@ IO.FileInfo2StatBufDT
and #$E0 and #$E0
sta StatBuf+S.TIME.MINUTE,x sta StatBuf+S.TIME.MINUTE,x
iny
lda (ZPPtr1),y lda (ZPPtr1),y
lsr lsr
ror StatBuf+S.TIME.MINUTE,x ror StatBuf+S.TIME.MINUTE,x

View File

@ -357,22 +357,28 @@ CS.RUN.Copy >PUSHB hSrcFile
clc clc
bra CS.RUN.CopyEnd bra CS.RUN.CopyEnd
.1 pha .1 sta ZPPtr2+1
>PUSHB hDstFile >PUSHB hDstFile
>PUSHW ZPPtr1 Src Ptr >PUSHW ZPPtr1 Src Ptr
pla lda ZPPtr2+1
>PUSHYA Bytes To Write >PUSHYA Bytes To Write
>SYSCALL FWrite >SYSCALL FWrite
bcs CS.RUN.CopyEnd bcs CS.RUN.CopyEnd
bit bQuiet bit bQuiet
bmi .8 bmi .2
lda #'.' lda #'.'
>SYSCALL PutChar >SYSCALL PutChar
.8 jsr CS.RUN.CheckKey .2 jsr CS.RUN.CheckKey
bcc CS.RUN.Copy bcs CS.RUN.CopyEnd
lda ZPPtr2+1
cmp PageCount
bcs CS.RUN.Copy
* clc
*-------------------------------------- *--------------------------------------
CS.RUN.CopyEnd php CS.RUN.CopyEnd php
pha pha