Fixed most issues on Windows + Python 3.5

Moved the linux loop in the linux code file

Author: guiweber

.gitignore

@@ -10,3 +10,4 @@ venv/
 coverage.xml
 .eggs
 *.egg
+.idea

readchar/key_windows.py

@@ -0,0 +1,100 @@
+# These following keys are ones that have 2 meanings.
+# The first key command is the one that is not in the dict below:
+# ctrl_i is tab
+# ctrl_[ is escape
+# ctrl_2 is ctrl_c
+# ctrl_h is backspace
+# ctrl_j is ctrl_enter
+# ctrl_m is enter
+
+windows_special_keys = {
+    # Single keys:
+    'H': 'up',
+    'M': 'right',
+    'P': 'down',
+    'K': 'left',
+    ';': 'f1',
+    '<': 'f2',
+    '=': 'f3',
+    '>': 'f4',
+    '?': 'f5',
+    '@': 'f6',
+    'A': 'f7',
+    'B': 'f8',
+    'C': 'f9',
+    'D': 'f10',
+    'S': 'delete',
+    # key combos & shifted_keys
+    'T': 'shift_f1',
+    'U': 'shift_f2',
+    'V': 'shift_f3',
+    'W': 'shift_f4',
+    'X': 'shift_f5',
+    'Y': 'shift_f6',
+    'Z': 'shift_f7',
+    '[': 'shift_f8',
+    '\\\\': 'shift_f9',
+    ']': 'shift_f10',
+    # ctrl_keys
+    '^': 'ctrl_f1',
+    '_': 'ctrl_f2',
+    '`': 'ctrl_f3',
+    'a': 'ctrl_f4',
+    'b': 'ctrl_f5',
+    'c': 'ctrl_f6',
+    'd': 'ctrl_f7',
+    'e': 'ctrl_f8',
+    'f': 'ctrl_f9',
+    'g': 'ctrl_f10',
+    '\\x8d': 'ctrl_up',
+    '\\x91': 'ctrl_down',
+    's': 'ctrl_left',
+    't': 'ctrl_right',
+}
+
+windows_keys = {
+    # Single keys:
+    '\\x1b': 'escape',
+    ' ': 'space',
+    '\\x85': 'f11',
+    '\\x86': 'f12',
+    '\\x08': 'backspace',
+    '\\r': 'enter',
+    '\\t': 'tab',
+    # key combos & shifted_keys
+    '\\x87': 'shift_f11',
+    '\\x88': 'shift_f12',
+    # ctrl_keys
+    '\\x89': 'ctrl_f11',
+    '\\x8a': 'ctrl_f12',
+    '\\x93': 'ctrl_delete',
+    '\\n': 'ctrl_enter',
+    '\\x94': 'ctrl_tab',
+    '\\x7f': 'ctrl_backspace',
+    '\\x1c': 'ctrl_\\',
+    '\\x1d': 'ctrl_]',
+    # ctrl letters
+    '\\x01': 'ctrl_a',
+    '\\x02': 'ctrl_b',
+    '\\x03': 'ctrl_c',
+    '\\x04': 'ctrl_d',
+    '\\x05': 'ctrl_e',
+    '\\x06': 'ctrl_f',
+    '\\x07': 'ctrl_g',
+    '\\x0b': 'ctrl_k',
+    '\\x0c': 'ctrl_l',
+    '\\x0e': 'ctrl_n',
+    '\\x0f': 'ctrl_o',
+    '\\x10': 'ctrl_p',
+    '\\x11': 'ctrl_q',
+    '\\x12': 'ctrl_r',
+    '\\x13': 'ctrl_s',
+    '\\x14': 'ctrl_t',
+    '\\x15': 'ctrl_u',
+    '\\x16': 'ctrl_v',
+    '\\x17': 'ctrl_w',
+    '\\x18': 'ctrl_x',
+    '\\x19': 'ctrl_y',
+    '\\x1a': 'ctrl_z',
+    '\\\\': '\\',
+}

readchar/readchar.py

@@ -17,15 +17,7 @@
     raise NotImplemented('The platform %s is not supported yet' % sys.platform)
 
 
-def readkey(getchar_fn=None):
+def readkey(getchar_fn=None, blocking=True):
     getchar = getchar_fn or readchar
-    buffer = getchar(True)
-
-    while True:
-        if buffer not in key.ESCAPE_SEQUENCES:
-            return buffer
-        c = getchar(False)
-        if c is None:
-            return buffer
-        buffer += c
+    buffer = getchar(blocking)
     return buffer

readchar/readchar_linux.py

@@ -7,14 +7,27 @@
 import select
 import tty
 import termios
+from . import key
 
 
 def readchar(wait_for_char=True):
     old_settings = termios.tcgetattr(sys.stdin)
     tty.setcbreak(sys.stdin.fileno())
+    buffer = ''
     try:
         if wait_for_char or select.select([sys.stdin, ], [], [], 0.0)[0]:
             char = os.read(sys.stdin.fileno(), 1)
-            return char if type(char) is str else char.decode()
+            buffer = char if type(char) is str else char.decode()
+    except Exception:
+        buffer = ''
     finally:
         termios.tcsetattr(sys.stdin, termios.TCSADRAIN, old_settings)
+
+    while True:
+        if buffer not in key.ESCAPE_SEQUENCES:
+            return buffer
+        c = readchar(False)
+        if c is None:
+            return buffer
+        buffer += c
+    return buffer

readchar/readchar_windows.py

@@ -3,15 +3,38 @@
 # http://code.activestate.com/recipes/134892/#c9
 # Thanks to Stephen Chappell
 import msvcrt
+from .key_windows import windows_keys, windows_special_keys
 
 
-def readchar(blocking=False):
-    "Get a single character on Windows."
-
-    while msvcrt.kbhit():
-        msvcrt.getch()
+def get_char():
+    """Get a single character on Windows."""
     ch = msvcrt.getch()
-    while ch in '\x00\xe0':
-        msvcrt.getch()
+    if ch in b'\x00\xe0':
         ch = msvcrt.getch()
-    return ch.decode()
+        ch = repr(ch)[2:-1]
+        ch = windows_special_keys.get(ch, ch)
+    else:
+        ch = repr(ch)[2:-1]
+    if str(ch)[0] == '\\' or ch == ' ':
+        ch = windows_keys.get(ch, ch)
+    return ch
+
+
+def readchar(blocking=False):
+    """gets a character or combo on windows and returns a string.
+    If blocking is True then it will catch ctrl+c and not have them end the program.
+    It will also wait for a key to be pressed before continuing on with the loop."""
+    if blocking:
+        return get_char()
+    else:
+        if msvcrt.kbhit():
+            return get_char()
+
+
+if __name__ == '__main__':
+    while True:
+        c = readchar()
+        if c:
+            print(c)
+        if c == 'e':
+            break