From 0db3bf5bf03856211406ba103a6d5c5d8da9d2bc Mon Sep 17 00:00:00 2001 From: burniouf Date: Wed, 26 Oct 2022 17:20:15 +0200 Subject: [PATCH] LIBGUI:more bugfix --- LIB/LIBGUI.S.MBOX.txt | 2 +- LIB/LIBGUI.S.MOU.txt | 28 ---------------------------- LIB/LIBGUI.S.MSG.txt | 21 ++++++--------------- LIB/LIBGUI.S.txt | 3 +-- 4 files changed, 8 insertions(+), 46 deletions(-) diff --git a/LIB/LIBGUI.S.MBOX.txt b/LIB/LIBGUI.S.MBOX.txt index 10c77c32..5c04783c 100644 --- a/LIB/LIBGUI.S.MBOX.txt +++ b/LIB/LIBGUI.S.MBOX.txt @@ -1,7 +1,7 @@ NEW AUTO 3,1 *-------------------------------------- -* MsgBox(hWND, pTITLE, pTEXT, pBM, iButtons) +* iButton MsgBox(hWND, pTITLE, pTEXT, pBM, iButtons) *-------------------------------------- *-------------------------------------- diff --git a/LIB/LIBGUI.S.MOU.txt b/LIB/LIBGUI.S.MOU.txt index b7f6a521..2a248c0e 100644 --- a/LIB/LIBGUI.S.MOU.txt +++ b/LIB/LIBGUI.S.MOU.txt @@ -59,34 +59,6 @@ MOU.Quit lda hDevMouse .8 clc 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 .1 ldx MENU.Stack.Cnt beq .9 diff --git a/LIB/LIBGUI.S.MSG.txt b/LIB/LIBGUI.S.MSG.txt index a4d1660b..49de1e7a 100644 --- a/LIB/LIBGUI.S.MSG.txt +++ b/LIB/LIBGUI.S.MSG.txt @@ -5,39 +5,30 @@ MSG.Get stz MSG+S.MSG.T lda A2osX.ASCREEN GUI screen active ? cmp DCB.GFX+S.DCB.GFX.DEVID - beq .10 + beq .1 jmp .9 no, exit.... -.10 lda hDevMouse +.1 lda hDevMouse beq .5 >PUSHA >PUSHBI IOCTL.READ - >PUSHW L.XY + >PUSHW L.MSG.XY >SYSCALL2 IOCTL 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 sta MSG+S.MSG.T - lda XY+S.XY.S + lda MSG+S.MSG.S bit #S.MSG.S.MOVE beq .2 - >PUSHW L.XY + >PUSHW L.MSG.XY jsr PTR.SetPos - lda XY+S.XY.S + lda MSG+S.MSG.S .2 bit #S.MSG.S.MOVE+S.MSG.S.CLK beq .5 diff --git a/LIB/LIBGUI.S.txt b/LIB/LIBGUI.S.txt index a0f773fc..f8b3f99f 100644 --- a/LIB/LIBGUI.S.txt +++ b/LIB/LIBGUI.S.txt @@ -147,8 +147,8 @@ L.SYSX7B .DA SYSX7B L.IOCTL .DA IOCTL L.DCB.GFX .DA DCB.GFX L.MouseClamp .DA MouseClamp -L.XY .DA XY L.MSG .DA MSG +L.MSG.XY .DA MSG+S.MSG.X1 L.CB.PTR .DA CB.PTR L.CB.Cache .DA CB.Cache L.OBJ.Cache .DA OBJ.Cache @@ -330,7 +330,6 @@ IOCTL .BS S.IOCTL DCB.GFX .BS S.DCB.GFX *-------------------------------------- MouseClamp .BS 8 -XY .BS S.XY MSG .BS S.MSG *-------------------------------------- CB.PTR .DA #S.CB.CMD.BITBLT