From 491792212b6ccc244517ce38e8fc1c2221742573 Mon Sep 17 00:00:00 2001 From: John LeFebvre Date: Thu, 25 Jan 2024 23:25:59 +0000 Subject: [PATCH] Updated with show/hide manual IP settings --- BIN/NETCONFIG.S.txt | 152 +++++++++++++++++++++++++++++++++----------- 1 file changed, 116 insertions(+), 36 deletions(-) diff --git a/BIN/NETCONFIG.S.txt b/BIN/NETCONFIG.S.txt index 3a7f20da..473bd5ce 100644 --- a/BIN/NETCONFIG.S.txt +++ b/BIN/NETCONFIG.S.txt @@ -14,6 +14,7 @@ NEW * Constants *-------------------------------------- EV.SAVE .EQ $C0 +EV.AUTOIP .EQ $C2 EV.OK .EQ $CE EV.CANCEL .EQ $CF SCR.X1 .EQ 3 @@ -32,6 +33,19 @@ hBuf1 .BS 1 hCTX .BS 1 hSCRN .BS 1 hItem1 .BS 1 +hIPLabel .BS 1 +hIPaddrL .BS 1 +hIPaddrV .BS 1 +hIPmaskL .BS 1 +hIPmaskV .BS 1 +hIPgwayL .BS 1 +hIPgwayV .BS 1 +hIPns1L .BS 1 +hIPns1V .BS 1 +hIPns2L .BS 1 +hIPns2V .BS 1 +hIPdomL .BS 1 +hIPdomV .BS 1 hDLGS .BS 1 hDLGitem .BS 1 ZPPtr1 .BS 2 @@ -134,11 +148,12 @@ CS.INIT >LDYA L.LIBTUI * clc CS.INIT.RTS rts *-------------------------------------- -CS.RUN >LDYAI 80 !!! >LDYAI immediate value of 80, not >LDYA content of memory location 80 +CS.RUN >LDYAI 80 >SYSCALL GetMem - bcs CS.INIT.RTS + bcc .1 + rts - >STYA ZPTmpPtr1 +.1 >STYA ZPTmpPtr1 stx hBuf1 !!! don't forget to free() it in CS.QUIT jsr CS.HOSTR Read HOSTNAME file @@ -146,9 +161,10 @@ CS.RUN >LDYAI 80 !!! >LDYAI immediate value of 80, not >LDYA content of mem jsr CS.File.Close CS.IPR doesn't close the file >LIBCALL hLIBTUI,LIBTUI.Init - bcs CS.RUN.RTS + bcc .2 + rts - sta hCTX +.2 sta hCTX jsr CS.SCRN.Init bcs CS.RUN.RTS @@ -175,7 +191,14 @@ CS.RUN >LDYAI 80 !!! >LDYAI immediate value of 80, not >LDYA content of mem jsr CS.SCRN.Draw Will Call SCRN.Draw lda hItem1 - >LIBCALL hLIBTUI,LIBTUI.Activate + >LIBCALL hLIBTUI,LIBTUI.Show + +* >LDA.G AUTOIP.Var +* bne CS.RUN.LOOP2 +* jsr CS.AUTOIP.Hide +* bra CS.RUN.LOOP2 + +*.show1 jsr CS.AUTOIP.Show Shown by default *-------------------------------------- CS.RUN.LOOP2 lda hSCRN >LIBCALL hLIBTUI,LIBTUI.Exec @@ -189,23 +212,29 @@ CS.RUN.LOOP2 lda hSCRN bra CS.RUN.LOOP2 -.1 cmp #EV.SAVE +.1 cmp #EV.AUTOIP bne .2 + + >LDA.G AUTOIP.Var + bne .11 + jsr CS.AUTOIP.Hide + bra CS.RUN.LOOP2 + +.11 jsr CS.AUTOIP.Show + bra CS.RUN.LOOP2 + +.2 cmp #EV.SAVE + bne .3 jsr CS.DLG.SAVE bcc CS.RUN.LOOP2 -.2 cmp #EV.QUIT +.3 cmp #EV.QUIT bne CS.RUN.LOOP2 lda hSCRN >LIBCALL hLIBTUI,LIBTUI.Destroy -*CS.RUN.QUIT2 lda hBuf1 !!! All done by CS.QUIT -* >SYSCALL FreeMem -* lda hLIBTUI -* >SYSCALL UnloadLib - lda #0 sec CS.RUN.RTS rts @@ -226,7 +255,6 @@ CS.HOSTR.Loop jsr CS.File.Read ldy #0 Copy setting to var string CS.HOSTR.Loop2 lda (ZPTmpPtr1),y -* cmp #0 !!! not required beq .2 sta (ZPTmpPtr4),y @@ -481,8 +509,8 @@ CS.AUTOIP.Init >PUSHB hSCRN hParent >PUSHBI SCR.Y1+3 >PUSHWZ -* >PUSHBI 0 HK -* >PUSHBI 0 EV + >PUSHBI 0 HK + >PUSHBI EV.AUTOIP EV >PUSHW L.AUTOIP.List >PUSHEA.G AUTOIP.Var @@ -583,6 +611,7 @@ CS.IP.Init >PUSHB hSCRN hParent >PUSHW L.MANUAL.Label >PUSHBI 0 >LIBCALL hLIBTUI,LIBTUI.NewLabel + sta hIPLabel >PUSHB hSCRN hParent >PUSHBI SCR.X1 @@ -590,6 +619,7 @@ CS.IP.Init >PUSHB hSCRN hParent >PUSHW L.IPADDR.Label >PUSHBI 0 >LIBCALL hLIBTUI,LIBTUI.NewLabel + sta hIPaddrL >PUSHB hSCRN hParent >PUSHBI SCR.X1 @@ -599,6 +629,7 @@ CS.IP.Init >PUSHB hSCRN hParent >PUSHWI 15 Len >PUSHBI 0 >LIBCALL hLIBTUI,LIBTUI.NewTLine + sta hIPaddrV >PUSHB hSCRN hParent >PUSHBI SCR.X2 @@ -606,6 +637,7 @@ CS.IP.Init >PUSHB hSCRN hParent >PUSHW L.MASK.Label >PUSHBI 0 >LIBCALL hLIBTUI,LIBTUI.NewLabel + sta hIPmaskL >PUSHB hSCRN hParent >PUSHBI SCR.X2 @@ -615,6 +647,7 @@ CS.IP.Init >PUSHB hSCRN hParent >PUSHWI 15 Len >PUSHBI 0 >LIBCALL hLIBTUI,LIBTUI.NewTLine + sta hIPmaskV >PUSHB hSCRN hParent >PUSHBI SCR.X3 @@ -622,6 +655,7 @@ CS.IP.Init >PUSHB hSCRN hParent >PUSHW L.GATEWAY.Label >PUSHBI 0 >LIBCALL hLIBTUI,LIBTUI.NewLabel + sta hIPgwayL >PUSHB hSCRN hParent >PUSHBI SCR.X3 @@ -631,6 +665,7 @@ CS.IP.Init >PUSHB hSCRN hParent >PUSHWI 15 Len >PUSHBI 0 >LIBCALL hLIBTUI,LIBTUI.NewTLine + sta hIPgwayV >PUSHB hSCRN hParent >PUSHBI SCR.X1 @@ -638,6 +673,7 @@ CS.IP.Init >PUSHB hSCRN hParent >PUSHW L.NS1.Label >PUSHBI 0 >LIBCALL hLIBTUI,LIBTUI.NewLabel + sta hIPns1L >PUSHB hSCRN hParent >PUSHBI SCR.X1 @@ -647,6 +683,7 @@ CS.IP.Init >PUSHB hSCRN hParent >PUSHWI 15 Len >PUSHBI 0 >LIBCALL hLIBTUI,LIBTUI.NewTLine + sta hIPns1V >PUSHB hSCRN hParent >PUSHBI SCR.X2 @@ -654,6 +691,7 @@ CS.IP.Init >PUSHB hSCRN hParent >PUSHW L.NS2.Label >PUSHBI 0 >LIBCALL hLIBTUI,LIBTUI.NewLabel + sta hIPns2L >PUSHB hSCRN hParent >PUSHBI SCR.X2 @@ -663,6 +701,7 @@ CS.IP.Init >PUSHB hSCRN hParent >PUSHWI 15 Len >PUSHBI 0 >LIBCALL hLIBTUI,LIBTUI.NewTLine + sta hIPns2V >PUSHB hSCRN hParent >PUSHBI SCR.X3 @@ -670,6 +709,7 @@ CS.IP.Init >PUSHB hSCRN hParent >PUSHW L.DOM.Label >PUSHBI 0 >LIBCALL hLIBTUI,LIBTUI.NewLabel + sta hIPdomL >PUSHB hSCRN hParent >PUSHBI SCR.X3 @@ -679,6 +719,7 @@ CS.IP.Init >PUSHB hSCRN hParent >PUSHWI 65 Len >PUSHBI 0 >LIBCALL hLIBTUI,LIBTUI.NewTLine + sta hIPdomV rts *-------------------------------------- CS.BUT.Init >PUSHB hSCRN hParent @@ -701,6 +742,61 @@ CS.BUT.Init >PUSHB hSCRN hParent >LIBCALL hLIBTUI,LIBTUI.NewBut .9 rts *-------------------------------------- +CS.AUTOIP.Hide lda hIPLabel + >LIBCALL hLIBTUI,LIBTUI.Hide + lda hIPaddrL + >LIBCALL hLIBTUI,LIBTUI.Hide + lda hIPaddrV + >LIBCALL hLIBTUI,LIBTUI.Hide + lda hIPmaskL + >LIBCALL hLIBTUI,LIBTUI.Hide + lda hIPmaskV + >LIBCALL hLIBTUI,LIBTUI.Hide + lda hIPgwayL + >LIBCALL hLIBTUI,LIBTUI.Hide + lda hIPgwayV + >LIBCALL hLIBTUI,LIBTUI.Hide + lda hIPns1L + >LIBCALL hLIBTUI,LIBTUI.Hide + lda hIPns1V + >LIBCALL hLIBTUI,LIBTUI.Hide + lda hIPns2L + >LIBCALL hLIBTUI,LIBTUI.Hide + lda hIPns2V + >LIBCALL hLIBTUI,LIBTUI.Hide + lda hIPdomL + >LIBCALL hLIBTUI,LIBTUI.Hide + lda hIPdomV + >LIBCALL hLIBTUI,LIBTUI.Hide + rts +*-------------------------------------- +CS.AUTOIP.Show lda hIPLabel + >LIBCALL hLIBTUI,LIBTUI.Show + lda hIPaddrL + >LIBCALL hLIBTUI,LIBTUI.Show + lda hIPaddrV + >LIBCALL hLIBTUI,LIBTUI.Show + lda hIPmaskL + >LIBCALL hLIBTUI,LIBTUI.Show + lda hIPmaskV + >LIBCALL hLIBTUI,LIBTUI.Show + lda hIPgwayL + >LIBCALL hLIBTUI,LIBTUI.Show + lda hIPgwayV + >LIBCALL hLIBTUI,LIBTUI.Show + lda hIPns1L + >LIBCALL hLIBTUI,LIBTUI.Show + lda hIPns1V + >LIBCALL hLIBTUI,LIBTUI.Show + lda hIPns2L + >LIBCALL hLIBTUI,LIBTUI.Show + lda hIPns2V + >LIBCALL hLIBTUI,LIBTUI.Show + lda hIPdomL + >LIBCALL hLIBTUI,LIBTUI.Show + lda hIPdomV + >LIBCALL hLIBTUI,LIBTUI.Show + rts*-------------------------------------- CS.DLG.SAVE >PUSHB hCTX hParent >PUSHBI 70 W >PUSHBI 11 H @@ -721,11 +817,7 @@ CS.DLG.SAVE >PUSHB hCTX hParent >PUSHB hDLGS hParent >PUSHBI 2 >PUSHBI 4 Y1 - -* >PUSHBI 0 -* >PUSHBI 0 >PUSHWZ HotKey, EV - >PUSHW L.DLGS.Label >PUSHEA.G DLGS.Var >PUSHBI 0 @@ -978,8 +1070,7 @@ CS.NETW.etalk >LDA.G LIBETALK.Var CS.DOEVENT sec do not discard TIMER event rts *-------------------------------------- -CS.QUIT lda hBuf1 !!! ZP, .... -* >LDA.G hBuf1 !!! ...not in DS +CS.QUIT lda hBuf1 beq .1 >SYSCALL FreeMem @@ -1001,19 +1092,8 @@ CS.SCRN.Draw lda hSCRN >SYSCALL GetMemPtr >STYA ZPPtr1 >PUSHEA.G SCRN.TitleBuf - >PUSHW L.SCRN.Title !!! NO %d.... - -* ldy #S.OBJ.X1 -*.1 lda (ZPPtr1),y -* >PUSHA -* iny -* cpy #S.OBJ.InnerH+1 -* bne .1 -* >PUSHBI 10 !!! .... so DATA byte count = 0 - - + >PUSHW L.SCRN.Title >PUSHBI 0 - >SYSCALL sprintf lda hSCRN >LIBCALL hLIBTUI,LIBTUI.Draw @@ -1120,9 +1200,9 @@ GATEWAY.Buf .BS 16 NS1.Buf .BS 16 NS2.Buf .BS 16 -DOM.Buf .BS 32 !!! enough room for ending \0 +DOM.Buf .BS 32 -SCRN.TitleBuf .BS 81 !!! maximum screen width + \0 +SCRN.TitleBuf .BS 81 DS.END .ED *--------------------------------------