From c909fa19f1e1fe842652deec9eb6865d8e7ccd11 Mon Sep 17 00:00:00 2001
From: "R. Eric Wheeler" <sikofitt@gmail.com>
Date: Thu, 7 Jan 2021 13:56:08 -0800
Subject: [PATCH] added _ungetch

---
 README.md                                     |   6 +++---
 src/Console/Getch.php                         |  13 +++++++++----
 src/Console/Resources/Makefile                |   4 ++--
 src/Console/Resources/{getwch.c => getch.c}   |   7 ++++++-
 .../Resources/{libgetwch.so => libgetch.so}   | Bin 15952 -> 16080 bytes
 5 files changed, 20 insertions(+), 10 deletions(-)
 rename src/Console/Resources/{getwch.c => getch.c} (84%)
 rename src/Console/Resources/{libgetwch.so => libgetch.so} (59%)

diff --git a/README.md b/README.md
index 0b1e51e..882750b 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@ $ composer require sikofitt/getch:dev-master
 
 ```php
  use Sikofitt\Console\Getch;
- $g = new Getch($linuxLibrary = null); // can also be a library that implements a function called _getwch;
-                                       // by default uses the bundled Resources/libgetwch.so
-                                       // on windows uses the built in _getwch function.
+ $g = new Getch($linuxLibrary = null); // can also be a library that implements a function called _getch;
+                                       // by default uses the bundled Resources/libgetch.so
+                                       // on windows uses the built in _getch function.
  $char = $g->getch();
  print $char;
 ```
