From d2fa55851048ef1a7ffe2a02abf9ba964989db33 Mon Sep 17 00:00:00 2001 From: burniouf Date: Thu, 20 Oct 2022 08:07:40 +0200 Subject: [PATCH] LIBGUI:reorg --- .Floppies/A2OSX.BUILD.po | Bin 33553920 -> 33553920 bytes LIB/LIBGUI.S.CB.txt | 144 +++++++++++++++++++++++++++++++++++++++ LIB/LIBGUI.S.DRAW.txt | 72 -------------------- LIB/LIBGUI.S.MENU.txt | 58 ++++++++-------- LIB/LIBGUI.S.MOU.txt | 8 +-- LIB/LIBGUI.S.SYSBAR.txt | 6 +- LIB/LIBGUI.S.WND.txt | 4 +- LIB/LIBGUI.S.txt | 64 +---------------- 8 files changed, 183 insertions(+), 173 deletions(-) create mode 100644 LIB/LIBGUI.S.CB.txt diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 31098df04e0f09b049c98ae09f35c461828ba845..31a9b1f34557c58eb90bd6a8e7d0a24fb44865c2 100644 GIT binary patch delta 18955 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 delta 20197 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�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 .1+1 + + ldx #S.CB-1 + +.1 lda $ffff,x SELF MODIFIED + sta CB.Cache,x + dex + bpl .1 + + rts +*-------------------------------------- +CB.GetBuf clc + + ldx hCBBuf + bne .9 + + >LDYAI 512 + >SYSCALL2 GetMem + bcs .9 + + stx hCBBuf + >STYA ZPCBPtr + >STYA ZPCBBufPtr + +.9 rts +*-------------------------------------- +CB.Cache2CBBuf + lda CB.Cache + lsr + tax + ldy CB.CmdLen-1,x + + ldx #0 + +.1 lda CB.Cache,x + sta (ZPCBBufPtr) + inc ZPCBBufPtr + bne .2 + + inc ZPCBBufPtr+1 + +.2 inx + dey + bpl .1 + + rts +*-------------------------------------- +CB.FlushBufToYA ldx hCBBuf + beq .8 + + pha + phy + + bit PTR.bVisible + bpl .1 + + jsr PTR.Hide.I + +.1 lda #0 + sta (ZPCBBufPtr) + + ply + pla + + jsr OBJ.GetInCache + +.2 lda (ZPCBPtr) + beq .7 + + >LDYA ZPCBPtr + jsr CB.GetInCache A = CB.CMD + + cmp #S.CB.CMD.DRAWTEXT2 + bne .4 + + lda #S.CB.CMD.DRAWTEXT+S.CB.CMD.OSD + sta CB.Cache+S.CB.CMD + jsr CB.GFXWrite + bcs .9 + + jsr CLIP.CB.Cache + bcs .3 + + jsr CB.GFXWrite + +.3 lda CB.Cache+S.CB.SrcPtr + >SYSCALL2 FreeStkObj + bra .5 + +.4 jsr CLIP.CB.Cache + bcs .5 + + jsr CB.GFXWrite + +.5 lda (ZPCBPtr) Get Cmd + lsr + tax + lda CB.CmdLen-1,x + sec +1 + adc ZPCBPtr + sta ZPCBPtr + bcc .2 + + inc ZPCBPtr+1 + bra .2 + +.7 lda hCBBuf + stz hCBBuf + >SYSCALL2 FreeMem + + bit PTR.bVisible + bpl .8 + + jmp PTR.Show.I + +.8 clc +.9 rts +*-------------------------------------- +CB.GFXWrite >PUSHB WND.Screen+S.OBJ.hPARENT + >PUSHBI IOCTL.WRITE + >PUSHW L.CB.Cache + >SYSCALL2 IOCTL + rts +*-------------------------------------- + + +*-------------------------------------- +MAN +SAVE usr/src/lib/libgui.s.cb +LOAD usr/src/lib/libgui.s +ASM diff --git a/LIB/LIBGUI.S.DRAW.txt b/LIB/LIBGUI.S.DRAW.txt index 3d2b5b37..42aeafe6 100644 --- a/LIB/LIBGUI.S.DRAW.txt +++ b/LIB/LIBGUI.S.DRAW.txt @@ -493,78 +493,6 @@ DRAW.AddP1YtoCBX sta CB.Cache+1,x rts *-------------------------------------- -DRAW.FlushBufToYA - ldx hCBBuf - beq .80 - - pha - phy - - bit PTR.bVisible - bpl .1 - - jsr PTR.Hide.I - -.1 lda #0 - sta (ZPCBBufPtr) - - ply - pla - - jsr OBJ.GetInCache - -.2 lda (ZPCBPtr) - beq .8 - - >LDYA ZPCBPtr - jsr CB.GetInCache A = CB.CMD - - cmp #S.CB.CMD.DRAWTEXT2 - bne .6 - - lda #S.CB.CMD.DRAWTEXT+S.CB.CMD.OSD - sta CB.Cache+S.CB.CMD - jsr CB.GFXWrite - bcs .9 - - jsr CLIP.CB.Cache - bcs .3 - - jsr CB.GFXWrite - -.3 lda CB.Cache+S.CB.SrcPtr - >SYSCALL2 FreeStkObj - bra .7 - -.6 jsr CLIP.CB.Cache - bcs .7 - - jsr CB.GFXWrite - -.7 lda (ZPCBPtr) Get Cmd - lsr - tax - lda CB.CmdLen-1,x - sec +1 - adc ZPCBPtr - sta ZPCBPtr - bcc .2 - - inc ZPCBPtr+1 - bra .2 - -.8 lda hCBBuf - stz hCBBuf - >SYSCALL2 FreeMem - - bit PTR.bVisible - bpl .80 - - jmp PTR.Show.I - -.80 clc -.9 rts -*-------------------------------------- MAN SAVE usr/src/lib/libgui.s.draw LOAD usr/src/lib/libgui.s diff --git a/LIB/LIBGUI.S.MENU.txt b/LIB/LIBGUI.S.MENU.txt index 97594f66..cbe7eadc 100644 --- a/LIB/LIBGUI.S.MENU.txt +++ b/LIB/LIBGUI.S.MENU.txt @@ -129,7 +129,7 @@ MENU.GetData lda ZPMENUPtr bne .2 inc ZPPtr1 skip 1 byte - bne .1 + bne .5 inc ZPPtr1+1 bra .5 @@ -183,7 +183,7 @@ MENU.GetData lda ZPMENUPtr lda #2 skip pICON jsr SkipAPtr1 -.5 ldy #S.MITEM.pTEXT + ldy #S.MITEM.pTEXT lda ZPPtr1 sta (ZPMENUPtr),y iny @@ -196,7 +196,7 @@ MENU.GetData lda ZPMENUPtr lda #0 sta (ZPMENUPtr),y - lda ZPMENUPtr +.5 lda ZPMENUPtr clc adc #S.MITEM sta ZPMENUPtr @@ -418,19 +418,16 @@ MENU.FindMItemByID .9 sec rts *-------------------------------------- -MENU.Enter jsr MENU.GETX1X2WDY +MENU.Enter jsr MENU.GetDXDYW jsr MENU.GetMItems .1 lda (ZPPtr1) beq .4 - lda (ZPPtr1) cmp #S.MITEM.T.SEP beq .2 - jsr MENU.ResetDX - lda DY Y1 sec adc SYSFON.H @@ -448,11 +445,12 @@ MENU.Enter jsr MENU.GETX1X2WDY bpl .2 eor #S.MITEM.S.SELECTED - sta (ZPPtr1),y + sta (ZPPtr1),y was selected before... jsr CB.GetBuf bcs .9 + jsr MENU.ResetX1Y1X2 jsr MENU.DrawMItem .2 jsr MENU.NextMItemDY @@ -461,29 +459,30 @@ MENU.Enter jsr MENU.GETX1X2WDY .3 ldy #S.MITEM.S lda (ZPPtr1),y bmi .8 already selected, nothing to do - + >DEBUG eor #S.MITEM.S.SELECTED sta (ZPPtr1),y jsr CB.GetBuf bcs .9 + jsr MENU.ResetX1Y1X2 jsr MENU.DrawMItem lda (ZPPtr1) cmp #S.MITEM.T.SUBMENU bne .1 - >LDYA L.WND.Screen - jsr DRAW.FlushBufToYA +* >LDYA L.WND.Screen +* jsr CB.FlushBufToYA - jsr MENU.NewSubMenu - bcs .9 +* jsr MENU.NewSubMenu +* bcs .9 bra .1 .4 >LDYA L.WND.Screen - jmp DRAW.FlushBufToYA + jmp CB.FlushBufToYA lda MSG+S.MSG.S bit #S.MSG.S.CLK @@ -546,22 +545,20 @@ MENU.Draw >SYSCALL2 GetMemPtr jsr MENU.DrawBorders - jsr MENU.GETX1X2WDY + jsr MENU.GetDXDYW jsr MENU.GetMItems .1 lda (ZPPtr1) beq .8 - jsr MENU.ResetDX + jsr MENU.ResetX1Y1X2 jsr MENU.DrawMItem jsr MENU.NextMItemDY bra .1 .8 >LDYA L.WND.Screen - jsr DRAW.FlushBufToYA - - >DEBUG + jsr CB.FlushBufToYA .9 rts *-------------------------------------- @@ -972,7 +969,7 @@ MENU.Destroy clc .8 clc rts *-------------------------------------- -MENU.GETX1X2WDY ldy #S.OBJ.X1 +MENU.GetDXDYW ldy #S.OBJ.X1 lda (ZPMENUPtr),y clc adc #1 @@ -992,14 +989,6 @@ MENU.GETX1X2WDY ldy #S.OBJ.X1 sbc #0 sta Counter+1 - lda DX - clc - adc Counter - sta CB.Cache+S.CB.X2 - lda DX+1 - adc Counter+1 - sta CB.Cache+S.CB.X2+1 - ldy #S.OBJ.Y1 lda (ZPMENUPtr),y clc @@ -1012,10 +1001,21 @@ MENU.GETX1X2WDY ldy #S.OBJ.X1 rts *-------------------------------------- -MENU.ResetDX lda DX +MENU.ResetX1Y1X2 + lda DX sta CB.Cache+S.CB.X1 + clc + adc Counter + sta CB.Cache+S.CB.X2 lda DX+1 sta CB.Cache+S.CB.X1+1 + adc Counter+1 + sta CB.Cache+S.CB.X2+1 + + lda DY + sta CB.Cache+S.CB.Y1 + lda DY+1 + sta CB.Cache+S.CB.Y1+1 rts *-------------------------------------- diff --git a/LIB/LIBGUI.S.MOU.txt b/LIB/LIBGUI.S.MOU.txt index efb2b6d9..47fe2e9b 100644 --- a/LIB/LIBGUI.S.MOU.txt +++ b/LIB/LIBGUI.S.MOU.txt @@ -121,11 +121,11 @@ MOU.CheckOverMenu * TODO:destroy from TOP to current, then enter current - inx - phx +* inx +* phx - jsr MENU.Destroy - bra .3 +* jsr MENU.Destroy +* bra .3 .7 jmp MENU.Enter diff --git a/LIB/LIBGUI.S.SYSBAR.txt b/LIB/LIBGUI.S.SYSBAR.txt index 0936d1ba..90307ae7 100644 --- a/LIB/LIBGUI.S.SYSBAR.txt +++ b/LIB/LIBGUI.S.SYSBAR.txt @@ -10,7 +10,7 @@ SYSBUT.Enter sec jsr SYSBAR.ShowSysBut >LDYA L.WND.SysBar - jsr DRAW.FlushBufToYA + jsr CB.FlushBufToYA >PUSHW L.MENU.Sys >PUSHW WND.SysBar+S.OBJ.X1 @@ -36,7 +36,7 @@ SYSBUT.Leave bit WND.SYSBAR.bSysBut >LDYA L.WND.SysBar - jmp DRAW.FlushBufToYA + jmp CB.FlushBufToYA .8 clc .9 rts @@ -52,7 +52,7 @@ SYSBAR.Show jsr CB.GetBuf >LDYA L.WND.SysBar - jmp DRAW.FlushBufToYA + jmp CB.FlushBufToYA .9 rts *-------------------------------------- diff --git a/LIB/LIBGUI.S.WND.txt b/LIB/LIBGUI.S.WND.txt index 21853e37..65ca9076 100644 --- a/LIB/LIBGUI.S.WND.txt +++ b/LIB/LIBGUI.S.WND.txt @@ -394,7 +394,7 @@ WND.Show2 jsr CB.GetBuf >LDYA L.WND.Desktop - jsr DRAW.FlushBufToYA + jsr CB.FlushBufToYA lda WND.hWND pha @@ -505,7 +505,7 @@ WND.fPaint >SYSCALL2 GetMemPtr jsr CB.Cache2CBBuf .8 >LDYA L.WND.Desktop - jmp DRAW.FlushBufToYA + jmp CB.FlushBufToYA *-------------------------------------- WND.ShowBorders sta IY diff --git a/LIB/LIBGUI.S.txt b/LIB/LIBGUI.S.txt index ef686f26..1efbb76a 100644 --- a/LIB/LIBGUI.S.txt +++ b/LIB/LIBGUI.S.txt @@ -240,69 +240,6 @@ LIB.UNLOAD dec LibCount .8 clc rts *-------------------------------------- -CB.InitCacheA sta CB.Cache+S.CB.CMD -*-------------------------------------- -CB.ClearCache ldx #S.CB-1 - -.1 stz CB.Cache,x - dex - bne .1 - - rts -*-------------------------------------- -CB.GetInCache >STYA .1+1 - - ldx #S.CB-1 - -.1 lda $ffff,x SELF MODIFIED - sta CB.Cache,x - dex - bpl .1 - - rts -*-------------------------------------- -CB.GetBuf clc - - ldx hCBBuf - bne .9 - - >LDYAI 512 - >SYSCALL2 GetMem - bcs .9 - - stx hCBBuf - >STYA ZPCBPtr - >STYA ZPCBBufPtr - -.9 rts -*-------------------------------------- -CB.Cache2CBBuf - lda CB.Cache - lsr - tax - ldy CB.CmdLen-1,x - - ldx #0 - -.1 lda CB.Cache,x - sta (ZPCBBufPtr) - inc ZPCBBufPtr - bne .2 - - inc ZPCBBufPtr+1 - -.2 inx - dey - bpl .1 - - rts -*-------------------------------------- -CB.GFXWrite >PUSHB WND.Screen+S.OBJ.hPARENT - >PUSHBI IOCTL.WRITE - >PUSHW L.CB.Cache - >SYSCALL2 IOCTL - rts -*-------------------------------------- SkipAPtr1 clc adc ZPPtr1 sta ZPPtr1 @@ -330,6 +267,7 @@ SkipStrZPtr1 ldy #$ff *-------------------------------------- .INB usr/src/lib/libgui.s.bm .INB usr/src/lib/libgui.s.but + .INB usr/src/lib/libgui.s.cb .INB usr/src/lib/libgui.s.clip .INB usr/src/lib/libgui.s.cur .INB usr/src/lib/libgui.s.draw