Apple-2-SW/A2osX
1
0
Fork 0
mirror of https://github.com/A2osX/A2osX.git synced 2024-10-31 23:09:33 +00:00
Code Issues Projects Releases Wiki Activity

LIBGUI:more bugs added :-)

Browse Source
This commit is contained in:
burniouf 2022-11-03 17:21:26 +01:00
parent c481b84d0b
commit 50db74891f
5 changed files with 37 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.Floppies/A2OSX.BUILD.po
View File

Binary file not shown.

4
LIB/LIBGUI.S.CB.txt
View File

@ -153,6 +153,10 @@ CB.FlushBufToYA jsr CLIP.GetRect
.8 clc .8 clc
.9 rts .9 rts
*-------------------------------------- *--------------------------------------
CB.GFXWritePtr jsr PTR.Disable
jsr CB.GFXWrite
jmp PTR.Enable
*--------------------------------------
CB.GFXWrite >PUSHB WND.Screen+S.OBJ.hPARENT CB.GFXWrite >PUSHB WND.Screen+S.OBJ.hPARENT
>PUSHBI IOCTL.WRITE >PUSHBI IOCTL.WRITE
>PUSHW L.CB.Cache >PUSHW L.CB.Cache

19
LIB/LIBGUI.S.DRAW.txt
View File

@ -54,7 +54,7 @@ DRAW.Line jsr DRAW.PullY2X2Y1X1
jsr CLIP.CB.Cache jsr CLIP.CB.Cache
bcs .8 bcs .8
jsr CB.GFXWrite jmp CB.GFXWrite
.8 clc .8 clc
rts rts
@ -67,6 +67,8 @@ DRAW.Line jsr DRAW.PullY2X2Y1X1
* jsr CLIP.Line * jsr CLIP.Line
* bcs .8 * bcs .8
jsr PTR.Disable
lda #S.CB.CMD.SETPIXEL lda #S.CB.CMD.SETPIXEL
sta CB.Cache+S.CB.CMD sta CB.Cache+S.CB.CMD
jsr CB.GFXWrite jsr CB.GFXWrite
@ -108,8 +110,7 @@ DRAW.Line.IncXY lda DX DX=DY
jsr CB.GFXWrite jsr CB.GFXWrite
bra .1 bra .1
.8 clc .8 jmp PTR.Enable
rts
*-------------------------------------- *--------------------------------------
DRAW.Line.IncY lda DY DRAW.Line.IncY lda DY
eor #$ff eor #$ff
@ -185,8 +186,7 @@ DRAW.Line.IncY lda DY
jsr CB.GFXWrite jsr CB.GFXWrite
bra .1 bra .1
.8 clc .8 jmp PTR.Enable
rts
*-------------------------------------- *--------------------------------------
DRAW.Line.IncX lda DX DRAW.Line.IncX lda DX
eor #$ff eor #$ff
@ -264,8 +264,7 @@ DRAW.Line.IncX lda DX
.6 jsr CB.GFXWrite .6 jsr CB.GFXWrite
bra .1 bra .1
.8 clc .8 jmp PTR.Enable
rts
*-------------------------------------- *--------------------------------------
* fill (short int hWND, short int OP, short int COLOR, int X1, int Y1, int X2, int Y2) * fill (short int hWND, short int OP, short int COLOR, int X1, int Y1, int X2, int Y2)
*-------------------------------------- *--------------------------------------
@ -282,7 +281,7 @@ DRAW.Fill jsr DRAW.PullY2X2Y1X1
jsr CLIP.CB.Cache jsr CLIP.CB.Cache
bcs .8 bcs .8
jmp CB.GFXWrite jmp CB.GFXWritePtr
.8 clc .8 clc
rts rts
@ -304,7 +303,7 @@ DRAW.BitMap lda #S.CB.CMD.BITBLT
jsr CLIP.CB.Cache jsr CLIP.CB.Cache
bcs .8 bcs .8
jmp CB.GFXWrite jmp CB.GFXWritePtr
.8 clc .8 clc
rts rts
@ -326,7 +325,7 @@ DRAW.Text lda #S.CB.CMD.DRAWTEXT2
jsr CLIP.CB.Cache jsr CLIP.CB.Cache
bcs .8 bcs .8
jmp CB.GFXWrite jmp CB.GFXWritePtr
.8 clc .8 clc
rts rts

5
LIB/LIBGUI.S.MENU.txt
View File

