Merge in Brandon Navra's changes to be able to run bpython in the Windows CLI. Also move Brandon's Windows_Support.txt in the README file. Note to self: Include in documentation after 0.10 release

ikanobori · ikanobori · commit 629759e3bf8e · 2011-07-16T20:23:19.000+02:00
diff --git a/README b/README
@@ -118,3 +118,38 @@ For known bugs please see bpython's issue tracker at
 bitbucket:
 
 http://bitbucket.org/bobf/bpython/issues/
+
+CLI Windows Support
+===================
+
+Dependencies
+------------
+Curses
+    Use the appropriate version compiled by Christoph Gohlke
+    http://www.lfd.uci.edu/~gohlke/pythonlibs/
+
+pyreadline
+    Use the version in the cheeseshop
+    http://pypi.python.org/pypi/pyreadline/
+
+Recommended
+-----------
+Obtain the less program from GnuUtils. This makes the pager work as intended.
+It can be obtained from cygwin or GnuWin32 or msys
+
+Current version is tested with
+------------------------------
+Curses 2.2
+pyreadline 1.7
+
+Curses Notes
+------------
+The curses used has a bug where the colours are displayed incorrectly:
+    red  is swapped with blue
+    cyan is swapped with yellow
+
+To correct this I have provided my windows.theme file.
+
+This curses implementation has 16 colors (dark and light versions of the colours)
+
+
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -22,18 +22,38 @@
 # THE SOFTWARE.
 #
 
+# Modified by Brandon Navra
+# Notes for Windows
+# Prerequsites
+#  - Curses
+#  - pyreadline
+#
+# Added
+#
+# - Support for running on windows command prompt
+# - input from numpad keys
+#
+# Issues
+#
+# - Suspend doesn't work nor does detection of resizing of screen
+# - Instead the suspend key exits the program
+# - View source doesn't work on windows unless you install the less program (From GnuUtils or Cygwin)
+
 from __future__ import division, with_statement
 
+import platform
 import os
 import sys
 import curses
 import math
 import re
 import time
-import signal
+
 import struct
-import termios
-import fcntl
+if platform.system() != 'Windows':
+    import signal      #Windows does not have job control
+    import termios     #Windows uses curses
+    import fcntl       #Windows uses curses
 import unicodedata
 import errno
 
@@ -76,6 +96,7 @@
 DO_RESIZE = False
 # ---
 
+
 def getpreferredencoding():
     return locale.getpreferredencoding() or sys.getdefaultencoding()
 
@@ -136,7 +157,7 @@ def readline(self, size=-1):
 
         curses.raw(True)
         try:
-            while not buffer.endswith('\n'):
+            while not (buffer.endswith('\n') or buffer.endswith('\r')):
                 key = self.interface.get_key()
                 if key in [curses.erasechar(), 'KEY_BACKSPACE']:
                     y, x = self.interface.scr.getyx()
@@ -147,7 +168,7 @@ def readline(self, size=-1):
                 elif key == chr(4) and not buffer:
                     # C-d
                     return ''
-                elif (key != '\n' and
+                elif (key not in ('\n', '\r') and
                     (len(key) > 1 or unicodedata.category(key) == 'Cc')):
                     continue
                 sys.stdout.write(key)
@@ -224,6 +245,21 @@ def make_colors(config):
         'w': 7,
         'd': -1,
     }
+
+    if platform.system() == 'Windows':
+        c = dict(c.items() + 
+            [
+            ('K', 8),
+            ('R', 9),
+            ('G', 10),
+            ('Y', 11),
+            ('B', 12),
+            ('M', 13),
+            ('C', 14),
+            ('W', 15),
+            ]
+         )
+
     for i in range(63):
         if i > 7:
             j = i // 8
@@ -773,14 +809,22 @@ def p_key(self, key):
 
         config = self.config
 
-        if key == chr(8):  # C-Backspace (on my computer anyway!)
+        if platform.system() == 'Windows':
+            C_BACK = chr(127)
+            BACKSP = chr(8)
+        else:
+            C_BACK = chr(8)
+            BACKSP = chr(127)
+            
+        if key == C_BACK:  # C-Backspace (on my computer anyway!)
             self.clrtobol()
             key = '\n'
             # Don't return; let it get handled
-        if key == chr(27):
+
+        if key == chr(27): #Escape Key
             return ''
 
-        if key in (chr(127), 'KEY_BACKSPACE'):
+        if key in (BACKSP, 'KEY_BACKSPACE'):
             self.bs()
             self.complete()
             return ''
@@ -893,7 +937,7 @@ def p_key(self, key):
                 self.statusbar.message(_('Cannot show source.'))
             return ''
 
-        elif key == '\n':
+        elif key in ('\n', '\r', 'PADENTER'):
             self.lf()
             return None
 
@@ -904,9 +948,25 @@ def p_key(self, key):
             return self.tab(back=True)
 
         elif key in key_dispatch[config.suspend_key]:
