diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 73b0c463..e98c96bb 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 1a795150..37a4c249 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/INC/LIBGUI.I.txt b/INC/LIBGUI.I.txt index 05e5d161..29f09d10 100644 --- a/INC/LIBGUI.I.txt +++ b/INC/LIBGUI.I.txt @@ -63,14 +63,14 @@ S.CB.X1 .EQ 4 xPIXEL,xLINE,FILLRECT,BITBLT,GETRECTBUFSIZE,DRAWLINE S.CB.Y1 .EQ 6 xPIXEL,xLINE,FILLRECT,BITBLT,GETRECTBUFSIZE,DRAWLINE S.CB.X2 .EQ 8 VLINE,FILLRECT,DRAWLINE S.CB.Y2 .EQ 10 HLINE,FILLRECT,DRAWLINE -S.CB.SrcW .EQ 12 BITBLT,GETRECTBUFSIZE -S.CB.SrcH .EQ 14 BITBLT,GETRECTBUFSIZE -S.CB.DstX .EQ 16 BITBLT,DRAWTEXT -S.CB.DstY .EQ 18 BITBLT,DRAWTEXT -S.CB.SrcPtr .EQ 20 BITBLT,DRAWTEXT -S.CB.DstPtr .EQ 22 BITBLT +S.CB.SrcW .EQ 8 BITBLT,GETRECTBUFSIZE +S.CB.SrcH .EQ 10 BITBLT,GETRECTBUFSIZE +S.CB.DstX .EQ 12 BITBLT,DRAWTEXT +S.CB.DstY .EQ 14 BITBLT,DRAWTEXT +S.CB.SrcPtr .EQ 16 BITBLT,DRAWTEXT +S.CB.DstPtr .EQ 18 BITBLT * -S.CB .EQ 24 +S.CB .EQ 20 *-------------------------------------- CUR.T.ARROW .EQ 0 CUR.T.RESIZEX .EQ 2 diff --git a/SBIN/GUI.S.txt b/SBIN/GUI.S.txt index 5ba17b7d..74db5877 100644 --- a/SBIN/GUI.S.txt +++ b/SBIN/GUI.S.txt @@ -40,6 +40,7 @@ L.SYSFONT .DA SYSFONT L.Filename .DA Filename L.MouseData .DA MouseData L.CB.Rect .DA CB.Rect +L.BM.Apple .DA BM.Apple L.CB.BitBlt .DA CB.BitBlt L.CB.DrawLine .DA CB.DrawLine L.GC.Clip .DA GC.Clip @@ -154,6 +155,8 @@ Destop.Paint >LIBCALL hLIBGUI,LIBGUI.HideCursor >LIBCALL hLIBGUI,LIBGUI.GetScreenGC >PUSHYA + >LDYA L.BM.Apple + >STYA CB.Apple+S.CB.SrcPtr >PUSHW L.CB.Rect >LIBCALL hLIBGUI,LIBGUI.Draw @@ -198,7 +201,37 @@ CB.Rect .DA #S.CB.CMD.FILLRECT .DA 519 X2 .DA 151 Y2 +*-------------------------------------- +CB.Apple .DA #S.CB.CMD.BITBLT + .DA #S.CB.OP.SET + .DA #S.CB.MODE.C16 .DA #0 + .DA 0 X1 + .DA 0 Y1 + .DA 16 W + .DA 9 H + .DA 28 DestX + .DA 170 DestY + .BS 2 SrcPtr + .DA 0 + + .DA #0 +*-------------------------------------- +BM.Apple .DA #S.BM.F.BBP4 + .DA #2 RowBytes + .DA 16 W + .DA 9 H + .DA 0 + + .HS FFF6 green (8) + .HS 6FF6 green (8) + .HS 6666 green (8) + .HS EEEE yellow (15) + .HS CCFC orange (14) + .HS 88F8 magenta (10) + .HS 9999 violet (11) + .HS 1111 Dark blue (4) + .HS 1FF1 Dark blue (4) *-------------------------------------- CB.BitBlt .DA #S.CB.CMD.BITBLT .DA #S.CB.OP.SET