From 658749b18f9015b4d03f58b0bc6fa3b1a9ec5a48 Mon Sep 17 00:00:00 2001 From: burniouf Date: Wed, 26 Oct 2022 08:12:16 +0200 Subject: [PATCH] LIBGUI:more API... --- .Floppies/A2OSX.BUILD.po | Bin 33553920 -> 33553920 bytes INC/LIBGUI.I.txt | 4 +- LIB/LIBGUI.S.CB.txt | 13 ++++++ LIB/LIBGUI.S.MBAR.txt | 91 ++++++++++++++++++++++++------------- LIB/LIBGUI.S.MOU.txt | 2 +- LIB/LIBGUI.S.OBJ.txt | 10 ---- LIB/LIBGUI.S.WND.txt | 53 ++++++--------------- LIB/LIBGUI.S.txt | 7 ++- ROOT/asmtest/TESTGUI.S.txt | 5 -- 9 files changed, 92 insertions(+), 93 deletions(-) diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 94f3ad154f197acc47075e41cee5ef4144853c07..c128df14697186fcd6a28a79511c2572840c1b1e 100644 GIT binary patch delta 22534 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 diff --git a/INC/LIBGUI.I.txt b/INC/LIBGUI.I.txt index cd9b8098..0ae24df6 100644 --- a/INC/LIBGUI.I.txt +++ b/INC/LIBGUI.I.txt @@ -6,7 +6,7 @@ LIBGUI.PTR.SetPos .EQ 6 LIBGUI.PTR.Hide .EQ 8 LIBGUI.PTR.Show .EQ 10 LIBGUI.PTR.Update .EQ 12 -LIBGUI.ReadMouse .EQ 14 +*LIBGUI.ReadMouse .EQ 14 LIBGUI.DRAW.Line .EQ 16 LIBGUI.OBJ.SetProp .EQ 18 LIBGUI.OBJ.GetProp .EQ 20 @@ -16,7 +16,7 @@ LIBGUI.WND.Show .EQ 26 LIBGUI.WND.Paint .EQ 28 LIBGUI.WND.SetMBar .EQ 30 LIBGUI.MSG.Get .EQ 32 -LIBGUI.MBAR.New .EQ 34 +*LIBGUI.MBAR.New .EQ 34 *-------------------------------------- C.BLACK .EQ 0 C16.D.BLUE .EQ 1 diff --git a/LIB/LIBGUI.S.CB.txt b/LIB/LIBGUI.S.CB.txt index 4150650f..53fc7cc6 100644 --- a/LIB/LIBGUI.S.CB.txt +++ b/LIB/LIBGUI.S.CB.txt @@ -30,6 +30,19 @@ CB.GetWndYCacheX sta CB.Cache+1,x rts *-------------------------------------- +CB.FillRectMonoA + sta CB.Cache+S.CB.COLOR + + lda #S.CB.CMD.FILLRECT + 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 + rts +*-------------------------------------- CB.GetBuf clc ldx hCBBuf diff --git a/LIB/LIBGUI.S.MBAR.txt b/LIB/LIBGUI.S.MBAR.txt index 673f2be6..0496b63b 100644 --- a/LIB/LIBGUI.S.MBAR.txt +++ b/LIB/LIBGUI.S.MBAR.txt @@ -144,14 +144,17 @@ MBAR.Enter ldy #S.WND.pMBAR >SYSCALL2 GetMemPtr >STYA ZPMENUPtr pMBAR - jsr MBAR.GetMBItems + stz ZPPtr2 + stz ZPPtr2+1 ldy #S.OBJ.X1 ldx #S.CB.X1 jsr CB.GetWndYCacheX + jsr MBAR.GetMBItems + .1 lda (ZPPtr1) - beq .8 + beq .3 jsr MBAR.SetX2 @@ -159,49 +162,68 @@ MBAR.Enter ldy #S.WND.pMBAR cmp CB.Cache+S.CB.X1 lda MSG+S.MSG.X1+1 sbc CB.Cache+S.CB.X1+1 - bcc .7 + bcc .2 lda CB.Cache+S.CB.X2 cmp MSG+S.MSG.X1 lda CB.Cache+S.CB.X2+1 sbc MSG+S.MSG.X1+1 - bcc .7 + bcc .2 - ldy #S.MBITEM.S + ldy #S.MBITEM.S in RECT.... lda (ZPPtr1),y bmi .8 Already Selected, nothing to do - eor #S.MBITEM.S.SELECTED - sta (ZPPtr1),y + >LDYA ZPPtr1 + >STYA ZPPtr2 save MBITEM to activate +.2 jsr MBAR.NextMBItem + bra .1 +*-------------------------------------- +.3 lda ZPPtr2 + ora ZPPtr2+1 + beq .8 no change.... + jsr MENU.DestroyAll + ldy #S.OBJ.X1 + ldx #S.CB.X1 + jsr CB.GetWndYCacheX + + jsr MBAR.GetMBItems + jsr CB.GetBuf bcs .9 -.2 jsr MBAR.DrawMBItem +.4 lda (ZPPtr1) + beq .7 -.3 jsr MBAR.NextMBItem - - lda (ZPPtr1) - beq .6 + jsr MBAR.SetX2 ldy #S.MBITEM.S lda (ZPPtr1),y - bpl .3 + bmi .5 - eor #S.MBITEM.S.SELECTED + ldx ZPPtr1 + cpx ZPPtr2 + bne .6 + + ldx ZPPtr1+1 + cpx ZPPtr2+1 + bne .6 + +.5 eor #S.MBITEM.S.SELECTED sta (ZPPtr1),y - jsr MBAR.SetX2 - bra .2 + jsr MBAR.DrawMBItem + bcs .9 + +.6 jsr MBAR.NextMBItem + bra .4 -.6 >LDYA L.WND.Screen +.7 >LDYA L.WND.Screen jmp CB.FlushBufToYA -.7 jsr MBAR.NextMBItem - bra .1 - .8 clc .9 rts *-------------------------------------- @@ -232,20 +254,25 @@ MBAR.Draw >SYSCALL2 GetMemPtr jsr MBAR.NextMBItem bra .1 -.8 clc +.8 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 + + ldy #S.OBJ.X2 + ldx #S.CB.X2 + jsr CB.GetWndYCacheX + + jsr MBAR.SetY1Y2 + + lda PREFS.MBarColor + jsr CB.FillRectMonoA + + jmp CB.Cache2CBBuf .9 rts *-------------------------------------- -MBAR.DrawMBItem lda #S.CB.CMD.FILLRECT - 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 - - ldy #S.MBITEM.S +MBAR.DrawMBItem ldy #S.MBITEM.S lda (ZPPtr1),y asl @@ -254,7 +281,7 @@ MBAR.DrawMBItem lda #S.CB.CMD.FILLRECT eor #$ff -.1 sta CB.Cache+S.CB.COLOR +.1 jsr CB.FillRectMonoA jsr MBAR.SetY1Y2 diff --git a/LIB/LIBGUI.S.MOU.txt b/LIB/LIBGUI.S.MOU.txt index 7b28c48e..b7f6a521 100644 --- a/LIB/LIBGUI.S.MOU.txt +++ b/LIB/LIBGUI.S.MOU.txt @@ -59,7 +59,7 @@ MOU.Quit lda hDevMouse .8 clc rts *-------------------------------------- -MOU.ReadMouse >PULLW ZPPtr1 pS.XY +MOU.ReadMouse.OLD >PULLW ZPPtr1 pS.XY lda A2osX.ASCREEN GUI screen active ? cmp DCB.GFX+S.DCB.GFX.DEVID diff --git a/LIB/LIBGUI.S.OBJ.txt b/LIB/LIBGUI.S.OBJ.txt index e8a83787..2de9d90a 100644 --- a/LIB/LIBGUI.S.OBJ.txt +++ b/LIB/LIBGUI.S.OBJ.txt @@ -33,16 +33,6 @@ OBJ.New pha .9 plx rts *-------------------------------------- -OBJ.Init sta (ZPObjPtr) - - lda #0 - -.1 sta (ZPObjPtr),y - dey - bne .1 - - rts -*-------------------------------------- * hOBJ, Prop8, Value16 *-------------------------------------- OBJ.SetProp ldy #3 diff --git a/LIB/LIBGUI.S.WND.txt b/LIB/LIBGUI.S.WND.txt index 4ece8a6d..480e4c3b 100644 --- a/LIB/LIBGUI.S.WND.txt +++ b/LIB/LIBGUI.S.WND.txt @@ -357,7 +357,7 @@ WND.Show2 sta WND.Stack,x ldy #S.WND.InnerY2 lda (ZPWNDPtr),y sec - sbc SYSFON.Hp1 + sbc SYSFON.H sta (ZPWNDPtr),y iny lda (ZPWNDPtr),y @@ -681,55 +681,30 @@ WND.DrawStatusBar sta CB.Cache+S.CB.COLOR ldy #S.OBJ.X1 - lda (ZPWNDPtr),y - sta CB.Cache+S.CB.X1 - sta DX - iny - lda (ZPWNDPtr),y - sta CB.Cache+S.CB.X1+1 - sta DX+1 + ldx #S.CB.X1 + jsr CB.GetWndYCacheX ldy #S.WND.SBarY1 - lda (ZPWNDPtr),y - sta CB.Cache+S.CB.Y1 - clc - adc #1 - sta DY - - iny - lda (ZPWNDPtr),y - sta CB.Cache+S.CB.Y1+1 - adc #0 - sta DY+1 + ldx #S.CB.Y1 + jsr CB.GetWndYCacheX ldy #S.OBJ.X2 - lda (ZPWNDPtr),y - sta CB.Cache+S.CB.X2 - iny - lda (ZPWNDPtr),y - sta CB.Cache+S.CB.X2+1 + ldx #S.CB.X2 + jsr CB.GetWndYCacheX jsr CB.Cache2CBBuf - lda #S.CB.CMD.FILLRECT - 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.SBARCOLOR - sta CB.Cache+S.CB.COLOR + lda PREFS.SBarColor + jsr CB.FillRectMonoA inc CB.Cache+S.CB.Y1 bne .1 + inc CB.Cache+S.CB.Y1+1 -.1 ldy #S.OBJ.Y2 - lda (ZPWNDPtr),y - sta CB.Cache+S.CB.Y2 - iny - lda (ZPWNDPtr),y - sta CB.Cache+S.CB.Y2+1 +.1 ldy #S.OBJ.Y2 + ldx #S.CB.Y2 + jsr CB.GetWndYCacheX jsr CB.Cache2CBBuf @@ -742,7 +717,7 @@ WND.DrawStatusBar ldx hSYSFON clc - jmp DRAW.YATextAtDXDY + jmp DRAW.YAText *-------------------------------------- WND.SetMBar >PULLW ZPPtr1 diff --git a/LIB/LIBGUI.S.txt b/LIB/LIBGUI.S.txt index 04ed7620..a0f773fc 100644 --- a/LIB/LIBGUI.S.txt +++ b/LIB/LIBGUI.S.txt @@ -85,9 +85,9 @@ ZPWNDPtr .BS 2 ZPMENUPtr .BS 2 ZPBMPtr .BS 2 +ZPCBBufPtr .BS 2 ZPPtr1 .BS 2 - - .BS 2 +ZPPtr2 .BS 2 DX .BS 2 DY .BS 2 @@ -102,7 +102,6 @@ CLIP.Line.P2 .BS 1 IY .BS 1 hCBBuf .BS 1 -ZPCBBufPtr .BS 2 .ED *-------------------------------------- @@ -127,7 +126,7 @@ CS.START cld .DA PTR.Hide .DA PTR.Show .DA PTR.Update - .DA MOU.ReadMouse + .DA $ffff MOU.ReadMouse .DA DRAW.Line .DA OBJ.SetProp .DA OBJ.GetProp diff --git a/ROOT/asmtest/TESTGUI.S.txt b/ROOT/asmtest/TESTGUI.S.txt index fefa8e8b..ea84d4ce 100644 --- a/ROOT/asmtest/TESTGUI.S.txt +++ b/ROOT/asmtest/TESTGUI.S.txt @@ -112,11 +112,6 @@ WND.Test >PUSHBI S.WND.F.RESIZE+S.WND.F.MOVE+S.WND.F.CLOSE+S.WND.F.MAX+S.WND.F. >PUSHB hWND >PUSHW L.WND.MBAR -* >LIBCALL hLIBGUI,LIBGUI.MBAR.New -* sta hMBAR - -* >PUSHB hWND -* >PUSHB hMBAR >LIBCALL hLIBGUI,LIBGUI.WND.SetMBar >PUSHB hWND