Compare commits

...

3 Commits

Author SHA1 Message Date
burniouf fee113dff1 KERNEL: fix for PAKME 2024-01-01 13:27:43 +01:00
burniouf b531907ddd Merge branch 'master' of https://github.com/A2osX/A2osX 2024-01-01 12:25:31 +01:00
burniouf 9abd365415 LIBTUI: DLG fixes 2024-01-01 12:25:12 +01:00
6 changed files with 15 additions and 13 deletions

Binary file not shown.

View File

@ -84,7 +84,7 @@ S.OBJ.pVar .EQ 26
*-------------------------------------- *--------------------------------------
S.OBJ.Childs .EQ 32 S.OBJ.Childs .EQ 32
* *
S.OBJ .EQ 48 S.OBJ .EQ 64
*-------------------------------------- *--------------------------------------
S.SCRN .EQ S.OBJ S.SCRN .EQ S.OBJ
*-------------------------------------- *--------------------------------------

View File

@ -24,17 +24,19 @@ DLG.New lda #S.OBJ.T.DLG
>SYSCALL2 GetMemPtr >SYSCALL2 GetMemPtr
>STYA ZPPtr2 >STYA ZPPtr2
ldy #S.OBJ.W ldy #S.CTX.W
lda (ZPPtr2),y lda (ZPPtr2),y
sec sec
ldy #S.OBJ.W
sbc (ZPObjPtr),y sbc (ZPObjPtr),y
lsr lsr
ldy #S.OBJ.X1 ldy #S.OBJ.X1
sta (ZPObjPtr),y sta (ZPObjPtr),y
ldy #S.OBJ.H ldy #S.CTX.H
lda (ZPPtr2),y lda (ZPPtr2),y
sec sec
ldy #S.OBJ.H
sbc (ZPObjPtr),y sbc (ZPObjPtr),y
lsr lsr
ldy #S.OBJ.Y1 ldy #S.OBJ.Y1

View File

@ -182,7 +182,6 @@ OBJ.SetX2Y2 ldy #S.OBJ.X1
*-------------------------------------- *--------------------------------------
OBJ.Exec >PUSHA hOBJ OBJ.Exec >PUSHA hOBJ
jsr LIB.GetOBJ jsr LIB.GetOBJ
jsr LIB.GetCTX jsr LIB.GetCTX
.1 jsr IO.GetC .1 jsr IO.GetC

View File

@ -297,10 +297,11 @@ LIB.GetCTX >LDYA ZPObjPtr
>STYA ZPCtxPtr >STYA ZPCtxPtr
.1 lda (ZPCtxPtr) .1 lda (ZPCtxPtr)
* cmp #S.OBJ.T.SCRN cmp #S.OBJ.T.DLG+1
beq .8 bcc .8
jsr .8 jsr .8
bra .1 bra .1
.8 ldy #S.OBJ.hParent .8 ldy #S.OBJ.hParent

View File

@ -27,6 +27,13 @@ MAIN.ORG .EQ $1000
A2osX.Unpak >STYA ZPOutBufPtr A2osX.Unpak >STYA ZPOutBufPtr
.INB usr/src/shared/x.unpak.s .INB usr/src/shared/x.unpak.s
PAKME.GP .DA GP
PAKME.MAIN .DA MAIN
PAKME.AUX .DA AUX
PAKME.D1 .DA D1
PAKME.D2 .DA D2
PAKME.E0 .DA E0
GP .DA #0 GP .DA #0
.DA GP.S .DA GP.S
@ -134,13 +141,6 @@ DevMgr.FreeMem .EQ *
E0.S .EQ *-E0.B E0.S .EQ *-E0.B
PAKME.GP .DA GP
PAKME.MAIN .DA MAIN
PAKME.AUX .DA AUX
PAKME.D1 .DA D1
PAKME.D2 .DA D2
PAKME.E0 .DA E0
.AS "PAKME" TAG .AS "PAKME" TAG
.DA $2000 BIN ORG .DA $2000 BIN ORG
.DA #6 Chunk Count .DA #6 Chunk Count