LIBTUI : Added Show/Hide and FindActive API

MAN & NETCONFIG updated
This commit is contained in:
burniouf 2024-01-20 14:13:22 +01:00
parent b07bdce5d3
commit f50fee89e4
16 changed files with 1348 additions and 1070 deletions

Binary file not shown.

View File

@ -190,11 +190,11 @@ CS.Scr.Init >LIBCALL hLIBTUI,LIBTUI.Init
>PUSHBI 0 Y1
>PUSHBI 80 W
>PUSHBI 22 H
>PUSHBI 0 F
lda hFileBuf
>SYSCALL GetMemPtr
>PUSHYA
>PUSHW BufSize
>PUSHBI 0 F
>LIBCALL hLIBTUI,LIBTUI.NewTBox
.99 bcs .9
@ -347,7 +347,7 @@ hLIBTUI .BS 1
ENV.MANPATH .AZ "MANPATH"
FILE.INDEX .AZ "index"
*--------------------------------------
MSG.ScrTitle .CZ "A2osX-MAN - <Ctrl-Q>uit"
MSG.ScrTitle .CZ "A2osX-MAN - UP/DOWN : Scroll, LEFT/RIGHT : Prev/Next link, <Ctrl-Q>uit"
*--------------------------------------
MSG.USAGE .CS "Usage : MAN <manfile>[#htag]"
MSG.CRLF .CS "\r\n"

File diff suppressed because it is too large Load Diff

View File

