From ab08792170585641861ff4ba9eeb705e91b7069d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GIBERT?= Date: Wed, 29 Nov 2017 07:59:27 +0100 Subject: [PATCH] Kernel 0.9.1 : GUI, BitBlt debugging.... --- .Floppies/A2OSX.BUILD.po | Bin 819200 -> 819200 bytes .Floppies/A2OSX.SRC.po | Bin 819200 -> 819200 bytes DRV/DHGR.DRV.S.BLT.txt | 4 +- DRV/DHGR.DRV.S.LBUF.txt | 3 +- DRV/DHGR.DRV.T.txt | 4 +- SBIN/GUI.S.txt | 111 +++++++++++++++++---------------------- 6 files changed, 54 insertions(+), 68 deletions(-) diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index a2bb2a872a0c41ff74fbc4a98e76c231f451e45c..d295a6c1ca15e1dc5ca556d4352edab19c079b9a 100644 GIT binary patch delta 2974 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 H%xL;Ab&YYu diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po index 53be27df419eca6ffbfb592c7df9c31efe2242c9..6879ab58d76518220fe864c14c0feb6761c5d09d 100644 GIT binary patch delta 5574 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 Ab^rhX delta 6158 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 diff --git a/DRV/DHGR.DRV.S.BLT.txt b/DRV/DHGR.DRV.S.BLT.txt index 3278dc04..f88e1748 100644 --- a/DRV/DHGR.DRV.S.BLT.txt +++ b/DRV/DHGR.DRV.S.BLT.txt @@ -179,7 +179,7 @@ BITBLT.LOOP0 lda CB.Cache+S.CB.OP *------------ Shift 1->6 Comment : SCRBitOfs=X=3 -BITBLT.LOOPx lda CB.Cache+S.CB.OP +BITBLT.LOOPx lda CB.Cache+S.CB.OP X = BLT.SCRBitOfs bit #S.CB.OP.MASK beq .4 @@ -225,6 +225,8 @@ BITBLT.LOOPx lda CB.Cache+S.CB.OP stx BLT.ScrColIdx cpx LBUF.C2 bne .1 + + ldx BLT.SCRBitOfs .4 lda Shift7BitsCol1,x get #%00001111, BM bits that go in Col1 sta .6+1 diff --git a/DRV/DHGR.DRV.S.LBUF.txt b/DRV/DHGR.DRV.S.LBUF.txt index 7f20b0f3..2594eb33 100644 --- a/DRV/DHGR.DRV.S.LBUF.txt +++ b/DRV/DHGR.DRV.S.LBUF.txt @@ -200,7 +200,7 @@ LBUF.DrawAtY.ORA .8 rts *-------------------------------------- -LBUF.DrawAtY.AND.ORA +LBUF.DrawAtY.AND.ORA ldx LBUF.C1 x C1->C2 ldy COL.BANK,x @@ -239,6 +239,7 @@ LBUF.DrawAtY.AND.ORA sta $C000,y ldy COL.OFS,x + >DEBUG lda LBUF.MASK,x get MASK bits ora LBUF.C2.MASK and (ZPBasePtr),y diff --git a/DRV/DHGR.DRV.T.txt b/DRV/DHGR.DRV.T.txt index 4825578e..9694a3ae 100644 --- a/DRV/DHGR.DRV.T.txt +++ b/DRV/DHGR.DRV.T.txt @@ -53,7 +53,7 @@ C1.DATA .DA #%11111111 set (ORA) COL 1 bits .DA #%11100000 .DA #%11000000 *-------------------------------------- -C2.MASK .DA #%11111110 Clear (AND) Col 1 bits +C2.MASK .DA #%11111110 Clear (AND) Col 2 bits .DA #%11111100 .DA #%11111000 .DA #%11110000 @@ -61,7 +61,7 @@ C2.MASK .DA #%11111110 Clear (AND) Col 1 bits .DA #%11000000 .DA #%10000000 -C2.DATA .DA #%10000001 set (ORA) COL 1 bits +C2.DATA .DA #%10000001 set (ORA) COL 2 bits .DA #%10000011 .DA #%10000111 .DA #%10001111 diff --git a/SBIN/GUI.S.txt b/SBIN/GUI.S.txt index a24d8427..57fd6f2d 100644 --- a/SBIN/GUI.S.txt +++ b/SBIN/GUI.S.txt @@ -118,10 +118,21 @@ CS.INIT >LDYA L.MSG.INIT ora #S.PS.F.EVENT Now accept events sta (pPs) + >PUSHWI 0 Aux type + >PUSHBI $CB Type + >PUSHBI SYS.FOpen.R + >PUSHW L.FILENAME + >SYSCALL LoadFile + bcs .9 + + txa + >SYSCALL GetMemPtr.A + >STYA BitBlT.CB+S.CB.SrcPtr + jsr Destop.Paint clc - rts +.9 rts *-------------------------------------- CS.RUN lda A2osX.ASCREEN GUI screen active ? cmp #3 @@ -184,60 +195,8 @@ CS.QUIT clc Destop.Paint >PUSHW L.Rect.CB >LIBCALL hLIBGUI,LIBGUI.Draw - lda #S.CB.MODE.C16 - sta SetPixel.Mode - - lda #0 - sta SetPixel.Color - - lda #20 - sta SetPixel.Y - -.1 lda #28 - sta SetPixel.X - lda /28 - sta SetPixel.X+1 - -.2 >PUSHW L.SetPixel.CB - >LIBCALL hLIBGUI,LIBGUI.Draw - - lda SetPixel.X - clc - adc #4 - sta SetPixel.X - bcc .3 - inc SetPixel.X+1 - -.3 lda SetPixel.X - cmp #84 - lda SetPixel.X+1 - sbc /84 - bcc .2 - - inc SetPixel.Y - lda SetPixel.Y - cmp #192 - beq .4 - and #$7 - bne .1 - - inc SetPixel.Color - lda SetPixel.Color - cmp #16 - bne .1 - -.4 >PUSHW L.DrawLines.CB - >LIBCALL hLIBGUI,LIBGUI.Draw - - >PUSHWI 0 Aux type - >PUSHBI $CB Type - >PUSHBI SYS.FOpen.R - >PUSHW L.FILENAME - >SYSCALL LoadFile - - txa - >SYSCALL GetMemPtr.A - >STYA BitBlT.CB+S.CB.SrcPtr +* >PUSHW L.DrawLines.CB +* >LIBCALL hLIBGUI,LIBGUI.Draw >LDYAI 105 >STYA BitBlT.CB+S.CB.DestX @@ -256,19 +215,41 @@ Destop.Paint >PUSHW L.Rect.CB >LDYA L.BM.Arrow >STYA MousePtr.CB+S.CB.SrcPtr + + >LDYAI 7 + >STYA MousePtr.CB+S.CB.DestX >PUSHW L.MousePtr.CB >LIBCALL hLIBGUI,LIBGUI.Draw - >LDYAI 128 + >LDYAI 29 >STYA MousePtr.CB+S.CB.DestX >PUSHW L.MousePtr.CB >LIBCALL hLIBGUI,LIBGUI.Draw - >LDYAI 182 + >LDYAI 51 >STYA MousePtr.CB+S.CB.DestX >PUSHW L.MousePtr.CB >LIBCALL hLIBGUI,LIBGUI.Draw + >LDYAI 73 + >STYA MousePtr.CB+S.CB.DestX + >PUSHW L.MousePtr.CB + >LIBCALL hLIBGUI,LIBGUI.Draw + + >LDYAI 95 + >STYA MousePtr.CB+S.CB.DestX + >PUSHW L.MousePtr.CB + >LIBCALL hLIBGUI,LIBGUI.Draw + + >LDYAI 117 + >STYA MousePtr.CB+S.CB.DestX + >PUSHW L.MousePtr.CB + >LIBCALL hLIBGUI,LIBGUI.Draw + + >LDYAI 139 + >STYA MousePtr.CB+S.CB.DestX + >PUSHW L.MousePtr.CB + >LIBCALL hLIBGUI,LIBGUI.Draw rts *-------------------------------------- *-------------------------------------- @@ -290,12 +271,14 @@ MouseData .BS S.MOUSE Rect.CB .DA #S.CB.CMD.FILLRECT .DA #S.CB.OP.SET .DA #S.CB.MODE.C16 - .DA #2 + .DA #1 .DA 0 .DA 0 .DA 559 .DA 191 + .DA #0 + .DA #S.CB.CMD.FILLRECT .DA #S.CB.OP.SET .DA #S.CB.MODE.MONO @@ -424,8 +407,8 @@ MousePtr.CB .DA #S.CB.CMD.BITBLT .DA 0 Y1 .DA 11 X2 .DA 12 y2 - .DA 112 DestX - .DA 24 DestY + .BS 2 DestX + .DA 1 DestY .BS 2 SrcPtr .DA 0 @@ -456,8 +439,8 @@ BM.Arrow.DATA .DA %0000.00000000 .DA %0000.01111110 .DA %0000.11111110 .DA %0001.11111110 - .DA %0010.01110010 - .DA %0100.11110010 + .DA %0010.01111110 + .DA %0000.11110010 .DA %0000.11100000 .DA %0000.00000000 @@ -471,8 +454,8 @@ BM.Arrow.MASK .DA %1111.11111100 .DA %1110.00000000 .DA %1100.00000000 .DA %1000.00000000 - .DA %0000.00000000 - .DA %0000.00000000 + .DA %1000.00000000 + .DA %1110.00000000 .DA %1110.00001111 .LIST OFF *--------------------------------------