@ -912,12 +912,9 @@ MENU.Destroy clc
php php
bit PTR.bVisible
bpl .1
jsr PTR.Disable jsr PTR.Disable
.1 lda #S.CB.CMD.BITBLT lda #S.CB.CMD.BITBLT
jsr CB.InitCacheA jsr CB.InitCacheA
lda #S.CB.OP.RESTORE lda #S.CB.OP.RESTORE

63
LIB/LIBGUI.S.PTR.txt
View File

@ -16,12 +16,9 @@ PTR.Update lda PTR.T
*-------------------------------------- *--------------------------------------
PTR.Set sta PTR.T PTR.Set sta PTR.T
lda PTR.bVisible jsr PTR.Disable
bpl .1
jsr PTR.Hide.I ldx PTR.T
.1 ldx PTR.T
lda L.Cursors,x lda L.Cursors,x
sta CB.PTR+S.CB.SrcPtr sta CB.PTR+S.CB.SrcPtr
sta ZPPtr1 sta ZPPtr1
@ -73,8 +70,7 @@ PTR.Set sta PTR.T
sta CB.PTR+S.CB.Y2 sta CB.PTR+S.CB.Y2
stx CB.PTR+S.CB.Y2+1 stx CB.PTR+S.CB.Y2+1
lda PTR.bVisible bra PTR.Enable
bmi PTR.Show.I
PTR.Set.RTS rts PTR.Set.RTS rts
*-------------------------------------- *--------------------------------------
@ -92,18 +88,6 @@ PTR.SetPos >PULLW ZPPtr1
sta PTR.Pos,y sta PTR.Pos,y
dey dey
bpl .2 bpl .2
lda PTR.bVisible
bmi PTR.Show.I
clc
rts
*--------------------------------------
PTR.Disable bit PTR.bVisible
bmi PTR.Hide.I
clc
rts
*-------------------------------------- *--------------------------------------
PTR.Enable bit PTR.bVisible PTR.Enable bit PTR.bVisible
bmi PTR.Show.I bmi PTR.Show.I
@ -111,29 +95,25 @@ PTR.Enable bit PTR.bVisible
clc clc
rts rts
*-------------------------------------- *--------------------------------------
PTR.Hide lda PTR.bVisible PTR.Disable bit PTR.bVisible
bpl .8 bmi PTR.Hide.I
stz PTR.bVisible
bra PTR.Hide.I
.8 clc PTR.Disable.8 clc
rts rts
*-------------------------------------- *--------------------------------------
PTR.Show lda PTR.bVisible PTR.Hide lda PTR.bVisible
bmi .8 bpl PTR.Disable.8
dec PTR.bVisible stz PTR.bVisible
bra PTR.Show.I
.8 clc
rts
*-------------------------------------- *--------------------------------------
PTR.Hide.I lda #S.CB.OP.RESTORE PTR.Hide.I lda #S.CB.OP.RESTORE
bra PTR.Draw.I bra PTR.Draw.I
*-------------------------------------- *--------------------------------------
PTR.Show lda PTR.bVisible
bmi PTR.Disable.8
dec PTR.bVisible
*--------------------------------------
PTR.Show.I ldx PTR.T PTR.Show.I ldx PTR.T
lda PTR.Pos+S.POINT.X lda PTR.Pos+S.POINT.X
sec sec
@ -154,19 +134,22 @@ PTR.Show.I ldx PTR.T
sta CB.PTR+S.CB.Y1+1 sta CB.PTR+S.CB.Y1+1
lda #S.CB.OP.ORA+S.CB.OP.MASK+S.CB.OP.SAVE lda #S.CB.OP.ORA+S.CB.OP.MASK+S.CB.OP.SAVE
*--------------------------------------
PTR.Draw.I sta CB.PTR+S.CB.OP PTR.Draw.I sta CB.PTR+S.CB.OP
>LDYA L.WND.Screen >LDYA L.WND.Screen
jsr CLIP.GetRect jsr CLIP.GetRect
>LDYA L.CB.PTR * >LDYA L.CB.PTR
jsr CB.GetInCache * jsr CB.GetInCache
jsr CLIP.CB.Cache * jsr CLIP.CB.Cache
bcs .8 * bcs .8
jsr CB.GFXWrite >PUSHB WND.Screen+S.OBJ.hPARENT
>PUSHBI IOCTL.WRITE
>PUSHW L.CB.PTR
>SYSCALL2 IOCTL
.8 clc .8 clc