Apple-2-SW/A2osX
1
0
Fork 0
mirror of https://github.com/A2osX/A2osX.git synced 2025-02-16 18:30:26 +00:00
Code Issues Projects Releases Wiki Activity

Kernel 0.9.1 : GUI, Clipping...BugFix

Browse Source
This commit is contained in:
Rémy GIBERT 2017-12-06 08:28:30 +01:00
parent 045e1fe069
commit f96a9855c0
4 changed files with 22 additions and 12 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.

BIN
.Floppies/A2OSX.SRC.po
View File

Binary file not shown.

3
LIB/LIBGUI.S.CLIP.txt
View File

@ -41,7 +41,7 @@ CLIP.BitBlt lda CB.Cache+S.CB.DstX
>SCMPAX GC.Cache+S.GC.X1 >SCMPAX GC.Cache+S.GC.X1
bpl .1 DestX Inside X1-X2, go check if X1+W fit in 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.... lda GC.Cache+S.GC.X1 Compute D....
sec sec
@ -101,6 +101,7 @@ CLIP.BitBlt.Y lda CB.Cache+S.CB.DstY
pha pha
>SCMPAX GC.Cache+S.GC.Y2 DestY after Y2....exit >SCMPAX GC.Cache+S.GC.Y2 DestY after Y2....exit
bmi .10 bmi .10
pla
sec sec
rts rts

31
SBIN/GUI.S.txt
View File

@ -111,16 +111,16 @@ CS.RUN lda A2osX.ASCREEN GUI screen active ?
.1 bit #S.MOUSE.S.CLK .1 bit #S.MOUSE.S.CLK
beq .4 beq .4
* >LDA.G CUR.T >LDA.G CUR.T
* inc inc
* inc inc
* cmp #CUR.T.WAIT+2 cmp #CUR.T.WAIT+2
* bne .2 bne .2
*
* lda #CUR.T.ARROW lda #CUR.T.ARROW
*
*.2 >STA.G CUR.T .2 >STA.G CUR.T
* >LIBCALL hLIBGUI,LIBGUI.SetCursor.A >LIBCALL hLIBGUI,LIBGUI.SetCursor.A
lda MouseData+S.MOUSE.X1 lda MouseData+S.MOUSE.X1
sta CB.BitBlt+S.CB.DstX sta CB.BitBlt+S.CB.DstX
@ -183,12 +183,21 @@ MouseData .BS S.MOUSE
CB.Rect .DA #S.CB.CMD.FILLRECT CB.Rect .DA #S.CB.CMD.FILLRECT
.DA #S.CB.OP.SET .DA #S.CB.OP.SET
.DA #S.CB.MODE.C16 .DA #S.CB.MODE.C16
.DA #2 .DA #1
.DA 0 X1 .DA 0 X1
.DA 0 Y1 .DA 0 Y1
.DA 559 X2 .DA 559 X2
.DA 191 Y2 .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 .DA #0
*-------------------------------------- *--------------------------------------
CB.BitBlt .DA #S.CB.CMD.BITBLT CB.BitBlt .DA #S.CB.CMD.BITBLT