From d72a6c714dda276568ec238393ea8c9b3c7e5c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GIBERT?= Date: Wed, 9 May 2018 16:57:05 +0200 Subject: [PATCH] Kernel 0.9.1 : OSD, bugfix in FONT redering... --- .Floppies/A2OSX.BOOT.po | Bin 143360 -> 143360 bytes .Floppies/A2OSX.BUILD.po | Bin 819200 -> 819200 bytes .Floppies/A2OSX.SRC.po | Bin 819200 -> 819200 bytes INC/GUI.I.txt | 32 +++++++++++--------- LIB/LIBGUI.S.MENU.txt | 50 +++++++++++++++++++++++++++++- SBIN/GUI.S.txt | 8 ++--- SYS/KERNEL.S.OSD.txt | 64 ++++++++++++++++++++++++++++----------- 7 files changed, 116 insertions(+), 38 deletions(-) diff --git a/.Floppies/A2OSX.BOOT.po b/.Floppies/A2OSX.BOOT.po index afb25661359b45abcfae49db87d660c99161d914..3955e38ee787c5c5360a18856cbf9674919afc33 100644 GIT binary patch delta 5191 zcmZu#4O~-KmcREUd87#300~5j&YO^n&@#xnAHzChI|?X4K2m}LTDqC7PO&peXQv;# zt~KeDbXt~Y(R3?nU{VBXSdvEQXzduyl<7=BrLQW?PFq{HouRZ_G1IDb8I?WnJ;Fz9 z^2>eap8LP&>z;ehyRna{?PF?xx>D&eeplnbc|heBlcH^MGj)|krY;mF}=m`&EY5QfMAs6@&;v=&tr%#(&l zJpLx*a#pXXu+-#QYAsboWq_Y1m_-Ngnw7@Mt}YQ_&U#gxRtsVt$Ft)Su^%(cK^)VM znM=4&oxXM^hUH6b6fIsmi?f7uO4h1RpO(mYs&8QeX9+h{4QG;J&rVTj!XTKiQp zZWabEB;$Q%6W;4AF{eSh)%+d2%jtx6uk$z1KGJ{1{C60a0`LReR~3_#-R&Wcg2pxZ zT;f1ecro`1abz?aI#8dXZHSB;1ZF&AVoWWBecjHyA1$`^60eu|&Jb=hDQ?woH8>3Q zTQeLP-Xr7%wXnw9LyEIwdg{x2$fJ>;1cCtx_9_YMydEN``wXl8K=v7|eTF3;$OD{&pYXeWc~`&Lf-)p4TPg>gevt-XX z(mYID?+_2>hY0t6g8vu%i}CZMju6)<2(yic|3Q+*Um#q20)LTo8oDwZ%NujOFzk-^ zULg6~N5vrUqols1q(r}cgzzK8{Y zh}Abr0@n%u{e-|R!mmmQd`E8216gPRE z)UUciN@Ui<5)VumjnZ*)p-Ckz>SB*woL?W3jru%l!UgMi79>}8UzYXUY0|<7Z2sj_ z#INuMod@bOZD)z^9C;xotj@jx%iMw|_%o!bWXBm2`SlJH?>mu9G)+5}w?dQK3g9F4 z+Yr}I{42#ocE_9;B6|&Dz8D}~41781%7Bc?;426uts9N!3d-^2;YA0gr$fS*lNH2% zxk+#R$2}KFGel(+5Uut^NOf4pBlWPf2_qzTl$2i}{?CQ4tesrfx5eG#7I)FA#_zjN zILo&^oSveG>r;+BoKOf?J1 zt>M4r9?Y~XVUd> z_2V3;gLX*x+A}Q!^j6NP6$isMBZ%H0B0}&O60QTaU<&j_x$U~%HeF;E@P>pbXeB$I z79ZTx!1`Kmb-O)?TmFeZm0ygS^=Qw}v~J|VB1hG3hEI~=G&~BdfRoOaLm!P=62mqD|i|@ zst+eNx9MiB0;PRvJ0;-JndjcL$#$KP_FlxnWZC|v$u==od-YR0_13AK`O+L2n=B83 z?Ax<~cUn<@O~bRxu%rKjmyNhz!-Q~0E2Ai@FvDSd3wO9!<^c$Gzb_c*-iIP@Phq4Nb*HuP9Vp;qtT7+oQ!m?P0 zvdbzqSY`tPuw5YTzG$sZ%skciW&(rXbdrp{Y>Uxm6PEuEZx^_@k1LdAI zxY3ChX_)0cGKPd}`~yLr1o`+NkAnP$poihdPU)?#kD=kdG`6hqj-480gjL=zPGvJ? z57MxLi#K|I7|grZi-MX=UK7l=`5vQ}9;0E^kZ{AE6nK&zIk9U-yxn#Ugy^jvlyA*B zN%OYk9HbgW>3Rcf0X2V+x(-pjwU|>I>j!P<HfLZ{lkyx6Hu4$ubIX%GSa zyHN)U{V|S)@0yr68%Kq&^wwQZa+9a2?=)>YO$UGAj~mkntQe+~;tYYhPSFmu#khq| z1YkU`C2w%0KWF$9%_hZN#!ku_Go_z?tI=U>-AWyl{ih%Pvy|ogf*RW?s?mZ3&vYjh zm@Z?lKo7i2Cj~0X`d+wG)*~CGk&V*GM(yGz4^iJC+IEPJ;c#}Ziw38JZw-cprQS9= zs28-}b~=cKcv!@ADlTDgk#Nm*5Nzf`1`pylQBNwr`9A8g^R>W)hv*NWQ)ZWZUQ7wZ zRA2x$6IJlMn!0M7=YrHG1|NolsbSS*4bZ+#lzZGb!P$&oY^K81-fG%mwl4x7%yyL< z!7}Yxk>P`dac|;&VB8rBP77CI(q?hekT_`*Oag{L!`gsA1r^s~u*VF>K+tO`lzn+9 zXGqBQzDoyL!DjH>4gPsHL*uQXXNDgawd5_}Ixrx@F&+9ry&v}s?Wv)|6<}x*@Xw2U z^PpMci!t%SF36F#MVJLzND?_h99L)L>u9#!QY(bYSL3|@t#4(C zgcy+4k|TZvuLvIHcqV8KETaxCa6ff?TOtjC`<>6dbzhG70eupz|;HvZHiMW3C zZ*M4=EkA+;g%f&6$vm=6CIuz)=uc#FRLN{_kjW2}v5)=B&mMo`$*2DH-*y7)I_~&b z%l!M((rDj}bY|v~F_mt!qZssA?7|~!H=KZ`HET-O7Zz>It$>3KvA=**ydmnEu^VLp z%)ENNj1gh~0rv;T%>5y9FW8Ol0a!t0t+{Fj$hLsAtx`=`F?T%6xT*rP$sEDGgfu8G zJ<2$6A{lqwWLVoXKYzB-0o^IwiQ^Q{J^upGw{Uj?W|d9N{2u7t#N8=at$1G)6=D(?B@z`x~&Vvp&#oODn5)-OyzJ1n!C2L zekfYMl<&CWos|>sdxz1o^-u%Xn%0Sd6F+PpxO+3I1Rh3oT~Sq4tqhT1$Dl0eq_Qxt zwjD;g(u#HSFSqO)-%u(Kqf9Asg|qV5H(@QFi&~4rV$CWr7nGJ)%>dcc06P-}!-t)i zdAoZpW)^jJzk0;e^IyGQ-)j)5Yq+}v>lH`)Uzg*#1+&brjstxgcmD*!e&W|B1JHx8 zKaSPPQ^DW7CH0Q&#tgf39DNdX{eB_?4J?b71Gt}SguuTIF<2Z`8V68nVY$UrzE(;_ zDOA6Q5d1poZD9Z-# z+?RKVGn!51vuh1fSpj^w67{w)fR@31d_$F~G@_Ti0I<8GV7392QC9f(5sdg`M*-)& zBP52hxjd9$e}s*^F=``=(xiVTW(BfiAnlPmq$QQfi6dX{MXeu$uMkZ!qi0il0MSwl zoC&ki5c?+(r-~ML{I&!B)L?%5J2^3$AQcABoINKe#!EPsdFNeu#Eq5A`HM2$4fMz# zWV#nC+5dj;{SPjE2>mJC-G}3tkN!s<3qs0$@@JV2VFnNE$3s|an}9VOkBPQ7%Vb`# z7un0O6+5HOu>oW(Dm2Y5v*`U_;6*MJ^&&Tb3 z;-Yr;fK%MqXECGv^s~?Z7orGTRe%%ni^(feNRQ+9@U$v6{N-0yuU-H8#{W$L_d4$W z7;6=Oy>;99Olq1_!+h#&&@YAOhut@DEXK~&wIcV=-3lg#QN@6U+ue&8l~NtMC=NO| nk0mncG1B3BoYOO73RQw8F)0~F{@T5SiHDhw9)HxpysY?thxd4E delta 5122 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 MWkm4F1&NFQ0z(PPPyhe` diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po index 1ec9369d8087134a2569ae0821476e4fc29f3a5d..47d5df2f0f55a2e89b0585906ec7fbc885503206 100644 GIT binary patch delta 5288 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 ZPPtr1 +MENU.New >STYA ZPPtr1 lda #2 1px Border @@ -22,6 +22,54 @@ PopupMenu >STYA ZPPtr1 .1 lda (ZPPtr2) *-------------------------------------- +MENU.SysMenu +*-------------------------------------- +MENU.MenuEditor .AZ "File" + .DA #02 ID + .DA #S.MITEM.HOTKEY.CTRL + .DA #'N' + .AZ "New" + .DA #04 ID + .DA #S.MITEM.HOTKEY.CTRL + .DA #'O' + .AZ "Open..." + .DA #06 ID + .DA #S.MITEM.HOTKEY.CTRL + .DA #'S' + .AZ "Save" + .DA #08 ID + .DA #S.MITEM.HOTKEY.OA+S.MITEM.HOTKEY.CTRL + .DA #'S' + .AZ "Save As..." + .DA #10 ID + .DA #S.MITEM.HOTKEY.CTRL + .DA #'Q' + .AZ "Quit" + .DA #0 + .AZ "Edit" + .DA #12 ID + .DA #S.MITEM.HOTKEY.OA + .DA #'X' + .AZ "Cut" + .DA #14 ID + .DA #S.MITEM.HOTKEY.OA + .DA #'C' + .AZ "Copy" + .DA #16 ID + .DA #S.MITEM.HOTKEY.OA + .DA #'V' + .AZ "Paste" + .DA #0 + .AZ "Options" + .DA #18 ID + .DA #0 + .DA #0 + .AZ "Check Me" + + + .DA #0 + .DA #0 +*-------------------------------------- MAN SAVE /A2OSX.SRC/LIB/LIBGUI.S.MENU LOAD /A2OSX.SRC/LIB/LIBGUI.S diff --git a/SBIN/GUI.S.txt b/SBIN/GUI.S.txt index 364cd30e..a0e9f03b 100644 --- a/SBIN/GUI.S.txt +++ b/SBIN/GUI.S.txt @@ -222,7 +222,7 @@ CB.Paint .DA #S.CB.CMD.FILLRECT *-------------------------------------- CB.DrawTextB .DA #S.CB.CMD.DRAWTEXT .DA #S.CB.OP.SET OP - .DA #0 M + .DA #255 M .BS 1 hFont .DA 0 X1 .DA 0 Y1 @@ -285,9 +285,9 @@ BM.Apple .DA #S.BM.F.BBP4 .HS 9999 violet (11) .HS 1FF1 Dark blue (4) *-------------------------------------- -TXT.SampleB .AZ "A2osX: A Sample Text with SYSX7B.FON Height=7px, Variable Width {}[] #0123456789$ " -TXT.Sample .AZ "XXXXXXXX: SYSX7.FON Height=7px, Variable Width @@ /\ () {}[] #0123456789$ " -TXT.A2osX .AZ "XXXXXXXXXXXXXXXXX" +TXT.SampleB .AZ "Sample Text with SYSX7B.FON Height=7px, Variable Width {}[] #0123456789" +TXT.Sample .AZ "White/Black: SYSX7.FON Height=7px, #.;:!?+-_=%*$@ /\ () {|}[] #0123456789" +TXT.A2osX .AZ "A2osX" *-------------------------------------- CB.Marylin .DA #S.CB.CMD.BITBLT .DA #S.CB.OP.SET diff --git a/SYS/KERNEL.S.OSD.txt b/SYS/KERNEL.S.OSD.txt index aa0564d0..fab61c30 100644 --- a/SYS/KERNEL.S.OSD.txt +++ b/SYS/KERNEL.S.OSD.txt @@ -321,8 +321,8 @@ DRAWTEXT.SHIFT0 lda FON.Cache+S.FON.PixH ldy GWORD get col index in BM .7 jsr CHAR.GetNext - eor CB.Cache+S.CB.M - + + eor (ZPTmpPtr),y sta (ZPTmpPtr),y iny @@ -350,30 +350,31 @@ DRAWTEXT.SHIFT1 lda FON.Cache+S.FON.PixH ldy GWORD get col index in BM .2 jsr CHAR.GetNext - eor CB.Cache+S.CB.M asl 8th bit in ->carry eor (ZPTmpPtr),y sta (ZPTmpPtr),y iny + + bcc .3 - lda #0 - rol + lda #1 + eor (ZPTmpPtr),y sta (ZPTmpPtr),y - dex +.3 dex bne .2 lda ZPTmpPtr Next line... clc adc DstBM.Cache+S.BM.RowBytes sta ZPTmpPtr - bcc .3 + bcc .4 inc ZPTmpPtr+1 -.3 pla get back Height counter +.4 pla get back Height counter dec bne .1 rts @@ -401,7 +402,6 @@ DRAWTEXT.SHIFT26 .2 pha save Width counter jsr CHAR.GetNext - eor CB.Cache+S.CB.M pha and First.Masks,x x = 2->6, for X=3 : A=000xxxxx @@ -423,6 +423,7 @@ DRAWTEXT.SHIFT26 .4 lda $FFFF,y SELF MODIFIED ldy ColIndex get col index in BM + eor (ZPTmpPtr),y sta (ZPTmpPtr),y pla get back Witdh counter @@ -450,19 +451,22 @@ DRAWTEXT.SHIFT7 lda FON.Cache+S.FON.PixH ldy GWORD get col index in BM .2 jsr CHAR.GetNext - eor CB.Cache+S.CB.M lsr 1st bit in carry, for COL 1 + bcc .3 + pha Other 7 bits for COL 2 - lda #0 - ror get back 1st bit, -> for bit 8 + lda #$80 eor (ZPTmpPtr),y sta (ZPTmpPtr),y - iny pla get back bit 1->8 already shifted Left 7 (= Shift right 1) + +.3 iny + + eor (ZPTmpPtr),y sta (ZPTmpPtr),y dex @@ -472,11 +476,11 @@ DRAWTEXT.SHIFT7 lda FON.Cache+S.FON.PixH clc adc DstBM.Cache+S.BM.RowBytes sta ZPTmpPtr - bcc .3 + bcc .4 inc ZPTmpPtr+1 -.3 pla get back Height counter +.4 pla get back Height counter dec bne .1 rts @@ -546,9 +550,16 @@ BM.Create lda DstBM.Cache+S.BM.W >LDYA DstBM.Cache+S.BM.H ldx DstBM.Cache+S.BM.RowBytes - jsr YAMultX + jsr YAMultX Compute BM total bytes pha + + eor #$ff + sta ZPTmpPtr+1 + tya + eor #$ff + sta ZPTmpPtr + tya clc adc #S.BM @@ -571,9 +582,26 @@ BM.Create lda DstBM.Cache+S.BM.W * clc adc #S.BM sta ZPDstBMPtr - bcc .8 + sta .4+1 - inc ZPDstBMPtr+1 + lda ZPDstBMPtr+1 + adc /S.BM + sta ZPDstBMPtr+1 + sta .4+2 + + lda CB.Cache+S.CB.M Get Background color + ldy #0 + +.3 inc ZPTmpPtr + bne .4 + inc ZPTmpPtr+1 + beq .8 + +.4 sta $ffff,y + iny + bne .3 + inc .4+2 + bra .3 .8 txa hBM