@ -10,6 +10,7 @@ NEW
.INB inc/libtui.i
*--------------------------------------
EV.SAVE .EQ $C0
EV.CHECKBOX .EQ $C1
EV.OK .EQ $CE
EV.CANCEL .EQ $CF
*--------------------------------------
@ -20,8 +21,11 @@ ZPPtr1 .BS 2
hCTX .BS 1
hSCRN .BS 1
hTBOX1 .BS 1
hDLGS .BS 1
hRADIO1 .BS 1
hDLGSAVE .BS 1
ZS.END .ED
*--------------------------------------
* File Header (16 Bytes)
@ -53,11 +57,11 @@ L.TBOX1.Status .DA TBOX1.Status
L.LBOX1.List .DA LBOX1.List
L.LABEL.Label .DA LABEL.Label
L.TLINE.Default .DA TLINE.Default
L.RADIO1.List .DA RADIO1.List
L.CBOX1.Label .DA CBOX1.Label
L.RADIO1.List .DA RADIO1.List
L.BUTQ.Label .DA BUTQ.Label
L.BUTS.Label .DA BUTS.Label
L.DLGS.Title .DA DLGS.Title
L.DLGSAVE.Title .DA DLGSAVE.Title
L.BUT.OK .DA BUT.OK
L.BUT.Cancel .DA BUT.Cancel
.DA 0
@ -73,30 +77,30 @@ CS.INIT >LDYA L.LIBTUI
CS.INIT.RTS rts
*--------------------------------------
CS.RUN >LIBCALL hLIBTUI,LIBTUI.Init
bcs CS.RUN.RTS
bcs CS.INIT.RTS
sta hCTX
jsr CS.SCRN.Init
bcs CS.RUN.RTS
bcs CS.INIT.RTS
jsr CS.TBOX1.Init
bcs CS.RUN.RTS
bcs CS.INIT.RTS
jsr CS.LBOX1.Init
bcs CS.RUN.RTS
bcs CS.INIT.RTS
jsr CS.TLINE.Init
bcs CS.RUN.RTS
jsr CS.TLINE1.Init
bcs CS.INIT.RTS
jsr CS.RADIO.Init
bcs CS.RUN.RTS
jsr CS.CBOX1.Init
bcs CS.INIT.RTS
jsr CS.CBOX.Init
bcs CS.RUN.RTS
jsr CS.RADIO1.Init
bcs CS.INIT.RTS
jsr CS.BUT.Init
bcs CS.RUN.RTS
bcs CS.INIT.RTS
jsr CS.SCRN.Draw Will Call SCRN.Draw
@ -121,7 +125,25 @@ CS.RUN.LOOP lda hSCRN
jsr CS.RUN.DLGSAVE
bcc CS.RUN.LOOP
.2 cmp #EV.QUIT
.2 cmp #EV.CHECKBOX
bne .8
>LDA.G CBOX1.Var
bne .20
lda hRADIO1
>LIBCALL hLIBTUI,LIBTUI.Hide
bcc CS.RUN.LOOP
rts
.20 lda hRADIO1
>LIBCALL hLIBTUI,LIBTUI.Show
bcc CS.RUN.LOOP
rts
.8 cmp #EV.QUIT
bne CS.RUN.LOOP
lda hSCRN
@ -168,11 +190,11 @@ CS.TBOX1.Init >LDYAI 1024
>PUSHBI 1 Y1
>PUSHBI 44 W
>PUSHBI 20 H
>PUSHBI S.OBJ.F.bHBorder+S.OBJ.F.bVBorder+S.OBJ.F.bTitle+S.OBJ.F.bStatus
>LDA.G TBOX1.hBuf
>SYSCALL GetMemPtr
>PUSHYA
>PUSHWI 1024
>PUSHBI S.OBJ.F.bHBorder+S.OBJ.F.bVBorder+S.OBJ.F.bTitle+S.OBJ.F.bStatus+S.OBJ.F.bEdit
>LIBCALL hLIBTUI,LIBTUI.NewTBox
bcs .9
@ -195,16 +217,17 @@ CS.LBOX1.Init >PUSHB hSCRN hParent
>PUSHBI 1 Y1
>PUSHBI 20 W
>PUSHBI 9 H
>PUSHBI S.OBJ.F.bHBorder+S.OBJ.F.bVBorder
>PUSHW L.LBOX1.List
>PUSHEA.G LBOX1.Var
>PUSHBI S.OBJ.F.bHBorder+S.OBJ.F.bVBorder
>LIBCALL hLIBTUI,LIBTUI.NewLBox
rts
*--------------------------------------
CS.TLINE.Init >PUSHB hSCRN hParent
CS.TLINE1.Init >PUSHB hSCRN hParent
>PUSHBI 50 X1
>PUSHBI 11 Y1
>PUSHW L.LABEL.Label
>PUSHBI 0
>LIBCALL hLIBTUI,LIBTUI.NewLabel
bcs .9
@ -214,6 +237,7 @@ CS.TLINE.Init >PUSHB hSCRN hParent
>PUSHBI 25 W
>PUSHEA.G TLINE.Buf
>PUSHWI 65 Len
>PUSHBI 0
>LIBCALL hLIBTUI,LIBTUI.NewTLine
>PUSHEA.G TLINE.Buf
@ -222,25 +246,33 @@ CS.TLINE.Init >PUSHB hSCRN hParent
.9 rts
*--------------------------------------
CS.RADIO.Init >PUSHB hSCRN hParent
CS.CBOX1.Init >PUSHB hSCRN hParent
>PUSHBI 50 X1
>PUSHBI 14 Y1
>PUSHBI 0
>PUSHBI EV.CHECKBOX
>PUSHW L.CBOX1.Label
>PUSHEA.G CBOX1.Var
>PUSHBI 0
>LIBCALL hLIBTUI,LIBTUI.NewCBox
rts
*--------------------------------------
CS.RADIO1.Init >PUSHB hSCRN hParent
>PUSHBI 50 X1
>PUSHBI 16 Y1
>PUSHBI 0
>PUSHBI 0
>PUSHW L.RADIO1.List
>PUSHEA.G RADIO1.Var
>LIBCALL hLIBTUI,LIBTUI.NewRadio
rts
*--------------------------------------
CS.CBOX.Init >PUSHB hSCRN hParent
>PUSHBI 50 X1
>PUSHBI 18 Y1
>PUSHBI 0
>PUSHBI 0
>PUSHW L.CBOX1.Label
>PUSHEA.G CBOX1.Var
>LIBCALL hLIBTUI,LIBTUI.NewCBox
rts
>LIBCALL hLIBTUI,LIBTUI.NewRadio
bcs .9
sta hRADIO1
>LIBCALL hLIBTUI,LIBTUI.Hide
.9 rts
*--------------------------------------
CS.BUT.Init >PUSHB hSCRN hParent
>PUSHBI 50 X1
@ -248,6 +280,7 @@ CS.BUT.Init >PUSHB hSCRN hParent
>PUSHBI 19 Ctrl-S
>PUSHBI EV.SAVE
>PUSHW L.BUTS.Label
>PUSHBI 0
>LIBCALL hLIBTUI,LIBTUI.NewBut
bcs .9
@ -257,6 +290,7 @@ CS.BUT.Init >PUSHB hSCRN hParent
>PUSHBI 17 Ctrl-Q
>PUSHBI EV.QUIT
>PUSHW L.BUTQ.Label
>PUSHBI 0
>LIBCALL hLIBTUI,LIBTUI.NewBut
.9
CS.BUT.Init.RTS rts
@ -264,45 +298,49 @@ CS.BUT.Init.RTS rts
CS.RUN.DLGSAVE >PUSHB hCTX hParent
>PUSHBI 70 W
>PUSHBI 11 H
>PUSHW L.DLGS.Title
>PUSHW L.DLGSAVE.Title
>PUSHBI 0
>LIBCALL hLIBTUI,LIBTUI.NewDlg
bcs CS.BUT.Init.RTS
sta hDLGS
sta hDLGSAVE
>PUSHB hDLGS hParent
>PUSHA
* >PUSHB hDLGSAVE hParent
>PUSHBI 50 X1
>PUSHBI 7 Y1
>PUSHBI C.CR
>PUSHBI EV.OK
>PUSHW L.BUT.OK
>PUSHBI 0
>LIBCALL hLIBTUI,LIBTUI.NewBut
bcs .9
sta ZPPtr1
>PUSHB hDLGS hParent
>PUSHB hDLGSAVE hParent
>PUSHBI 57 X1
>PUSHBI 7 Y1
>PUSHBI 3 Ctrl-C
>PUSHBI EV.CANCEL
>PUSHW L.BUT.Cancel
>PUSHBI 0
>LIBCALL hLIBTUI,LIBTUI.NewBut
bcs .9
lda hDLGS
lda hDLGSAVE
>LIBCALL hLIBTUI,LIBTUI.Draw
bcs .9
lda ZPPtr1
>LIBCALL hLIBTUI,LIBTUI.Activate
.1 lda hDLGS
.1 lda hDLGSAVE
>LIBCALL hLIBTUI,LIBTUI.Exec
.9 php
pha
lda hDLGS
lda hDLGSAVE
>LIBCALL hLIBTUI,LIBTUI.Destroy
lda hSCRN
@ -392,7 +430,7 @@ CBOX1.Label .AZ "Check Me"
*--------------------------------------
BUTS.Label .AZ "(^S)ave..."
BUTQ.Label .AZ "(^Q)uit"
DLGS.Title .AZ "Save As..."
DLGSAVE.Title .AZ "Save As..."
BUT.OK .AZ " OK "
BUT.Cancel .AZ "Cancel"
*--------------------------------------
@ -400,8 +438,8 @@ BUT.Cancel .AZ "Cancel"
.OR 0
DS.START
SCRN.TitleBuf .BS 80
CBOX1.Var .BS 1
TLINE.Buf .BS 65
CBOX1.Var .BS 1
RADIO1.Var .BS 1
LBOX1.Var .BS 1
TBOX1.hBuf .BS 1

