From 3a31ecede6dbc44839525703745735b288cbb4d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GIBERT?= Date: Wed, 6 Dec 2017 17:26:36 +0100 Subject: [PATCH] Kernel 0.9.1 : LibGui, Clipping....BugFix --- .Floppies/A2OSX.BUILD.po | Bin 819200 -> 819200 bytes .Floppies/A2OSX.SRC.po | Bin 819200 -> 819200 bytes DRV/DHGR.DRV.S.LINE.txt | 13 ++--- INC/LIBGUI.I.txt | 4 +- LIB/LIBGUI.G.CUR.txt | 98 ++++++++++++++++++++++++++++--- LIB/LIBGUI.S.CLIP.txt | 2 +- LIB/LIBGUI.S.CUR.txt | 1 - LIB/LIBGUI.S.txt | 121 +++++++++++++-------------------------- SBIN/GUI.S.txt | 16 +++--- 9 files changed, 144 insertions(+), 111 deletions(-) diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 4cb7d288531c76490a4d497a43c381e80042ac37..4d8ce947b1c0b9042f48a11ecfb92bdfa65b2b0c 100644 GIT binary patch delta 3485 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 WoSATD!I=%`GB}r?=2~**UH=7C0H5gq delta 3425 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 delta 10344 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 ODlwj{I49p!CjK9LDYA CB.Cache+S.CB.X1 jsr LBUF.SetBounds1YA - >LDYA CB.Cache+S.CB.X2 jsr LBUF.SetBounds2YA - lda CB.Cache+S.CB.MODE - bit #S.CB.MODE.C16 - bne HLINE.C16 - - ldy CB.Cache+S.CB.COLOR + lda CB.Cache+S.CB.COLOR beq .1 - ldy #%01111111 + lda #%01111111 .1 ldx LBUF.C1 -.2 tya - sta LBUF.DATA,x +.2 sta LBUF.DATA,x cpx LBUF.C2 inx bcc .2 ldy CB.Cache+S.CB.Y1 + >DEBUG jmp LBUF.DrawAtY HLINE.C16 lda CB.Cache+S.CB.X1 diff --git a/INC/LIBGUI.I.txt b/INC/LIBGUI.I.txt index 83bd6e8b..fb925284 100644 --- a/INC/LIBGUI.I.txt +++ b/INC/LIBGUI.I.txt @@ -25,10 +25,8 @@ S.GC.X1 .EQ 4 S.GC.Y1 .EQ 6 S.GC.X2 .EQ 8 S.GC.Y2 .EQ 10 -S.GC.W .EQ 12 -S.GC.H .EQ 14 * -S.GC .EQ 16 +S.GC .EQ 12 *-------------------------------------- S.CB.CMD .EQ 0 S.CB.CMD.SETPIXEL .EQ 0 diff --git a/LIB/LIBGUI.G.CUR.txt b/LIB/LIBGUI.G.CUR.txt index b0ebcb70..7d7b74c4 100644 --- a/LIB/LIBGUI.G.CUR.txt +++ b/LIB/LIBGUI.G.CUR.txt @@ -14,8 +14,8 @@ CUR.HotPoints .DA #0,#0 CUR.T.ARROW .DA #6,#5 CUR.ResizeY .DA #5,#5 CUR.ResizeXY1 .DA #5,#5 CUR.ResizeXY2 - .DA #0,#0 CUR.Cross - .DA #0,#0 CUR.Text + .DA #5,#5 CUR.Cross + .DA #5,#3 CUR.Text .DA #5,#6 CUR.Wait1 .DA #5,#6 CUR.Wait2 .DA #5,#6 CUR.Wait3 @@ -27,9 +27,9 @@ CUR.CB .DA #S.CB.CMD.BITBLT .BS 1 .DA #S.CB.MODE.MONO .DA #0 - .BS 16 + .BS S.CB-4 *-------------------------------------- -CUR.SaveBuf .BS 48 16*3 +CUR.SaveBuf .BS 64 16*4 *-------------------------------------- CUR.Arrow .DA #S.BM.F.BBP1 .DA #2 RowBytes @@ -147,11 +147,95 @@ CUR.ResizeXY1.MASK .DA %111.11000000 .DA %111.10000000 *-------------------------------------- -CUR.ResizeXY2 +CUR.ResizeXY2 .DA #S.BM.F.BBP1 + .DA #2 RowBytes + .DA 11 W + .DA 11 H + .DA CUR.ResizeXY2.MASK-CUR.ResizeXY2 + + .DA %000.00000000 + .DA %000.00011110 + .DA %000.00001110 + .DA %000.00001110 + .DA %000.00010010 + .DA %000.00100000 + .DA %010.01000000 + .DA %011.10000000 + .DA %011.10000000 + .DA %011.11000000 + .DA %000.00000000 +CUR.ResizeXY2.MASK + .DA %111.10000000 + .DA %111.11000000 + .DA %111.11100000 + .DA %111.11100000 + .DA %011.11000000 + .DA %001.10001100 + .DA %000.00011110 + .DA %000.00111111 + .DA %000.00111111 + .DA %000.00011111 + .DA %000.00001111 *-------------------------------------- -CUR.Cross +CUR.Cross .DA #S.BM.F.BBP1 + .DA #2 RowBytes + .DA 11 W + .DA 11 H + .DA CUR.Cross.MASK-CUR.Cross + + .DA %000.00100000 + .DA %000.01010000 + .DA %000.01010000 + .DA %000.01010000 + .DA %011.11011110 + .DA %100.00000001 + .DA %011.11011110 + .DA %000.01010000 + .DA %000.01010000 + .DA %000.01010000 + .DA %000.00100000 +CUR.Cross.MASK + .DA %111.11011111 + .DA %111.10001111 + .DA %111.10001111 + .DA %111.10001111 + .DA %100.00000001 + .DA %000.00100000 + .DA %100.00000001 + .DA %111.10001111 + .DA %111.10001111 + .DA %111.10001111 + .DA %111.11011111 *-------------------------------------- -CUR.Text +CUR.Text .DA #S.BM.F.BBP1 + .DA #1 RowBytes + .DA 7 W + .DA 11 H + .DA CUR.Text.MASK-CUR.Text + + .DA #%0000000 + .DA #%0000000 + .DA #%0000000 + .DA #%0000000 + .DA #%0000000 + .DA #%0000000 + .DA #%0000000 + .DA #%0000000 + .DA #%0000000 + .DA #%0000000 + .DA #%0000000 +CUR.Text.MASK + .DA #%0011100 + .DA #%1101011 + .DA #%1110111 + .DA #%1110111 + .DA #%1110111 + .DA #%1110111 + .DA #%1110111 + .DA #%1110111 + .DA #%1110111 + .DA #%1101011 + .DA #%0011100 *-------------------------------------- CUR.Wait1 .DA #S.BM.F.BBP1 .DA #2 RowBytes diff --git a/LIB/LIBGUI.S.CLIP.txt b/LIB/LIBGUI.S.CLIP.txt index e0d3085d..eae92b25 100644 --- a/LIB/LIBGUI.S.CLIP.txt +++ b/LIB/LIBGUI.S.CLIP.txt @@ -60,7 +60,7 @@ CLIP.BitBlt lda CB.Cache+S.CB.DstX sta CB.Cache+S.CB.SrcW+1 bcc CLIP.BitBlt.99 Negative!!!! nothing to do,exit... - lda CB.Cache+S.CB.DstX Dst.Y+=D + lda CB.Cache+S.CB.DstX S.CB.DstX+=D clc adc D sta CB.Cache+S.CB.DstX diff --git a/LIB/LIBGUI.S.CUR.txt b/LIB/LIBGUI.S.CUR.txt index 4def0c74..7b352f80 100644 --- a/LIB/LIBGUI.S.CUR.txt +++ b/LIB/LIBGUI.S.CUR.txt @@ -49,7 +49,6 @@ SetCursor.A sta CUR.T lda (ZPPtr1),y sta CUR.CB+S.CB.SrcH - iny lda (ZPPtr1),y diff --git a/LIB/LIBGUI.S.txt b/LIB/LIBGUI.S.txt index 2075aff2..9547b840 100644 --- a/LIB/LIBGUI.S.txt +++ b/LIB/LIBGUI.S.txt @@ -127,39 +127,27 @@ InitGUI lda GC.Screen+S.GC.hDev >STYA ZPPtr1 - ldy #S.DSTAT.GFX.W+1 - lda (ZPPtr1),y - sta GC.Screen+S.GC.W+1 - sta MouseClamp+3 - lsr - sta CUR.Pos+S.POINT.X+1 - - dey + ldy #S.DSTAT.GFX.W lda (ZPPtr1),y - sta MouseClamp+2 - sta GC.Screen+S.GC.W - ror - sta CUR.Pos+S.POINT.X - - ldy #S.DSTAT.GFX.H+1 - + clc + sbc #0 + sta GC.Screen+S.GC.X2 + iny lda (ZPPtr1),y - sta MouseClamp+7 - sta GC.Screen+S.GC.H+1 - lsr - sta CUR.Pos+S.POINT.Y+1 - - dey + sbc #0 + sta GC.Screen+S.GC.X2+1 + iny #S.DSTAT.GFX.H + lda (ZPPtr1),y - sta MouseClamp+6 - sta GC.Screen+S.GC.H - ror - sta CUR.Pos+S.POINT.Y - - >LDYA L.GC.Screen - jsr GC.SetX2Y2 + clc + sbc #0 + sta GC.Screen+S.GC.Y2 + iny + lda (ZPPtr1),y + sbc #0 + sta GC.Screen+S.GC.Y2+1 .1 >LDYA L.DEVNAME.MOUSE >SYSCALL GetDevByName.YA @@ -176,13 +164,35 @@ InitGUI lda GC.Screen+S.GC.hDev clc .9 rts +* Mouse Setup + .2 stx hDevMouse >STYA GoDevMouse+1 txa ldx #DEVMGR.OPEN jsr GoDevMouse - + + lda GC.Screen+S.GC.X2+1 + sta MouseClamp+3 + lsr + sta CUR.Pos+S.POINT.X+1 + + lda GC.Screen+S.GC.X2 + sta MouseClamp+2 + ror + sta CUR.Pos+S.POINT.X + + lda GC.Screen+S.GC.Y2+1 + sta MouseClamp+7 + lsr + sta CUR.Pos+S.POINT.Y+1 + + lda GC.Screen+S.GC.Y2 + sta MouseClamp+6 + ror + sta CUR.Pos+S.POINT.Y + >LDYA L.MouseClamp ldx #DEVMGR.CONTROL jsr GoDevMouse @@ -215,59 +225,6 @@ GC.Get >STYA .1+1 rts *-------------------------------------- -GC.SetX2Y2 >STYA ZPPtr1 - - ldy #S.GC.X1+1 - lda (ZPPtr1),y - tax - dey - lda (ZPPtr1),y - - clc - ldy #S.GC.W - adc (ZPPtr1),y - pha - iny - txa - adc (ZPPtr1),y - tax - pla - sbc #0 - bcs .1 - dex - -.1 ldy #S.GC.X2 - sta (ZPPtr1),y - iny - txa - sta (ZPPtr1),y - - ldy #S.GC.Y1+1 - lda (ZPPtr1),y - tax - dey - lda (ZPPtr1),y - - clc - ldy #S.GC.H - adc (ZPPtr1),y - pha - iny - txa - adc (ZPPtr1),y - tax - pla - sbc #0 - bcs .2 - dex - -.2 ldy #S.GC.Y2 - sta (ZPPtr1),y - iny - txa - sta (ZPPtr1),y - rts -*-------------------------------------- CB.Get >STYA .1+1 ldx #S.CB-1 diff --git a/SBIN/GUI.S.txt b/SBIN/GUI.S.txt index 23ef978e..c7a4c458 100644 --- a/SBIN/GUI.S.txt +++ b/SBIN/GUI.S.txt @@ -116,7 +116,7 @@ CS.RUN lda A2osX.ASCREEN GUI screen active ? inc cmp #CUR.T.WAIT+2 bne .2 - + lda #CUR.T.ARROW .2 >STA.G CUR.T @@ -191,12 +191,12 @@ CB.Rect .DA #S.CB.CMD.FILLRECT .DA #S.CB.CMD.FILLRECT .DA #S.CB.OP.SET - .DA #S.CB.MODE.C16 + .DA #S.CB.MODE.MONO .DA #0 - .DA 50 X1 - .DA 50 Y1 - .DA 449 X2 - .DA 149 Y2 + .DA 1 X1 + .DA 1 Y1 + .DA 558 X2 + .DA 190 Y2 .DA #0 *-------------------------------------- @@ -208,8 +208,8 @@ CB.BitBlt .DA #S.CB.CMD.BITBLT .DA 0 Y1 .BS 2 W .BS 2 H - .DA 130 DestX - .DA 20 DestY + .DA 50 DestX + .DA 51 DestY .BS 2 SrcPtr .DA 0