From b5b24d248601e72e9232903ad86204a206a97cb1 Mon Sep 17 00:00:00 2001 From: Egan Ford Date: Sun, 16 Apr 2017 13:57:04 -0600 Subject: [PATCH] more minor refactoring --- bin/page2text | Bin 8480 -> 8480 bytes bin/page2text.exe | Bin 28529 -> 28529 bytes bin/text2page | Bin 8512 -> 8512 bytes bin/text2page.exe | Bin 28370 -> 28370 bytes page2text.c | 7 ++++--- text2page.c | 16 +++++++++------- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/bin/page2text b/bin/page2text index afd44433d818d42b681bd99032829ecdafaf9d78..2fe7b65e862a1087af4323cc11e81272d9d71df1 100755 GIT binary patch delta 535 zcmZ4Bw7_Y?1)&eT3=E763=BFT0ti0vPJCo1D8mmC<$(w?$V@h5w4bcN$ib-s715a7 z$Y?JZ09CgFDjKl)A|pSOKm_kBIgRu7k)6I-wFWP9#3p}W)?oU;yIG3m8s{WFamgFZ z3=BTKDJlX!ohd3D9=%gkE`UTjA5S*mld1Qyd{lbh)$m&yzq|_r1BBcW78)Ar+WFO^ z+ed}N@%uZM&JPEF$ZH~R0@Y5BhNwPW*Nrji)P=3|VG&Hp4yXG82`1yhqB@JYnD0X2D8 z-YtEW4F0craQGkb?V*)TX zdVpdwK-}=}KN#ptZsd32n83mE9w^8)`3%1f8w)7XxF;WEk>s_2#)K1y-mEBapMPQk k%Or(#?GMsGH6Q?EFag>8i~?XWkbW^R9~ASGCn@v+0E4xW8UO$Q delta 524 zcmZ4Bw7_Y?1tA7L1_nk31_pHy0RnszAK6VVVC3NBf$$kLCL1!^3!3ml)Tuy4O(r)2 zMI)f13!tJAn=dl*GYM?X=q=EZH@x37i%rzQ?2y;w56l`&41AlVSgvtSzQ7_d`2(-G z*u`yqFAhmS^*E z#^wk0jvem*JuTmtzIJRr$_O?H)f7j|qotC2Ie;3{^!VjlM8O_<5e%f7-!hhdb8P-A zQQ9#10G~vH5m3y-@^0z-{ahec=j#^=K-$OhY3W&y#v>qK86Jp^b&PS0b&PY2KRn^T z>LZ~1f7K@-RlTxjfs|wLf7QJ}dO`+}V0iiL|Ns9Pz>s8kc?Zav9KbIj*aGCq0CC4Z zpa>ACPp;&5VQ=7I`41GFe3V~j@o{Gh&r#oVp=pGN7!<{A|aCjORI1_lP8HXesgAORHPk>GF5{r~@eud_mLjfwzB zG;M<6x7UK*&I%xny&jC6-U=N8CEDH2Djxj%M9fo_ih7Pz;K*Jg$qbEAJ=&C@-NWv7L^Ok3=EdXOPBSgela`{9Ty*a817#Fjz*B9 ztUcU;&hNBtJ;2}54iYf-a03Y#g9Lg(0^A;sAOUWWz+{ksu!j>!Ko}@c-!T*2koo9_ zEJZhDHP{fRPT`lYfuRKoH65U95f1CD1cnSqSQJ&b7%Kel4_tLU&<&lSfCMRjjt~b4 zr$dD=pb95Kg?FL~M?-}dp$dmWg}Z^mFKvO&oqz%iLOY)}zma&s`uYEVVCXjpJ21RB z`RV`vlZTIKVY8svd&Y?dY?~yiC4uR##!#Bs zN5NsTA#>U$BO7+cOPg&iAIdW+2uxOp+ytVoL@Kem2rw`(PQL3XKH1NbW3yBgA0wmB ZX3gkm7N7yG@e6^ZdcsSfkYHj09{?d6KFI(8 delta 686 zcmex(kMZL@#t9uvUk**|@?+i;$T;!#Qbv`{jf}B8i~^JI^U4Fs|Gc7%0-Hto&N7RC z|G6V9G&HpH+V}UJKMwwo*F4nA^2zYq}1XB4s{(+3JcJH)?DY*+0KsIC#NC4T8*&qRg zA^aV+AOU8FPUdEyJ0#WdQqax4=bnxT?A(48`Zf6w_{(U0mtp_@tRVp8V zeIlX)lxJ~!k@*+sZJ>W|_m-$J9A{DC0vgzST;oL~P`tNAJP;ih zAA1-SRysh*m(~CO{|9m8fgE5+yo`eK`JsGED8K&yABX}8sK9$D|2xpFAOr40`PZQQ z^HBa)D1SecKLyC2fC@r8pEkddcwzea|9_y{8-yJgUi|#@|NqIuP-Q?H|MPs1cK~{d zfdRzXEGYJXagrDZvx0&Hko}%44wD;!q8U)p8Bo!T z%@-NtnFO+nK5b6+va@OsTB^M-ApXH-2bOc3^=}Q|x*9%7c!3t#{4cS$ z;Vt=W!^Pin4`@#FU-kNDj?I6>>oq)+uX-e(Z9dW9(JL~k`6#1D@02SCm>C#4S_B>b z{Qv*r98kH<|I&j#y}BELCIL<7mu~<$1xk7JW^2Ihn>?3~yM7K((!=s@>3f&X2fM;T zLqlCUpM8G?j2@k@fzFU9-R#kL1Z1n>f#_Jr7{^%0 zxWm0HS3%Zz%<$@!(eUjpVda2Z+yatd;NNEL(R`Tkg$|JIX?d^o{p+47Lyx+q6tvZ8Bo!L z%@-NtnFM4u&-tM4VOqMEani!c&-3y(JFuMNtbbzomS4UBq>^901+3u(E6^gF|0Mx7 zyd|G)xcFOM0fn3Ys@FerZ2lu&Z|Tzc$ffg{NAlU`N9+gxF*l!R=oJZSKFY}W$s_ra zN3X~vkKQR)4lpw?bhHRM{Q3X?#a5txoByR7e0o(E0F8Dve4EBE?*g*0fnjnjpL9LQ zUJuK=rSDyPOBr{Dg@%T@bbk2$5=b2UA+LF;mnF#2@>r>nOXmy6gMa0L5}L1iS+0T{ z>oLQtS4P3NH;09TU!H+~o3%&tVa69GKp9Vvd5+EhBwRbcdUU=nZT4t90&XJ0@$!$rt(UCnj)kdO(9ZXtSh%x*!0HQ3VrCRf6rtX+4qg$7eyDY3MOdOLQyWFA;E6eMG?5}MyKy+ZlW_6hr{#f}FPiQ##7&ll0xV;$rVv8kSSZRq1`z%-K6HZQuNs$_j#a$9I{Cq(3 z^F!mktwy04z*?zZH1L@sgtXUcyorX-Hee49!-kplSf<}+M(T-gx`hZ}hqM;r5tAz}Gh7W( ze9cO(hJ|SLse8i54L{MH-hlc}^T+P)b;`}DN-zVY=RzlInu*BmFTisq>pcfC+)Tu=UI_kXB;d;S0r+L!9PeQ5m4@zeynFtRwrl?ASxgx~& zu?rP%M=AnbU6o{&S3bvM!oB_QH%7z*Ty2#U6S*5>^-T`^$~twj+lx_b^pXW@sO=yo eR$rSJ<67&%<+D5-S?(Bxb*M89r8`%1NNWn7s% z!+>Tly#&$+J@n*|pik=>Y+4VsRA3?YL9|;ztc9*-dpqOj!|XgS<=W6%T!Qi0h0#+-Aeo!}E4GtkhnHtBtbaM~p;;MQxAmqKGs<8z6o* z676o&7`+LTQq|e_nIeS9D<$Tmp=O^w^gg^&rD)BqM(+kY~b^ z8Kz#hHQ?tu8`k@uePj?)?&P0XrF1KK&wWzKCog3wHFI`7k#xUD@8v!5I-Ub7MC$lT z{W=mBf0Sr`PraP2(gT<@dK72qkml!A*U^CTn)vxhv}ayOXrNYRAciF_zCKwFX(6KP z-5>yN9PE)uVt`$fEAFM`NWu|0gAp>}L`yIjT>7p_@IIMwABgESZ%u!709A`ffn9Ke zet?lfnJ|N(&b3O^Q#_{>ssq@nyOB$mXVukg>!e1{W;U`e4;&p4%90QiMB{Vko6nw9iCQ zFtef}6Wz**e*Fb>JPZETus0_AmNRVJL=SSJdnTF%G`RT$$yfO&mn>VLG|uwjQV}I* z)09q6Z3y5v)aLYx=DkDa$FRUeZOV diff --git a/page2text.c b/page2text.c index d53fe6b..f7b5097 100644 --- a/page2text.c +++ b/page2text.c @@ -2,7 +2,7 @@ int main() { - int i, j, k, mask = 0x7F; + int i, j, k, line, mask = 0x7F; char screen[24][40]; // clear screen @@ -11,9 +11,10 @@ int main() screen[i][j] = ' '; for (i = 0; i < 24; i++) { + line = 8 * (i % 3) + i / 3; for (j = 0; j < 40; j++) - screen[8 * (i % 3) + i / 3][j] = getchar() & mask; - if ((i + 1) % 3 == 0) + screen[line][j] = getchar() & mask; + if (i % 3 == 2) for (k = 0; k < 8; k++) getchar(); } diff --git a/text2page.c b/text2page.c index f4a54a1..f4e7041 100644 --- a/text2page.c +++ b/text2page.c @@ -14,7 +14,7 @@ unsigned char holes[] = { int main() { char c, highbit = 0x80; - int i, j, k, column = 0, line = 0; + int i, j, k, line = 0; unsigned char screen[24][40]; // clear screen @@ -22,27 +22,29 @@ int main() for (j = 0; j < 40; j++) screen[i][j] = ' ' | highbit; + i = j = 0; while ((c = getchar()) != EOF) { if (c == '\r') // windows trash continue; if (c == '\n') { // end of line - column = 0; - line++; + j = 0; + i++; + line = 3 * (i % 8) + i / 8; continue; } - if (column > 39) // user didn't read the docs + if (j > 39) // user didn't read the docs continue; - if (line > 23) // ditto + if (i > 23) // ditto break; - screen[3 * (line % 8) + line / 8][column++] = c | highbit; + screen[line][j++] = c | highbit; } // dump to stdout for (i = 0; i < 24; i++) { for (j = 0; j < 40; j++) putchar(screen[i][j]); - if ((i + 1) % 3 == 0) + if (i % 3 == 2) for (k = 0; k < 8; k++) putchar(holes[(i / 3) * 8 + k]); }