View File

@ -20,6 +20,9 @@ LIBTUI.GetProp .EQ 34
LIBTUI.SetProp .EQ 36
LIBTUI.Activate .EQ 38
LIBTUI.Deactivate .EQ 40
LIBTUI.FindActive .EQ 42
LIBTUI.Show .EQ 44
LIBTUI.Hide .EQ 46
*--------------------------------------
S.CTX.hSCRN .EQ 0
S.CTX.hClipBrd .EQ 1
@ -58,7 +61,8 @@ S.OBJ.F.bEdit .EQ %00000001
S.OBJ.S .EQ 2
S.OBJ.S.bActive .EQ %10000000
S.OBJ.S.bDisabled .EQ %01000000
S.OBJ.S.bHasChilds .EQ %00100000
S.OBJ.S.bHidden .EQ %00100000
S.OBJ.S.bHasChilds .EQ %00010000
S.OBJ.S.bCurOn .EQ %00000001
S.OBJ.hParent .EQ 3
S.OBJ.X1 .EQ 4

View File

@ -2,11 +2,15 @@ NEW
AUTO 3,1
.LIST OFF
*--------------------------------------
* BUT.New hParent,X1,Y1,HK,EV,pLabel 7
* BUT.New hParent,X1,Y1,HK,EV,pLabel,F 8
*--------------------------------------
BUT.New lda #S.OBJ.T.BUT
jsr OBJ.Create
bcs .9
>PULLA
ldy #S.OBJ.F
sta (ZPObjPtr),y
ldy #S.BUT.pLabel
jsr OBJ.PullWordY

View File

