LIBGUI:more bugfix

This commit is contained in:
burniouf 2022-10-26 17:20:15 +02:00
parent 658749b18f
commit 0db3bf5bf0
4 changed files with 8 additions and 46 deletions

View File

@ -1,7 +1,7 @@
NEW NEW
AUTO 3,1 AUTO 3,1
*-------------------------------------- *--------------------------------------
* MsgBox(hWND, pTITLE, pTEXT, pBM, iButtons) * iButton MsgBox(hWND, pTITLE, pTEXT, pBM, iButtons)
*-------------------------------------- *--------------------------------------
*-------------------------------------- *--------------------------------------

View File

@ -59,34 +59,6 @@ MOU.Quit lda hDevMouse
.8 clc .8 clc
rts rts
*-------------------------------------- *--------------------------------------
MOU.ReadMouse.OLD >PULLW ZPPtr1 pS.XY
lda A2osX.ASCREEN GUI screen active ?
cmp DCB.GFX+S.DCB.GFX.DEVID
bne .9 no, exit....
lda hDevMouse
beq .99 CS
>PUSHA
>PUSHBI IOCTL.READ
>PUSHW L.XY
>SYSCALL2 IOCTL
bcs .99
ldy #S.XY-1
.1 lda XY,y
sta (ZPPtr1),y
dey
bpl .1
* clc
rts
.9 sec
.99 rts
*--------------------------------------
MOU.CheckOverMenu MOU.CheckOverMenu
.1 ldx MENU.Stack.Cnt .1 ldx MENU.Stack.Cnt
beq .9 beq .9

View File

@ -5,39 +5,30 @@ MSG.Get stz MSG+S.MSG.T
lda A2osX.ASCREEN GUI screen active ? lda A2osX.ASCREEN GUI screen active ?
cmp DCB.GFX+S.DCB.GFX.DEVID cmp DCB.GFX+S.DCB.GFX.DEVID
beq .10 beq .1
jmp .9 no, exit.... jmp .9 no, exit....
.10 lda hDevMouse .1 lda hDevMouse
beq .5 beq .5
>PUSHA >PUSHA
>PUSHBI IOCTL.READ >PUSHBI IOCTL.READ
>PUSHW L.XY >PUSHW L.MSG.XY
>SYSCALL2 IOCTL >SYSCALL2 IOCTL
bcs .5 bcs .5
ldx #S.XY-1
ldy #S.MSG-1
.1 lda XY,x
sta MSG,y
dey
dex
bpl .1
lda #S.MSG.T.XY lda #S.MSG.T.XY
sta MSG+S.MSG.T sta MSG+S.MSG.T
lda XY+S.XY.S lda MSG+S.MSG.S
bit #S.MSG.S.MOVE bit #S.MSG.S.MOVE
beq .2 beq .2
>PUSHW L.XY >PUSHW L.MSG.XY
jsr PTR.SetPos jsr PTR.SetPos
lda XY+S.XY.S lda MSG+S.MSG.S
.2 bit #S.MSG.S.MOVE+S.MSG.S.CLK .2 bit #S.MSG.S.MOVE+S.MSG.S.CLK
beq .5 beq .5

View File

@ -147,8 +147,8 @@ L.SYSX7B .DA SYSX7B
L.IOCTL .DA IOCTL L.IOCTL .DA IOCTL
L.DCB.GFX .DA DCB.GFX L.DCB.GFX .DA DCB.GFX
L.MouseClamp .DA MouseClamp L.MouseClamp .DA MouseClamp
L.XY .DA XY
L.MSG .DA MSG L.MSG .DA MSG
L.MSG.XY .DA MSG+S.MSG.X1
L.CB.PTR .DA CB.PTR L.CB.PTR .DA CB.PTR
L.CB.Cache .DA CB.Cache L.CB.Cache .DA CB.Cache
L.OBJ.Cache .DA OBJ.Cache L.OBJ.Cache .DA OBJ.Cache
@ -330,7 +330,6 @@ IOCTL .BS S.IOCTL
DCB.GFX .BS S.DCB.GFX DCB.GFX .BS S.DCB.GFX
*-------------------------------------- *--------------------------------------
MouseClamp .BS 8 MouseClamp .BS 8
XY .BS S.XY
MSG .BS S.MSG MSG .BS S.MSG
*-------------------------------------- *--------------------------------------
CB.PTR .DA #S.CB.CMD.BITBLT CB.PTR .DA #S.CB.CMD.BITBLT