diff --git a/src/Console/Getch.php b/src/Console/Getch.php
index ddb6e3b..a4b3b19 100644
--- a/src/Console/Getch.php
+++ b/src/Console/Getch.php
@@ -17,7 +17,7 @@ use RuntimeException;
 
 final class Getch
 {
-    private const LINUX_LIBRARY = __DIR__ . '/Resources/libgetwch.so';
+    private const LINUX_LIBRARY = __DIR__ . '/Resources/libgetch.so';
     private const WINDOWS_LIBRARY = 'ucrtbase.dll';
 
     private static ?FFI $ffi = null;
@@ -31,13 +31,13 @@ final class Getch
         if (self::$ffi === null) {
             $osFamily = PHP_OS_FAMILY;
             if ($osFamily === 'Windows') {
-                self::$ffi = FFI::cdef('char _getwch();', self::WINDOWS_LIBRARY);
+                self::$ffi = FFI::cdef('char _getch();', self::WINDOWS_LIBRARY);
             } elseif ($osFamily === 'Linux') {
                 if (!file_exists($linuxLibrary)) {
                     throw new RuntimeException(sprintf('Could not find library file %s.', $linuxLibrary));
                 }
 
-                self::$ffi = FFI::cdef('char _getwch();', $linuxLibrary);
+                self::$ffi = FFI::cdef('char _getch(); int _ungetch(int ch);', $linuxLibrary);
             } else {
                 throw new RuntimeException(sprintf('Sorry, %s is not supported yet.', $osFamily));
             }
@@ -46,6 +46,11 @@ final class Getch
 
     public function getch(): string
     {
-        return self::$ffi->_getwch();
+        return self::$ffi->_getch();
+    }
+
+    public function ungetch(string $char)
+    {
+        return self::$ffi->_ungetch($char);
     }
 }
diff --git a/src/Console/Resources/Makefile b/src/Console/Resources/Makefile
index 189e7d6..fa3a278 100644
--- a/src/Console/Resources/Makefile
+++ b/src/Console/Resources/Makefile
@@ -2,8 +2,8 @@ CC = gcc
 CFLAGS = -shared -Wall -fPIC
 
 all:
-	@${CC} ${CFLAGS} getwch.c -o libgetwch.so
+	@${CC} ${CFLAGS} getch.c -o libgetch.so
 clean:
-	@rm -f libgetwch.so
+	@rm -f libgetch.so
 	
 	
diff --git a/src/Console/Resources/getwch.c b/src/Console/Resources/getch.c
similarity index 84%
rename from src/Console/Resources/getwch.c
rename to src/Console/Resources/getch.c
index c495867..5f2e769 100644
--- a/src/Console/Resources/getwch.c
+++ b/src/Console/Resources/getch.c
@@ -3,7 +3,7 @@
 #include <unistd.h>
 
 /* reads from keypress, doesn't echo */
-int _getwch(void)
+int _getch(void)
 {
     struct termios oldattr, newattr;
     int ch;
@@ -14,4 +14,9 @@ int _getwch(void)
     ch = getchar();
     tcsetattr( STDIN_FILENO, TCSANOW, &oldattr );
     return ch;
+}
+
+int _ungetch(int ch)
+{
+    return ungetc(ch, stdin);
 }
\ No newline at end of file
diff --git a/src/Console/Resources/libgetwch.so b/src/Console/Resources/libgetch.so
similarity index 59%
rename from src/Console/Resources/libgetwch.so
rename to src/Console/Resources/libgetch.so
index dea1f53bed878fc52b801a40caded1be576e6d15..a6bc39f6e356edd20e2773fee8379dfe3564096c 100755
GIT binary patch
delta 1989
zcmZ`)VN4uF6rS0;g<A@^dw_e_P}$RxLdDy=gX8XilSLwI6HUvH#%Qcysuc`v?vPW|
zHb9z?UPvSG65B+R!awkbO3z;!(^gGuwLj>ehM1W2PZLNm784URnDx!>Ow*e9$jvwJ
zd*96N&U^D%JH2*hE)<+oiEEYz<Vbq{V7sy`d+zf5h^Z7L&ne6=nLW3-P9WjyDe`6b
z3q(CZ;Mqsf;+xo@QC$mhRfwxXkfGg5i?@Wdz%)G^`M;fZ*rU*PV4K$L--9#pY-0)?
z%TE|riNDe}7hXF&@b?xh(GXZtNM1lvL$8KTKwi>m4o4H_I{h#%)zVj8?gSfQO^QW|
zs1D+0eL<X{?e~BjMPz&d6yGq6`C@g0g;Q_6IevVYyfgmB$SLA^u;i<mY$N?I9D1&I
zFcD2eliqrX_y{`;$^BzU-7jEKiryteeyF5&WTc9qeuZ;|y(0=+QDS1W2dC`0B&T^3
zm7i;KfCmg7uq=-dyztjyz^_-`?e?N9krEv9>tS98E`9%@r~>CPTH(pvF=Tm8If4(q
z#i-vS+_A~>92PBu-!RH%!qS#EV_cx5$;T@e)Uo7uCLzOYlg&j3t#J(f6LX%D5c_;~
z6$$&i{27DH&iFoiR*u32wIz^u1If4HXSH7XGYXq(^V1RJNFimP&E8<echoN48?Ury
zvl8+fS=@ia#^Km?c_#{4?Q5EZ9WC9s^^fD+{GN&Jvs-HM%q~9T+%x#RS#|dLUAuUv
zcw=Lu6c2t<wP5%gSpl;bHtsu)jW~svLo94N&N;-sKOAQnBE|uE?RUo+f)|aaXaMqt
zp1g<3+o&Kt)#{AYTU93Asw~GO)gyHpe;?xxZvBb)Acjjl!QQH{$hk-{zaHcgG)Eh>
zQC_@ZwmDh=UXC_U72c1UbO=^(eg$sgd;<Q8Hbi1P-y%6Vo<mVCS0Q6INR}U7F`tkO
zKYU=$z?U?D*Netd%DcR5Ey%>)!`)Y7IyFFx*ZE{(xmZSW4E^OKCPOgZN2j0%!+Xda
z<l{OWg<{;KF<3(GF?`kAalDD~$9)>X2PAa54&j7JEr=)Te09Wz*Ax9=(ZIaVBcvK9
z65h@=xR%hv;!s31g%e8H+HH)AYa*g2`Pv*rT6N4!rnOsHbXQc9A7Q%nz@g7wMI{l(
zimq#4;Ydj>5%-DH<eJOl`|}Ga_@7|ARS*BlSJ{@}J=}yyn;v%1kq92W=muOQ!$6xZ
zM=;M`FKdHoR3Aa#?MnQnyVZm%USd%^SzJRubd?`*<$wFyMOXQSJ6?D7cR@>Dh98nM
zLASA4)<ew<2HN+P4Z3X)PPRAJdrj{V2@!p<G~Yf+p*sB}ZGw2ZTS`+HOGmXKpZ7%q
zufS^B)C^v80{6mp+N`iRi?w$!)2@la6nGW#8B-JGD{ul<Gm}_|@eUIfJ5<PZ#57Sa
z0)K(k4pR~N9EHt}e%b=@PTbA#UQghsknc2=2Q3#?I#aON83VOTRYZP6(A<^M)_JE~
zXFUh43G!XtShuTPCKy>`A!{fi<u){DyJb6uD(I1FU@F^GG0Z$PRffyic4dP9<Jg7m
PY)TntC5(0l53Au{!5?Wh

delta 1838
zcmZ`(U1%It6h3z*lkCK-&Tf*<tR!SsBW|MZ>}-<#Np_Q6f6^@|CJ%Yi(ycW%E0rcS
zB?M}dS`h3HBso3^`jCKNjSuDrh5FR?K?FgQ7Y#@yJ_ywpcVEPUu%0_}Z%73X%>C~9
z&N*|>J@?$Z^UltNB`dsWfF}hXU?;uYo6-%<SB>S0qZbulDK4)$#ZQEvL=f?e_(uAS
zxbI*LKZptOlMIHK8M1|!Exc^ZvJt)84}osH#9og6-=C^{DUvGISgWnmOs-w@cmU3E
zY1(=I8m_SpEGQP6#~H<BGknBV(vN%kX+Ex~34Mb6!|)JH;<!4+=J2MPSU6L8?Nt2j
zv+)!heeu|{&z(rdlktIrdB3-Y0xF>@MxF@+1+EZ^!oc}QE0mB59|*3kQV9b2tdh<}
zRx04DP!9PMD<_I04Tdme3ciEnrM^Gn^ZXbX-fb`=4L;$G)kD@M3~FXX#&fe(@SLED
zK*79bVoqxb#tyL>zD4XAt!4XKxZ1p8oO|M32jGn*KMtUDJ%5vk(sgZ%L-z04&eBzF
z6hAed4$OOofphq?(V=J#-Zy%l>LCu!r%RXfKk;UmD82vNY)k2CzM1%Y`Fg#6uSCP~
zZ!~c5rO?;x1q_5U?4Rw)@JB)1(E3;GhECovy!>{xUM~<%6HXCM*6Q^|?6IHJ_WrEb
z$8f@aJOX4pyyFh?dzHSsxNMu-m&4P+h^)LUv}iQAg3)+aC=(`cl86sr;CQ@?SvV7S
zXk4TDI^L#v8Ef&b=!U30FDRFQ&}9lY&~>_=+2h%h&`!^Clq*uMo_<Hz?{gi;hfUh~
z>&!-$NV5zU6LZHb;lZP&sL%j1QgR$s&_J&EAm0c9WUk3Ja5vG8aW~1P@g(Vs=(_D{
z3uJKFbyy5<yCzoMBdP%w*2r$t*sg|QAEQZ!G8#{sIF>wu7n4bf-AtO1Tk;x+1*3!t
z-7^D!C2OJJ({kUVq%yiW7KZxFgY)ox0OmdGBNSWg8`0N1?O|A@tXlEozP5!gh*5yD
z6(=R*zVtlXKwcEd-|_em$X7`6-+2?dq_$*y{Dpu)8_2As^$(A4?FA@EN+9h^0Xp*k
z6rmA!`_0H>Wc8jLaj$npP%pXzCL8s}SGXs8)0<!N#t%Ja3r`Mg(KFSWdavok>B-r-
zQ&aePsuO=mb#EK#iwu`CHtWXC%m}OEX4b?&)(Xj9k+_a-)(Oc@k=TYaS*Ka{$)1Yq
z*;MGDeMKAJz#4_hCYM-7cW{A?;pU*DPm4WI<L`rM+#fX9SLhBox;&f=R)&u96o;Hp
z%=Wh~@dDO{94zM&IF>VXOT2>?R&r@w9+r)t<<dd<=Izs~0a#R8SMmw!LpM(g75tyl
vLise7^ETef$FxF1Iu6I0%UmJ(wgHpFDLppetKZ|ya9aN><!e7umAd`~1&=Id