@ -2,12 +2,16 @@ NEW
AUTO 3,1
.LIST OFF
*--------------------------------------
* CBOX.New hParent,X1,Y1,HK,EV,pLabel,pVar 9
* CBOX.New hParent,X1,Y1,HK,EV,pLabel,pVar,F 10
*--------------------------------------
CBOX.New lda #S.OBJ.T.CBOX
jsr OBJ.Create
bcs .9
>PULLA
ldy #S.OBJ.F
sta (ZPObjPtr),y
ldy #S.OBJ.pVar
jsr OBJ.PullWordY
@ -52,7 +56,7 @@ CBOX.New lda #S.OBJ.T.CBOX
* clc
rts
.9 >POP 9
.9 >POP 10
.99 rts
*--------------------------------------
@ -85,12 +89,16 @@ CBOX.Run ldy #S.BUT.HotKey
>PUSHA
jsr OBJ.Draw.Body
inc pStack
bcs .99
ldy #S.CBOX.EV
lda (ZPObjPtr),y
* clc
rts
.9 lda #0
sec
rts
.99 rts
*--------------------------------------
CBOX.Draw ldx #'<'

View File

@ -114,7 +114,7 @@ CONT.Run lda (pStack) Event
ldy #S.OBJ.S
lda (ZPPtr2),y
and #S.OBJ.S.bDisabled
and #S.OBJ.S.bDisabled+S.OBJ.S.bHidden
bne .10
ply

View File

@ -2,12 +2,16 @@ NEW
AUTO 3,1
.LIST OFF
*--------------------------------------
* DLG.New hParent,W,H,pTitle 5
* DLG.New hParent,W,H,pTitle,F 6
*--------------------------------------
DLG.New lda #S.OBJ.T.DLG
jsr OBJ.Create
bcs .9
>PULLA
ldy #S.OBJ.F
sta (ZPObjPtr),y
ldy #S.OBJ.pTitle
jsr OBJ.PullWordY
@ -48,7 +52,7 @@ DLG.New lda #S.OBJ.T.DLG
* clc
rts
.9 >POP 5
.9 >POP 6
rts
*--------------------------------------
MAN

View File

@ -2,12 +2,16 @@ NEW
AUTO 3,1
.LIST OFF
*--------------------------------------
* LABEL.New hParent,X1,Y1,pLabel 5
* LABEL.New hParent,X1,Y1,pLabel,F 6
*--------------------------------------
LABEL.New lda #S.OBJ.T.LABEL
jsr OBJ.Create
bcs .9
>PULLA
ldy #S.OBJ.F
sta (ZPObjPtr),y
ldy #S.OBJ.S
lda #S.OBJ.S.bDisabled
sta (ZPObjPtr),y
@ -28,7 +32,7 @@ LABEL.New lda #S.OBJ.T.LABEL
* clc
rts
.9 >POP 5
.9 >POP 6
.99 rts
*--------------------------------------
LABEL.Draw ldy #S.LABEL.pLabel

View File

@ -2,22 +2,22 @@ NEW
AUTO 3,1
.LIST OFF
*--------------------------------------
* LBOX.New hParent,X1,Y1,W,H,F,pList,pVar 10
* LBOX.New hParent,X1,Y1,W,H,pList,pVar,F 10
*--------------------------------------
LBOX.New lda #S.OBJ.T.LBOX
jsr OBJ.Create
bcs .9
>PULLA
ldy #S.OBJ.F
sta (ZPObjPtr),y
ldy #S.OBJ.pVar
jsr OBJ.PullWordY
ldy #S.OBJ.pBuf
jsr OBJ.PullWordY
>PULLA
ldy #S.OBJ.F
sta (ZPObjPtr),y
jsr OBJ.PullHW
jsr OBJ.PullY1X1hParent

View File

