From 0454699b6ecc2c165620fdeaeb3f7b08d3ca8426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GIBERT?= Date: Mon, 18 Dec 2017 08:17:58 +0100 Subject: [PATCH] Kernel 0.9.1 : GUI..... --- .Floppies/A2OSX.BUILD.po | Bin 819200 -> 819200 bytes .Floppies/A2OSX.SRC.po | Bin 819200 -> 819200 bytes INC/LIBGUI.I.txt | 14 +++++++------- SBIN/GUI.S.txt | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 7 deletions(-) diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 73b0c46349db85580e27445047f106a250bfd40b..e98c96bbc54f08fbfe6dbf4f6b65eb09a4da3cd8 100644 GIT binary patch delta 1885 zcmZ8hTWk|Y6us*m2NTlN!H-~Sh`q)TQdqA|2E8(t)THI;si06M6x-`e}SiJS--oQe6C8m3Sx01em{k znxZKg$cbS!f_Gwu02Wh&O2_1|c#63BfL~EKU0TZc3pYw{Fe?l9OLk^e;c2OXSzYkl zTWMRPI)vn?oIFW9mL2I!NLevD`s+>SYy-4ZK;C6Fy5Q0GyU4K}Em&Ovn{QeY{Q!yWyKTw?Qtf@BtlJZe` z1DHCeu+$f1HGY`erEG3zZEN4h?Z-qymf~qXOJW@o!1VDHl%tRj^q-Iz z2PSbEqaF;OYB4^;L{bdl5MH_-90Tz0QCQpnFkZf!eZqQ{^pW0K5|N@&B87QxVJF<0 z?YK~BtYRSr;QJ`c6DWl*OH_n`u(yPS$Q|Cbg7kv@gm2eF7NPj&!k&#)1w`xK_`^{R9qj z`^FPp?6qH%7yFp9e#<%twIum8A4n$U3|*rD)lm&hiYaNMn58$$2i37x;2eeP!4`i7 z&T6gE05uqHGj)RB}^DVh}*-m)IUX}lJ4J}T$~OH$Kj0+I&es-)Da7}I#a z!5AN*4K0AJMYH)}FyW;k-1w4uVeSSc--vAf%rw4UhXQxqqjY6d5@Ok8v8;!`? zzfqNBXf_`hH>q~BcKxb1t9C4qTF1+g)F3HC1L(Kl%2d8fIr>20OSV;Ae^o0+=`E)1 zCV;g~0|GtUcI119NCYpq-=nCK4xpOXwrPq)M_==?AA-n$T(=npj5+|`an})bZgJjm z-gf@&{LN|R=5cGe?c9EDP+1&7cJ#n`<$)qaPy_Q&8HgZ{rI&MTb$$ou;q=@q51bdu z9qf--aWjGz)MC?&&1;#WojZ#Dv=yC>TlO>dqJvIEU4iMMT`@M{qtTp;W^TBPD_XeW zy?JYHqlPWSP@CYBtU)HyViRZ0zc9ozqIbD``^a1uLFOhO^}F$^u8x?HG=5 z$3?E_QZsW?nGGcKn<`pICY!yuNHrI}BEp*)Z9I0@xc2sgta+ziIU8crJrx5E+Tn|sXGF{3WU3^ErH9(p{= U@R)&z0gst@l#eqPXT7-pA0V$A)c^nh delta 1746 zcmY*ZZ%kWN6hF7`wUj~1+X`i1-TGdKVgDZOqm;rnMq6H?qwVY3vbLL3aGS!W1pyuE z6gE-jA5ho0yBI%g%Q7>wDncSzjE0zHiC>&S944ChVSdoW5Bs|4GViYNh4hv@GCVLK14bo=e`gj?87i!9NQ%LL z7**Qj4@G(ZX$eFr&n@jl_4$^i$B-v~aLJAu@+X(P$eaISsj0nD3kWI^CGmk8Q9nKs z4`<}aj*&<>ChrJ^Bawt0Oo82}d4`l&ib~gyw-PRsf?@7$lbb05v!xo_B(<7F}9epk)vg7W7`a8&6^%3@Z- zBq;C2mwFj%ZQmnGqV8U>9$&$d@2Ltts6K&z?`5iXKmUjk+mv*S(lzrYm)ixKURXs& zl>@R)8VTuw%{lDuV>Y3F9PeWuM*}!Vw$T@18>}B(jytC&YXb8SY@2^#Cs>CG5m&;o zl$cSq&bYw((h8KNkOan;RgII&IMwigc|_NEg%E0!NjGRcMB~+EC@X821lHGtfIP{SO1ocWKzV>zZ7?ZV&Wm|CAAlQ`< zQ=&hSP||doTu|Arg9$kqJ}772r$JEJu?Egk*aKDJHE>2B1us9#46mQ2WUfQ zPp+bTI>oB2Q<5b+8(G(Yj)J1>=czyazgDf8HEh_R+cQ~ z=#%w<`Ji^8^@j*bp0e0MXVC?=Cw0I-bmUlW_^hhnhML0^#fyG+bIVh@N4#&OgTBIg zsCZh(LVbfn!+JI4-8vZQ85*XJ4N%#G-Mx&h=^3303?Az_LH!%SctjnkqZ&i+PwG6T z)mi>5fz`jl*8$ed@;49y&H%8(vEbOpAL75~Z}5Nfi@ZrF6KaJ$LMPrHV(sh#e|-UW zhFCB98J`KUbrn9rahSgb7vZDo>kItlbq?lR;&Cg)ZW$$JIWecx1&ii_@% diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po index 1a795150e49f95db4054b4747f275ce7f2f56238..37a4c249eeae9a21aa22873c69d018995de3f7de 100644 GIT binary patch delta 3033 zcmZuzX>=P`6~5AFY^|2%Sc@&ksUs(`>|~-*Y{%}Bpv7`bh~&^FBqeS$)nRFS+7p%*oUL|&Ld{Ou_ceqW~<0)NV--FoVL zi{gfPh4R%?n<>qG%Bt5EUDV5WUTg1wAmbfmJn3|TyPNTQ_!5BC8&Tx*GTwO3o5&p( zWn}~{n}pg0>KX+junUxJ)n+J)au=vw(7wEW6Ev~H%?p%W*s@e*H?Qi1;XA4tY?;uih2E4uV` zPz3AsLhTvKVz~jWhlV3NyaRlz&zFxLN^{V#O}OSsx?TvKp;SA!%L*gtKQa~x4DE`7 z?Hx!W@OgqkKA4K_iR2CpjqeA&XT^)jE1#&e$?7K_`zk$pWsd>L<4l+bOMivKz(BBX zmuIjKY&)**v1R};{8JW&wJTwAzA<=u(!}RkKeHhwq6!U8rwq2lf)pQtb zZitA?Ix`(bP%})dw53B?C$#MrOznyd?IYx1gw%{daUwCngZ5n*f{@8&L46aczw2hf zbB@}){oSZ>FwHx*fb|wkY?9-do_rY=ay9r(C_ldxWN8S-z*%CVC&jCcm39d6L&fawH|G^me5 zF_uk$?nIfQ??Hpk4@-63I-K4U%W=NROg4pGeG(Bj$~#z!za| z93F_C6g&%>dgYd)(6UIm6(1ozl3b(=H+@vD`ss7l#PhD1!{!3i5#>%Bze*LGqEXfJ`C;m3un(!HsKO_-Tnwd=>kHx=F=6s z`+bZr5l;jC2|SDSlNFNkU_;BNB+GiqGW}_|7dAX9GV8BC zvtxu&pC{&>7a$N%oVrN0Y91$yYf;#Ak=oq8L}0@cP#(>r;$C?^K>azQu=ex9+(oKo z<_qLwfb)Z44uzOVUlgoQR+585{yxUXc7yJVGR=bFOY%3QfK6TVR0)i+JQ$Y=>gwt( zjJm=2Wdhk=wlL-f`YV`S`&S8vP6dp?WcgYduN=bmb>W#wrFHNdvdjfF-z3XUm*n+Z zWi-Zu@o9p(SmO2D1hQSk>vzzr`n%A6`V!UXvi}u@J21h40Gs#6G6(qa#3aYJbvi-) zH#s{mK)LEig{LN!W~=${#N=g}vi(Ck4{9L z`{Ena^GfLvwe-T9RQ(+rp~g@ai;Yl2P^l4&1d>J&ve#?dn~e1e>6Sl1W=d;T_{pfM zEs7=M>(p_@+_Y+Lnx31kIz3(eO0D=rYWbd+N9h7OCiTON`TJKSPnw(`RFW%`^Fx`& z{`e7DlK%K{35d!32?1<3wuj-T1oVo{Vfq;X?jE@}>V6J0QhM2~Ri?xza*Pn zK>tc?j$acf7UVai$yZ;5(mi`jsz^k9Tm~4gH`EFBzm@gfg>Y)hdnm_c!ElLi;t6L! z|2u;4h@gFjtkK!;(V6uR2ywy!fk1bDZ-(QNd|Qtbtj`j<`*PayM?x>FDwS=2DzSa} zLtG+}n&R8oE+;fRC-JxNK3~9>Pi11sy*Rrp4sYY1$&Q|$Ku`W)Y%iC@2WlJZa)Ryo zlC9qSZShos%OTI=j=z-nD=&h%w0beE88X%BV5$yM4wc>k&)yXi-|RTr5LY! H;I01yR^NqU delta 2577 zcmZuzX>=3U6~3CM!K1~JZ7lC*i3}J6V~wyWZc{*(j4?=-k-RBug{%`qge@#NKpI=)+fM1Rm;V4a-L*X4{Et+#fXM?1|r{BhHrW-_^W zT*v+Ea4j*=`B(Gj#`8Gil!IK@$5pPNmSdzsx00?nMi%K-QSUKQQY%76^tfaP2(?gi zYUwJdaDY1~wzRgikFE21LN3`W`hv|W0mTvxf37PkbwUQ_uZGO5g14oyxuXS2>c-bU zShT=g51DO|q%1ZxK;9b2BvWB|yQWgLmYzON%4psMF|2F2sKdU|UBM6Qt0$9@T=Opxfp3%HFGt-b~|b|z%|YAC)IGu9iG#kJ|)zLj!x zPb_sxF9LrZ`YOJjuAd|}Zs}LlLRJK#;T~V#Kr#xZu$JdK;J2Y>MTDL?K}wbdp`-^T zv6O5Niaviwut`+@JDb21MLxPq79}XYK`~pT+nx?Yh^xEn+#y`&C%vIjJAm0wlQ#dk|k@inE`wj56~)eQ>=RX(R%S|P!Ln^lQLks##v zq2wf~;b>CzLS4|UhwfS4xO$)hz z|2A5;eMcj@aKyM9#XvNYg2ngJ3sYo~{(h)ALU&D(stvgh;8L9mxY73DoITBM(H)N^ zfPVVfjd z>6vM)!V`c)@9+#+=y(#e*)=9M24x8fj=^?qdfd(!VS-s%ejGN&;zyq*Rn$L2stivt z+A&E7XGm?$2?k3~f_h&(;Z*p5VnDkTAWSiZE2inYGi345(`+*1rNMCgZDOzq$JH}) zNuS@-B)X+FV0u=gCCGhF8|Z25O3U-JASB6PeSx9+`i6A36Ra;XC^bmwkQ4ZqFpK4< z7>7>jhchI<=;bWFc!-i$=m!H_@pa$VWDc$BeV%EA$gB2|uMv{!JEF{!Ek1O+v}fHS*~Dq-?$f#(#i^RZsXQN}4>AI_{iq z>ObUTPQTCIV4Obt87aKEj9qcOfpHF9?&R3mb-=1#diG$>N=qMyvtcjr2^25cMVB7R zsdD#o%G3mFlFNj9BJx#jZK-|?DaEOenhKqeKfr7;Dc)bxO-vo*`ND2`$Dy1x#yy;J zEkW4JO>bRGc-{U%{r*9I|KPl%gE^lLsnMy`^!Z!;V0t~9kK8xdQcY~`o3jA(YB|k- zR41jo!1|Vk>K*A#G8DYcpwr<C*bPxwzM{ZZDy_r zySUpQfRf+NC4GMS$pB{v6c;KGJmS{DL(6gcCh{()R+B`5@(?fl}Gu6FwG|noAV2dP?!gO bcD>mSe>fXazV$}KvH^d_>9B0N@4x>C(bogx 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