From 8c0255d502a076ed5d54e1b9c583cb7c7c89992f Mon Sep 17 00:00:00 2001
From: xamidev <121681048+xamidev@users.noreply.github.com>
Date: Sun, 2 Jun 2024 12:30:56 +0200
Subject: [PATCH] Colors everywhere

---
 hex.c    |  23 ++++++++---------------
 minihex  | Bin 20280 -> 20336 bytes
 test.txt |   2 +-
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/hex.c b/hex.c
index c7e06e1..3a0866f 100644
--- a/hex.c
+++ b/hex.c
@@ -1,11 +1,8 @@
 #include <stdio.h>
 #include <ctype.h>
 
-// TODO: Position printing 
 // TODO: Stop appending garbage at file end
 // TODO: Skip repeating lines
-// TODO: Coloring printable ASCII characters in output
-// TODO: Stop scanning always for cmd & loc (for q and s commands)
 
 #define BYTES 1024
 #define BYTES_PER_LINE 20
@@ -14,7 +11,6 @@ void print_hex(unsigned char* buf, int byteno, int pos)
 {
   for (int i=0; i<byteno; i++)
   {
-    // Print line number here
     if (i % BYTES_PER_LINE == 0)
     {
       //printf("%03d:  ", lineno);
@@ -23,18 +19,15 @@ void print_hex(unsigned char* buf, int byteno, int pos)
         printf("  ");
         for (int j=i-BYTES_PER_LINE; j<i; j++)
         {
-          if (isprint(buf[j])) printf("%c", buf[j]);
+          if (isprint(buf[j])) printf("\x1b[33m%c\x1b[0m", buf[j]);
           else printf(".");
         }
       }
       puts("");
-      // Here, we could print positions in hex but I prefer using integers.
-      //printf("%04X  ", i);
-      
-      if (pos == 0) printf("%06d:   ", i);
-      else printf("%06d:   ", pos);
+      // Here, we could print positions in hex but I prefer using integers. printf("%04X  ", i); 
+      if (pos == 0) printf("\x1b[1;34m%06d:\x1b[0m   ", i);
+      else printf("\x1b[34m%06d:\x1b[0m   ", pos);
     }
-
     printf("%.2X ", buf[i]);
   }
 
@@ -45,17 +38,15 @@ void print_hex(unsigned char* buf, int byteno, int pos)
     for (int i=0; i<padding; i++) printf("   ");
     printf("  ");
   }
-
   int start = byteno - (byteno % BYTES_PER_LINE);
   for (int j = start; j < byteno; j++) {
     if (isprint(buf[j])) {
-      printf("%c", buf[j]);
+      printf("\x1b[33m%c\x1b[0m", buf[j]);
     }
     else {
       printf(".");
     }
   }
-
   puts("");
 }
 
@@ -77,7 +68,9 @@ int main(int argc, char** argv)
     char cmd;
     int loc;
      
