Merge pull request #181 from flagarde/fixes

fixed input on wndows

Author: staxfur

cpp-terminal/base.cpp

@@ -122,9 +122,9 @@ void Term::get_cursor_position(int& rows, int& cols) {
 
 Term::Terminal::Terminal(bool _clear_screen,
                          bool enable_keyboard,
-                         bool disable_ctrl_c,
+                         bool disable_signal_keys,
                          bool _hide_cursor)
-    : BaseTerminal(enable_keyboard, disable_ctrl_c),
+    : BaseTerminal(enable_keyboard, disable_signal_keys),
       clear_screen{_clear_screen},
       hide_cursor{_hide_cursor} {
     if (clear_screen) {

cpp-terminal/base.hpp

@@ -114,7 +114,7 @@ class Terminal : public Private::BaseTerminal {
    public:
     Terminal(bool _clear_screen,
              bool enable_keyboard,
-             bool disable_ctrl_c,
+             bool disable_signal_keys,
              bool _hide_cursor);
     // providing no parameters will disable the keyboard and ctrl+c
     explicit Terminal(bool _clear_screen);

cpp-terminal/input.cpp

@@ -4,21 +4,52 @@
 #include <thread>
 #include "private/platform.hpp"
 
-int Term::read_key() {
-    int key{};
-    while ((key = read_key0()) == 0) {
+bool Term::is_ASCII(const Term::Key& key) {
+    if (key >= 0 && key <= 127)
+        return true;
+    else
+        return false;
+}
+
+bool Term::is_extended_ASCII(const Term::Key& key) {
+    if (key >= 0 && key <= 255)
+        return true;
+    else
+        return false;
+}
+
+bool Term::is_CTRL(const Term::Key& key) {
+    // Need to supress the TAB etc...
+    if (key > 0 && key <= 31 && key != Key::BACKSPACE && key != Key::TAB &&
+        key != ESC && /* the two mapped to ENTER */ key != Key::LF && key != CR)
+        return true;
+    else
+        return false;
+}
+
+bool Term::is_ALT(const Term::Key& key) {
+    if ((key & Key::ALT) == Key::ALT)
+        return true;
+    else
+        return false;
+}
+
+std::int32_t Term::read_key() {
+    std::int32_t key{Key::NO_KEY};
+    while ((key = read_key0()) == Key::NO_KEY) {
         std::this_thread::sleep_for(std::chrono::milliseconds(10));
     }
     return key;
 }
 
-int Term::read_key0() {
-    char c{};
+std::int32_t Term::read_key0() {
+    char c{'\0'};
     if (!Private::read_raw(&c))
-        return 0;
-
-    if (c == '\x1b') {
-        char seq[4];
+        return Key::NO_KEY;
+    if (is_CTRL(static_cast<Term::Key>(c))) {
+        return c;
+    } else if (c == Key::ESC) {
+        char seq[4]{'\0', '\0', '\0', '\0'};
 
         if (!Private::read_raw(&seq[0]))
             return Key::ESC;
@@ -152,13 +183,11 @@ int Term::read_key0() {
         return -4;
     } else {
         switch (c) {
-            case '\x09':  // TAB
-                return Key::TAB;
-            case '\x0a':  // LF; falls-through
-            case '\x0d':  // CR
-                return Key::ENTER;
-            case '\x7f':  // DEL
+            case Key::DEL:
                 return Key::BACKSPACE;
+            case Key::LF:
+            case Key::CR:
+                return Key::ENTER;
         }
         if (c == '\xc3') {
             if (!Private::read_raw(&c)) {
@@ -202,4 +231,4 @@ std::string Term::read_stdin_alone() {
     // temporarily enable raw mode
     Term::Terminal term(false, true, false, false);
     return Term::read_stdin();
-}
+}

cpp-terminal/input.hpp

@@ -1,12 +1,146 @@
 #pragma once
+#include <cstdint>
 #include <string>
 
 namespace Term {
-enum Key {
-    BACKSPACE = 1000,
-    ENTER,
-    ALT_ENTER,
-    TAB,
+enum Key : std::int32_t {
+    NO_KEY = -1,
+    // Begin ASCII (some ASCII names has been change to their CTRL + key part)
+    NUL = 0,
+    CTRL_A = 1,
+    CTRL_B = 2,
+    CTRL_C = 3,
+    CTRL_D = 4,
+    CTRL_E = 5,
+    CTRL_F = 6,
+    CTRL_G = 7,
+    BACKSPACE = 8,
+    TAB = 9,
+    ENTER = 10,
+    LF = 10,
+    CTRL_K = 11,
+    CTRL_L = 12,
+    CR = 13,  // MAPED to ENTER
+    CTRL_N = 14,
+    CTRL_O = 15,
+    CTRL_P = 16,
+    CTRL_Q = 17,
+    CTRL_R = 18,
+    CTRL_S = 19,
+    CTRL_T = 20,
+    CTRL_U = 21,
+    CTRL_V = 22,
+    CTRL_W = 23,
+    CTRL_X = 24,
+    CTRL_Y = 25,
+    CTRL_Z = 26,
+    ESC = 27,
+    CTRL_SLASH = 28,
+    CTRL_CLOSE_BRACKET = 29,
+    CTRL_CARET = 30,
+    CTRL_UNDERSCORE = 31,
+    SPACE = 32,
+    EXCLAMATION_MARK = 33,
+    QUOTE = 34,
+    HASH = 35,
+    DOLLAR = 36,
+    PERCENT = 37,
+    AMPERSAND = 38,
+    APOSTROPHE = 39,
+    OPEN_PARENTHESIS = 40,
+    CLOSE_PARENTHESIS = 41,
+    ASTERISK = 42,
+    PLUS = 43,
+    COMMA = 44,
+    HYPHEN = 45,
+    MINUS = 45,
+    PERIOD = 46,
+    SLASH = 47,
+    ZERO = 48,
+    ONE = 49,
+    TWO = 50,
+    THREE = 51,
+    FOUR = 52,
+    FIVE = 53,
+    SIX = 54,
+    SEVEN = 55,
+    EIGHT = 56,
+    NINE = 57,
+    COLON = 58,
+    SEMICOLON = 59,
+    LESS_THAN = 60,
+    OPEN_CHEVRON = 60,
+    EQUAL = 61,
+    GREATER_THAN = 62,
+    CLOSE_CHEVRON = 62,
+    QUESTION_MARK = 63,
+    AROBASE = 64,
+    A = 65,
+    B = 66,
+    C = 67,
+    D = 68,
+    E = 69,
+    F = 70,
+    G = 71,
+    H = 72,
+    I = 73,
+    J = 74,
+    K = 75,
+    L = 76,
+    M = 77,
+    N = 78,
+    O = 79,
+    P = 80,
+    Q = 81,
+    R = 82,
+    S = 83,
+    T = 84,
+    U = 85,
+    V = 86,
+    W = 87,
+    X = 88,
+    Y = 89,
+    Z = 90,
+    OPEN_BRACKET = 91,
+    BACKSLASH = 92,
+    CLOSE_BRACKET = 93,
+    CARET = 94,
+    UNDERSCORE = 95,
+    GRAVE_ACCENT = 96,
+    a = 97,
+    b = 98,
+    c = 99,
+    d = 100,
+    e = 101,
+    f = 102,
+    g = 103,
+    h = 104,
+    i = 105,
+    j = 106,
+    k = 107,
+    l = 108,
+    m = 109,
+    n = 110,
+    o = 111,
+    p = 112,
+    q = 113,
+    r = 114,
+    s = 115,
+    t = 116,
+    u = 117,
+    v = 118,
+    w = 119,
+    x = 120,
+    y = 121,
+    z = 122,
+    OPEN_BRACE = 123,
+    VERTICAL_BAR = 124,
+    CLOSE_BRACE = 125,
+    TILDE = 126,
+    DEL = 127,
+    // End ASCII
+    // Extended ANSII goes up to 255
+    ALT_ENTER = 256,
     ARROW_LEFT,
     ARROW_RIGHT,
     ARROW_UP,
@@ -16,13 +150,11 @@ enum Key {
     CTRL_RIGHT,
     CTRL_LEFT,
     NUMERIC_5,
-    DEL,
     HOME,
     INSERT,
     END,
     PAGE_UP,
     PAGE_DOWN,
-    ESC,
     F1,
     F2,
     F3,
@@ -35,20 +167,34 @@ enum Key {
     F10,
     F11,
     F12,
-    // special keys
-    CTRL = -96,
-    ALT = -128
+    // Keys bellow need to be under 512
+    // special keys (CTRL is special^2)
+    CTRL = -AROBASE,
+    // Now use << to for detecting special key + key press
+    ALT = (1 << 9)
 };
 
+// Detect if Key is convertible to ANSII
+bool is_ASCII(const Key&);
+
+// Detect if Key is convertible to Extended ANSII
+bool is_extended_ASCII(const Key&);
+
+// Detect if Key is CTRL+*
+bool is_CTRL(const Key&);
+
+// Detecti if Key is ALT+*
+bool is_ALT(const Key&);
+
 // Waits for a key press, translates escape codes
 // if Term:Terminal is not enabling the keyboard it'll loop for infinity
-int read_key();
+std::int32_t read_key();
 
 // If there was a key press, returns the translated key from escape codes,
 // otherwise returns 0. If the escape code is not supported it returns a
 // negative number.
 // if Term::Terminal is not enabling the keyboard it'll always return 0
-int read_key0();
+std::int32_t read_key0();
 
 // returns the stdin as a string
 // waits until the EOT signal is send

cpp-terminal/private/platform.cpp

@@ -176,7 +176,7 @@ Term::Private::BaseTerminal::~BaseTerminal() noexcept(false) {
 
 #ifdef _WIN32
 Term::Private::BaseTerminal::BaseTerminal(bool enable_keyboard,
-                                          bool /*disable_ctrl_c*/)
+                                          bool disable_signal_keys)
     : keyboard_enabled{enable_keyboard} {
     // silently disable raw mode for non-tty
     if (keyboard_enabled)
@@ -216,14 +216,17 @@ Term::Private::BaseTerminal::BaseTerminal(bool enable_keyboard,
         if (has_ansi_escape_code()) {
             flags |= ENABLE_VIRTUAL_TERMINAL_INPUT;
         }
+        if (disable_signal_keys) {
+            flags &= ~ENABLE_PROCESSED_INPUT;
+        }
         flags &= ~(ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT);
         if (!SetConsoleMode(hin, flags)) {
             throw std::runtime_error("SetConsoleMode() failed");
         }
     }
 #else
 Term::Private::BaseTerminal::BaseTerminal(bool enable_keyboard,
-                                          bool disable_ctrl_c)
+                                          bool disable_signal_keys)
     : orig_termios{std::make_unique<termios>()},
       keyboard_enabled{enable_keyboard} {
     // silently disable raw mode for non-tty
@@ -246,7 +249,7 @@ Term::Private::BaseTerminal::BaseTerminal(bool enable_keyboard,
         // raw.c_oflag &= ~(OPOST);
         raw.c_cflag |= (CS8);
         raw.c_lflag &= ~(ECHO | ICANON | IEXTEN);
-        if (disable_ctrl_c) {
+        if (disable_signal_keys) {
             raw.c_lflag &= ~(ISIG);
         }
         raw.c_cc[VMIN] = 0;

cpp-terminal/private/platform.hpp

@@ -61,7 +61,7 @@ class BaseTerminal {
 
    public:
     explicit BaseTerminal(bool enable_keyboard = false,
-                          bool disable_ctrl_c = true);
+                          bool disable_signal_keys = true);
 
     virtual ~BaseTerminal() noexcept(false);
 };