From 7553cd6c76877a4388ef1e39ad7a1b9b46cb84bd Mon Sep 17 00:00:00 2001 From: Joshua Bell Date: Sat, 2 Sep 2017 20:49:28 -0700 Subject: [PATCH] Window params: scrollbar control --- desk.acc/show.text.file/a2d.inc | 19 ++++++++++------ desk.acc/show.text.file/stf.list | 36 +++++++++++++++++++------------ desk.acc/show.text.file/stf.o | Bin 22308 -> 22473 bytes desk.acc/show.text.file/stf.s | 17 ++++++++------- 4 files changed, 44 insertions(+), 28 deletions(-) diff --git a/desk.acc/show.text.file/a2d.inc b/desk.acc/show.text.file/a2d.inc index 0dfdc8a..e050e53 100644 --- a/desk.acc/show.text.file/a2d.inc +++ b/desk.acc/show.text.file/a2d.inc @@ -66,13 +66,13 @@ A2D_CREATE_WINDOW := $38 ;; 0 = desktop ;; 1, 2, ... = file windows ;; 100 = DA (for example) - ;; .byte flags (A2D_CW_*) + ;; .byte flags (A2D_CWF_*) ;; bit 0: remove title bar ;; bit 1: add close box ;; bit 2: add resize box ;; .addr title - ;; .byte ??? - ;; .byte ??? + ;; .byte hscroll bits: 7 = enable, 6 = show thumb, 0 = show track + ;; .byte vscroll ;; .byte ??? ;; .byte ??? ;; .byte ??? @@ -160,9 +160,16 @@ A2D_SCROLL_PART_AFTER := 4 A2D_SCROLL_PART_THUMB := 5 ;;; Used in A2D_CREATE_WINDOW -A2D_CW_NOTITLE := 1 << 0 -A2D_CW_ADDCLOSE := 1 << 1 -A2D_CW_ADDRESIZE:= 1 << 2 +A2D_CWF_NOTITLE := 1 << 0 +A2D_CWF_ADDCLOSE := 1 << 1 +A2D_CWF_ADDRESIZE:= 1 << 2 + +A2D_CWS_NOSCROLL := 0 +A2D_CWS_SCROLL_ENABLED := 1 << 7 +A2D_CWS_SCROLL_THUMB := 1 << 6 +A2D_CWS_SCROLL_TRACK := 1 << 0 +A2D_CWS_SCROLL_NORMAL := A2D_CWS_SCROLL_ENABLED | A2D_CWS_SCROLL_THUMB | A2D_CWS_SCROLL_TRACK + ;;; Macros .macro A2D_CALL op, addr diff --git a/desk.acc/show.text.file/stf.list b/desk.acc/show.text.file/stf.list index 09c47d3..25ba226 100644 --- a/desk.acc/show.text.file/stf.list +++ b/desk.acc/show.text.file/stf.list @@ -143,13 +143,13 @@ Current file: stf.s 000800 2 ;; 0 = desktop 000800 2 ;; 1, 2, ... = file windows 000800 2 ;; 100 = DA (for example) -000800 2 ;; .byte flags (A2D_CW_*) +000800 2 ;; .byte flags (A2D_CWF_*) 000800 2 ;; bit 0: remove title bar 000800 2 ;; bit 1: add close box 000800 2 ;; bit 2: add resize box 000800 2 ;; .addr title -000800 2 ;; .byte ??? -000800 2 ;; .byte ??? +000800 2 ;; .byte hscroll bits: 7 = enable, 6 = show thumb, 0 = show track +000800 2 ;; .byte vscroll 000800 2 ;; .byte ??? 000800 2 ;; .byte ??? 000800 2 ;; .byte ??? @@ -237,9 +237,16 @@ Current file: stf.s 000800 2 A2D_SCROLL_PART_THUMB := 5 000800 2 000800 2 ;;; Used in A2D_CREATE_WINDOW -000800 2 A2D_CW_NOTITLE := 1 << 0 -000800 2 A2D_CW_ADDCLOSE := 1 << 1 -000800 2 A2D_CW_ADDRESIZE:= 1 << 2 +000800 2 A2D_CWF_NOTITLE := 1 << 0 +000800 2 A2D_CWF_ADDCLOSE := 1 << 1 +000800 2 A2D_CWF_ADDRESIZE:= 1 << 2 +000800 2 +000800 2 A2D_CWS_NOSCROLL := 0 +000800 2 A2D_CWS_SCROLL_ENABLED := 1 << 7 +000800 2 A2D_CWS_SCROLL_THUMB := 1 << 6 +000800 2 A2D_CWS_SCROLL_TRACK := 1 << 0 +000800 2 A2D_CWS_SCROLL_NORMAL := A2D_CWS_SCROLL_ENABLED | A2D_CWS_SCROLL_THUMB | A2D_CWS_SCROLL_TRACK +000800 2 000800 2 000800 2 ;;; Macros 000800 2 .macro A2D_CALL op, addr @@ -569,9 +576,10 @@ Current file: stf.s 000994 1 000994 1 .proc window_params 000994 1 64 id: .byte window_id ; window identifier -000995 1 02 flags: .byte A2D_CW_ADDCLOSE ; window flags (2=include close box) +000995 1 02 flags: .byte A2D_CWF_ADDCLOSE; window flags (2=include close box) 000996 1 00 10 title: .addr $1000 ; overwritten to point at filename -000998 1 00 C1 L0998: .byte $00,$C1 ; ??? +000998 1 00 hscroll:.byte A2D_CWS_NOSCROLL +000999 1 C1 vscroll:.byte A2D_CWS_SCROLL_NORMAL 00099A 1 00099A 1 20 L099A: .byte $20 ; hscroll? 00099B 1 00 FF L099B: .byte $00,$FF ; more hscroll? @@ -878,18 +886,18 @@ Current file: stf.s 000B6A 1 AD B5 09 lda text_box::width+1 000B6D 1 ED 62 09 sbc window_width+1 000B70 1 8D B1 09 sta text_box::hoffset+1 -000B73 1 AD 98 09 wider: lda window_params::L0998 +000B73 1 AD 98 09 wider: lda window_params::hscroll 000B76 1 AE 61 09 ldx window_width 000B79 1 E0 00 cpx #max_width 000B82 1 D0 05 bne L0B89 -000B84 1 29 FE and #$FE +000B84 1 29 FE and #(A2D_CWS_SCROLL_TRACK ^ $FF) 000B86 1 4C 8B 0B jmp L0B8B 000B89 1 -000B89 1 09 01 L0B89: ora #$01 -000B8B 1 8D 98 09 L0B8B: sta window_params::L0998 +000B89 1 09 01 L0B89: ora #A2D_CWS_SCROLL_TRACK +000B8B 1 8D 98 09 L0B8B: sta window_params::hscroll 000B8E 1 38 sec 000B8F 1 A9 00 lda #0;HH&Achj#$x9@GgwX^^L;E`Kb_Z4?AS4*#P3E8ySX^KUT!ihmFUpYzYCU#jJo;UTWC!T*3_Y1<&^R6hu| zJRaA(TC2CU_Bs?wcx3sd%AJV`;TQjV(UbcsLW$$Y%zJWha%#qk1y5cL|L94i`@frX zKm9g@f=}+U(6M@fW!kyKAe0bsW`PYz3T&-?7z%8p9ZC*D;fOPfSs7Z18^mS@wk#aj z8rv1Z!-zARV*jlAKL<9%$`MrC+vr>pjoG>cY;15AKGz^(uOz`6M{HEoq3;s%T|u}K z(Sb-1s=C`QV6@t%#Tn?2>m$X%qG}Tno~u$ z**Ph_h2*k1&9oQl1fk4`GXQ5}HnhPR7cZE+g@sdthBjL!-|%c~Fc=#B90lwd5XVQ*AM# z9GgHsQ|&z(HbtD#WjV-^4bChzRFyP^F$&hlE4CFr66KE~RQ4*at6aKQ^i8!t2BCcs zD9Go)Pqi)r?&7!$h!tEIxJyE{xT@GT1ddx1p%TX(MJB<80W*>dfMFnS6Y>SZ#Ag`T zFOvYUVPH>;)?%w-yAe3{h<4_1$BeY)pmqrUJ{L= zt(gM@wPRq9TFby9wg8owb<#@d zqswfE+4pP{NO`rn1?lZBm{SIpO1#tze zM_NMm2009D5Awj)soyOcvd_Q>?6g{U3F#I!n}i>M?NYCg)Vhsa1@`sndf|V4dQrB% zK7CbQeSNw@5q*6+QT}{=THn+2HAsJr%Galhq%Y^!s=8f{UD0q%(C~d-dcy{x|Mh8L ze;2T^&d0df%kinT#HU+e?=UN2l`JaQZ#?#u@^OUxiqk1b13M}o=gRk2B)P1iJ0beE zrpXk=v@MP{AZ}^D+DEc1xRHRGXPa5ySUc%UA+X^>oTBy=S9(tlK)v-!+`+SIUMLrS zw)-0i1gl@E%7)Z4} zP*xn4Z-}zg<;6zfIo)cv>i6HOW8AJ_Zen0F*c8|V@`4as>{xdJTnzRNY)(8qZ^q+1 z>~V&ySiSzi4G)&FuS1vN$_;bMG2{P3O|8Z`#WkJ&<+l2e+v;j{$Is&wp4XG(FEVFv zd{Eruou0SA_Iav9HYXnMViFs(`?Q(g=Qrhf z_A{6@_HThDLc*1)N9_b-Rc%$|!9;WHOC)t{7<8c>FNxXp_nK$t3GXimGibupy_RlgTy|?TSQOLnLJp+lsIvYW)bX zENYE?E*wLlq>fm{k8C;$fR~exF%er4;b=x2s~kRJ1F%(XjU2rZf~cM42v_+}N9`>v z*0Hl#Uua*_XWgvBcHV6y*+hmPAk?%z6o}K& zS`1a}-w-%Tz!4}4OgI($1Kbh&0o}8VjBd6gdzmM8jQa1A0 zsBOmf$i7iK=kk)Mou})_KSXV^%lk!bIH_LJJ8B=e{Et!FbDC)1Oeq}pVB``?Y6NjQNyks2D6RGUCmtTh79 z(x0MK6z`v+Hi@djlL{se|_%B490WtdKK&xUc5jX?`Jvu(nwx3lVjC5x8Y=+N@ zz>WZ#V^_&}YAB)B2j`X^O7QN_L_-NUfZt5ZFB?Lsentax0>08g7F0oHY6bLYsj^a~DwA$XMo+$c#8-wT9MKi4#x2?KR_JwN9nA30! zqYDYOg_WUNVH?5byZ}9GXW{`kV?!UQu!rGC$efr5#;aK;Y5)d$#)GTKKQIt#}J zM{N#aR)lOf_lww|sJ#w$YG~EXF;vCcBJfch6r~a$#?f?R3B%Y#Pq4VJq&TDRv6~Y} z6?+tc_w5^{qB%G)YRl|>?MX|-)4d128^dxbD2)N^Jzwi`z) zY$gL>PQ$TbQELqw617V{j@(3tqf%wpv6U!VWAD=SZqX|1&x%P9Wo@I`RkX^Mq8}Em zvGvHCiB{Qvx+O@BeSy)oqE)s`)7ELVtyWK`nf8Yulv59CJao{GnI>PsnN`}q9}JVUxLG+%r!(6f!!1LzFIzxWtR1>XE0PN0RBKU$Br@Y9BqpnzC=r1 zbK1g=FpExe=wkFd3o)=$Z35we0|V!IJg5=Pu`{(^5mJ?HrunL9jlG2ATcX_R$pK-& zxG~RQCA;McCRU-%;hstyFyc5){{+!0TY$^gL`U1JiqC0R z#bQh{Enw)rMCO?mFfNX9!L)#J@fPc|V~R8E{G(5S#Q>UU3mZxA96L*6rCs&2K~$`q zRS?)ITL(l78w}p*=JqM9s=3X=`ciuv7cYyBv}JT8gD|jWf>mMVDYi65L3&s|>=KhGHB_pX1==H;Cs* z1?Sto9v8QSGjwcXyL>{^_#t40wi6X@3^3h^{zMy^+wiu~QneYU(!xzAkzk7gf?g8H|!NA5WUV|GG^PbQZL0BKg8D2`JNPK;mT>;BXOsyj!nnWYP;Lh z4au>6B&dl^_Y|V^uAkS(Y6?a5vTHOB^k-Iwe*ig@GmSiFWe#CC*ddu>Fw(h)fn}nd^$akV zJ}2je_D`Bh|AdGW%L(w9d((X?GNVpnq|oNYPZ%)GsZX^O^EJMEn3l1ZIB0sf%b2?? z!X<30?R{LvgWp)RiG2g7(EAwtg64MI)4}Cd26VK2KvKd^!{>mQLiV@WV6HL;r`R&0 zXkv#wjp)CN=|Ve7uGmXp;n+$B(gUXBMujt!fb*gT3&&PPZHGqr0>d}2p*dp)Y(X(* zXHonwj%8#fW*-3gJI>EQy89#WsK)v-^o>QE*j6l8+EykAeVi2}+GaeB+03{MMkt3+ z3yYq!PvV#`;=!HFS6Cey-5HqXH1v@tjh$<}N5^R5Em& zr(n76~GZ3#$j_hJ_kI6A$O^v^*0Tx!tb#4GRzOL^=?>4*sE1Qp2a1&6>uocMk~s z;`@!9aq&zLnjV32588r&ndBpQo|j(nkt-)t6}AAB#!kbr3lUpIxQybp_|&VSQ_RL< zA)Q}$nm=3Vo57rt?elExoU>rzSWeW2;4W{V(C8U;#zi@aD2zJe;(bsbjfz$9lg$@s zcGNyXkrOzcAFA(+i94AKdcnA9%wbY6*LQJbZZ`l0h{ zei*@+s})R)v%h8U0Y7Hb0Q^6!al%ctGxWYt-x-I58t6|%o7fA!g2wSk0qy)GTR;|B zNN-_swC%+8kW+uK^C>u$HV{j{iaH~-7r^X4At26Ri z4P4A#Kwr@0y%wYUA3FNFz|uO0oe@~CO0fZqPK{lmb7!Zas#H6SsM`MG;{h3AxiNV=v!{S01CNF};V^UuPjQ3P>x6@AH6JRjFUSL>~oQBVl zm&JZFYS@4Wq#E@JJ_&rF39!=kA|zU8RX1#=(lZ;xs6jQ1qnRa@#6HS%Kqi;?iU9V{ zJ^%~IG9v@i5DX&s48a*jf&`ru+In0{FsSE$BNzPs#x%db0d}DA3~Lj6o6vIXBy~mz zEzasr29Z)`^EhSf0=Re%qr-7%rB%l#A}n0U%pUJ^5B`Z7M-UYg6BaIHp6~FxDf~E? z<-8uk;yU{n%+n2=g?G|+gw$2rd@Lu4uCp0vpK9PNyc6VO__owGKsnw)Pg$ktOAPI? z`t|{aYwR*8jh%)wS2wU}guBk(i{rrL;ZDYNo%JJOScl28&*`0MLvedh1F?$0W-*&$ z_EvlkgQ4&uvjGKX8G-eMjle1n?BP8ah)v9NcDp8JlV+;Y;Kp)vAd6rwyHjE4lZs_G#DHwv)tadz0|OPQ&MD`clrmiR+cz zzsE4aW3~$Qjt!lu_xD_OghA@mP^===-o};kz!m|>t%+17Y;eZI!-MD%4U7p8xV>-s zuW?AsD!@(LAcn`Q(2v;;28W#uhTHSFcsk;Y9p(bCsJ%|o%ItkC{aCcjwv(M!PJJUD zjmKs7>%e{rk-K}y03C3kwP=~0r~VVsGK-=AGtm}y4$xGa$my=pYtGog-bJ;>4&p!^ zr=hA$%XP^GCZ&l6wt?Uo?!~yl5hm_Gj4{8AsD<^!4}LHg_xZuYu!0G#gjKu19XHb!d)1K!X#R_+rpS~8<<0A!x*S*D04uAR@z{~0^1os zN^hV%+V;`^o1!gjI-XbBM1aw9cDjyT6#ii*05TZ6!GHKvgY2>)alc^fO$_plRzAIW`JILH4qGdLQ0r;M1s*MFSmDj<7cmanh?E+5ostLw?+5+mgoVs&w zqE%*#X!xNFA@-pg$2Uv%Wa>GpC`7AvPN$Wj2WB)=vFY zGlnrJv(Ip=m1qkaL366@$2n#^jQC~{O{KM!Z*ASR9=_G}2*UnCY$#K#BH0FV$D6^c zu)*k(BP> zA;xctR@xx)L5g7baRB#N2hd&i5;4*M!~M-T#X%3oj{gqEe%;6!^Xgz+4d!ZCS%(@{ zQtf>*!fz-TYwSamnOGnomdC_R^)*2si3X4lEIg0DEo`A5Hx}|7jPX2eLy^^U%6o)HHkc$f zu~j|{3-~ob{Drm`^jw~N5%Qzfj+P3}*yt77gW7K%^f$vxNkR*2?pxpUD4w>B^lk1m z9Ak*ak-TB{F-oUxIPHAO!AQm!-7h_@p_MmZA*y0Y2>hlvun`sip_3Y#T!)*b{}fV% zpF)%CxW@QKR9vIdYU1kx#-N|U2q8jKL)~k8I_GxV-TUP?3U&8xnKpui9&Y3e)pGwC z>{e7kxm>@8`!u5Bcjxj3b_V=)JTVSJyLe;*#0=|C;z<{bS)JoI{n4OZ66Nh)xE50t zVjC595BP0AD(o)gSifj;5Cj{2@IrxCH{Gi8!{Vm&b+4Kf-iS+44T2Zz?2Sg?n-iS! z>Y2jZLdqMG9P{s91D@MZ)<;~Y(rpB%le~VTj@NmgPI*VYSgVvR<|2OiQeG1N^sr0D ziGI_o+XS#G(d*U8PDhGX%g8=;;=LQ?T^aA;DihT>EWyP)Wa)Xqd?J_|s^8^}-wwk5 zDK9F8e%ZgS_ueVcsybfh^%3P-$m_E?;^2gOAD4s|bd*7LoxZO;%n-tVxjOp{Wts&1 zwh02B@ljq^Y(o_J-EMiT4Dp_wvO?fIW2f**28HK#l>hPibMh;u7}#7Wr-a2PsuT{p z*x=0wbe|x1%A=#wiOJI`a%O}Q_>yoIiB1$9AfJYbE|#q>Zsmfila$gg6vA$K`Jy~K zqSk}z#Dhl)r^g_;qWmnAy$_{wNj5%HSD#ryP$oYXOXs`p_FHnBA8SFdSBCg5f>NXY zRT_!Ia$~#t-|LE;`zRv?+g}0C5z1f<%F9xJPlj$N5mV(x2M_EU?&v~+Kd1gYoS^Jd zA3oKfES02OeX1m1BCNl-e6AX=sPP3Eog%Q6l8h1^B*|;4?@>-R31)>P`{dGU^=;tZ zuo+TbvPd{7__K%CPhrebV0^JjDRuFFMg48p-k~-=^`MkXqrM|e)A1eE0vdQB;?<ba?H0{EG` z_@YMWY&;5Sk5as|RX?x1^45Y*{e@C4&n~KUfpR=k`g4@nkL2+?qThG;DN-+X%U5ON ztWe$&?hw%xqO*i}Tsqv6D16dP`KhCflZk)z>br`R@9Mp-p1cX7d?DPiGS^>Nuc&@X zzU&vkcuk}OYJFSun9zDV@H_$VTAcFzh$RKQ$D@3v{_lxym&$h4|IugZTY}{XMOiNK zV$Imua=p8Yd4x^bDPO7;-E~nuz@coD7d7g7w`=mOmNH*%9gw+q)%B_-$5jQ~U#)zf zK;b7gHqwuFQr0`mCLb~E;y@Bt=*$Zs=g*`mzB1cg)&(vuc>Ea@3UDd3nVzH zM$SzXo=j2>iJp_AeCta&s4!MapZDODKPdyu*`(lz#AWjOWqHc^iozof$^yX;*YIU} zr%&b5SkVgkQQyS}q_R@YsU&lA9YwXPJvB-I~s+?`VC91GVeDJ_XNIX$=pv38pyIG_6h7d1mMO~C+j#P$9zDnqC$mAUt& zI83p>D|1WbSRgu z;jf06enS6T=>3KAzEH-9ZW7jJq40eiWu-z`As9aUrfk*zH9$Bg)QfL!DMPd~-_Z2p zB!LU}csP7}&R(i1vsEa(-lM!A55~ye6}dWGh@S~@yjl-Q-dB=R$2y|aE>tvKUBC}i z%J00oP+gWud6eiw%-WT{Gshot$j z>gR-WOq#3I_hVu973EDFWsy91UKw64&qhkp*&E-Ar(d*6Ib18?k0n_n+RQy(CqHWB z+1_|UHJv%X^|v9@x~EKJl`cy(j4$Jb=)D12V5{lf+}He*NoXC zSIX4$g6e!dM478d-%>39;ay)7%DrBFU9pwRiA}YhrqRBj8F3p!@vh=?Y*g{G83p>g@)laJL zN7COVx>Jtu$rt6gbpFNT87HS}^>LcEGZgG@ zY4%rrmOL0C$y`Z(>-Kgkw~HjcF30%1hH_4jH{?x$EBfDM1gkVQTLiUM0S{1rUP@8= z31zF26_aMndj<`iek4WyUXgpQdY+^f1Ow&DKuH#>Ki}d~Qe5$pTsbT8X;Geb1i_oC z^0^k}sOTtxuaLJjLj0Z|hrZ()lN{t{-h#r^Z6KT$s=6=nVO>swr{HAPe7o8`{8!`%SS}1u= z_-KjJPXNaRwngsnr#Lu!MUum6y)FkY#j_$)3nh6$BQaII)=P3my`~CbgWMUf)-!V9 znCJ)6StOm+%I;c)epLD|svZ;CG)bDeJ1Ye!Y{7gfs_ZUS;~5FYh|be=U2exCP~6~s}$U$jFXeIq{C}A%7adnnf*fHZ`mjZ6jFv) zFAA!!yx{u;%4T_5sW}wWKn;>d%jDg1$(JZ#zUHRPmW02aqVNq!5b(l`^0K<}jGJ;u zU3uw3StM`f3-W;EyXDz6MRQVez6PM2keC0kc+P`+eBd$G5ex6t82i0f3XnSv*8aFRvgGGnS(ajnfUWHMP3f3QF z24Be9UJ0%W7tV*;b}cbAlcx( z8-pYthiOjupLqpyHP==PaIP8;%3MsaFR697B6v&VGgnxAKR{U}2XehWUWywecuBe1 zCdlKGd@5kRTn1v5z;?)kkJVbC))I#~C0ssjr10ldJpGd!tGk#^k~*VSdYlIxg|wxi>51a08zxQw6v|YWz(&dVGpVStk=0 z)u)^H>FCnOoHTH)Eplg)+Wnb5kE4|ry@**U@p(aClTUnz%ig1mE?3W2rNY+&l&77n zli-q6`1pXbKu)a@y`~8?PEIWlK!tEeD9RD4b3~!=cjA;$ngLsd_JRUx>>fY4T#E1nbp_&oU@y zpItgvvGW3sazs%~QM_+Ur9x5jRXgRhG-oM{qi#BQUOK#i zrR-LHtn{xd_H(MQk$j_cR*UwNXA^}sN8VRTGGF=FCH*`ld# z^;_=8r|LdJ<|>s4J_#bqv8sO}`O8YdStb6mz-P!AUODnGMJjxgMY$$$|NGuxxKQ{5 zY{~|?RVKu_>i>|N*ruL?Bpxj~Gma&c3EE3mO2Qw(Qch|-t_za)#uWZ`m#5c4U#O)~ zuKE^%T~qA*{U~Ln68~MVo>CZlrE*m&+m(W9$;YYACuF`K<72rx?viw(D4%9gnt1N` zpg9Qia&wy8WN)D?SA?(2*&J6JqJI3xA1GzAGGC3m73U~GRI@yMT6-svCw`g1`I zlJtN)eqKEXNIp}(y`uV1g}+aEIxQRj?#{JwsL`_Xj(QFj%4T_VIX)~}8WV&vUW0az zXLW(V-&WUy>a-U;9s{e>KE=CBls`kFd@A`xX^zr5`&{(_GCNPeCuH`xmdH-Y*K690 zQQt4+_OIOIa+w{axX+5Nkz|S>mq@}F_!K50ZcUc614L)bP5*2;IIp1A$jkqBZ9avd z@KrKprm&_;rJu6*zT6urOMB(sB{}9VF?n&N);B~4s4p)}gW$b*l(O-*q9KWtMRI18 zy8fq|JtmbepFLU8+pRXVO?(*-J=Lb zD*G2zuT*^RtM!H)t56E~C73$0PLXjT(nBTJN15KOVecydQ;{OFj-G0=oq&Tm* z_kC2u?K0aYweFan);T@7O?s!!9kZTH>X_a>tzCLbr}WO*8ErGuv)i`M$V&P7?N`ZJ z?Xxr6wok9)IvqNuXS98yjw{5g30WP|+b6eAf813Pz;2WHc*nM#(-T`~W_3zW%*gE0 z>CuSyY?s#Yv55EcO0rARvoexh;M}iUb%|fYrP#S`yYvQWnVDIw@v3ur$Btb(bZ*op z{cj|7+-7zwv>vM~%klbc3CQj9Y+-((Cm_->tzE}9Ss5A0@k;wB{PB*Rk$98W+DFnd zJO8SK>%=SVlQUblN^AdEv*ffcPqfSWWqNX_&S@PxXJ*Cuqiqw@+qcQga{6f76i;j0 z_Gz8lX0^}Ey8Y_Ww#m88^E3)+&D+%L(*CjbS&z5RZcQ{Pzv$AgLw4u1R;0gavpcSu z-*I*S9aj(BarNLGR}bBB_3#~6E$+B#dHYqfrgvQ3;Y+hSd}(%vFU{`orP+gZ2r-)w zvzy+Z;?>USPcXb$Pc*yZs(Ax%)2vGC%=osy)va~In@#H4A*+*mw$4mX>*zp#)ok{_ zt!hi@wCR}kxD3{J2%lfAx^!k-8~J5?@@GHZwtbtd#~Zt(b{*7;grG^9)umIqu3B|w zlrr14eoWqi{`2gP>7CmCDqSxAXP5MjPkMWL`_8fuZ>xp7)umJGj#-(R(&*Bm4GS@W=c*y>p+=&!(l@@4~%Hx`p$4m)_kiw`b4n!rX$Q?9!6l!d}Ha3ySjV-xB8L z<&`x2m)xS_q91l@&3^mCrcIkRyZ2UmX?|g^p1Gy@+4)6zjlU{R=viFcD=K+GQ9)^f zlW1|T{G#mc1wHe>;qGPk%EfT+Y`n}aEtV^Fr4g6kp%eGB*ma{N`MG&QsjFICyWUgz zr4nZ67k97k7w}pODZOvD73P-wu7O{9rM9(Bx1Pnl^VPRryc$QWQ|lh_)vK+>Q`;-I zv`0~HVSaK+e)sI6K85x3^1J8u=~8r;@^VXa6EmB(eBeRR zheRJ1Z6Vq+rE5>d1#e1A^Gk|Sp6O9QR%@@K&lD8p6+e?*kmtG&rir!^Z5{Cu%kEX& zJE3QO_tJ!}xxMr2)v7;JkXPCxrS_sne!){cO1;lR^5G%*@Q|!O)KYTcJ|x_ST1(QV zF|z`%dUq=+W}f8b_bknA(A__J%q}d>BV9dnpQ_ijPibj!kgZ`FH)kPkzZCvb*&x z$S*3bRZ9T3G%4=P-L)vS;l(Yw(=8NOi-+&-(~GP#-{Zc=6%tDS&?`Sowi=c8=u_DB zb{`T8i=WQVt6Q4?Y$>sn6cjy`;Ilu>2&UW|TV?dGBOOoa%>>ta;3?^ySXxlpGe5aU z+;;NQaqix=RFYe^s#`1bkxLY8QXDQK2f7wN8!j#GmE5Dadv|7P^3!o%_ogGXr}z@e z?oC#^mFDL$PfL4bGfncJjaN%^yY|elBb~TZRY?1_0d;fJ( zk*WwDmUPGayPnDI&8DO^TEc8$gUIs`Z>HjJBEKol?an?Fcl;Z-X?M-F%>&-IsY@~(4eIiY zmTjCiYwEOlbJa7PW`NMFX;bNFXUTY=nadyWjWeUATg-S+b#15_4@uI(eaL9()-zhR zOfD@b%aZ$dY6;gB2`{~@Q>HTdI^74C^rf7#{p=Wz;lM0?HBJmO3 z#MokzO7eZBMgO|+qVa8+o$DL?AW6&oVY@UAe%YO#Y}YC)({I~NBm5leGYLlMSF^l76TDVoGP6=L#{3^X; RR)@5orzf=Ul9?F<{}(p?y0-uT literal 22308 zcma)^2Y6N2mG95GSM36#x#3KbxiguW#F-zm5ILSYwf2x+BhKD#l2k(qxo3=slUTP5h z^J8(nv$cBPsXY#b5+2%mrebGeLU_!RiynV%K`3$D=y{J1N{(i%T=4ki@V%RnuKU-d z?_#$u6r8)wLhscJEYr><2BCx$XBJrBq`=nM`=P)_*n#9A6i#twF&lzbVx`!uz+MOk zw$@$?5n+lmn{3}v|2u&VwwVa3Z8tg>L}Ruw0Uwpl!e<+#*t#Tm;}jbdap>EGd|ME% zK(sd{2vyx~ALF#zrV`NyqA~jb2m*j%GBb(LDxKLJyNp&t(G7M9^B<=;v+?#W!%@-g zc2Y`jAh~ExGp)Q%5Xww(2H;feLY2-qc-|B(EF29Q+8nuj#j8MMJM9O=pgRm*XAV1|N>{$rL)fl-ETLJt}OY_Lm^EHw6mv zG4P}IO9B7Vai1esaADvs3f1DOW7`opZcPfEIPPF72`&tnK^y=K19_v6FOnuP!@yok z0lx)wHrWE)3kc6qcA_AdgF~MOMdlAaLYRgidYD9D2+l z2YN4#4Fh{2^DxU=1(xq5W(UwrsC35Zw1PEwBE=b}(;%jn0~jaN7Z_LDK8krkG-j(9 zX63*v$2tb~u>EIXDK-a{n03F5^N7pfnD{L*w~7oW}lK* z5ZDApLRLi$afUpw)v~)uL-q+6fqkga-9oxa&BhZ)V6VxlMx&dlRbXGAz9jswPd}Eg zuTM8As;^I%DxNwWmtMF2=zo10 z*gphp_Rr$nY;}BTE%)UX*gjSzY#}EV?6;o#GQ~JVamDE*q=CJo80RbYwUT_HsXHdR zSIcCQa(Xq6)+g@ipvDJsDg;&oYMyQ6{KnfyekueuQi!89p6W`66#&#nFT?}T zLQ_{7BTpi`C4E6|HpVeG#v>T0pf-qJi;ITK+eKXDS&V2xwvMfqOV%`@d<@-aPNSCZ zeyaI*T{N(MvYn_4$<4W%9(Cg%J-JHVzKh!j8wnPPS`qwY@2Y;y_c;6$B5iF6P^WsIV zo+4ivUpoEc6IAVaglrFl$Y&CC%!VRkH-~ZgzE@Z8d%ZgY6RzaW$^+XT4#F|E#Lq+A z$NbYF%VvGp8vrCa4Oc`D*}wY)yieIpG{-6_dmVclrG+*kF$iy1e#rI%SC(Xxk~v&) z$YydiElUO}2+iVFfCQE%*~d)yLMvnFSdxvSM%C7r{6kJd$C7OsGgO{vgU~KZu~j5f z97E5fVdo1P}eG%Od@O<*eIKTR>-N>YzO91J3*)v24>~9h7;%8qGh%Q z$#+G|Z5b=!A<;5Bjn4N(qqc)UqJcB+E|=kNXdN+%yOc65wb3l;B+=1U#)PGaZnHHh z@tU7we7k*ueYIU8xX(l<*_$|NVlmw2+ZX7hh?d!>$Wuf|*?i<7(PNewSj0(=?Ixdc z7BSJstc=`?BhJE$x#%yJuo{hoN`r+rga+GX0-bIPSz6Z{I`d-Ug5P(P1fi}e&~U{$^5Molc0R=_{cO0FVsA&_m$=Dx9*)=*P@*=E6*(lu8MjkUZeRj} zhs3Q#=*j1q`f-ualOIx`Xy~=%+F^Ap0f8$lh|rOS{V50yZU_Z;H6xQ6Ipg3Z5^GxD z88D@_D9-KQL#2)p1ffzO!cm-m+vVR6ecR4*)bRwMebyg6Q660sBPC?lSU*l8d}^o`g=m-mX;5bQ?$DPo6R-Y;T1ICZMR z)|Z59>^&As9jBqH1e=GS8ase!y=c@bD9(zy&cd0y>)2Xiq++b!|7_$;!tt7(Syo#* zb*y!0mU+H^iO^BLe~H*|3SML5(4QyDO)vN_@GC{dKbukup^mi-olS8FCi!d%5P05C zoWTfZR?l8%bp?UV;2_5?3t?MAErL3h9@>`R2v0@m#1R0v+R!kG8f9QXFjwU^3_-|g zc;`wAsaYINn2F}J+@_%wI1TSy5wS~%6=+PO%4cj5?sK^_1~awZuI5sF^ z?{HWivKgcm8yK;@*hNE?Hx`gO))s-!-M|Q)_}r}}Xii%gL60ElOR3JV?H8_{cXjMx z1a8|WLPv{lK*Zi7pDJ5|KKBC98aoFN&oiJ^HiI~c2wH9Dk%UDvZ7qvzd_8BDW2+c0 zw}XO!hGRn`Hk(r;HaKE!m?AElpQ2J_!>LN5XpMb=`t71swx7`i(Hgq~WEasYTZ4XB zw8kpXZzfvBY3R{9t+5V)wRKWuUohufWueu!g!u`JX4*yff8lz1#0KG|#zup9r)bpHv#7JAJ;m*n;!00zb zqqdk_$pXf;cxkQUDI68r^DJP}fRV-&E}99VRrVJ4S42nIJYo!qmfKO}mz^rO=QxU5 z41AJ=5!`CZb4WDDc5vc)a7RhM$|gZCi&A79))j5Sy#n_)X3KoplJH(l{9pnD69(on zEYFJO*g1lUS_3VM2Hssry;v164qgC@ODBwj_c-W~>WsYKAi8S%Cttmg7Pb`392<#M zg}uZo>&m7En?sB&gX7l4mDYi9qB(aQL8z)Zv+h-z#_&ba5%zApd@!(u9hrC!& zor}}FP@IdWm`y(!U%+3L9l>{^XpOy1zmaH_ox(Ojw8qAg=g&l|>?~Gc(HiR&SZgO$ z_6o%}(Hh%_Mmy0e`xwNKXbnF{0&69jV<$9ObGbp{420Xl{JB8XkPIU@y2Ow&T zICV}p6yqlJlFtrTg&CN0Kl`jNa;^i{QEg(U8LVJ%8!;F1*fa3$7^ch5YmSO)AAA&A z6|==&4AXTe>Ynyd#oejSICz)E#0Lnf)nfJyZCKEF&_z2@oZ9V={orZVf{Rdv&U;7;mWRwj9 zi04>dd1bz-H% z2=iIS<21)M_`2f`ZJh5W!y-IP=TkwG-HAyj+qQpbLQ zz^`3HBXs<_mt*HWxKLWHnsaVJ(_D#L&@|Vnun%=4Ru!_#sN`5zyph|B%HV2zfx#%{ z1rAtd)gC7+=?o4E?Fuu)N`h%6{j-+dK@XkvG@fJ&?R^TwdV*;^&5XF4bGW9Ir(APc z#CG~cetEQ?L8&%?qb4@rH&m?O#C4&)g=@AFSU9$dg8B-7LK(hz-A(%HqHtX?NxG&*=80A zG8m~$hlWMZ+5xn{gyFb`AT!se8sX&FK#wD2{XIrDu482Gr}l8pn6f0B;`vbgx6tBV zYA}#dTfhPLQZQ}c<$y**7yL(t|2k5~9)bJ%7#yJ!Uqstj&gEtmK0A0C=2)TiNwsF` zV75M~)@*%J+-$S2QM*WH+;_vc!R*iS4|q)L^$e}NamTF=zq?lIj+@_IEB%gJx2@}` z-tTP`bd>Ebp1#X09gcuE4J|ce&nFGU4Qd`F`X^b)4zf)hmAI zXDOjqbi>ynLdV@kDa9)PIbn_9p3{;Dof|{_Ja4S}DcxUin^>Ff9Iq13!*La}m)VZm za;K}kVFV?(r;)*kXeU8TOL4|E=$U~1;u&K9IK?(Gz{Ksrq}-;m3>!NQ$3981=Rso< zSHwMBq8c%KmAOo3rv)HpWAKo{FF!o6O``qth_i4kC&KmEg@ahAJ-BnyLS2DIVZ>mJ z%w^iV~4$x+3Y_o)u^39@tyk4Shw#GAXYHjX%jhMUBcMHrl4G3w8DmS65t4i z){ut*qg08U78UHoU;=rl4!KAi9w23|MI8^XODpXL% zPWf5G;WTD+l)Z(+u+#8are>v9#A4E;$S`1co!&d1lhIx1s;Bs!td_SV}qh!9H1wfTx0FQ8x>vjPz zF-s3ZQyVzN<^rpThoJbK*1#DDRUAxj;4B;iV4pi-a;74lmt@y`*B;Hams)U>vz26G zVsSYv&dk4{cQRZ+V@ovQ69qPn8PtslDN z3*$Z7L=Ospy9t}q_EYq_+iFLP*cX(l+RDKUi)PwXFlRJy#?IZ3@~#aJw$GTiCN>>f zXiHcG6b?q=&Y;Z!jOBI(cVW@9)>8%TiD%~SEdtzW8_0(u!*DqWQIgYe1rvT6u$?xV z{TeVBU`G%oISrqsFclObvta`(2cw*K6FwtM)OZ4~u<=xvY@JnIx7|chV>5{;;#3nk z+3&2#eVp%7lwuTehkahN)0bK>J1|YcbIdxAU;E>V3Y}!OYV0&{2~K?qRuNjYt%34W zxHiBoOl=bzrK#OZZoE~%gkKD3@lcJZ%|?<~%*Fvi=r9aE!Jxw4W5P)s7A|CM@9<>^ zAIsXTurmx&Hdwfjl^*lUDSSKPIsB#~gAKNvljB4KXW^ZUodC7k-oiXdbOVpEg3$2> z&cZuEo`%&DJ3wq)?4iePwdg$N_Hcb$L2Na46qLqJ!!}O_8IXF#0*v**iecPvl*PUqz*%2KTs$*%Lwd!hK2`rl{okCoR}IlG1~+1 z@60AMA#=?(5!^|$mAI*31D~XG>_dP#f5^*s)1y?r#{TLj!e0YjTl@ND-|i0e)zyA< zgbw?<&qimW<)XQS;T(H|1yR8{{gTgcWBZB2H1r8-$P@X%W>bWl zjn@QT<}Fn2g46IW0492L>=oN^!iGM~4-pS06RxQv$%Ja`s$GV!Qs=0xq5?l{=qy~p z<##J{NeHVnhgHz9LBnSm+Ch3b*2fjOgg;9V>|=h9-_V(?S7H#e?**Zb4V{+r%ZW(l z1h!k+^O=r>N`vuGd@Kbe85j#-Ka*0;=Q{irhs5j~dLj-b-gyFDj5>Q8jG$kqP*0{f zV~3f~0cs~1DYKU;=#NFq>aQ@m-^tAfMB?75!ewYXL*(r4~-Kqb8SN_V>rjQkoueiTR?VfZ5(t< zwxcZhZb^2QfVbPH6r&mle^dhXi)(K;T!$`a%aHgwnoK5~ETgFzXtSB-Cbo@G|BbhZ z4EXik926Xg(xbX4}yDo@ms@;5N!T zYbuvxV}PizXA$vc3C2cHgYGw+`XXP!%#?Al@$ zzwn*z7yJO^S=8^rNw$G3yXm39b`^u|)|ZT{tqez(MRRPSZyqHPThI7TdlB@qM$S+> zhVvw+dNif* zpG*u=G76r~&x=N*;Vm}K4upe5`Zte4Pd5sUN^$*qaMy2NQrxq+q_iMBDrKB43_%FwSgc3w;0x9)j8F9eJI+P5yiSwv^U~5<>)VP^si{l4_$ce4RPxXa7 z+T-Yied5lY@*bg)4OKn^*)}Q`L~J>0rO>8O19lx48|rqhCKcroYv&`Mu%y^?U|ew? zaO?_-+ufQw@GJ_{+-W$*JgvuisEwp_C+s7XxKrW;jWNaj(Tj$*-*|DQjwK=RpF0B@ z(ea-<(NIN%>!trbSBD=&6%p4M*NBd5RM;qL!_2{$`7;E?Du6~qAKWlihimQ!GR<#9 z$4xV>dk{L<2#WHM8$amPL3xON;r4Ds$1l)x8dx{K;W$AwySSsl!*n~yL{KmoYr7wi z4K2qnzL01rb^}oza*GL(ANaA_-^?Sz$w3hCl!>2Lfp_`6f1|tMW|x;(TtKAoa$JgP z5G<aHD zS9!b=1Sf^IO!(8nE*UF&w|BP-;IIJrfkCSl@Cearx!Nn!cjdgh8%>aSXgpSVdQLFs zj1~gRpo9g&=ukFvy8SreZdQhamH+MTe~iRS<$9%DY*0Q|9V$34$)CN?*Q2ypyk^St zQ(^6qJHLNnRFUo#u=pm7wo8`0HlWQ>k*XwFtf2quI+rAVK~5)YhE_>3QgomoUr~RPOjoMUuUpz0 zS@GT`2$nH%Nx}bkGJRExnF{WtT$j4|fa3b5``n?iIU4hi0t3EjDV~&kjp#lZHFX!$6hwvWPb=h@1|RjoKRMuYD*tae3|^30KP`nl z@-S8=XB6Q@^|{-njaPq=RYCl&E{CHt--o+Zh% z@;^sL8>RV?Rv}NQXsZ?INyYWNMu)2ZzGC4UVA@ed^tybVlFlk2*Ygl~D@6O5hr3i| zIU~#Q(i^F)XQ|I;?x^>Z~CmxX&q_WLzQgGKqs zindaHzTTzHl)od==P3ehgo6C3BaW53fAj9U%Jf}X&QL60Xz7lT(|$r(pXBz(7105i zj#C70X>_0HVd1=z;F`T0c%EQhR@v@Jv83RDV);}k?~A@Bl-Jb%Ctsy+3VekG&x_7d z(A^w$nmp`OT-Cz5rkUZ#J#D+9sFBg_?!QW&=ga6VIeJ&7mzCsYCEQP=JlCd86~G(P z;b$}LF^5^J86PKqyF@3*$92(jg5e`F+7MOwxLi$^<|vI8XoaX-*OQzhN0;PiyR=WK z|F#hMaFkZAz<8ETYw6^Sj9Pm{yyT<3qBJh5U@r<~l(w=-!fNa)Tcxrub`cl z#w^hla<@Xb{3NFFEgx;A^j}sX?(mhcRnbk*-~fr!9e1l{a*O7nGFvJ`BwsBb zZ_3|t<?6Y__y{{ziLFHs>W7t^O14bdwaX)cH0ybswq9FU9L9 z#i0tLkt*9jxit7*F>reFprrH`aIOc9)w`~!J?PLjh)q)O-) zrT>of`6z~VO7gS9KP;=&vf||ut&cp$gt~HYj8Bnhl?K-d_>?4T zMS1T`Yv$o^kdGSSzM(neWdcj^fc){hlYK&qbd5qCEc@LG?c)^NxykMd5s*%6y@znHSd){z=*HQYJeU)DeyTi(8FSeCK4u;|ODx2a??&1g)LhHigSiu~;&S7&8$OzsE7sU*)! zdx=6%b;S#^IV152Q63Hi!RzWClHN$EtW=ye!rG%^e9v#0zU4Xaxjt>bN-;ccqxky> z<&PfQTrKlSGC!@v=V_1^C$zT(SR+Rt$b0CP7Vv;RRuCxVP2BtphmALv4M~m{M0d16g^M}Cf{Zd&clzDPAO^WLkA#hmDTDV zRAy^sG)N&m?XWxOB)BY;?>h=lIcdD-rEQR9ndl;^Ocmv;OWH;S`aRd*C`bL|l-G;2p{n#dl8g~u zqyT0K{$u%W=!N}Af~lfIrTB@!21(_8Ny?I$b01XEpe?T*m~vOe>U^IJ9A^)ti#@!5@tm3$)b= zDcAesq+Tfj4_j#41$;yjKH;PB%`$=QPz0wWFPGaA2RJVEcjc*(hc{5}_>7viQT-9J zj48*3vY(><3i-RJ_0QLvv|$?UgExL@Dc})G_LuHyvIf^Fq`mTbN@2{@nmeb=J{MSh zk9V+&vRl*ox)iGw%_h;k8XYT`R8sse=ZIk?!DXIT(0bi!j z1}M_z9!9w$J*#tXom?!CWWCa!C&cHK@HGYVeUFzv{!m@MIiQVJh`S`2tpu(KY_KF(n63WDvWh93nZo>r$9hEKfAGjwDr~;V=EN6BrPRul(^lop|6G9f znQXecO$R@I#7P53o2U^!ETQpMfQy+T{#bB)Y|FieG-e8Ig#vy_k`uCd(hWCAa6u|d zmDvIXvR3qp7SIBjmMgR2%4xXz+;Y&i$@WFz@U1qjvHPB=Q|VrhdzN~Lsk|=JS)x%Ff5X#0uR;!&(+UN~pRUrz zsLx+$)6Qv>kF9AJ1wLIN@gj{gRD=KMbswfF;N2;$QlV^i7eSe@o|WZ;UcBwH87T26 z(HW8)S8%J;=Wh;Z*97*uD1U#;PcPwe1!i!L`mYM$ib}Fd8^w3slE1T{9oKI2hQhck zmDg0YYRUO3n8vqYLBOA;0;odmidS0nsysJw`@3Aj-%|!t6(BnXZH2PhtmTp8YW%M( zXv4H7%j9Lg2Kn@lHc=sO)aZ+fXM=QFx#>T;#^(auChr5K@s<*NPAL5~Izw^tS2469 zD#d?zaBUo9lxoPwKD0ry+$yY#^2~Q!v~ilKJG`C?1hr2_+hz2&jNXv?2+_UDcb69I zc}YH#&PZ8(u6}=oH&4Jvl^`$RF-^pMO!P$WI-;L{AE!V z90^WRu>Cd3vjnEs#~-UGYZc{xJIZ+3^ZuJQMs$X|3#Lf1uPXL|!W*Gkc|+k{5aMR( zf1=SXqWy(7L8H9z<+-H5_Q{A+(iSN&{%Vf)Up{(R!F(abvGG|{W>*x!5g{&9#;b)p zN-^;Qm^Mqmg9XNG7TV*U`~eyDmHKc6c1SAE36eL%v@tTBDxLjWh-;-YM)0=_My88J zUzO=g0v;x#ql)rzkNa0n4(j+d(LKszgl2-T&1fG;eqHwED#20pU(za@F7)*Zqp$ka z>hpa%ZN4ghTKanw_A%*Q(mQtQko9;{ zhxB%7kEW+~Oz)JP(Ka(ZyKTFStkj=>`6xN7U3O;McIkCor+tU?jJCh3;|lR^LRS0q zcFFD1A9Ixiu-ha))}d{u^u*SgSsl|8Gcr4Od^p7|A5H7(RUQtZ_B(ewssnVDIwiKvG|&+-133Xt3T>B9U% zFF;C%v`0I%$;!w`j(6Hc;E#3agv5uu*DfV3v(vBJyH32*E;+MxtF(5HG)qqF{HsT^ zewm)!u~S-yPMKM8{&3sG^mc7Bvz$KMHr318wq07Mwpr~mv%Y-vaNFeE=6RZhwB~K< zb#C`ayR66BWw$1q)L(Rdw0(A`v{sbAX|r37n%{DC-z`V?-*WW8Ek_UDa`dBHj#}Ju z)bh(m&6?hFbW1GFZi%JYEwMDaC6;Cn)FH)eQp|38U#fRIrT>cQ&H7cdTaKDH@G-5b zv`)-#yPIaM8{Qa_Y5S~>vTU81p4P#E{-)XN{+r#F(rMEn?J+s5?-0JeT6ONkyf*T~ z_~OrgtZlnCS&ub#N$q)1D-wbhX;$Zs={joFiCM~Q+xihj3;NHqJEV7P`|EUt_+OpV zJ3Q{=>FqknLwu|j?xsn{)*Z4kGo{hFeH%`|?6^cA>6z(|dLWN<%4#p45~>iMO}3LHO<*NB}nx1=HOG|PKdlvU7D9W#YQ<$5VSJLoba*K+Ke$cTs zo8S+cHf`GM&YR<<`Gq}u!Pi?X{F^vJ)< z!^`fOi{oC|M44S$tWfGoBQC#1Cmv_9>qbiQbMu5!SG~A)y(jWZCCtt*?pEIq;I$r7 zd)*i-%q{st13&Uk?P#5@J&Jqf%eG#;8%L~D8y@-9tL?^1+cUScdr@v-esW2Ex9pl!!yJvB)gdX|bN)x)|_R6nU ztNv6$UTOE#+Jo--1y6J@b(;qj!-I<9L3w|$rR2hWP`D4amZVK%Rs~V@>RM9FI?2oL zQJUMJn}2GUU09q)xq9S2QLjty($eB0Ust91^$Lr7Q^t6ulAi8bTwIcu^o&?SevkaZ zFwrzF$@kTmomZ0kM6G71ATJWHdY957U%RFGxBanqe#tZ0U3(Pd7nRnkC4gI+6c6V1 zT9n%K;vPNd7D}wek8bbXld7}c#4wn}9OzvLXtsCnz`N=r1d&52Bsea;Q_o9|vOY`$sou%EgSseLK z$GfGuU3%o#kxpEyuB3^%UHITLwf3BgFW$TVb}nY;7Ucm{P?{YtXqW|`nAxmpMw^D5 zzFljj**moj{%wyL-G|-_YRL6}u zR;9ALzUT+^2EQLiT#)mr&DIEquAQYQaKn*0fCq6)7s{)jd0I)ey)V zMHYYyy4O}+f;+#Y5nlvf5qHV&!P)i|F$HA*l=!wUf%NVfm)-Ft8E30!PC}`9#o0I4 zTK(EZSv#|TJB$ZNTItQ&+@<<{^~B@6C@#rw^mog;xYyqn6{Sic!jf)8f7?^Jz1WI$ zW|pv8*cS3U^Bbl3yUcHhbGxzo!~?(UOWIxXyW#p~nm5#a%ZW?Bj9ub8Ob5rt3DrHhRvsU+Xew8-C1yhwaA zX1}_N-v()!KX^2ad$8<|k3ZTfE7LF5O;h+~)YCV#|A#`ex;=7P@9}f2;mxzLc3-*? zPKr8ynaS_bD?gFlp`cqr>#R2ENgcAd(@P7t>ew;CJ1M_T?~v6#?dRzU?K)>>2EqRV D>70wF diff --git a/desk.acc/show.text.file/stf.s b/desk.acc/show.text.file/stf.s index 1943282..c632591 100644 --- a/desk.acc/show.text.file/stf.s +++ b/desk.acc/show.text.file/stf.s @@ -303,9 +303,10 @@ len: .byte 0 ; length .proc window_params id: .byte window_id ; window identifier -flags: .byte A2D_CW_ADDCLOSE ; window flags (2=include close box) +flags: .byte A2D_CWF_ADDCLOSE; window flags (2=include close box) title: .addr $1000 ; overwritten to point at filename -L0998: .byte $00,$C1 ; ??? +hscroll:.byte A2D_CWS_NOSCROLL +vscroll:.byte A2D_CWS_SCROLL_NORMAL L099A: .byte $20 ; hscroll? L099B: .byte $00,$FF ; more hscroll? @@ -600,18 +601,18 @@ title: jsr on_title_bar_click lda text_box::width+1 sbc window_width+1 sta text_box::hoffset+1 -wider: lda window_params::L0998 +wider: lda window_params::hscroll ldx window_width cpx #max_width bne L0B89 - and #$FE + and #(A2D_CWS_SCROLL_TRACK ^ $FF) jmp L0B8B -L0B89: ora #$01 -L0B8B: sta window_params::L0998 +L0B89: ora #A2D_CWS_SCROLL_TRACK +L0B8B: sta window_params::hscroll sec lda #