From c465e85d672a00b85e3c3c0a1dd6ec19d314e00e Mon Sep 17 00:00:00 2001 From: Noah Swerhun Date: Fri, 2 Jul 2021 19:08:12 -0500 Subject: [PATCH] added color, made resizable, put text in subwindow --- .gitignore | 2 ++ cards | Bin 17264 -> 0 bytes obj/card.o | Bin 2608 -> 0 bytes obj/main.o | Bin 5088 -> 0 bytes src/card.c | 2 +- src/main.c | 89 ++++++++++++++++++++++++++++++++++++++--------------- 6 files changed, 67 insertions(+), 26 deletions(-) create mode 100644 .gitignore delete mode 100755 cards delete mode 100644 obj/card.o delete mode 100644 obj/main.o diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b202107 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.o +cards diff --git a/cards b/cards deleted file mode 100755 index f9bc3c4f473d34f1aab67e21de5d493a99beb1cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17264 zcmeHOeQ;dWb-yc1whU-jHa0Qf#E%by!14M6;~0qJx3*+IWn^%$4I$V(uXb0~n$@nn zAC}DEpveXgTUm{pHZ9XI1O1qmX_{8er$ZBvF||!5O=O@%lu%S^huu2C!huAg!Q0=t z_ny_;hhC@2AD!vU-kp8tp5Hm=-t*4A@7{Ocd-tKXj*WFbpWrk@d_oX6Fh?P#7EIix zGa#l|Bbsphi1@IW3BF!pN^U9wsY+vY)wEILGeF610cED43l%JwvWG;;&MTQ0D+yE4 zta!3(pseQI^qaGl9#fWA>NAvFxaeVheoUQq6q~W7%5H3JHJ#LUYxMcE9l>N*)OJN} z$8>@mLSoACq?pj3%X3o`GD@aA3gNcv*M7KZtJY^qbx_)RCL8@->f562h7DPaaMK+M z7EHOmPr;7j^1n^o%y;VgyxO5fw*ylhUa>3@?_9lVSt7bL5l`m&m-eq&y>#`eU?vq@ zDP17Hmg7%-YSZo8McsfHA&l*P!Y6s%twf#XSx&n1@Taho{k;0?uY6~3u>Qge*RPBn zJTYhf?(Zc@ht7j+NQV+(^yftGUx`2I$oQaQF(B#)qig4tC5IN?a(<96BOujjE)3^Z zLz1KNjA`)4fK8{L_rPEB!2iwzPk7)PJ@A+Z{zDI(0yUlgB@g`%12^z@r&j??SI#pY zc+La=k_Y~v2R`V5Kk0#=@W5~P!2iMn|0r++e|Mr@Ib9sy27a|$8T@_t&k>i4aZ?F- z9C}0JB2Z>SbE#$4T)4Twk_P5hzZ-?-IGe%nQS+4O&li5Dew>y@Nbi+Cw>D@14{qd~mO7+H)a0tFc?zbb|_uF0JctWIO;Y1=8A=PZ^ ze$hpS#3Z2H!y*)(7G1LJE))^z58GYwWH=FjfKCwuQAD3&PZ(ap#h3t?q_c=+`e;mA zO+ZBDHg&YG-(ar{t`eME8N3-mrIAAY^-vFveuUCdB}Ry23(EVzwcy&}adloi-bAC< zN{!{Nh-0X$6CVdpiRU|R-(KBG#`S#0xS{crrZlU}OU#e0Q#g%nQ(g)&?!fhwFBOXp z91d2}gacntL4}xf;8!^CaZ@ogzSCG*NxFX$?i^GXm`Y<7hz@}S36OB^4M!ChVX#O%45H&7{a*^5i(%XQPrz&IVJyyDT(w`cM%C3cHoyP6?uHr zfz!Oo=?PQisNVSuf<9>~hVaW&Rvw2<#Ss1>m6gXMreX-cTxDy=S_Enls72uabp(D9 z_{e)!{%4KWV8biRgs>hS$<~!et^9M1$K-jHZ+-)CdGTo+1B*=Li0>v@X}pZI_+N>q zDX%mt`4@<Pm+t|25)iiYpCB{%?qvLmcax%2WTL@=Cj*yB%d%g#$&akQ=uK+d$hUK*vERL6P4+x$_ul zg|=-)4>h5D1j@rW^*hj9&^rmeBi7LT4U&D?Dx4_pL`We)2R<+=aslWrk-`(jh3KNt zA3h=7DxCpA6;#BSRgktTlF6UDoKgK|%_jghawMhV+S`2ytm17jlaF!gO& zQ2sgd-p~#eX@t2MVMhELPGiAGO@Ll_l{~c{qL3q0V6lMGpP>uBxCs8scFg~5Iqb$z zr+h92I!UT$KQVCNTsb#O+MSJ9d5BRcox!9I!47hjn|x@?1u6198~9e+xku{2$n%*6 zrAOM%p|Fc`U&RSbitJp-Caj??bP|)6Z}hl4)5+&$kHL8uvTy0Q_Wc(s$&dIb4zE&P zR=B+=ZB^s1A{a$g3NQ-?et_;a614{F7q{SK$Y{lgj_QfFpU?>&Z+lVX5B$LQ5cRZr z3^G*1*Qi0Ljq)RC5nOuPU(zQVRP9|XUWVF=r*Kf+=}lRA!`DZvN= zw%|S4BvIq-Dbi}}gD*)$FhJ(!=oKf45nhrk-ywfV_Cx$b=1m~XJ{ zrCZv@9-LL(FlRgRJ!3xV>icIyBVY8P>+424yF7p3CnDR3qc3~$*{cClZ$8_o<%iD( zivNQ8RomP~&QV{3qpt(y{07cr^4ufn7y1r$iID8n-r`qXXVLs$D`wx|;Gjllo6`C>GX_F$Zo9>T(MfrxGU#}XY0is9RUK}{^ zVma{eAL6olI-hIWK@hVBd5&N-9jOS%&yN@Y&nnE|Y&S_Enls70U_fm#H9#|Y4KeM(qB zr-{;Ai&)girVM(aVRV5rT9Ua$!st!m-A62agNXO^rXfrlk<31$E0yjEXUQ%bPTXoN z&RitOCK>LD8R^*GTs$3%3d7hCPDhPv7DtyYjvDuNrBli5PQz#ti!)7bVJF_7NEvy< ziJ$ft*ZHoTaoY~Sba&Kyu3SD0IyzA<_k%wFwwlM!fsTQ{=NIKNJ&gYYP+I<7^-j6` zanMfC9iRia2^avK06hsxi5BLRd=K0yeErS7D=(SVco;Im>3RPa)P;q&5UsQ1V{AlZF{2)@^8-8Ab(Q zshkJ#4?w<$%3=AYLo@RAGw$;#HL(Dqzr_Dj=gZ|apcOr2$-fc&dmy8@RAhC7(wgMs z_`e2u2(%)9P!(5rfo|Fm|P{hrYJ{H+wN zzbN62jXWP@r7GU}NWMiI;(d+eInG!%O1`Ko!lQi2SNxWx{@)+?yK;BUt93uvsOepr zc4@j#(}SA+v8I2e>9;gJuIbB~{#4UnYC2PY^mUo0*J-+1(~X+mrD>O@`!r?0Pns&X zX~TwFjTU?@eS@)LMQ}xMIV*TjYM*-XcG)ea>%j-fW4eJ1tw7(3O{Y)a2~UT&0I$Or za>FivZ`Am>3#ZQ`NuRGv8_{Df zN?T?5ez9D)yL`3U|tImGAC9U(w~v)f1+Cu7|RQJ<9pE2mZ7N{!bqGk38^ym$+Zd*5@mq zVZxs?9{RLTYPxnWd*IC&uc_VLaaai4&@pt9)xf7Ke;x3vor*gD8L96V`?b+^8jk>{ zeGMPjzYy+>FHNShv0wz>@`JIn;oXAvBLIk`vzcrTUr0s7)D8zb+ha#)k3$9q(UiSA zk?IU5>}WQHO$*^%zlfxIdK0m1EQ-l(S`FGg5VynWba=lVOJ>viv1b6!+T6aOS|ayj0KzP6w^_C- z!D_uz*qb`;SRd-J@7TC;Yuh$^TWEbp8A2kBU^@3M{7+jz)EEdp}jFxxNTzx4|gZp z+B5BboyrEC>fJC^C7~s3Y8*O$Y@n%N zR(8Jw>deKl^DiFNP-uPoQo3w|q~0CI4xwOle-c$FnoTRozF0aFPbI4u8?tmP5heqj z>rG@uP_|q!8|z1&E?3A>vfBn@-TDIUj>48XWudNAWx;tA9PWunP-_Zh;SiJ+sKU^? zB8UN_2jjprquFl{(YnuvKZakK7GT_?#FW>43RSwCCwdM3v;<=NHQJu337IqTI*hT^ z$T;o$wLQ~oSy5A--x+Rq+4KE9Q-c*Xb=%(!9Iw7o>_4w(nbQ3}C0@_E{SQM%YgxAE z^)AyRT0rMWab|m7cgBIyDYHGVpPBM{87eYS8P2p946RMsp4X#HZ`I1|KkG65EabG- zWuDi&OnJTK_Md$iLWW|>_PpL^I-wQ0e)swRiMC&_^?3cxl-K)YPiuU){htA&m~i=Y zD=3qu{9Hq$(pSzCeGGr6y`k-x?s5g(RlN9Xmp$L#Fi?A3j@$7aV04OX&-)w4^bLLs895T$GyOGWPJ3Z$<>iWwXqE}vF|C8K(|*KMnj_kt z{dC(`co8OlUTeKB zEmFk60%;X2Ax`}P969)y3nI{p^hQoJM_-Cki37d$fMmY6o=GO7^`(8%?7a8A@4b05 z^E}Bnxx(CtWswq#F42LdP@?YWfu4!g3>~L&S`yI{5v}iusMQl2In23#G50V(#|(Yx z`Hct6$}TR5_CFbrH$m=-&MTY-yhq?|iq6S_`Im^c_oQb>wAXj2HL=f?o{e00n<@14 z2|ieYQ|yXJkL@A0ml*p zaSIUkKdA9a^bjVFL2ZTu4&pn4PiaeZPFscOZxKC~wWLI}Fa{4cBLlZ{yId=z5-;WcuA7-v+mv1~cN)#}^;;vP_vK{)i-|*^o1(rQkZ&j;y!(Xe1UT}ui zYK;KSz%DiK*cCshxgk-0cJ?ECD*wsS8GCx#nRd=`GDsT3#^6hXmqy6iVoZr8ZPhy` zq{I698d-NIty9O2jQs%TY2Z9q-s4a9_~dsZv*V*K2r%EpxX3u<7AI5w{P(GLI`xG$ zpvC^A4~L}bSwG2_O6+W+RJ^Oh5nRg~8b7WT*y|Ekc3dMc8)Fi~ln((U;k?HrJTnB( z55eb$;GYe_mxtg~a)Yu{qPq80k=58PHr$};711A5%opZovW4RO+}uKLvACF>DddV& z;pU?9nn%qr2>sg>cy6`om)I<~8XyFoN0pmiSjD<5>TXA%r!f9Q1G9Y0PKd$>XutpI z0FL|b2z13?mAK-oUTkQ5zC*?TQN!^Y*~fp9xXSasw13w4dY)f2T+j38kUWnyzMdz| zjSAtqU&T;$p3v~uH2j?*_!SN3Tq@79h9A@LhK7%8xDB0!&w+=Mj8qh^`ktKTy;|t5 zV8+eI^QzJUuj)FXcQ+)b?1nBmE6pZ3fj=-xey!%!;j8N1IR2ahj9 zel^d)uXLUIwpoyLn%rx^`5iFnQxY)iGV8yESk7t2e=dP9;nT&8=PpdT|1sH6YJI+c zejil4y8ooLdA&`!{#ChQ{>}0_W<2LK?;a41$^KhmLlg7-`0rOz{CQbF{slNBX8iv{ CZ;Rk5dQR!3oEH&fJRZw^?J9*9bE6q-X7OV zo04oGJug)fz7XRVqaTQg2_{654{(5?g%HzPf|p2QW6+#AVrxHL;-C87?7T9!c8yWv zyX?-)Z{BUls9qAf7ysJlU&e)-_w_1GZy-NgT3+rgZ;JHJ!``)l5bGYMc}pHD-sE z9L{W5xr4tg^ z@BXZ*;xvR^n0I~#B&|%)!jvk_FHyQ1a!+2LcCUT$?zFp(2Q}^9cNySU0NWAr6$LmZ z)o)C@_g|iNuOA`niMgy1{+0D8S(l6rZl|cD#4U7WDPd_?e~|)#+!vK`vv}Ch;Wp4` z77rQg;5GnFkFmup9!!Q!CFja0w>B!dzRJ>tDYThgIhWa=W4#MN!_2$VN=__Vp~39G z!;C7pyNrc}#{lC)Tc{HKCkyUBtqlZ6f#QQI*UfuX2O0jFKgY#v<_|lsUcmN6yv-Vz zUwCkE_wjQ;GwrwF0UuIfPbgE(>9OYYh&r^)(jU7}4HYuxK6y~MBTlQACo0tR75;d; zM%7FeWmiu7h`fN1>DjfBm%y%sTXX6Kj6-aDY0v+7_P>l-{eObS`OId&^!XZ8#*g)n z&$y4D`fX;0XBZE>pt^1;-|xmep785eaX}ah`3-+`lczpW%|el=7V~#$9$h<}jObdB zc|5ItJ?MG7KKOKf(DQmokH?HRJf0d>pQy2ScKQQ{c%S9hx=(Dg%KSFAqqTLDXZ4Pk z+Shm*8@-L*2CJt63J+YkqoI?PF;^BDKDsC_(OzIR*-}xu-rUVxJ$0^?iz=&5g7R|U zt3=;(ST@(zohWOqnJ+kJP(La6m1V%%vU?RdNHf0)+dkgS`dAwyUMN&9`g&_C3m8 z-`?hyHpRz6-FhTugqYS7F<9t;W<;5;`J>TzfVTo*tp}6cJ}lvU0l&NtT7m9fJ_-xK zA>-@z>j}*lNE~62Sj0#KbQX(ifpDA!l6u0I&nzn7*CATgbtJ_DOR*Hh6bLh)FJZtD9Opv3MeGBd z7sijVqU;nL_3X6CviNhiJO9BJoqg@{2d2=#(|%6;9pA| z=erj!lzTS5-@>eD&JWi9amqH%MIe@0U345%QlF9K*sY`a=0Y(q9Q}(!XKT zr~KTuamweUjg$T_Hct9<{!={9@Msu&6cYo2g&fZo!AT$Adnm6s=nvTRDV~gtQ#>Eq zIO(6YaniqL;}rk6;8@7DPy@u9fFmDh(SDCjnkziguZZ!h& zt}ZPGeX+QqdEp!KDSpt4_JLT^+pWjDHQne18}y`weIXsbb7>0ys`P+09wqplDNB=R ztPuI6K5^_&ldmBzMbj*?DjoQ;09h^U@g0G-xOY)-Z=*a37jm%;5OI0UHZF1d`0Jqq zeg0E>{BA^_@-qQV)*;3ZV?z>(pU_6ApnU@YQH}_Ee7DF#@l)9Xom7|gzWJN;$L~*k zH`?Q$5cc-C?C~EIpv(yOge-;u0Q? cards_ct - 1) @@ -77,31 +109,38 @@ int main(int argc, char **argv) { } break; case 'q': + delwin(inner_text_container); + delwin(outer_text_card); + delwin(main_card); endwin(); exit(0); break; } - // clear old card - wclear(main_card); - wrefresh(main_card); - - // draw box - box(main_card, 0, 0); - - // print title + text - if (cf == 0) { + // print + if (cf == 0) { // obverse mvwprintw(main_card, 0, 10, " Card #%d/%d [front] \r", cc + 1, cards_ct); - mvwprintw(main_card, (term_y * .75) * .5, (term_x * .75) * .5, "%s\r", cards[cc].obverse); - } else { + wprintw(inner_text_container, "%s\r", cards[cc].obverse); + } else { // reverse mvwprintw(main_card, 0, 10, " Card #%d/%d [back] \r", cc + 1, cards_ct); - mvwprintw(main_card, (term_y * .75) * .5, (term_x * .75) * .5, "%s\r", cards[cc].reverse); + wprintw(inner_text_container, "%s\r", cards[cc].reverse); } - wrefresh(main_card); - } while ((k = getch()) != EOF); - /* for (size_t i = 0; i < cards_ct; i++) */ - /* printf("o: `%s`, r: `%s`\n", cards[i].obverse, cards[i].reverse); */ + /// colors + wbkgd(outer_text_card, COLOR_PAIR(2)); + wbkgd(main_card, COLOR_PAIR(1)); + + // refresh + touchwin(outer_text_card); + wrefresh(inner_text_container); + touchwin(main_card); + wrefresh(outer_text_card); + wrefresh(main_card); + delwin(inner_text_container); + delwin(outer_text_card); + delwin(main_card); + + } while ((k = getch()) != EOF); return 0; }