diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 979fa32d..4cb7d288 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po index 091b4872..3017f451 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/LIB/LIBGUI.S.CLIP.txt b/LIB/LIBGUI.S.CLIP.txt index 039433a5..e0d3085d 100644 --- a/LIB/LIBGUI.S.CLIP.txt +++ b/LIB/LIBGUI.S.CLIP.txt @@ -41,7 +41,7 @@ CLIP.BitBlt lda CB.Cache+S.CB.DstX >SCMPAX GC.Cache+S.GC.X1 bpl .1 DestX Inside X1-X2, go check if X1+W fit in -* S.CB.DstX before S.GC.X1: D=S.GC.X1-S.CB.DstX, S.CB.SrcW-=D, S.CB.DstX=0, S.CB.X1+=D +* S.CB.DstX before S.GC.X1: D=S.GC.X1-S.CB.DstX, S.CB.SrcW-=D, S.CB.DstX=+=D, S.CB.X1+=D lda GC.Cache+S.GC.X1 Compute D.... sec @@ -101,6 +101,7 @@ CLIP.BitBlt.Y lda CB.Cache+S.CB.DstY pha >SCMPAX GC.Cache+S.GC.Y2 DestY after Y2....exit bmi .10 + pla sec rts diff --git a/SBIN/GUI.S.txt b/SBIN/GUI.S.txt index 7b7c60a8..23ef978e 100644 --- a/SBIN/GUI.S.txt +++ b/SBIN/GUI.S.txt @@ -111,16 +111,16 @@ CS.RUN lda A2osX.ASCREEN GUI screen active ? .1 bit #S.MOUSE.S.CLK beq .4 -* >LDA.G CUR.T -* inc -* inc -* cmp #CUR.T.WAIT+2 -* bne .2 -* -* lda #CUR.T.ARROW -* -*.2 >STA.G CUR.T -* >LIBCALL hLIBGUI,LIBGUI.SetCursor.A + >LDA.G CUR.T + inc + inc + cmp #CUR.T.WAIT+2 + bne .2 + + lda #CUR.T.ARROW + +.2 >STA.G CUR.T + >LIBCALL hLIBGUI,LIBGUI.SetCursor.A lda MouseData+S.MOUSE.X1 sta CB.BitBlt+S.CB.DstX @@ -183,12 +183,21 @@ MouseData .BS S.MOUSE CB.Rect .DA #S.CB.CMD.FILLRECT .DA #S.CB.OP.SET .DA #S.CB.MODE.C16 - .DA #2 + .DA #1 .DA 0 X1 .DA 0 Y1 .DA 559 X2 .DA 191 Y2 + .DA #S.CB.CMD.FILLRECT + .DA #S.CB.OP.SET + .DA #S.CB.MODE.C16 + .DA #0 + .DA 50 X1 + .DA 50 Y1 + .DA 449 X2 + .DA 149 Y2 + .DA #0 *-------------------------------------- CB.BitBlt .DA #S.CB.CMD.BITBLT