-    scanf("%c%d", &cmd, &loc);
+    scanf(" %c", &cmd);
+    if (cmd == 'p' || cmd == 'P' || cmd == 'e' || cmd == 'E') scanf("%d", &loc);
+
     switch(cmd)
     {
       case 'p':
diff --git a/minihex b/minihex
index 7751565a87d43a1a7cc9df8516bfbdd053d0ccbb..6982c7a3a0b56844086451c484a3e72b72647c29 100755
GIT binary patch
delta 2051
zcmbtVe@s(X6u$R8Zu|OLT3bsQ)<}!1P?XXM2#8RlcI#?}Gufsan^9p5olKoI#YNLZ
zz=;*5yUT)eLCiwr4~)91VQQ4bMdP+?Y&xTV3|ZXFBN`!$Eh5ghbKe8)ekCS*$$Q_q
z_k8F3?m4eNy4&zj8*a(sywAq6`*er3NVyJEGtSi==hW5l`13dyo4cIq@)6P|ZqVv`
z@0_#z{o-9K>aKRtuLt%B(JP+#Za&wDH_|ia+jt@Ew9MAugwpzL5;8Tk&|fT0yoPEg
z=SF5m{dWSDy@9CzS^)Q&P9oFEo~8?dX3}jyDA07Vn;A;|f5`G}@tlXn4G`D+?_ek_
z@k?9x0=HG=N?TZJTQAydkNPD=C6cJ}F;hv4`g@gB9ZTsZ93u3{WPAFmMEWa=kpxCk
ziT{de_pyg`mDNoxR)<H{CminX19qSx;0=}d?``de1AUs9|Awx#mhx+)KH6^0DTjtf
z{<UFCV$EF8oM^ajjOmYn{s^2yX?R#v{H4p(kP<BFRafe$P6NAJhHKzH22!-K2Q~ur
zJwhOg0?jE?6ql<oS?M6%lj6pOv^&Ka*#mxo=EfV0t4!y3qUJK#Hl0+m^EQN>6XA;?
z+eG+gNIwz!H%|kl{zpphBq}98Rx+LKsh9lq_dMYpO=&%WW@{sR)iAuZP!LVx0<Cb|
z71U$P;VzBQH*Dz(Zs`)HzWqM57-JRDMoBTdC{2UCe{_68sZu)j(6hEw-AAg7G>!Jz
z+=W)PW<sK46b7$VMtPeIy!(&|zI?ALFw^SF0<#d2C@?OakNZ+r2_HE0^XwIQd9|)e
zdxf_aA$!F$C3*R^F7KSGxopSbaKPT*cU+#?%N+=EG~KZ!+2N{0t}5iJsi{L@+ToZU
z`QbNN)<5Ch3B2atRX#tCPg?sQyomgN4uI`^NfAs+!=`mtme&F156bd~fQtaT07n2{
z0{n4EmcIaO_*IsF2DHMB5WV1>f?MfN&Qy%(s528{XGZFh77#nC5Y)$1fZcGLLF5qo
znerPa?cf$BYxp+KpcN3yGqcuVSziB_d^O9*V;P@|v?iwrx5p3We8zD$LXUAa`nER%
z!uVeADLzs_Hh_RP1s-rIB7pdlO-TqPXTaC1z{m)E>`XXWhM>UCGJNc4SW}Hkb+zEi
z$F7Ant2bApGIO1h>kk_{fa+5VuY^rw<MK_Q$1Y7}Z53K1?ng)u)!&9S>(*ByKfRov
zsTVa(7L{~}l7jSzn8j4M*rLfB)^9@j>SDfeF8EGY7d6Iekaeqzb=Cvp<rU*zZUTO5
zkino5mYW`o6Sk^0NV67MEo$<0cs~W|8$xa+4PS`Gs=y3o4qR*{GIfkowmeqIre75d
zVljStj)?IMdZBP*M8w1(yh`{G(Z5CnZl;BZjYQW@EJ7*KwGfk+7`a&%;zL{#4iX20
zVKPZLKxRS6?I)RPLc5cQw@3<GRD<9F@)S!84TLZpCQ}*kwZe8{VVoez=2K4*Ek{oj
zW#*JY0LF%T!dDYrE*t|KXDlY#Vc{TonpN&2X=)k2i;BfF=8<IK5)neg&XPf5We_56
zfTSSFU=SjO0Gc52G6*RRXoG|ZU(&qdY;kpnU`TMhGyYbwBPqVKGz;US^jO(*xQmXK
z4dQk>;5&j3(S7rm=^lOV;-mA^by%ip!CYN?syf$px-`g&_QBrcf8+0hg*wTpGNib9
o@kI{bq}N|4#GTY!?!(vVQh0XKSh<gzw19qJUWU(8^ODRz0YGEbLI3~&

delta 1882
zcmbtVe@s(X6u$R8ZrfLA3#FwpFm2Hyl-~peBtqS+JV05N%}kwt;9v|H42+n%MAHpq
zp(&`{o%<08;Fc}hV&b$>i8^gI17XV|X2h^1ZX}z@BRE0E7Pp~q=e~!^vL!RwO>WOU
z=ljlg&OPt7o$bd%{rE^4cgGuYe=ls-B4ur+aX3fl=2WjcT!C|N+(D=6KCm>v%~(G7
zpR+IT&fH!6-BEhxSkc8z{I;%eH=kp~Ptyx=)3|_sWX_Ksht!S(5;7fpjovUj@ph_>
z&+#V*y*I_$F)`?!5b>Dl3^JXG1V*HRyRtm3zmyF*5`}Yz_a+8riC5a+FZPh$7=%Qi
zbus9`7}}c@^h$wYK-yJgi1jIb%v2JC-Z2GwaVc~NAjqMY<E{4crN9eHH3_OoCEjsU
zcjO*zwWL$0#gTm@TB)jP-(6r`%>r+>#CvD|B-B2&6u(YeEbI8~($DmSC94dsIsY%$
z)PczTYcBlB1m{6;9ttbhj8X-q+th8XEE?7?DgQ07hh$h&XEB6>oe>C#9TA-vL}HIM
zR>{1^W^{=jx2EGQ^qSR~dK~JBJx3=Qx2N+5W|Yyqzf}5VT9aT&8Vy9m9!n>iBV3IU
zf>E6K4rsqk4<}@C?ge@=!T$L2rI|ne0sVwnMzB*-#787Q#QxFVO@UoSY40$#+ib!W
zB>-$%W=k*HtLEI7(11IwRmMI|rcU2uf?Mv?i5V7G8Wd|I(){nTJo*I+57>6<=$NkN
z4M(&ExpLRkt#vpY$d#SH)q&WFmOEZCxN2Q>$kouW5BU(HUprR#`+k*W>m%+K;63x3
z%K!2abN)lyFaMtga1viq1Y^*^?z<(+O<;G-$nu+Do4_6in>-6mgC)0R`7+o;zsT}W
zU@fp=2DhA#B}Ran%DfHQSY}qjE`XgzohhplBOt7V83c<Zw!t2vJ5y|h#ULMGzZ70$
z?CabU1`Yoz7o*joWC*eH@6E|_=HKuY3=f}7Ije`q<)#f;Mc5NQmUW8bPDjy`TmpS5
zHwBL2!@1{pe<^7N5wjIOU@1aiao?UOgbXS0`j;9Rfe&5q8Duz=CNYE$ed^QHqm4o{
zROUkyKF#xc>rr{!J_Vcf89xB3s3wm4OxG9XH-a8pn%d?%v{~PaP&8y;@oAb`YEd=)
zreIaHK@%{mqyQzW?S4ZVQ{h4z;#*txpaRwL7}r8wx9T()>p?b8b($;#i|LydYo!yY
zw+oqKRKix%!XlwrErT?TXqj0Bcfjyd)#rxN6&St)RjNRiG6ybHgG_HNQW_sB<kPQK
z&tOCN{2D#RAJXB%-F^cmF}iJpZzIvq5gnIdCi+ey3=*?$9TAQYQ!X)bnP!rUxF}pn
z9L&s-*z+V4PFycprN*^gL@yC5bLv5FfGlIMu9FaE=SVU${4QNPF*8mjaq~&%h?dKs
zXNyv^%h<_GVmb(4PlOz311j38h<5HXvXW)KOA^&Io)_AwzBrZVT=BH2*sZT?BUsV4
zhX;!tQQ=GL(lPF$Q>EqjAk8bA!5-@LoWKEk)$^?I;Qa~bt+xxfpFUNYBY14;d^|Kz
z$&#)@?BSoAP*o^IoGK#{uBaN}@Fz5`x)8U}is~{vNCWWMN=K{9xQX>t|758U+@P`>
IX`E>P3vgJJ0ssI2

diff --git a/test.txt b/test.txt
index a546446..4426f9b 100644
--- a/test.txt
+++ b/test.txt
@@ -1,3 +1,3 @@
-?ello, from a text file.
+?eÿlo, from a text file.
 This is a public service announcement
 brought to you in part by Slim Shady lol