From b7579262271860678df9c0aac14e57494d5a0a7e Mon Sep 17 00:00:00 2001 From: burniouf Date: Thu, 27 Oct 2022 17:14:06 +0200 Subject: [PATCH] LIBGUI:more bugfix --- .Floppies/A2OSX.BUILD.po | Bin 33553920 -> 33553920 bytes .Fonts/SYSx7.fnt | Bin 3472 -> 3472 bytes INC/LIBGUI.I.txt | 1 + LIB/LIBGUI.G.BM.txt | 36 +++++++++++++++ LIB/LIBGUI.S.CB.txt | 10 +++++ LIB/LIBGUI.S.MBAR.txt | 93 +++++++++++++++++++++------------------ LIB/LIBGUI.S.MENU.txt | 10 +---- LIB/LIBGUI.S.OBJ.txt | 10 +---- LIB/LIBGUI.S.WND.txt | 10 +---- LIB/LIBGUI.S.txt | 1 + 10 files changed, 101 insertions(+), 70 deletions(-) diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index f0aa2465242afe32be192afad3ac61a3f3807034..9f03a484135cbf6a725db68324e07939f0ca4668 100644 GIT binary patch delta 25330 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

&EmJ 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 delta 24363 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 diff --git a/.Fonts/SYSx7.fnt b/.Fonts/SYSx7.fnt index 07a9bd716e34904097fd3ed5b4976ddc9113429a..3e0f82b7c05d0ee63eb58711a68c715884619af2 100644 GIT binary patch delta 74 zcmbOrJwbYdHK%O_L&Jj!6DB-hU`UwIFd>0Kpa94#U|=Zd_|QNWL6M delta 74 zcmbOrJwbYdHK%O>L&Jj!6DB-hU`S|aXh>iXC;;*bfV>G08VZ172Y{js3_!sGfdsJ1 S2@DJk3}8VAhRqe65-b2SRvSnF diff --git a/INC/LIBGUI.I.txt b/INC/LIBGUI.I.txt index 83ee4b70..f4aad133 100644 --- a/INC/LIBGUI.I.txt +++ b/INC/LIBGUI.I.txt @@ -43,6 +43,7 @@ BM.ID.LEFT .EQ 10 BM.ID.RIGHT .EQ 12 BM.ID.UP .EQ 14 BM.ID.DOWN .EQ 16 +BM.ID.INFO .EQ 18 *-------------------------------------- BUT.ID.OK .EQ 1 BUT.ID.CANCEL .EQ 2 diff --git a/LIB/LIBGUI.G.BM.txt b/LIB/LIBGUI.G.BM.txt index 422000e7..e4442684 100644 --- a/LIB/LIBGUI.G.BM.txt +++ b/LIB/LIBGUI.G.BM.txt @@ -177,6 +177,42 @@ BM.Down.AND .DA #%1111111 .DA #%1110111 .DA #%1111111 *-------------------------------------- +BM.Info .DA #S.BM.F.BBP4 + .DA #4 RowBytes + .DA 28 W + .DA 14 H + .DA BM.INFO.AND-BM.INFO + + .HS FFFFFFF0 + .HS FFFFFFF0 + .HS FFFFFFF0 + .HS FFFFFFF0 + .HS FFFFFFF0 + .HS FFFFFFF0 + .HS FFFFFFF0 + .HS FFFFFFF0 + .HS FFFFFFF0 + .HS FFFFFFF0 + .HS FFFFFFF0 + .HS FFFFFFF0 + .HS FFFFFFF0 + .HS FFFFFFF0 + +BM.Info.AND .HS FFFFFFFF + .HS FFFFFFFF + .HS FFFFFFFF + .HS FFFFFFFF + .HS FFFFFFFF + .HS FFFFFFFF + .HS FFFFFFFF + .HS FFFFFFFF + .HS FFFFFFFF + .HS FFFFFFFF + .HS FFFFFFFF + .HS FFFFFFFF + .HS FFFFFFFF + .HS FFFFFFFF +*-------------------------------------- MAN SAVE usr/src/lib/libgui.g.bm LOAD usr/src/lib/libgui.s diff --git a/LIB/LIBGUI.S.CB.txt b/LIB/LIBGUI.S.CB.txt index 53fc7cc6..e00b7902 100644 --- a/LIB/LIBGUI.S.CB.txt +++ b/LIB/LIBGUI.S.CB.txt @@ -30,6 +30,16 @@ CB.GetWndYCacheX sta CB.Cache+1,x rts *-------------------------------------- +CB.BorderLineH lda #S.CB.CMD.HLINE + sta CB.Cache+S.CB.CMD + lda #S.CB.OP.SET + sta CB.Cache+S.CB.OP + lda #S.CB.M.MONO + sta CB.Cache+S.CB.M + lda PREFS.BorderColor + sta CB.Cache+S.CB.COLOR + rts +*-------------------------------------- CB.FillRectMonoA sta CB.Cache+S.CB.COLOR diff --git a/LIB/LIBGUI.S.MBAR.txt b/LIB/LIBGUI.S.MBAR.txt index ee358c45..4edb94bf 100644 --- a/LIB/LIBGUI.S.MBAR.txt +++ b/LIB/LIBGUI.S.MBAR.txt @@ -176,21 +176,24 @@ MBAR.Enter ldy #S.WND.pMBAR >LDYA ZPPtr1 >STYA ZPPtr2 save MBITEM to activate - + .2 jsr MBAR.NextMBItem bra .1 -*-------------------------------------- +.3 lda ZPPtr2 + ora ZPPtr2+1 + bne MBAR.Set .8 clc .9 rts +*-------------------------------------- +* ZPMENUPtr = MBAR +* ZPPtr2 = Item to activate +*-------------------------------------- +MBAR.Reset stz ZPPtr2 + stz ZPPtr2+1 -*-------------------------------------- -.3 lda ZPPtr2 - ora ZPPtr2+1 - beq .8 no change.... - - jsr MENU.DestroyAll +MBAR.Set jsr MENU.DestroyAll ldy #S.OBJ.X1 ldx #S.CB.X1 @@ -203,13 +206,13 @@ MBAR.Enter ldy #S.WND.pMBAR .4 lda (ZPPtr1) beq .7 - - jsr MBAR.SetX2 - + + jsr MBAR.SetX2 set X2 = X1 + W + ldy #S.MBITEM.S lda (ZPPtr1),y bmi .5 - + ldx ZPPtr1 cpx ZPPtr2 bne .6 @@ -217,25 +220,34 @@ MBAR.Enter ldy #S.WND.pMBAR ldx ZPPtr1+1 cpx ZPPtr2+1 bne .6 + + ldx CB.Cache+S.CB.X1 + stx Counter + ldx CB.Cache+S.CB.X1+1 + stx Counter+1 .5 eor #S.MBITEM.S.SELECTED sta (ZPPtr1),y - >LDYA CB.Cache+S.CB.X1 - >STYA DX - jsr MBAR.DrawMBItem bcs .9 - -.6 jsr MBAR.NextMBItem + +.6 jsr MBAR.NextMBItem set X1 = X2 bra .4 .7 >LDYA L.WND.Screen jsr CB.FlushBufToYA bcs .9 - - >LDYA CB.Cache+S.CB.Y2 - >STYA DY + + >LDYA Counter + >STYA DX + + ldy #S.WND.MBarY2 + lda (ZPWNDPtr),y + sta DY + iny + lda (ZPWNDPtr),y + sta DY+1 ldy #S.MBITEM.pMENU lda (ZPPtr2),y @@ -243,18 +255,13 @@ MBAR.Enter ldy #S.WND.pMBAR iny lda (ZPPtr2),y ply - >DEBUG - jsr MENU.New.I - bcs .99 - - jmp MENU.Draw - -.99 rts -*-------------------------------------- -MBAR.Leave - clc - rts + jsr MENU.New.I + bcs .9 + + jmp MENU.Draw + +.9 rts *-------------------------------------- * ZPWNDPtr = parent WND *-------------------------------------- @@ -264,13 +271,13 @@ MBAR.Draw >SYSCALL2 GetMemPtr ldy #S.OBJ.X1 ldx #S.CB.X1 jsr CB.GetWndYCacheX - + jsr MBAR.GetMBItems .1 lda (ZPPtr1) beq .8 - jsr MBAR.SetX2 + jsr MBAR.SetX2 set X2 = X1 + W jsr MBAR.DrawMBItem bcs .9 @@ -288,10 +295,10 @@ MBAR.Draw >SYSCALL2 GetMemPtr jsr CB.GetWndYCacheX jsr MBAR.SetY1Y2 - + lda PREFS.MBarColor jsr CB.FillRectMonoA - + jmp CB.Cache2CBBuf .9 rts @@ -299,10 +306,10 @@ MBAR.Draw >SYSCALL2 GetMemPtr MBAR.DrawMBItem ldy #S.MBITEM.S lda (ZPPtr1),y asl - + lda PREFS.MBarColor bcc .1 - + eor #$ff .1 jsr CB.FillRectMonoA @@ -316,12 +323,12 @@ MBAR.DrawMBItem ldy #S.MBITEM.S adc CB.Cache+S.CB.X1 sta CB.Cache+S.CB.X1 bcc .10 - + inc CB.Cache+S.CB.X1+1 .10 inc CB.Cache+S.CB.Y1 bne .11 - + inc CB.Cache+S.CB.Y1+1 .11 ldy #S.MBITEM.S @@ -336,7 +343,7 @@ MBAR.DrawMBItem ldy #S.MBITEM.S ply ldx hSYSFON jsr DRAW.YAText - + jmp CB.Cache2CBBuf *-------------------------------------- MBAR.GetMBItems lda ZPMENUPtr @@ -353,7 +360,7 @@ MBAR.NextMBItem lda CB.Cache+S.CB.X2 sta CB.Cache+S.CB.X1 lda CB.Cache+S.CB.X2+1 sta CB.Cache+S.CB.X1+1 - + lda #S.MBITEM jmp SkipAPtr1 *-------------------------------------- @@ -362,12 +369,12 @@ MBAR.SetX2 lda CB.Cache+S.CB.X1 ldy #S.MBITEM.W adc (ZPPtr1),y sta CB.Cache+S.CB.X2 - + lda CB.Cache+S.CB.X1+1 iny adc (ZPPtr1),y sta CB.Cache+S.CB.X2+1 - + rts *-------------------------------------- MBAR.SetY1Y2 ldy #S.WND.MBarY1 diff --git a/LIB/LIBGUI.S.MENU.txt b/LIB/LIBGUI.S.MENU.txt index 17c3b99c..0558ac04 100644 --- a/LIB/LIBGUI.S.MENU.txt +++ b/LIB/LIBGUI.S.MENU.txt @@ -584,15 +584,7 @@ MENU.DrawMItem jsr MENU.ResetX1Y1X2 cmp #S.MITEM.T.SEP bne MENU.DrawMItem1 - lda #S.CB.CMD.HLINE - sta CB.Cache+S.CB.CMD - lda #S.CB.OP.SET - sta CB.Cache+S.CB.OP - lda #S.CB.M.MONO - sta CB.Cache+S.CB.M - - lda PREFS.BorderColor - sta CB.Cache+S.CB.COLOR + jsr CB.BorderLineH jmp CB.Cache2CBBuf *-------------------------------------- diff --git a/LIB/LIBGUI.S.OBJ.txt b/LIB/LIBGUI.S.OBJ.txt index 2de9d90a..ecb9380b 100644 --- a/LIB/LIBGUI.S.OBJ.txt +++ b/LIB/LIBGUI.S.OBJ.txt @@ -149,15 +149,7 @@ OBJ.GetInCache >STYA .1+1 OBJ.DrawBorders >STYA ZPObjPtr stx IY - lda #S.CB.CMD.HLINE - jsr CB.InitCacheA - - lda #S.CB.OP.SET - sta CB.Cache+S.CB.OP - lda #S.CB.M.MONO - sta CB.Cache+S.CB.M - lda PREFS.BorderColor - sta CB.Cache+S.CB.COLOR + jsr CB.BorderLineH ldy #S.OBJ.X1 diff --git a/LIB/LIBGUI.S.WND.txt b/LIB/LIBGUI.S.WND.txt index 480e4c3b..e441cc33 100644 --- a/LIB/LIBGUI.S.WND.txt +++ b/LIB/LIBGUI.S.WND.txt @@ -670,15 +670,7 @@ WND.DrawTitleBarText jmp DRAW.YATextAtDXDY *-------------------------------------- WND.DrawStatusBar - lda #S.CB.CMD.HLINE - jsr CB.InitCacheA - - lda #S.CB.OP.SET - sta CB.Cache+S.CB.OP - lda #S.CB.M.MONO - sta CB.Cache+S.CB.M - lda PREFS.BorderColor - sta CB.Cache+S.CB.COLOR + jsr CB.BorderLineH ldy #S.OBJ.X1 ldx #S.CB.X1 diff --git a/LIB/LIBGUI.S.txt b/LIB/LIBGUI.S.txt index 57126b11..44f7d7e9 100644 --- a/LIB/LIBGUI.S.txt +++ b/LIB/LIBGUI.S.txt @@ -174,6 +174,7 @@ L.BM.Left .DA BM.Left L.BM.Right .DA BM.Right L.BM.Up .DA BM.Up L.BM.Down .DA BM.Down +L.BM.Info .DA BM.Info *-------------------------------------- L.PTR.SaveBuf .DA PTR.SaveBuf L.Cursors .DA PTR.Arrow