From f737bd21fbb7bfa88ce9cf8813923fad9d687e39 Mon Sep 17 00:00:00 2001 From: burniouf Date: Thu, 27 Oct 2022 08:20:09 +0200 Subject: [PATCH] LIBGUI:fixes --- .Floppies/A2OSX.BUILD.po | Bin 33553920 -> 33553920 bytes INC/LIBGUI.I.txt | 25 +++++++++++++++--------- LIB/LIBGUI.S.MBAR.txt | 38 ++++++++++++++++++++++++++++++------- LIB/LIBGUI.S.MBOX.txt | 2 +- LIB/LIBGUI.S.MENU.txt | 3 ++- LIB/LIBGUI.S.txt | 1 - ROOT/asmtest/TESTGUI.S.txt | 37 +++++++++++++++++++++++++----------- 7 files changed, 76 insertions(+), 30 deletions(-) diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index c128df14697186fcd6a28a79511c2572840c1b1e..f0aa2465242afe32be192afad3ac61a3f3807034 100644 GIT binary patch delta 31928 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 Y7vKcoB;XX_Z@@o*)4ILF8Qt;!2fRVxNB{r; delta 30823 zcmb7tdtB62`u~}Mfq{V!m$`D2;o=AaBNsuuBJ&v#aJUGlU}d0EkQY#}w6;bz`D7-h zwd>I~i&(WVF>Om~%hImaR!h6xbGz5pmaVmI_s!q?ob#Ds(0+e>>-9J@=RD^*&w0*s zp7WgNJf9Dnem)nq32@{RU2t>GbknV^x-@*zns42r+lwz6^R1a7tR&U)r@9cEp1$|r zkO?F9a80e|`d6cFcr{7`&;o)0!6UCm=~iY$SHzOvWlxFS^vj12wKAe3b;Y^|BQok5 z>z$3x()#+^#Wy?47WC#4(S`GinJd*|tlWz+n1m2O@IhKv1Wi)%z-5z$R2lZj=9 zS|fPg!szFdq?z>1dAdaJtZ|i2xs*$1BDjWxjI+mTZ({8VNbDT7sM5{lJe3$r)DrZ| zkqSxlTr#;=9gnlAnZ%Z=C{20lQl{)w&?NW5hpG^0*vhH(MP>uM`&8l6o{7Qe+9>itE{yeOaO z8oZzp)99<~+*sBChcv`4!RF>BCZsrjpn$wP^8lF%(c=s}@y=l47D;$7ZBk6m$K_haKn<6Oy=| zo|&&pn0_UyF#*nUCo^|K2gQ<1y2@WAdukiX_)?h&TauTXOAaGQ=N!O_;4bFvD3u#47nO0{ zR_&;6GZ?b3y4MA!BOPRFn3++I<9Q( zX(PHFD4DQRZP?h+v#PBrkL#M~DzBJKxP_ho^|V`=cz@@^bhWN)&I@1{YLWE&UA5q8 z7foUxl+IuuyXoRuUDB*QYP-rcYueT|=LhtVUrds2Q)?S8po+@d=@CX~FMW}H+(G|U ztBX&(Q*GhyTwW0{)PiD?FhK2fkjY(iCO*7_D&l2ztsQH60vMh;mFWJ6AzAhb46fX& z=wTxF3l)z)fLbPgXJt>@>h7`jM0YnD>+cb0rXh}2*;rQXY~=hvy$_;{zEY>NneQE| zZQ!+eB;^p*EYR6=hR3RedgK$^;jywVW_uK-bJ#lWqcsb3)}|xqIQFO?hp!Nr$@>K> z$$w%suyM}zhSEi4u7%}&thpE&Hund7)g6nuvWkj)689iIzCdS-Kjy1n8CYLL5=ZF2 z7w8h|9%93OSoCH5GeZ`mR&Brak+C9YLs=c?4r6*WpqMpKH-UuXbVx3jda&Qrz- z!-zvW5?}n3(^n7J16bh4#RRTSnEw`pS6~ zjhtW}_R*Ks(uG2@%=!D9TI9z5A%+0`{k!0G!YddBHZ|C0N*i>hkXJFZ#MkK223>;p zb$qwJp(3=q#GG(_An|Xi#Z3P=QJFz|F)`dr-91Q(1*LSp%fdQY9)nP z{s(%oz2n0{H$HMYR~1Qom(~r&C1~EGtJuf;N~7*rW60#l=)#HI)h54uNbJmQADPh_ z^3qc8h6#lKcgX&w{oA68rfr(mKkc7I=gvJlae3j*g>^H&nh`(KKC5uf?x}||r_WmD zTJQ3@ZgairddKyN>r2=7F1?&8&yx4ZZ_7#UOWiBnE8X4hYuwknUvhu$jxXCV=k_@# z=6p0qUoxR&YDrbemXcE?!E=k}UOacl+^6P#KR4T3T2;ELbbINM(l1K0UGr1tr&g!l zovKOeO4FpR!vF2*U1@|2A9Ib)w5R6Vlcpb;YM+;RWXkY}>uiv{I^Vu}`Vax*_Wo&y zTI|EE_HDm&_y68~XqkO@xqaK9yZ?{wFORuwEiZvWkbPgit;N>n>GSN+ep1~saPHJm z8geou&zmX_#@&%BKR^0o%eMI`{hpM;xZ~%}?L|rScP&TV_;L#WrpYb+6Xl`s{#1D= zxIaxE()6dxEw%%fj>Zg-A?@HMxB!ABo<4U*%j@-0=LRE=ss zng8jQ=&xE1Tza;rVoCPpCDB3lJ=2EBEmic`$q;Gg*M;|2oh{v0wST_dmGYcrG;wGL zda_SQJu=7cN<9*UZ^K3M;4kQ9lipWye^u4N;}4IVI~ih;42+~_?=)M>@SW5?8j^-_ zWqJ?(<`%oHYXUN+#3v%V*Jl1WVJUo?mJ5?SoWZf3ZJF5cLs!naRZg-gG$Ch?B z#I33ZctTC9I*;zLJ1jSFc7^EhHbS&u7KE9Pm&L|k7}Nu(a$vu zL$j^UKuw{%I@4Ff734z2D?a2?JfGeL^Z1!}LgwRkc0cV*mv`jgXG-~1y@w%?z@ zXO61@W{#;ru3lF+S~{fPv;?Yf82mY8a5+4QNoo5exj##0@&k7naz9pACX*R-ygx@S z9wHyt_0{3u1$_&KG<{3?{9vx@+4MwVvKw+^b@ijkLm^o6wBePIR4qQQdL?9Xv_l>Z z`Vz{<)L?0UhD?vX60#^6rLid86uH02*4Eh9w71 zD1uqd8fG>1u$qHG1G=LXd-LTju(10p`itcKmHpFX&(@S73;N=7Fhh`@Df@a3oEv{% z+h)l9Gv)0Q-LInE&VCzmt0Y~Da>!O(aT`yChcGl>jrrA@M|G)MQ&!} z`^)43CqBygk9qRIRQ&MpAJzQd8vbvse8^)TuC{v)(*L~{GILg{%(n>7wP`ZjB@WH7 z56`sQugpA>w!Nj~&@B7#Z2rr!495}RxKYVCWoHa)+;Mpt{*Wgp5L z&<_UN8&m8zXW6?`j^u$_8mRFW5eGaU)r>|RsQ##SG^}#dPLJJ_btH;4fAdg{eYn={ z+2>8c&e}5g4K}CE<$d$Uh=EQd=&%;)ti`{<5i_A#a{nZGAYxF@`g}5LIKRx^l7g9O zVLgW9=MHVUlnKH*62tMkmSaRy9=jy`{*{Tc>*MWNv%y0#eM{|Ya@lzPka;*? z{-}{{C<}LlD(p+&Li>i?BXR!Prx&r>#i(Up`WCl9BB%X)3-b=qb9kST_PS%m9JTs>ZhsZbD&pr%a>wDKg_)$;)&o0kU zo_}EWr*n^FGF?sISH6GVAh8D**~9V#V|ul_Z+!Zh(qf+sj-S(x+PH}wbKr)jl)>sV z%j0wGyu!0PoKt3Bk-H;!Yvs9vurDyJ#jBT>2*ch%VAP?PK1F02)e-7bPkU7^Ci#a+ zT+b|P%l+kRazRmODe8&`AW_s|1385+lVtE0JSy2IVRpm(h$svhjpOL?2t#p$M$h;vF_DqO+ZPzq`z~q9HpN%FwgrwLo2PbNfp9VCMPL_ zZnmS?dnCy7!8ChrF-SDYXMfzjSU%pQ3enwHhUsu;LXGUN6zsTsznhWUUnb~z#Ci;} z|1yKw$`=VUk7qOx+@>^UFUJaW_LY-2MGfQzlpP6$S@^aHzSdAQ|2(`H$F1vmVR6ff zrBEd|l%@I?*Qf-tpONZwuF>G3;J&3;`Mie6qgGL)kw+uIrtUUc}ls&9qN20yBV29N{zhFn~FgX!D zu|N7mrnmnm*APMbK;;^UdiZ;xFt!$E=!;t_4q6|52#9PGd-RBHGnP&JEpy*G_~=74 z@57Kgy+0N9|6Dj|WQX5b{P4>#l%+!gZgoZ&)!=z`b8l z#+_e$Wu7au19M>`aH80ng8ATuK3tRo*UOD6Jj7HP)6S{09hp(bvB&3as}v#x1zsvB za~B+z+}3h1GpesC9RKN>?%A4owy&uQ|LK|rL-)SudcI;e{%wCg`ad|pKg|~QWhKu= z?^qQd|C~2*R67*ie_6?}dOAORS;_GY_Wne<&vSgEy+29rt7e;YzYV972)P1IM}M5W zI?{JAiI%s=fL~94JnAJ;pCGS}^3})6+l?}4=gQ-afZE%DH|VHmPkRYgI73PXYp4l9 zl;HNuOZbo65c}R~FI`^JGGyPB3Fd~|ON#%us-!sJ@4M)2iJ>ziqGQOOIduygDi-&8=*Nkn zY2Iiv*|TcJhTgOWT>s_dkr)g6y^;OKB_|4^Y-mqct!V9SYR=w3q&TvtyQj4mmDwAK zKA!AZ(T2|i_PK!=6486tD)dfF6BwaZl@RWTal2?r_BYPr^qt;D5}P6ro0?J9)a+~^ zmQ+yb=$?wuRjdg?m6No>aXRMRIDXFd&} zyFHzdk>ClT=QQ5orNW3i+}xH=6dxJlV-o+c!_^6ftHb9Z+H|{^hDiS`c=kb=+04YE z$o^`v{d;wKP|-3JK7Lg?%P^VIaGT-J42B-}u5|N5(09y#UI_ykj9|bjH=MKu!>gIS z#Nl%d``Iw4wV#{BQOtgnPwEk{Y8bx49e$|MKD^Kluf=m!#)VyqzPi<}xErN%WfE@G zu#@>$;O82KL%+6%rkn4S56!g?m)f_z?&^QTg=P4r3n8nllu*0(0~hw$Z9{VZL3!Kf za{m|dwj6iA(>>f)(m%z`Hraa-*qGw(KZEmwyMML2f4#f^T2?Wmf33TJqr1P?Ep&a` z`*QyW^0qX0f4bX#u<%fweRzSLeG%%7FTQcHV-^As9k%{X_q_gY_n}4h;l*sgqN2D% z-+z@Gdw%hmtK9h3e~lX~Vrgw~_y2~K+wk4XzTk6{+djXT#ouC5Lz65`@`<@SB8IN3 z7z+F3^o-G;+FP*U&7|(s&?VZ*Wpp4lbe4Cq`~~*m@30A19B-EQHo+Ngl1IOJsY!0{ zUnH|VIwNp{9-3>vcn;Hur|qxKQU`^l$}#sg%U=fUmO9Ed;aJ{v#0g4brNwOU38 z6?T2r{v`uWlho>X`xdPog8xe z!l(mw9JnUR%njfhiW}PrJBdS0#i6W&Z2@ef=lh5odjRt5%h$E8?j|9h(<`$> zZ`2TaE<5z^iZk?>Q}5Z%lY2($9@X#G@~=01@tA((i^sxDUK+J%c8BJMkt1`$>og!* zeqe66HoUu9B%W5Yq%Zdmwqs$&3VnpfiP(H5L<+XTl2d5vU1pC+*Qh* zt2)<_xJc0gWXd~Mt*UQZ-c#MVrn8jjB($}mwFKXr1RX9(u^9`CmoT)lNOmoR~bv{>U!4YWwLF?tl87ry^828j1}vzvtqDm_AFbz zob5fjIN(LbYxcBtuIo)pzw9!SkVq$2&5XB9_>}=#?ewno4zo5sm9DLt85fqO*|U7r zauSzLWAYtVZQMk9GT33FC#q%!8y&tra8ou3og`#vXx?ufM%r>_qE4GQnSNC@Ga)<+ zSZmtAN!|f>crZPh6l#jdQg^RH5}!j~P6~~SaH53qTTBvjS&7lqu(8{01M4W|ubDr;V6T>thu-$h$(G`M98rw!Vt&VG3dQ(4@O8*1|6C9+0SNvZrIs^4_k7p4R0n ziK!Me+mUhguqF+Go$_~j?s=}2jgHjctR7EOPl2R3=R7ERQ zF-ldeQe{-COiGnmsj?_lR;9{ztSU~^L~k67OHBR1cT2~v^Z1pcxb-V0VIPWHzmcP# zCe*UEvrgF;r|gSY_9ZC$5|w>P%DxH8zGP*eUD=nS>`OhiFD+8M~WbH^_D&+b-O4UvT})H%Ot*wJ2^?E9oqK1xHExN9U%B%sa>{FZ z6wU!jxQKS$nI7-GSYXFqqG5S5?f8dN%p=yNyhOCCT(RK>(aw5lKyhPdms%XxGFE&O z!(`NOw@mb{sw|cXgyrkn+SY7U$6V`5Ma~q<&>_*weIvy$IJWu~qMf~sW(}k#*IjmA z_2nwrc0m?Pvvu7VSwGc|^O{{DnoU?qZyQKY(yXEn;bY$F03yz1Vx9k1j90%#w21H2 z@KiEUxt&#t07-AEi-&ctx zc@@3+uJjzu272kfbX&G@BPvUm^rn_B>s;T1o9t9#y+*~yiWAukEOmh-TuU{B>G7KD zXyRacTDn&t<@WK^17h5y((&y_sU+dIqQUj_Iy9KM`Md^wY6I*lJsoQA>E|@%FRy8CDGf&FCROme*9*`YG`X+x4fN?%XTxPV~yUS zHq6UqbkcV+c_c2#PMcIeiA3Kro=(iIDxLcEYd8_Z@72~w{MseNY^JKZZ|rvZMo()tr^qtf8cXaWxQSOq_M5Lr?<4BI+fV&P!WBi=y5WMkf=L-^rmtl z42+|97o!(9V=$1MoJtJ)d|1fjQF%Tv#A?yBjf2E^6I`H+bI0l}*EL5;|Mb;2ScXP4)( zAYb`zZJKjdqdhl$LY#8{p1FntSENq_cL<@>Ajj|kdR9;K!O>CUj@ z;^&0N===j%qL0L+AVCp42u!by$raF!v-4h~6UZQW+Rm~x5z3A*(_da~w8dhkGc zismW$0{eKHet950P4f(my&E6T(xSV8a*8fuAJ5S%?@phnd7h>ehF2)}q#w9v;yZ5N zmaqFoiw*jmmTzxz=lV50ZR@h&xsaee#H0yw7Go>j&^uNUrVU~n!IC&+8qdoM?huO=T zbBKAQ?jFZ)HNgvWg7oyYA;)HIN*G;m*paMF4yQL9bWG4j5IUfBn+jtiu|ansKEQ1} zv$qivc5fD8n4U|_(c<9EE9bTKG<00uM$9qv<-P=?6cNk(m2MzTCngh(xz}N2(T1K4 ztx9`!+nV*nY89PW%{JA~V5wVtKR~3x5>GF^*I}NE&_Xu?4)7ybFK`Jnujf0nvym8* z)EEO41fd0A+=5ZzDQmFuwiKGOa+0+KAq5tw;6ViLnh^tn2t4vpKum}qsEt{UZBt%W z0g1|B;Q|)Ha5rUdIB>|J4I-9InsUrx%GFO+!ya(zc-SLbb!d>J1g~z6$K71oyQHpm z*%e@yq)cI=wOirUu^@#{R_@lGR$?vii2%+W>x|d>L|`kVF`qar7E=+3HZ*dgst`zG zF@5*2BSAYu5b&De&0RpiI$QWpV^rA&P4p$I*ELsoU9m2L+1$m$HD%7)+6tnVxu-=! zv4ybdDf&+V>m!Zmjl2mwbLAG1RE~RZL>w+i|8;y9ggoFdkhGKX%1(A0ZOmFuo&0BU8QQ zS-no=p)V3L7+Xt7$X2J;->J2k_8xIq%9fxVQxDAl#iE%wg%HCfY7IhUmj>2g5QY}i zt!rf`kN9Q8SwMfe-(iVZt~QuTCbiLDjyN0lURGdg$4s zj-*-Zh1e`t3bC;**S|{UW|{sl%18_>5nN|~;v?{`iz7X0Rdc`{uqnguLOVz>?s znQcH0`6e#Wh+dR1iRP1p>*>+^9r3xF)sjLIqnt0v8&Jn2SxEF-#1P_dq(9y7h>O^& zwkjZ#wo&_^9FB~Bp&Y(B#5vKlofV1TC3h*X<6Ca#Yj&bxr&@wQit0 zKGP>A#?$l2h#d(tZQ0FBe6)( z6~WmdmBE9&yv=s6%3y)uszBw+G)$aR&(lW3eQGCIsz)wl;pq7+u*6ix!u`Cf1pS`` z3o#FjZ%Zr>a)dg|h^T7#PS*~9dVeE#475`Kp0u8;zvzcUv=w--s;X3IrG~#0$X~^Ujsbr zX?2A8efikeU7hPzw5>zD{2vSnn_Y7s+nakUNaQ=BnY)>_dT;#ZRn7L-)NW$@-~zi~ z_z)vxHlTo5KjtG*~*{(3Z2Cy;a@cOAxC_~=YHW_e1287|*M(J)Q7D=>6=#3eU z$Y@^;y0gUa_I9I@6$(4a_JIzFQ;oV+f`VDa;(@j?tR7$?#>V=oEF+dU(GQ|*yq^SL z4eKY7Q%Er)+@|u$_nVcANkp=WR|67uPQscZNJy#vDn=uX)5wUO$VxdEY^=?g4FuuT z!Rir%V++WFFr4NkhtaOj)G#|v^a#Omwz7S=jARaib$@l35~rXQbb>_?8hE$>H%~&4 zNxAgJM;wXCdFq4}lGuXt`?nOLvu7PfOIVR+@@^;?0&ki<-OHA9@fY(kh0hTETV@H| zsL0tq6voILKDJqwxf<;MK6gMIaKi9AW87=wQ-{fF5T^Z7Rn#oMnWB)Clc_ zc9mr;^KO-AW?@%y3!BstKqOVVLS>s1316jwmFEugYIW|`(2~a;>2jy|Y3@=F=WRXQ zsv@Y+MPk-6exdbK``Vda5aT*lfaw&WP!<)pb!+JRaS7(RrXI}&#{(7y;sgp1Ilz;0 zS6$Ftzdzyf#c@Q(G33xZ5?(X=6%R11;uE5W`;Jh$BJx zoop<8n@9YHDMI)l24tnoa_Il4uIqhbWXb#KLnj>*=HAVOb9JwqL?ArFzhMc)A{rB5 z3UO~EAs)j`VN+idBASQ5E3<~f!Ww275tHG|yR5IWtao-VTIdmp;fC?3uO+ib_lpK) zkqF3$1}H@+X54|*C*F|@#ru#d5j?y3XH~q9s6}A%xY|{7AFQ|jF~Owqaop+P2q)}{ zv!V;n5uH$b$0Ebp1jDd=ktcnv!II$#(FpFD^rRmd74c6)vDmS@636w;O?laL?vsvi z?K2wM`jNvp`&lr<&NBtX_#7iAHZ^`kXduStMGt{f{1-G}H!1lf@kM(3la2(pMQ*_zyAG01ji{y?~MT#u)j4F=F<{e}wMXxgPEyTO$qZ7R8BB zJJEm4)L;X#euCM+Rv1vt0t6BN1TF5vs95$_1yKAk(TooRy75$P3otAIGZbmaiDOT+W4KErhK%p z7jp|FnQzE5fl?sq8K8ZT=pgeJP=4sNm_0?##%Na z-^V{J5#nbC)h^olR0RgroN|6s;MvjwxrEv|p?9ULRuO%=VAecQJGqy!&(13ue3#55 zdWWb?nM6xZIqcpHNano2S?uHh(KNJP*+vXmW3tH+l>zJ9>8~{9f|?rJW5Q#>JwqNF z4&tK-LFS9L%x`0S;b=wQJLL$OKQ*93SPgd*+;nTv_(Gp?E!JMJcTM-p-8z%zJ?F4w z%nE4h-*Z6JFdL}C;>49`vFo%x<1lB<1vaJ|Ln>djzPlYptFg1Wl!UvqzFT-%2yK#^ z-uIltVJsg%L&Q2y%eG9D)>c7(dCpPZ#{fVG5P2-NfwC(wC=B!aY7K zvuSIzG-cN;qo$Ul;C&473$%2~PKQlX&r9e_8yq1i)Xfe8Zog@U2UNI!Yrk*Qf6 z&`*=vPqXM}iQ3Oa93`=u*e($hqGl>!n&etfZ9TCqrT6{CVa>mkO()9|K!~YT%lG}5 zWm=IbAUhXVU{fIa<*2|ZBDoE-QAi)z;D`%~yIf1}+7WL`!WPyJeZ}S-)1e)=g^{=` zI2R$vI)h`ic2I=ofmH>{C~XC@Te zuER+3b_Kf6ETljTUNm5a9&yrMp;hks(#6h=t*&YW?6kBs-C;?_kT;7yjeShIV*6w} z3Qmp|W!Fm%v*v~XF1Dy#~*j;lPY{Yq@U_&~L&$kox~;6CF}HffIUfphOO-5*Z#Z5gffOhq*-V8?HEh|7FT@So=54}bH=vPsMc1_AEeOkp-aU&0?|HivtLWt2 zCq7CYFFVq`$HxnnIn$4+`YXE|+EyX;scl7HS3A;`{)Tqw!uX0{(eDG5!r6TF!tP#! zaX@xc_#4b1qeG&9lXVP2Z>jygE&5A4O>g|0Bh~xPg*4t3UFzQxlW2VZLX;0wq93Y6 zKN3XEA7dXC2PJsiU3{Y^`cKr#e~J-~Q*f{O)AI(#;^4;5F6h$wFD_%ncb*b)bYlEm z_(cIOfZ+>uf~OP1my8bIQH^IWAZhqYyT>bBQ)2!P8nHZKL6_eb6T>$uB^+SBRoPVQ z#f>sNL$Uarcz?hTOdSGg)Rq#%k17S6NPa$_0;~7_Z;Ze>ShR5jWFX)Y*T*8RZMnT1 zV*&L+LEJe516Ezo`3C}E5@QH!Hf9O1P+~)axPOJXx3>{*wt&i;^sMOWUKR>R2~&Dv z3J+3!6c2wf0m_Nq5G0bUBKRFL9LXT=xQ0tXh(0n+HAe^e^2o&NvKm;AG5#La4h^w< zVAZ`&WNw*)_z6O9W}jHd7Su7{qmYE#f{+Tv6**q?7@ime)#eA@B$bB=f``e;wEI;@ zrq&)rW3&!qa%`$9FcFc1-8Q7L65(M@q@%AQCC?E=zY221#Y_@i>oWu^)=c{T_p-%3 z8JzH)lbEuFq?tQc-n4jK2VVPPb3#Hmb;_k4Pkt|a)>d<5{v?w>G5a%?+gBE8a z-dm;)F`t;`T{uL2rI_&W`AqCQ_T&-bo={Ey^135QQ$z21!(qzM*9t^KT@d$V(je{y zV%8Bq*VhXsEDa3XoYklz<&wySJ|rAeVi%7a7S8yVCY5}%N`A>0`HR$+xH!95C4UJg zU%PaS{G~o5kk_}W8na9c!L&Sx8{PUg1mc?Vn)49Vh+Q#`1!#?>jk93UU#7Bfxu1o& z_8|Ils>2el?@$@If-?}Y($7G`D%$m?BR+BsBg@0;ah-e~Ezyx(zB2HZu$GsatxOEv z<9Wb~w|Z0_)?+vj|6B{`bkyooY@D#7%I5xNbT2%tq z2??0JLIUL-YgYI+9ul+3xA4`=u!vr!=PYT!O{}70~|K6ZDRa^#=9R4R(G)7Iqv2l7W*(mw|AgWjey<4@>#fFaH|-J z^n0e5;wwW|mE|tcaLTxbF@u2(ndbdb?S7xCdHaRjy@6-0m;>YGLG*VE=B@VxiBpAd z_iN;db%r5Ty14zhS2PU>f$0y4p+z2MGsWU#>{xf7V2m9bkDxVu^0dR~y`Sj~s|Tma z4+zfuj44cQeSQateGoPRp4!-bs{WW5l66EhRO320Un9J|oJ2how8vS|&^tZ1&n3&m z^zb;WEo>@-td9io6d|+WQFTOc&K?Vb=hKBq9_{^y!<2RsHR5p~YHTi7^LRo)PvxDDG4cU2{W>MT&b)3>vl+N5f<9IIhxVWzHeUX>!)LwXUe{ zT;JX1to69B=h5fI>U3X^#9<`NPM%9ACWdBeN@;Ck=!7yWl9l<6FuiY0XLfJfhK`;S z!A=tE7T0?1?zSsAJraeaWw9Ej_sO^oMxru*T&k2@i-O2=g4qj${Mhm^b5qDxdAyYs_?=Z zk%7$D&&-A5rZ{{t@^biwYCtl}^y#~}k;lN<%L2_yxR~Vjw&g2puWVb#lda+|qT4@o z*jz|!QP+F;QkDk8@|Ud0XkiyJ+^&uV3C+lBVR|%H3ugb zz6}`%8{x+yAOnu|~W@*V53l@tt2F?S#EF~59WCqm$HchhVC>97?biAMFr#mJc8%*d!= z=kl?h*u};{k#u6dm$rQBFli1^`)3Zz>S0w(1)O7~Z?G3L5(AQHRBzdKzffNuRAF4O zr)v;FGC%NZJwNzsJs(qh9uYl1#CtA!SnYYLuV?m%4KX5RhKGUhLseb_(q(+iJWfx3 z>aZ4^{I$NH__e;DRQrBP^!+sN+x86W8zGP)U*9a7mRO&sHIRw-FM?+^E25R{HG;di@k@zcb-cmsDV|M5f{Zv8 zWE1n-Vtgun{`z7PeR_Nc;qNdTOH0n>SPRYXt1CBf2^cp`6W|+= zD#N=dAo`zFW`F)QW?8lj8#I_jqRjbp7_-QdQ7IWT8ZTdKkf%YbUO?g5v|w>rqt2Ch zb#xP$h}Pj^3aikk5OJXz>}TBZ5o)8pWttd}L*pBKIPR)^7jWDlVWAIxV9f^(EHanft+ReK<`a*F>XD^~DUpkU2idh$2yZJ_r zwPl_mdL6gmEHg23s1IB(hKK!;KWaEj49+?mSI0lgCa+}CXwAHMq$Bhq!S zT3Ip{?~g4f`TYJ+XmS5)e`RWaY9`MZi_LiuouzQzuXc~*9$)uWcK~IuEL1x{PS1t=;9|9dCf#EBsj=W*Z`x$^tz+^xcARCYaZ~~?PashdOd_VzUDxeTh1egXW z223B>^8Sns?O{ZRJT#KP^3Q&YdwB@hIt5u2?9!YoYPHLki;yccC-6J~)o0;h8}xoW zI)6bfF=8F4=F2y3tO((U7m2AbP8)|Zfh#(e35zjDPiJ*w30|fd^yT?8jT5mth!u;0 zElF_(^FP0*;Be9(C~yRWA@j!DtPGwTAiVlgpd2{Hi%XhmG37}k-S zW(9{XWXiQj9W}ecO46%~(AacA%YHRU9OU8SIKmUI(8=- zu3xEgvuY&Ine|upz-{tK@b+23`8hi^gv<>l#9^Oi@3LQM-Urtc}Zd!6;RxWM(TDH@hPt2N(w{ai&T28^o=@YY(@$vJCSt+5rQwC%0 zL66dwle5eyyYeK4y_@dFM~qsvZF@@p%_;joIJBESe{xpQt~uf9so$oQt?1|>MX9x2 zJsq8Ex=B-N3Arkj1Zy|d5W>JNCD-R-aXL(#PJ5TmPSDJtn-U~b&P*KN*sEGxm3R)cyb^A3U1bw7&r*vQ zFX<~?kHpE1T?lE;+3A02guGOidSLhawl(fM(!&u=MSlTWM& zg9sjaJ?z0|Cx3fB$>O3-PdBz5Rhhg^iHlz#jYY(FT3u1t)x=8qoL2$=eG|>829w{_yM(JGK&uCx99S8DO z^NoKSi~Fk2%Ei9ILZaM;sBs{}tE_}y|5#tAce3_xsMkMlipaVCE%u2h*4zC0C*w4N zjx6d^Kw{n*M-4&gcgKjmPm_NDu@A(BOV)=fv5y3?sE-kd4Y+XmL?sH({8M%hWYwBK zqhI|k!x)tGFLA>|cXY;wT1{VEcpa1UCHi0+(%Bzmz4qS-aL&lK1X;gQrSdhCidk#< z51sp?Z1(<_i%(G_vc0XVR`r(PDl-U&*yRDCIQ}4?^gY;OZYYa~;Nntc63Y4V6Y{NoZfRHCd^My?VVR4ARDd;b{0pAK)p6t?6pC`BX<>r zI5fw8miKDt;QwSt_A$O>H{TAVS9u+ z@jV@}hVc_D9@4=Ca|Ocw9rrjLjhSroA_n0PRN(#@8!7uU1SA#_2UZSkLn%+ee9CXl zjL)!Vm;&7)Vt5v{>`*n0z1)5eGC%|9^89+DdmiN`L?r_KD{nPkMP)>2B9Iz_KL$i8 z_-#ia(Y=IrQGaD98+;B<)F|vG6h{aF>7l@8+E_$l5U?0Sgm_{Qxfnx5f#Fp@a`Nlc zdrqEUM(~0erhuK__7Bm*CBF2;{Wk`jXN&t9h5Q)4n=*B1w>d1nB{#8 zS@>~*DPZ*Z0aKDk`h;+=%hSek;q-`2Fk7uhID#AKf2l_QbM};{8r@@g0XcmDGdtQQu zWqH!lUGb(M5~t-(3HK<2#(9*%!dqdERzhru-|11q2{ECF1onFSYrpo1j+h91(n6E)ZR4Qqrp={ouq%A`$9PU;3Vv6mqvTd-=0{(5zu z)DUxGAFT^Bw$Da4%|yA_uSV92HNK<4>oI^_as_;VQ~JaG(%PR$myPKOlIVcsHL4KU+7@xr)OaeUA^3 zzjh&hh#JD&amk1wv*y0{ElBs`HyZ)`8N4Q9m@Y85t)9caruE3X6oa>44ZK7c4 zd4CJmv*|NDtv15DIG#~O`|Ox#*<=dQR=~=0j`Dti2Pk0&;2p~A z(Vy)_&TA!Xyr3qe4Qu}^)MQYD;SZ!11c-cjSUN3BpPvW z)`_1i;^CZZ!}?_)x@J9wggwVMBz4=F`1#n7*a8zX9FD*^N6gQq^%3r@oUzy07_g!E zXnZZilK!7D8sKCLUw?D3vv53B1poCl<03#9oK^aGjYc@!&ubp$@&`VbbAB98n zu+xmAfl#=gMm}hq6Z(JveIOqi-|I^_ABcjFqY;GPY$}+{3Lr2| z-3zO$n@Kpr-p<;3{7J@$Fpayx3BSF*kx1d}J1j5WafQ8GV_;FXM-<7eNM(vtu1NC~ zsX~z|6{$**<|~p%k*XD`Mv-b2sZNm=C{n#5H7HV}A}v&;MT)dok(v~#S&^0~(nX4N zu_9ffNJ|yzQblS}q*g^*rbx>bX@w%SDbi(%bh#q6D^iCdU7<)T6={_styZKpiqxq{ zU5d0;k=7|vw<7f@(t1U@QjxAwqz#I+QIW1zq-zxEH;QzvB3-9QUPaoZNWF^mTSdBF zkv1z*pCT!Wbb}&oQKTCcX{#dLq)6Kosb7({E7Hx1v_p}0D$*^AbgLr$PLY1ENV^n? zD$;I6+M`IfDbgPl>2^iht4Mb!(w&Mlph$Nq(x4*!QIYm3(tbrcph$Ns(mjeaq(}!9 z>0U)Tq)5YxbXbw@Q=}t`bX1Y73m2@dQy>|QlzI9=@~_OR*_CA(sPRRydwQYkzP=w7ZvFxMf$5EjVjX1 ziu5-{`nw{%qDZeQ(rb$Jx+1-yNN+0ATZ;6yBAr&Ge<;#BiuA4`y{Aa;E7Avw^r0es zq(~nt(kF`aPeuAvkv>zTe<{-Eiu8pdol&GO73trKbXJkRQlzgH=|76}jUxS5k-k-= z?-c2KMfyRJepIBN6zOM0`kx~GqDbeqN}BDG2A~B50fGTKKnNfdpa+Bj!T|4P0WpABfDvE(o;3B}qfJ*>N0ha<= z0Ih&!faQP{fHuHofXe~xfDXVFfR%t%fYpFCfKEUcU@c%Bpc~KwSP!@oa1~$!U?bpa zz%_v10ImgG2k-(m0eS(y1zZo<4Cn(WfExf?05<}*0&W6q1M~y718xTF0PF_B;A6lifPVr$1$+kh7vOWi7l1Q>F9H7soCSOZ_!{sZz&C*Z0=@-& a2lyWF1K>x%Pk^5R{{#G@IV_#ioc({t&!fTs diff --git a/INC/LIBGUI.I.txt b/INC/LIBGUI.I.txt index 0ae24df6..83ee4b70 100644 --- a/INC/LIBGUI.I.txt +++ b/INC/LIBGUI.I.txt @@ -35,6 +35,22 @@ C16.PINK .EQ 13 C16.YELLOW .EQ 14 C.WHITE .EQ 255 *-------------------------------------- +BM.ID.APPLE .EQ 2 +BM.ID.CLOSE .EQ 4 +BM.ID.MAX .EQ 6 +BM.ID.MIN .EQ 8 +BM.ID.LEFT .EQ 10 +BM.ID.RIGHT .EQ 12 +BM.ID.UP .EQ 14 +BM.ID.DOWN .EQ 16 +*-------------------------------------- +BUT.ID.OK .EQ 1 +BUT.ID.CANCEL .EQ 2 +BUT.ID.RETRY .EQ 4 +BUT.ID.IGNORE .EQ 8 +BUT.ID.YES .EQ 16 +BUT.ID.NO .EQ 32 +*-------------------------------------- PTR.T.ARROW .EQ 0 PTR.T.MOVE .EQ 2 PTR.T.RESIZEX .EQ 4 @@ -200,15 +216,6 @@ S.MITEM.ID .EQ 10 * S.MITEM .EQ 12 *-------------------------------------- -BM.ID.APPLE .EQ 2 -BM.ID.CLOSE .EQ 4 -BM.ID.MAX .EQ 6 -BM.ID.MIN .EQ 8 -BM.ID.LEFT .EQ 10 -BM.ID.RIGHT .EQ 12 -BM.ID.UP .EQ 14 -BM.ID.DOWN .EQ 16 -*-------------------------------------- S.BUT.F.DISABLED .EQ %10000000 * S.BUT.S.PUSHED .EQ %10000000 diff --git a/LIB/LIBGUI.S.MBAR.txt b/LIB/LIBGUI.S.MBAR.txt index 0496b63b..ee358c45 100644 --- a/LIB/LIBGUI.S.MBAR.txt +++ b/LIB/LIBGUI.S.MBAR.txt @@ -108,13 +108,13 @@ MBAR.GetData lda ZPMENUPtr jsr SkipStrZPtr1 skip "TEXT\0" + lda (ZPPtr1) + jsr MBAR.AddByte pMENU + ldy #1 lda (ZPPtr1),y jsr MBAR.AddByte pMENU+1 - lda (ZPPtr1) - jsr MBAR.AddByte pMENU - lda #2 jsr SkipAPtr1 stkip pMENU bra .1 @@ -176,9 +176,15 @@ MBAR.Enter ldy #S.WND.pMBAR >LDYA ZPPtr1 >STYA ZPPtr2 save MBITEM to activate - + .2 jsr MBAR.NextMBItem bra .1 + +*-------------------------------------- + +.8 clc +.9 rts + *-------------------------------------- .3 lda ZPPtr2 ora ZPPtr2+1 @@ -215,6 +221,9 @@ MBAR.Enter ldy #S.WND.pMBAR .5 eor #S.MBITEM.S.SELECTED sta (ZPPtr1),y + >LDYA CB.Cache+S.CB.X1 + >STYA DX + jsr MBAR.DrawMBItem bcs .9 @@ -222,10 +231,25 @@ MBAR.Enter ldy #S.WND.pMBAR bra .4 .7 >LDYA L.WND.Screen - jmp CB.FlushBufToYA + jsr CB.FlushBufToYA + bcs .9 + + >LDYA CB.Cache+S.CB.Y2 + >STYA DY -.8 clc -.9 rts + ldy #S.MBITEM.pMENU + lda (ZPPtr2),y + pha + iny + lda (ZPPtr2),y + ply + >DEBUG + jsr MENU.New.I + bcs .99 + + jmp MENU.Draw + +.99 rts *-------------------------------------- MBAR.Leave diff --git a/LIB/LIBGUI.S.MBOX.txt b/LIB/LIBGUI.S.MBOX.txt index 5c04783c..a78b6a4b 100644 --- a/LIB/LIBGUI.S.MBOX.txt +++ b/LIB/LIBGUI.S.MBOX.txt @@ -1,7 +1,7 @@ NEW AUTO 3,1 *-------------------------------------- -* iButton MsgBox(hWND, pTITLE, pTEXT, pBM, iButtons) +* idButton MsgBox(hWND, pTITLE, pTEXT, pBM, idButtons) *-------------------------------------- *-------------------------------------- diff --git a/LIB/LIBGUI.S.MENU.txt b/LIB/LIBGUI.S.MENU.txt index c8159d25..17c3b99c 100644 --- a/LIB/LIBGUI.S.MENU.txt +++ b/LIB/LIBGUI.S.MENU.txt @@ -6,7 +6,8 @@ NEW MENU.New >PULLW DY >PULLW DX >PULLYA - >STYA ZPPtr1 MENU definition + +MENU.New.I >STYA ZPPtr1 MENU definition >STYA ZPObjPtr for pass #2 ldx MENU.Stack.Cnt diff --git a/LIB/LIBGUI.S.txt b/LIB/LIBGUI.S.txt index f8b3f99f..57126b11 100644 --- a/LIB/LIBGUI.S.txt +++ b/LIB/LIBGUI.S.txt @@ -445,7 +445,6 @@ TEXTBUF .BS 16 for composing HotKey strings PREFS.BestViewedX .DA #$FC PREFS.MBarXMargin .DA #5 * -PREFS.bSYSBARTOP .DA #0 PREFS.MenuColor .DA #C.WHITE PREFS.SYSBARCOLOR .DA #C.WHITE PREFS.BorderColor .DA #C.BLACK diff --git a/ROOT/asmtest/TESTGUI.S.txt b/ROOT/asmtest/TESTGUI.S.txt index ea84d4ce..95b25bdb 100644 --- a/ROOT/asmtest/TESTGUI.S.txt +++ b/ROOT/asmtest/TESTGUI.S.txt @@ -42,6 +42,11 @@ L.WND.TITLE .DA WND.TITLE L.WND.MBAR .DA WND.MBAR L.WND.STATUS .DA WND.STATUS L.WND.Test.fPaint .DA WND.Test.fPaint +L.MENU.FILE .DA MENU.FILE +L.MENU.EDIT .DA MENU.EDIT +L.MENU.OPTIONS .DA MENU.OPTIONS +L.MENU.HELP .DA MENU.HELP +L.MENU.SUBMENU .DA MENU.SUBMENU .DA 0 *-------------------------------------- @@ -110,6 +115,17 @@ WND.Test >PUSHBI S.WND.F.RESIZE+S.WND.F.MOVE+S.WND.F.CLOSE+S.WND.F.MAX+S.WND.F. >PUSHW L.WND.TITLE >LIBCALL hLIBGUI,LIBGUI.OBJ.SetProp + >LDYA L.MENU.FILE + >STYA WND.MBAR.1 + >LDYA L.MENU.EDIT + >STYA WND.MBAR.2 + >LDYA L.MENU.OPTIONS + >STYA WND.MBAR.3 + >LDYA L.MENU.HELP + >STYA WND.MBAR.4 + >LDYA L.MENU.SUBMENU + >STYA MENU.OPTIONS.2 + >PUSHB hWND >PUSHW L.WND.MBAR >LIBCALL hLIBGUI,LIBGUI.WND.SetMBar @@ -155,16 +171,16 @@ WND.TITLE .AZ "Libgui ASM API test" WND.STATUS .AZ "Window status bar message" *-------------------------------------- WND.MBAR .AZ "File" - .DA WND.MENU.FILE +WND.MBAR.1 .DA MENU.FILE .AZ "Edit" - .DA WND.MENU.EDIT +WND.MBAR.2 .DA MENU.EDIT .AZ "Options" - .DA WND.MENU.OPTIONS +WND.MBAR.3 .DA MENU.OPTIONS .AZ "?" - .DA WND.MENU.HELP +WND.MBAR.4 .DA MENU.HELP .DA #0 *-------------------------------------- -WND.MENU.FILE .DA #S.MITEM.T.ITEM +MENU.FILE .DA #S.MITEM.T.ITEM .DA #02 ID .DA #KEYMOD.CTRL,#'N' .DA 0 pICON @@ -196,7 +212,7 @@ WND.MENU.FILE .DA #S.MITEM.T.ITEM .DA #0 *-------------------------------------- -WND.MENU.EDIT .DA #S.MITEM.T.ITEM +MENU.EDIT .DA #S.MITEM.T.ITEM .DA #12 ID .DA #KEYMOD.CTRL,#'X' .DA 0 pICON @@ -216,8 +232,7 @@ WND.MENU.EDIT .DA #S.MITEM.T.ITEM .DA #0 *-------------------------------------- -WND.MENU.OPTIONS - .DA #S.MITEM.T.ITEM +MENU.OPTIONS .DA #S.MITEM.T.ITEM .DA #18 ID .DA #0,#0 .DA 0 pICON @@ -226,13 +241,13 @@ WND.MENU.OPTIONS .DA #S.MITEM.T.SEP .DA #S.MITEM.T.SUBMENU - .DA WND.MENU.SUB +MENU.OPTIONS.2 .DA MENU.SUBMENU .DA 0 pICON .AZ "Sub Menu" .DA #0 *-------------------------------------- -WND.MENU.HELP .DA #S.MITEM.T.ITEM +MENU.HELP .DA #S.MITEM.T.ITEM .DA #20 ID .DA #0,#0 .DA 0 pICON @@ -240,7 +255,7 @@ WND.MENU.HELP .DA #S.MITEM.T.ITEM .DA #0 *-------------------------------------- -WND.MENU.SUB .DA #S.MITEM.T.ITEM +MENU.SUBMENU .DA #S.MITEM.T.ITEM .DA #18 ID .DA #0,#0 .DA 0 pICON