-            self.suspend()
-            return ''
+            if platform.system() != 'Windows':
+                self.suspend()
+                return ''
+            else:
+                self.do_exit = True
+                return None
 
+        elif key[0:3] == 'PAD' and not key in ('PAD0', 'PADSTOP'):
+            pad_keys = {
+                'PADMINUS': '-',
+                'PADPLUS': '+',
+                'PADSLASH': '/',
+                'PADSTAR': '*',
+            }
+            try:
+                self.addstr(pad_keys[key])
+                self.print_line(self.s)
+            except KeyError:
+                return '' 
         elif len(key) == 1 and not unicodedata.category(key) == 'Cc':
             self.addstr(key)
             self.print_line(self.s)
@@ -1296,8 +1356,9 @@ def size(self):
 
     def suspend(self):
         """Suspend the current process for shell job control."""
-        curses.endwin()
-        os.kill(os.getpid(), signal.SIGSTOP)
+        if platform.system() != 'Windows':
+            curses.endwin()
+            os.kill(os.getpid(), signal.SIGSTOP)
 
     def tab(self, back=False):
         """Process the tab key being hit. If there's only whitespace
@@ -1575,9 +1636,32 @@ def gethw():
     So I'm not going to ask any questions.
 
     """
-    h, w = struct.unpack(
-        "hhhh",
-        fcntl.ioctl(sys.__stdout__, termios.TIOCGWINSZ, "\000" * 8))[0:2]
+
+    if platform.system() != 'Windows':
+        h, w = struct.unpack(
+            "hhhh",
+            fcntl.ioctl(sys.__stdout__, termios.TIOCGWINSZ, "\000" * 8))[0:2]
+    else:
+        from ctypes import windll, create_string_buffer
+
+        # stdin handle is -10
+        # stdout handle is -11
+        # stderr handle is -12
+
+        h = windll.kernel32.GetStdHandle(-12)
+        csbi = create_string_buffer(22)
+        res = windll.kernel32.GetConsoleScreenBufferInfo(h, csbi)
+
+        if res:
+            import struct
+            (bufx, bufy, curx, cury, wattr,
+             left, top, right, bottom, maxx, maxy) = struct.unpack("hhhhHhhhhhh", csbi.raw)
+            sizex = right - left + 1
+            sizey = bottom - top + 1
+        else:
+            sizex, sizey = stdscr.getmaxyx()# can't determine actual size - return default values
+
+        h, w = sizey, sizex
     return h, w
 
 
@@ -1679,10 +1763,11 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     global colors
     DO_RESIZE = False
 
-    old_sigwinch_handler = signal.signal(signal.SIGWINCH,
-                                         lambda *_: sigwinch(scr))
-    # redraw window after being suspended
-    old_sigcont_handler = signal.signal(signal.SIGCONT, lambda *_: sigcont(scr))
+    if platform.system() != 'Windows':
+        old_sigwinch_handler = signal.signal(signal.SIGWINCH,
+                                             lambda *_: sigwinch(scr))
+        # redraw window after being suspended
+        old_sigcont_handler = signal.signal(signal.SIGCONT, lambda *_: sigcont(scr))
 
     stdscr = scr
     try:
@@ -1733,8 +1818,9 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     curses.raw(False)
 
     # Restore signal handlers
-    signal.signal(signal.SIGWINCH, old_sigwinch_handler)
-    signal.signal(signal.SIGCONT, old_sigcont_handler)
+    if platform.system() != 'Windows':
+        signal.signal(signal.SIGWINCH, old_sigwinch_handler)
+        signal.signal(signal.SIGCONT, old_sigcont_handler)
 
     return clirepl.getstdout()
 
@@ -1743,6 +1829,7 @@ def main(args=None, locals_=None, banner=None):
     locale.setlocale(locale.LC_ALL, "")
     translations.init()
 
+
     config, options, exec_args = bpython.args.parse(args)
 
     # Save stdin, stdout and stderr for later restoration
diff --git a/windows.theme b/windows.theme
@@ -0,0 +1,28 @@
+# Each letter represents a colour marker:
+#   k, r, g, y, b, m, c, w, d
+# which stands for:
+#   blacK, Red, Green, Yellow, Blue, Magenta, Cyan, White, Default
+#
+# But in Windows (for now)
+#   K,     R,    G,     Y,    B,   M,       C,      W,     k
+#   blacK, blue, Green, cyan, red, Magenta, yellow, hite, grey
+# Capital letters represent bold (brighter)
+# Copy to %USERPROFILE%\.bpython\windows.theme and set "color_scheme = windows" in %USERPROFILE%\.bpython\config
+
+[syntax]
+keyword = G
+name = Y
+comment = c
+string = M
+error = B
+number = C
+operator = G
+punctuation = C
+token = M
+
+[interface]
+background = r
+output = w
+main = W
+prompt = W
+prompt_more = K