@ -219,7 +219,7 @@ OBJ.Run ldx ZPObjPtr
ldy #S.OBJ.S
lda (ZPObjPtr),y
and #S.OBJ.S.bDisabled
and #S.OBJ.S.bDisabled+S.OBJ.S.bHidden
bne .9
ldy #1
@ -280,7 +280,54 @@ OBJ.Run ldx ZPObjPtr
*--------------------------------------
OBJ.Draw >PUSHA hObj
jsr OBJ.Draw.Top
lda (pStack)
jsr LIB.GetOBJ
ldy #S.OBJ.S
lda (ZPObjPtr),y
and #S.OBJ.S.bHidden
beq .5
ldy #S.OBJ.Y1
lda (ZPObjPtr),y
>PUSHA
.1 jsr LB.Init
jsr LB.SetColor
ldy #S.OBJ.X1
lda (ZPObjPtr),y
tax
lda (pStack)
tay
jsr LB.GotoXY
ldy #S.OBJ.W
lda (ZPObjPtr),y
tax
lda #C.SPACE
.2 jsr LB.COut
iny
dex
bne .2
jsr IO.LBWrite
bcs .98
lda (pStack)
ldy #S.OBJ.Y2
cmp (ZPObjPtr),y
inc
sta (pStack)
bcc .1
bra .8
*--------------------------------------
.5 jsr OBJ.Draw.Top
bcs .99
jsr OBJ.Draw.Body
@ -316,7 +363,7 @@ OBJ.Draw >PUSHA hObj
cmp #S.OBJ
bne .6
clc
.8 clc
.98 inc pStack
@ -727,6 +774,36 @@ OBJ.FindActive ldx ZPObjPtr
rts
*--------------------------------------
OBJ.Show pha
jsr LIB.GetOBJ
jsr OBJ.CurOff
ldy #S.OBJ.S
lda (ZPObjPtr),y
and #S.OBJ.S.bHidden^$ff
sta (ZPObjPtr),y
pla
jmp OBJ.Draw
*--------------------------------------
OBJ.Hide pha
jsr LIB.GetOBJ
jsr OBJ.CurOff
ldy #S.OBJ.S
lda (ZPObjPtr),y
ora #S.OBJ.S.bHidden
sta (ZPObjPtr),y
pla
jmp OBJ.Draw
*--------------------------------------
OBJ.CurUpdPos ldy #S.OBJ.F
lda (ZPObjPtr),y
and #S.OBJ.F.bEdit

View File

@ -2,12 +2,16 @@ NEW
AUTO 3,1
.LIST OFF
*--------------------------------------
* RADIO.New hParent,X1,Y1,HK,EV,pList,pVar 9
* RADIO.New hParent,X1,Y1,HK,EV,pList,pVar,F 10
*--------------------------------------
RADIO.New lda #S.OBJ.T.RADIO
jsr OBJ.Create
bcs .9
>PULLA
ldy #S.OBJ.F
sta (ZPObjPtr),y
ldy #S.OBJ.pVar
jsr OBJ.PullWordY
@ -74,7 +78,7 @@ RADIO.New lda #S.OBJ.T.RADIO
* clc
rts
.9 >POP 9
.9 >POP 10
rts
*--------------------------------------

View File

@ -2,23 +2,24 @@ NEW
AUTO 3,1
.LIST OFF
*--------------------------------------
* TBOX.New hParent,X1,Y1,W,H,F,pBuf,BufSize 10
* TBOX.New hParent,X1,Y1,W,H,pBuf,BufSize,F 10
*--------------------------------------
TBOX.New lda #S.OBJ.T.TBOX
jsr OBJ.Create
bcs .9
jsr OBJ.PullBuf
>PULLA
ldy #S.OBJ.F
sta (ZPObjPtr),y
jsr OBJ.PullBuf
jsr OBJ.PullHW
jsr OBJ.PullY1X1hParent
jsr CONT.Insert
bcs .99
lda hObj

View File

@ -2,18 +2,19 @@ NEW
AUTO 3,1
.LIST OFF
*--------------------------------------
* TLINE.New hParent,X1,Y1,W,pBuf,MaxLen 8
* TLINE.New hParent,X1,Y1,W,pBuf,MaxLen,F 8
*--------------------------------------
TLINE.New lda #S.OBJ.T.TLINE
jsr OBJ.Create
bcs .9
jsr OBJ.PullBuf
>PULLA
ldy #S.OBJ.F
lda #S.OBJ.F.bHScroll+S.OBJ.F.bEdit
ora #S.OBJ.F.bHScroll+S.OBJ.F.bEdit
sta (ZPObjPtr),y
jsr OBJ.PullBuf
>PULLA
ldy #S.OBJ.W
sta (ZPObjPtr),y
@ -34,7 +35,7 @@ TLINE.New lda #S.OBJ.T.TLINE
* clc
rts
.9 >POP 7
.9 >POP 8
.99 rts
*--------------------------------------

View File

@ -70,6 +70,9 @@ CS.START cld
.DA LIB.SetProp
.DA OBJ.Activate
.DA OBJ.Deactivate
.DA OBJ.FindActive
.DA OBJ.Show
.DA OBJ.Hide
*--------------------------------------
J.ObjDestroy .DA OBJ.Destroy
.DA OBJ.Destroy