From 98829e24e28a35f759d4aa9dfde6b8811508360f Mon Sep 17 00:00:00 2001 From: "sigonasr2, Sig, Sigo" Date: Mon, 25 Jul 2022 17:39:36 +0000 Subject: [PATCH] Test ability to toggle windows on and off Co-authored-by: sigonasr2 --- main | Bin 17872 -> 17864 bytes main.c | 31 +++++++++++++++++++++++-------- project/utils/utils.c | 6 ------ project/utils/utils.h | 5 ++++- 4 files changed, 27 insertions(+), 15 deletions(-) delete mode 100644 project/utils/utils.c diff --git a/main b/main index 79c6176a01c391b0ee3fc51a3e5e1f917ad9e5d5..fc2a496307d3064270bbf31d283cd1370dc0959e 100755 GIT binary patch delta 3428 zcmZ`*4Qx}_6~5Q@bNo!)_{DLa9Rhw%`3oko9a55Xq}T-02TMl6lD7LnBr0qTq8h1^ zR$ZHtG~I;dc?ukLO4m*!lO{&hb&0Z{vZ*Ws36Lh%q(3y1Xz|vdISW-2AQh0Zw{zdS zj~b?3>D_bgcfND(x#zw6?wv@{b16FLlllsY-eQIzj>F~0#EjDzWk8~y!&ge33!(um zh)_r?<5_A9O-bCwn89{@+!e;yU4OSER%5I{Kb0kgvlPx!;5hx4*lJKnE4*Ua5&VCV z<}3zn4n*tjqTht&O?xVS@~ZoMve~yUy0lAmJO|HP*Z5^*nMo1SZzX+1VVED@wub26 zpkD~XV8RBawsl8rK6)FdO@?;V-q5u{TZH~r*W7j+*lb1A5A!yeT3HW@ph8A4@L%Yx z=D0qB5g|fn;U9u5IC1te7`1rlM}sLneQ6O zK_#e1bU&iwIj9GoMD#U8Cvs5l*swDs9C4R93d4k4)mD1O*1Aim_X!E7ygD=aA59y) zR6X}p7E}G#%=Ie;qtbvSSK~@dIt-xrt2@`N3D6Q zka>L&hu=U&O$$4jsJqeaRa3%!O#i`nx2R; z->yVXPpC~Ds6Vw1RW*6JJ6}!JpTR*^#Fb?CXqt9L_yEG5V{{dK=usVM7AGZKfYn7S z!{0Ur$5A9NsL8Y0&u(kl?EX|D`<298Phg<;3hD8uy!8g{MR=}gMNlvXkKFNjjrkyJ zg<+_N@uJ|jE@28dP0=0JHyNu1A6D;}UnLpc5WKW=(CEedU{ZqtyzJ?i7bZ=qq zJjDd+SZ$kG75LOE?p~KePz=JoWlOTyp+r_qo=PP$>X2G@s^G`(;OEuXd!BU1cx^r@ zHxm6SWAoBoy2&cK!@`p@R=U-+PU8wwJ@2QQrgUWBiX+uFu``~Wk0;OJzS)D@NB<;F z>SalueT&KL%9}9d+kP;F)|2dF_5@O2YN61UicL*{N@@Xo#7i_rt>oD*>(mb z6WM{p1f6*kze={J+i>foyraw~C7eWIYzG@g9o%(V{~^R5ZA{n0{e;9H*_OOe8gJW{ zT!^>ElV7x{>57*S|9WHjZ50=h-97fPzswFJ&e##9v56gd?0}v6Ow$gbbj)ko2udHy zb0}-CYT5ym!E2h9L77<4G&~82fO9J-*Px7{971^rhLzRJ#?cf1U4(4O)6a?(s8-{n z;tUbEtlS@Mp3^kl#8}vh@ae`!MV!SnTPZ3(!lw@Ef&roax~7f8uHaHU&Rz*F6|SHq z11EwFLN)q0#%P(m1Xrbq=E(K(sO-MfjD3oiwb)prdjJ&A@17fW8ismEWZb#H&0oZm~gg_z;ba zO@;#$1J6ffBm|>gtBAP=qq0BdFhb<^Rh z_YhSvnTGrv1tmUWmfp0U#|xZ=;0#ZhXo-Acusry-{n0NEZM9_%=dItt@;8t?YhU1pT$g#v*kNYF<&52b;&f z|KJ5H+dyN@54BTz07f^3r5L*$VlyS~QAA(o+t8HN5RHY!3`aB28LJV^Z5D&$v6?&k z*WAbWUSkJwpLE5;kcmq$8V^hD?8b%7lnTrvYF5XTdm*|x>@?p#ZpD3@e@I(lesfql zs_6d2lqy6U!lJng+|b!j1MLkFm}qc|=AKbtrUBFAKb;7F2NMw8qPf=aKgBW(8;1Hs YNPME!nBhg}O4Nw|-e`CPDo-J+bOM?fppT^ zNtlUa80SkU?qJ@uV<2e?{lNUe3?2Ug=>%euHsF>{oJ>pIPMDeuq@s2w<}0*=ow5iG^)5=DUSfUZaqL-0BiEbxwKFo7SiT_@o>3Dgu*u#)op8u5`{x=Iy`EZbbl94C z;Vf$9EUh^s0kJ}Gi8A#;ohZZCMW<^$x6DPI1-2l%8PSd`RDib;eGAbSv(Q}lBci7f zeIpAM;U=Q9hz?|-b0Ff7{jRKt2D7wo*x-<%#o=@v%|a#UL-b8VPi3L`a17D+9L^zU zV7;)*v%nsR5^`BvG;gTH6QI@DI#fo8JGg?7EAIQRWB(d%&g}lb?&@ENz!TC0yposK z{3}d?+UJVuqV58&zvg`u=~s8EeRW&0q4o(sU}D*Hr&mo0Wvu<`aHpt^yMx=<^giSg z`As^%x*jI-?z0FH5cB63&&Oa%S821_Tle`AY^uo%olZ4X_XT#+{#%-s{*I<;9|_lB zb^Za`2>;Gk?T473l<*a-ELaqM$>@xrNS;xXC(~cv)U=7ssYLpr#8g+Xw|kOw`BUBv z25mp=Em#;@WOSa-*u2GTkhQ{4Y=H5C&{GiAzqkYkS-8B1@gMU_U`k0aP+Ph(AVjb z+rEZNn6J49vY@>sEPRI<&z9>f%$}dk7-6Q5utsSjttLN6CC1eOb=e2*AI;!$n+8u~ z#Hqw6CNWFmd>`?yWnNpHrpl=A+B@l(RjQ5ffA z1bI6*e0ZCo7>w;YqmFHt0|vz%jOjla@yA#7)jd^2Nc^#;lBSKK^j+4p7g5qH7&*#C z*EG$J%b;Ki!zk-nDp7Wz>_9n&@-XaH7SjPZp~ylE{VH%)DWbJNL$bdd{d7jCC5nDR?dx<^-(~F06P)O68u~*G;yP?8 zm=R&({f59hd21v{71$k#(lCr*yB#h@qEapY zA!qB&$^aCX1tkw&m#pAU(2D|3l&z-2aIh>$cfd&5_s~a0^qrxxsE=avQn`$9sKRR% z$uLUUuh_X|mavjJ!~<(9R?-;!8o6$=2BjP@A4pkLyvrpL4#4LXjdT#CO0U(6Gl*Bp zIDv#ciF5pB{Fh-Mp*3rs*2$;%`bt{aGKM+iOOmE;Qci|JzRwesy=~g~s zu7qiI0{W}uiUM5LJe)-ne|#+D3l-$J!q=HSBUp*DHv zKZx5=AxMbnhM8)Q&N&L(t7ZDW?yZ=4v#++pCv`C`1)XyQIV^jJ`HVJl&Pko~d+4u`{Y9M9%6A=mM6i;E6R5q)wOhOf zsvmu9&gdQr;ZluEs~}V>+hQ01Zt#2yc@oyvzHjU5+_ZVfxy(u7fd^~F&W%6pd~{>m zGaW-)9{h`SNPW1K()Dm~c~lDXUl3E`X-0GhKd`2(gyL9K9OmdSw8d&f^JprtFIJN| z>E?+afQzvnyMk-S3P^DoUXM#+OfrBN?2FgHKwQerX5`jOnZG$^LVgFu^-+hpW$-Mw z*S|(v;9`AL8dMBtrtE;?hA0d)l*1bh9vH)Ku%TQuPf-}oHPmE&r)qhkPeJht%@yOD cWIj49hw4PBxUJUk{XA?+)ZjmleTl{Y0jOk6<^TWy diff --git a/main.c b/main.c index 8a3f44c..1c9a269 100644 --- a/main.c +++ b/main.c @@ -2,7 +2,6 @@ #include #include #include -#include "project/extras.h" #include "project/utils/utils.h" void drawBorder(WINDOW*box) { @@ -61,6 +60,8 @@ int main(int argc,char**argv) { drawBorder(messageBox); //box(messageBox,0,0); + boolean resizeOccured=false; + refresh(); getmaxyx(stdscr,rows,cols); int ch=ERR; @@ -68,19 +69,32 @@ int main(int argc,char**argv) { if ((ch=getch())!=ERR) { keyLog[currentLogCounter]=ch; currentLogCounter=(currentLogCounter+1)%25; + if (ch=='A') { + if (messageBox!=NULL) { + messageBox=NULL; + delwin(messageBox); + clear(); + } else { + messageBox=newwin(4,cols-2,rows-5,1); + } + } if (ch==KEY_RESIZE) { + resizeOccured=true; getmaxyx(stdscr,rows,cols); - delwin(messageBox); - messageBox=newwin(4,cols-2,rows-5,1); } } if (clock()-lastTime>FRAMETIME) { + if (resizeOccured) { + resizeOccured=false; + clear(); + delwin(messageBox); + messageBox=newwin(4,cols-2,rows-5,1); + } //mvprintw(5,7,"There are %dx%d squares. (%d)",cols,rows,frameCount++); - drawBorder(messageBox); - mvwprintw(messageBox,0,0,"There are %dx%d squares. (%d) It is good!",cols,rows,frameCount++); - mvwprintw(messageBox,1,0,"There are %dx%d squares. (%d) It is good!",cols,rows,frameCount++); - mvwprintw(messageBox,2,0,"There are %dx%d squares. (%d) It is good!",cols,rows,frameCount++); - mvwprintw(messageBox,3,0,"There are %dx%d squares. (%d) It is good!",cols,rows,frameCount++); + if (messageBox!=NULL) { + drawBorder(messageBox); + mvwprintw(messageBox,0,0,"There are %dx%d squares. (%d) It is good!",cols,rows,frameCount); + } for (int i=0;i<25;i++) { if (keyLog[i]>0) { mvprintw(6+i,2,"Key %d was pressed.",keyLog[i]); @@ -89,6 +103,7 @@ int main(int argc,char**argv) { refresh(); wrefresh(messageBox); lastTime=clock(); + frameCount++; } } free(keyLog); diff --git a/project/utils/utils.c b/project/utils/utils.c deleted file mode 100644 index 2f20b91..0000000 --- a/project/utils/utils.c +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include "utils.h" - -void testReach() { - addch(ACS_DEGREE); -} \ No newline at end of file diff --git a/project/utils/utils.h b/project/utils/utils.h index 4828daf..fb07948 100644 --- a/project/utils/utils.h +++ b/project/utils/utils.h @@ -1 +1,4 @@ -void testReach(); \ No newline at end of file +#define true 1 +#define false 0 +#define boolean char +#define byte char \ No newline at end of file