From e06f9e0cc79429ae0c2d55e7964d3945d7d485f7 Mon Sep 17 00:00:00 2001
From: "R. Eric Wheeler" <sikofitt@gmail.com>
Date: Wed, 24 Feb 2021 20:47:44 -0800
Subject: [PATCH] Updated libgetch

---
 src/Console/Resources/getch.c     |  79 +++++++++++++-----------------
 src/Console/Resources/libgetch.so | Bin 17264 -> 16792 bytes
 2 files changed, 33 insertions(+), 46 deletions(-)

diff --git a/src/Console/Resources/getch.c b/src/Console/Resources/getch.c
index 54a6105..ac71127 100644
--- a/src/Console/Resources/getch.c
+++ b/src/Console/Resources/getch.c
@@ -1,3 +1,9 @@
+/***********************************************************************
+ * This Source Code Form is subject to the terms of the Mozilla Public *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this *
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.            *
+ ***********************************************************************/
+
 #include <stdio.h>
 #include <termios.h>
 #include <unistd.h>
@@ -7,34 +13,31 @@
 #include <linux/input.h>
 #include <glob.h>
 
-// #define FKEY(k) ((k) >= KEY_F1 && (k) <= KEY_F10) || (k) == KEY_F12 || (k) == KEY_F11
+#define FKEY(k) ((k) >= KEY_F1 && (k) <= KEY_F10) || (k) == KEY_F12 || (k) == KEY_F11
 #define NOTNUMPAD(k) ((k) >= KEY_HOME && (k) <= KEY_DELETE)
 
 #define EVENT_DEVICE_GLOB "/dev/input/by-path/*-event-kbd"
 
 static struct termios oldTermAttributes;
 
-static void setRawMode(void);
-static void setNormalMode(void);
-
-inline static int discardRead(unsigned int length)
+static int discardRead(unsigned int length)
 {
     char buffer[length];
-    ssize_t bytes_read;
+    ssize_t bytesRead;
 
     int flags = fcntl(STDIN_FILENO, F_GETFL);
     fcntl(STDIN_FILENO, F_SETFL, flags|O_NONBLOCK);
 
-    if( (bytes_read = fread(buffer, sizeof(char), length, stdin)) == -1) {
+    if( (bytesRead = fread(buffer, sizeof(char), length, stdin)) == -1) {
         perror("discardRead");
     }
 
     fcntl(STDIN_FILENO, F_SETFL, flags);
 
-    return (int)bytes_read;
+    return (int)bytesRead;
 }
 
-int getEventDevice(const char * device)
+static int getEventDevice(const char * device)
 {
     glob_t search;
 
@@ -70,28 +73,33 @@ int getEventDevice(const char * device)
     return -1;
 }
 
-unsigned short getScanCode()
+static unsigned short getScanCode()
 {
-    struct input_event inputEvent[5];
-    int fd;
+    struct input_event inputEvent[3];
+    int eventDevice;
 
     const char device[FILENAME_MAX];
-    if(-1 == getEventDevice(device)) {
+    if(getEventDevice(device) == -1) {
+         perror("getEventDevice");
         return KEY_RESERVED;
     }
 
-    if( (fd = open(device, O_RDONLY)) == -1 ) {
+    if( ( eventDevice = open(device, O_RDONLY)) == -1 ) {
+        perror("open");
         return KEY_RESERVED;
     };
 
-    if( read(fd, &inputEvent, sizeof (inputEvent)) == -1 ) {
+
+
+    if( read(eventDevice, &inputEvent, sizeof(inputEvent)) == -1) {
+        close(eventDevice);
         return KEY_RESERVED;
     }
 
-    close(fd);
+    close(eventDevice);
 
-    for(int i = 0; i<=5; i++) {
-        if(inputEvent[i].type == EV_KEY) {
+    for(int i = 0;i<3;i++) {
+        if(inputEvent[i].type == EV_KEY && inputEvent[i].code != KEY_ENTER) {
             return inputEvent[i].code;
         }
     }
@@ -99,37 +107,16 @@ unsigned short getScanCode()
     return KEY_RESERVED;
 }
 
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "cppcoreguidelines-narrowing-conversions"
-inline static char *reverseString(char *str)
-{
-      char *p1, *p2;
-
-      if (! str || ! *str)
-            return str;
-      for (p1 = str, p2 = str + strlen(str) - 1; p2 > p1; ++p1, --p2)
-      {
-            *p1 ^= *p2;
-            *p2 ^= *p1;
-            *p1 ^= *p2;
-      }
-      return str;
-}
-#pragma clang diagnostic pop
-
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "bugprone-reserved-identifier"
 inline static void pushStdin(int c) {
     ungetc(c, stdin);
 }
-#pragma clang diagnostic pop
 
-inline static void setNormalMode(void)
+static void setNormalMode(void)
 {
     tcsetattr(STDIN_FILENO, TCSANOW, &oldTermAttributes);
 }
 
-inline static void setRawMode(void)
+static void setRawMode(void)
 {
     tcgetattr(STDIN_FILENO, &oldTermAttributes);
 
@@ -140,7 +127,7 @@ inline static void setRawMode(void)
 
 }
 
-unsigned short resolveScanCode(unsigned short key)
+static unsigned short resolveScanCode(unsigned short key)
 {
     switch(key) {
         case KEY_DOWN: return KEY_KP2;
@@ -157,16 +144,15 @@ unsigned short resolveScanCode(unsigned short key)
     };
 }
 
-int readKey(void) {
+static int readKey(void) {
 
-    unsigned short scanCode;
     int key = getchar();
 
     if (key == 27) {
 
-        scanCode = getScanCode();
+        unsigned short scanCode = getScanCode();
 
-        if (scanCode == KEY_ESC) {
+        if (scanCode == KEY_ESC || scanCode == KEY_RESERVED) {
             return 27;
         }
 
@@ -219,6 +205,7 @@ int readKey(void) {
         }
 
         pushStdin(scanCode);
+
         return returnResult;
     }
 
diff --git a/src/Console/Resources/libgetch.so b/src/Console/Resources/libgetch.so
index 90d8939257245cb6ef4f0a8d9e998f299d5c2899..886aca96e3c846fb87143e52dcac58b210e627b9 100755
GIT binary patch
delta 3608
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

delta 4267
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