From 97593445bd1276d401743f344bd735da05b27133 Mon Sep 17 00:00:00 2001 From: burniouf Date: Wed, 19 Oct 2022 08:26:48 +0200 Subject: [PATCH] LIBGUI:fixes --- .Floppies/A2OSX.BUILD.po | Bin 33553920 -> 33553920 bytes LIB/LIBGUI.S.MENU.txt | 146 +++++++++++++++++++++------------------ 2 files changed, 80 insertions(+), 66 deletions(-) diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 4ea1c77109305a2fd96f69eb4016a83718b9f42b..ddaa3e2c0f70a00daadb2cf9d1d43efc1c447740 100644 GIT binary patch delta 18137 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 DF3vop delta 18204 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 diff --git a/LIB/LIBGUI.S.MENU.txt b/LIB/LIBGUI.S.MENU.txt index 147f0aeb..727dc9dd 100644 --- a/LIB/LIBGUI.S.MENU.txt +++ b/LIB/LIBGUI.S.MENU.txt @@ -7,8 +7,8 @@ MENU.New >PULLW DY >PULLW DX >PULLYA >STYA ZPPtr1 MENU definition - >STYA ZPMENUPtr for pass #2 - + >STYA ZPObjPtr for pass #2 + ldy MENU.Stack.Cnt cpy #MENU.MAX beq .90 @@ -17,37 +17,42 @@ MENU.New >PULLW DY >SYSCALL2 GetMem bcs .99 - >STYA ZPObjPtr + >STYA ZPMENUPtr txa hMenu ldx MENU.Stack.Cnt sta MENU.Stack,x lda #S.OBJ.T.MENU - sta (ZPObjPtr) S.OBJ.T + sta (ZPMENUPtr) S.OBJ.T lda #0 ldy #S.MENU.Items-1 -.1 sta (ZPObjPtr),y +.1 sta (ZPMENUPtr),y dey bne .1 - >LDYA ZPMENUPtr - >STYA ZPPtr1 - - jsr MENU.GetData - ldx #3 ldy #S.OBJ.X1+3 .2 lda DX,x - sta (ZPObjPtr),y + sta (ZPMENUPtr),y dey dex bpl .2 + >LDYA ZPObjPtr + >STYA ZPPtr1 MENU definition + + jsr MENU.GetData + + ldx MENU.Stack.Cnt + lda MENU.Stack,x + >SYSCALL2 GetMemPtr + >STYA ZPMENUPtr + jsr MENU.SetMenuSizePos ldx MENU.Stack.Cnt @@ -106,25 +111,20 @@ MENU.GetSize lda #S.MENU.Items+1 Ending\0 rts *-------------------------------------- * ZPPtr1 = defintion -* ZPObjPtr = DstBuf +* ZPMENUPtr = DstBuf *-------------------------------------- -MENU.GetData lda #S.MENU.Items +MENU.GetData lda ZPMENUPtr clc - adc ZPObjPtr - sta ZPObjPtr + adc #S.MENU.Items + sta ZPMENUPtr bcc .1 + + inc ZPMENUPtr+1 - inc ZPObjPtr+1 - .1 lda (ZPPtr1) - sta (ZPObjPtr) + sta (ZPMENUPtr) beq .8 - ldy #S.MITEM.S - lda #0 - sta (ZPObjPtr),y - - lda (ZPPtr1) cmp #S.MITEM.T.SEP bne .2 @@ -140,7 +140,7 @@ MENU.GetData lda #S.MENU.Items ldy #1 T+ID+KEMOD+KEY+pICON+"text" lda (ZPPtr1),y ldy #S.MITEM.ID - sta (ZPObjPtr),y + sta (ZPMENUPtr),y ldy #2 lda (ZPPtr1),y @@ -149,10 +149,10 @@ MENU.GetData lda #S.MENU.Items lda (ZPPtr1),y ldy #S.MITEM.KEYMOD+1 - sta (ZPObjPtr),y + sta (ZPMENUPtr),y dey KEY txa - sta (ZPObjPtr),y + sta (ZPMENUPtr),y lda #4 bra .4 skip 4 bytes @@ -164,10 +164,10 @@ MENU.GetData lda #S.MENU.Items lda (ZPPtr1),y ldy #S.MITEM.pMENU+1 - sta (ZPObjPtr),y + sta (ZPMENUPtr),y dey txa - sta (ZPObjPtr),y + sta (ZPMENUPtr),y lda #3 skip 3 bytes .4 jsr SkipAPtr1 @@ -175,30 +175,34 @@ MENU.GetData lda #S.MENU.Items ldy #1 lda (ZPPtr1),y ldy #S.MITEM.pICON+1 - sta (ZPObjPtr),y + sta (ZPMENUPtr),y dey lda (ZPPtr1) - sta (ZPObjPtr),y + sta (ZPMENUPtr),y lda #2 skip pICON jsr SkipAPtr1 .5 ldy #S.MITEM.pTEXT lda ZPPtr1 - sta (ZPObjPtr),y + sta (ZPMENUPtr),y iny lda ZPPtr1+1 - sta (ZPObjPtr),y + sta (ZPMENUPtr),y jsr SkipStrZPtr1 skip "TEXT\0" -.7 lda ZPObjPtr + ldy #S.MITEM.S + lda #0 + sta (ZPMENUPtr),y + + lda ZPMENUPtr clc adc #S.MITEM - sta ZPObjPtr + sta ZPMENUPtr bcc .1 - inc ZPObjPtr+1 + inc ZPMENUPtr+1 bra .1 .8 clc @@ -211,6 +215,7 @@ MENU.SetMenuSizePos stz IE+1 stz INE Max Mod-Key W + stz INE+1 lda #2 2px Borders sta DY Menu H @@ -221,8 +226,12 @@ MENU.SetMenuSizePos .1 lda (ZPPtr1) beq .3 + cmp #S.MITEM.T.SEP + beq .2 + jsr MENU.GetMItemW - jsr MENU.NextMItemDY + +.2 jsr MENU.NextMItemDY bra .1 .3 lda #2+MENU.LMargin+MENU.RMargin 2px Borders+5 LMARGIN (Checked) +5 RMARGIN (SubMenu) @@ -267,7 +276,7 @@ MENU.SetMenuSizePos lda IY sta (ZPMENUPtr),y - iny #S.MENU.tW + ldy #S.MENU.tW lda IE sta (ZPMENUPtr),y iny @@ -313,11 +322,7 @@ MENU.SetMenuSizePos rts *-------------------------------------- -MENU.GetMItemW lda (ZPPtr1) - cmp #S.MITEM.T.SEP - beq .8 - - ldy #S.MITEM.pICON +MENU.GetMItemW ldy #S.MITEM.pICON lda (ZPPtr1),y iny ora (ZPPtr1),y @@ -346,11 +351,15 @@ MENU.GetMItemW lda (ZPPtr1) ldx hSYSFON jsr FON.GetTextSize - lda CB.Cache+S.CB.SrcW + ldx CB.Cache+S.CB.SrcW cmp INE + lda CB.Cache+S.CB.SrcW+1 + sbc INE+1 bcc .8 - sta INE set Max Mod-key W + stx INE set Max Mod-key W + lda CB.Cache+S.CB.SrcW+1 + sta INE+1 .8 rts *-------------------------------------- @@ -467,8 +476,8 @@ MENU.Enter jsr MENU.GetDXWIE X1,W,X2 >LDYA L.WND.Screen jsr DrawCBBufToYA -* jsr MENU.NewSubMenu -* bcs .9 + jsr MENU.NewSubMenu + bcs .9 bra .1 @@ -527,7 +536,7 @@ MENU.NewSubMenu lda DX *-------------------------------------- MENU.Draw >SYSCALL2 GetMemPtr >STYA ZPMENUPtr - + jsr MENU.Save bcs .9 @@ -541,15 +550,17 @@ MENU.Draw >SYSCALL2 GetMemPtr jsr MENU.GetMItems -.6 lda (ZPPtr1) +.1 lda (ZPPtr1) beq .8 jsr MENU.DrawMItem jsr MENU.NextMItemDY - bra .6 + bra .1 .8 >LDYA L.WND.Screen - jmp DrawCBBufToYA + jsr DrawCBBufToYA + + >DEBUG .9 rts *-------------------------------------- @@ -619,7 +630,9 @@ MENU.DrawBorders jmp CB.Cache2CBBuf *-------------------------------------- -MENU.DrawMItem lda (ZPPtr1) +MENU.DrawMItem jsr MENU.GetDX + + lda (ZPPtr1) cmp #S.MITEM.T.SEP bne MENU.DrawMItem1 @@ -761,12 +774,13 @@ MENU.DrawMItem1 lda #S.CB.CMD.FILLRECT ldx #BM.ID.RIGHT jsr DRAW.xBMAtDXDY -.8 lda DY - bne .80 +.8 +* lda DY +* bne .80 - dec DY+1 +* dec DY+1 -.80 dec DY +*.80 dec DY clc rts @@ -994,17 +1008,7 @@ MENU.Destroy clc .8 clc rts *-------------------------------------- -MENU.GetDXWIE ldy #S.OBJ.X1 - lda (ZPMENUPtr),y - clc - adc #1 - sta DX - iny - lda (ZPMENUPtr),y - adc #0 - sta DX+1 - - ldy #S.OBJ.W +MENU.GetDXWIE ldy #S.OBJ.W lda (ZPMENUPtr),y sec sbc #3 2Px border + correction from W @@ -1023,6 +1027,16 @@ MENU.GetDXWIE ldy #S.OBJ.X1 adc DX+1 sta IE+1 +MENU.GetDX ldy #S.OBJ.X1 + lda (ZPMENUPtr),y + clc + adc #1 + sta DX + iny + lda (ZPMENUPtr),y + adc #0 + sta DX+1 + rts *-------------------------------------- MENU.GetDY ldy #S.OBJ.Y1