From f20065ed252de1713b1353a74ea00ddcf62c6c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GIBERT?= Date: Thu, 16 Nov 2017 08:12:03 +0100 Subject: [PATCH] Kernel 0.9.1 : GUI, debugging.... --- .Floppies/A2OSX.BUILD.po | Bin 819200 -> 819200 bytes .Floppies/A2OSX.SRC.po | Bin 819200 -> 819200 bytes DRV/DHGR.DRV.S.LINE.txt | 11 ++++++----- DRV/DHGR.DRV.S.RECT.txt | 4 ++-- DRV/DHGR.DRV.S.txt | 36 +++++++++++++++++------------------- DRV/DHGR.DRV.T.txt | 10 ++++++---- SBIN/GUI.S.txt | 2 +- 7 files changed, 32 insertions(+), 31 deletions(-) diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 3c587c500ffe6f46d61bf9f34e8afec33c4b610b..8f1df6953be17bc269796cf716d1b3f9811a742d 100644 GIT binary patch delta 1523 zcmcIjT})e59KXG{45*A1DWw&*o%_-DoJ`5QZf1}W-$ZbOq${`?9R=SC;H}Jr!-kCfYY;j&C^w_n@*2!5tp|1}_w8dzA&4p}z{mX>_UHhepjvUt!Sr zs-nZA7U6j+Y2B2qNxTTrRunHm@B@#RbLV?Gjs$D>~1)YNY6Nkxd8Kd^+r_`cs@!!>YW>F%SZeD`#7>FjCT^7=*zs(caX_fH0EtYG9 z&ti$HUkaJ>+8csAhUC`dq*(uvuzL&*iF)esi0`q;;uEp|Rwc!kU_f1m@+hxvK>0GS zZb3QDt63<2!>g~m;)~GHpUui&qiBx3)*;byeg%$~0*mm- z3jHC020^A#R6Q+>_)yMbQ1p8mWy;mFhAT!5&J(M2#P37FHIi1Jb4v+B`-GvrLhm%3 z5NmzNX+|+3<~)N^AzjMfBo{boMi<2t@sBS{b(vyo8Ig9@>y{E;m%}g2wvkf{IW^86 zpKAZ^i-Pmo$C_zcqf5`5D#LrcOe2~ECF*D3Hd!@-Rgh-yvwhq&f1Qt_W|!C1;_|xN z+{fKF!sonFnDeKjj@nctiKStfBip*3kV3Yv^9f{-gVAO+;MBhmRELOKb|!5h{5z zn>9waXi_}cB@Btuq!?d-+OFD8!w8^&Gv|H!xc%?b_QJmpsboB$Ig|D>dAQ1A?(I(d z7*Kt9o!w>`&dNDCio*MWvJXT~07}J9pg2I}5;@ANEUp5|b0E@0tdL3i{6V<2hw+%! z!u>tWe&HdTngH@fZr#eQf3lbb3ILHJaGS*sSY|vZOYi#CC%mal35t>BCkKt|h zf;saF&a$$N!xSf1aM;Ajb`H~=T*<{Kxr~dMsoO*OPO)-`tdduwWH z+TU;QqR2P1eu~*m&lL7Do2FqaZT^Hl!w?vI0l_YULV_ZKVgd`nGc)v=lI`NZ05%77 A2mk;8 delta 1518 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 CB.Cache+S.CB.X1 .1 ldx LBUF.C1 .2 tya - and LBUF.AND,x - sta LBUF.ORA,x + and LBUF.MASK,x + sta LBUF.DATA,x inx cpx LBUF.C2 bcs .2 @@ -39,7 +39,8 @@ HLINE.MONO >LDYA CB.Cache+S.CB.X1 ldy CB.Cache+S.CB.Y1 jmp LBUF.DrawAtY -HLINE.C16 lda CB.Cache+S.CB.X1 +HLINE.C16 >DEBUG + lda CB.Cache+S.CB.X1 and #%11111100 tay lda CB.Cache+S.CB.X1+1 @@ -71,8 +72,8 @@ HLINE.C16 lda CB.Cache+S.CB.X1 tay lda (ZPPalettePtr),y - and LBUF.AND,x - sta LBUF.ORA,x + and LBUF.MASK,x + sta LBUF.DATA,x cpx LBUF.C2 inx bcc .1 diff --git a/DRV/DHGR.DRV.S.RECT.txt b/DRV/DHGR.DRV.S.RECT.txt index b12fa312..5d122521 100644 --- a/DRV/DHGR.DRV.S.RECT.txt +++ b/DRV/DHGR.DRV.S.RECT.txt @@ -18,11 +18,11 @@ FILLRECT jsr HLINE inc CB.Cache+S.CB.Y1 ldy CB.Cache+S.CB.Y1 cpy CB.Cache+S.CB.Y2 - bcc .8 + bcs .8 .2 jsr LBUF.DrawAtY - ldy CB.Cache+S.CB.Y1 inc CB.Cache+S.CB.Y1 + ldy CB.Cache+S.CB.Y1 cpy CB.Cache+S.CB.Y2 bcc .2 diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt index c695dc15..5e6328f0 100644 --- a/DRV/DHGR.DRV.S.txt +++ b/DRV/DHGR.DRV.S.txt @@ -110,9 +110,6 @@ OPEN sta A2osX.SCRNDEVS+2 DEV.ID in A inx cpx #3 bne .1 - -.8 clc - rts *-------------------------------------- CONTROL sta CLRTEXT sta CLRMIXED @@ -141,6 +138,7 @@ CLOSE clc *-------------------------------------- WRITE >STYA ZPCmdPtr + sta SETHIRES Make sure SET80STORE active a $2000 sta SET80STORE lda (ZPCmdPtr) Get Cmd @@ -157,7 +155,7 @@ WRITE >STYA ZPCmdPtr sta CLR80STORE -.8 clc + clc rts .10 jmp (J.Cmds,x) @@ -172,8 +170,8 @@ LBUF.SetBounds1YA sta LBUF.C1 tay - lda Mono.Head,x - sta LBUF.AND,y + lda C1.MASK,x + sta LBUF.MASK,y rts *-------------------------------------- LBUF.SetBounds2YA @@ -184,20 +182,20 @@ LBUF.SetBounds2YA cmp LBUF.C1 beq .2 - lda Mono.Tail,x - sta LBUF.AND,y + lda C2.MASK,x + sta LBUF.MASK,y lda #0 .1 dey cpy LBUF.C1 beq .8 - sta LBUF.AND,y + sta LBUF.MASK,y bra .1 -.2 lda Mono.Head,x - and Mono.Tail,x - sta LBUF.AND,y +.2 lda C1.MASK,x + and C2.MASK,x + sta LBUF.MASK,y .8 rts *-------------------------------------- LBUF.SetOPA @@ -214,9 +212,9 @@ LBUF.DrawAtY lda BASEL,y setup line Base Ptr sta $C000,x lda (ZPBasePtr),y - and LBUF.AND,y + and LBUF.MASK,y - ora LBUF.ORA,y + ora LBUF.DATA,y lda #$ff sta (ZPBasePtr),y @@ -231,9 +229,9 @@ LBUF.DrawAtY.XOR sta $C000,x lda (ZPBasePtr),y - and LBUF.AND,y + and LBUF.MASK,y - eor LBUF.ORA,y + eor LBUF.DATA,y sta (ZPBasePtr),y iny @@ -288,9 +286,9 @@ MOD7.lo .BS 3 MOD7.hi .BS 3 *-------------------------------------- LBUF.C1 .BS 1 -LBUF.C2 .BS 1 -LBUF.ORA .BS 80 -LBUF.AND .BS 80 +LBUF.C2 .BS 1 C1 C2 +LBUF.MASK .BS 80 Bits to CLR in VMEM & LBUF.DATA from C1 to C2 : 11100000 00000000 00111111 +LBUF.DATA .BS 80 Bits to SET/ORA/XOR in VMEM from C1 to C2 : 000ccccc cccccccc cc000000 *-------------------------------------- XDIV7 .BS 1 XMOD7 .BS 1 diff --git a/DRV/DHGR.DRV.T.txt b/DRV/DHGR.DRV.T.txt index 383c70a4..2a0f1b18 100644 --- a/DRV/DHGR.DRV.T.txt +++ b/DRV/DHGR.DRV.T.txt @@ -21,15 +21,17 @@ Mono.Masks .DA #%00000001 .DA #%00100000 .DA #%01000000 *-------------------------------------- -Mono.Head .DA #%10000000 - .DA #%10000001 +C1.MASK .DA #%10000000 mod 0..... +C2.DATA .DA #%10000001 ->C1.DATA .DA #%10000011 .DA #%10000111 .DA #%10001111 .DA #%10011111 - .DA #%10111111 + .DA #%10111111 ...to 6 *-------------------------------------- -Mono.Tail .DA #%11111110 +C1.DATA .DA #%11111111 +*-------------------------------------- +C2.MASK .DA #%11111110 .DA #%11111100 .DA #%11111000 .DA #%11110000 diff --git a/SBIN/GUI.S.txt b/SBIN/GUI.S.txt index b7650b89..d9aa9cb6 100644 --- a/SBIN/GUI.S.txt +++ b/SBIN/GUI.S.txt @@ -238,7 +238,7 @@ CS.END DEVNAME.GFX >CSTR "GFX" DEVNAME.MOUSE >CSTR "MOU1" LIBGUI >CSTR "libgui.o" -MSG.INIT >CSTR "DESKTOP:Init...\r\n" +MSG.INIT >CSTR "GUI:Init...\r\n" hLIBGUI .BS 1 hDevGFX .BS 1 hDevMouse .BS 1