better signal handlering yet

thomasballinger · thomasballinger · commit 68cf03b78e6f · 2013-11-06T18:52:45.000-05:00
--HG--
branch : scroll-frontend
extra : amend_source : 4222dbd8a6e18ea77e7e8ba33dc82f9f85494a33
diff --git a/bpython/scrollfrontend/coderunner.py b/bpython/scrollfrontend/coderunner.py
@@ -48,37 +48,39 @@ def run_code(self, for_code=None):
             self.code_thread = threading.Thread(target=self._blocking_run_code, name='codethread')
             self.code_thread.daemon = True
             self.orig_sigint_handler = signal.getsignal(signal.SIGINT)
-            signal.signal(signal.SIGINT, signal.default_int_handler)
+            signal.signal(signal.SIGINT, self.sigint_handler)
             self.code_thread.start()
         else:
             assert self.code_is_waiting
             self.code_is_waiting = False
-            signal.signal(signal.SIGINT, signal.default_int_handler)
+            signal.signal(signal.SIGINT, self.sigint_handler)
             if self.sigint_happened:
                 self.sigint_happened = False
                 self.responses_for_code_thread.put(SigintHappened)
             else:
                 self.responses_for_code_thread.put(for_code)
 
         request = self.requests_from_code_thread.get()
-        signal.signal(signal.SIGINT, self.sigint_handler_while_fufilling_code_request)
         if request in ['wait', 'refresh']:
             self.code_is_waiting = True
             if request == 'refresh':
                 self.stuff_a_refresh_request()
             return False
         elif request in ['done', 'unfinished']:
             self._unload_code()
-            if self.orig_sigint_handler:
-                signal.signal(signal.SIGINT, self.orig_sigint_handler)
+            signal.signal(signal.SIGINT, self.orig_sigint_handler)
             self.orig_sigint_handler = None
             return request
         else:
             raise ValueError("Not a valid request_from_code_thread value: %r" % request)
 
-    def sigint_handler_while_fufilling_code_request(self, *args):
-        logging.debug('while fufilling code request sigint handler running!')
-        self.sigint_happened = True
+    def sigint_handler(self, *args):
+        if threading.current_thread() is self.code_thread:
+            logging.debug('sigint while running user code!')
+            raise KeyboardInterrupt()
+        else:
+            logging.debug('sigint while fufilling code request sigint handler running!')
+            self.sigint_happened = True
 
     def _blocking_run_code(self):
         unfinished = self.interp.runsource(self.source)
diff --git a/bpython/scrollfrontend/repl.py b/bpython/scrollfrontend/repl.py
@@ -21,7 +21,6 @@
 from fmtstr.fmtstr import fmtstr, FmtStr
 from fmtstr.bpythonparse import parse as bpythonparse
 from fmtstr.bpythonparse import func_for_letter, color_for_letter
-from fmtstr.events import pp_event, SigIntEvent
 
 from bpython.scrollfrontend.manual_readline import char_sequences as rl_char_sequences
 from bpython.scrollfrontend.manual_readline import get_updated_char_sequences
@@ -201,6 +200,7 @@ def process_event(self, e):
         if isinstance(e, events.SigIntEvent):
             logging.debug('received sigint event')
             self.keyboard_interrupt()
+            self.update_completion()
             return
         if isinstance(e, events.WindowChangeEvent):
             logging.debug('window change to %d %d', e.width, e.height)
@@ -454,8 +454,16 @@ def run_code_and_maybe_finish(self, for_code=None):
             self.done = not unfinished
 
     def keyboard_interrupt(self):
+        #TODO factor out the common cleanup from running a line
+        #TODO make rewind work properly with ctrl-c somehow
+        self.cursor_offset_in_line = -1
+        self.unhighlight_paren()
+        self.display_lines.extend(self.display_buffer_lines)
         self.display_lines.extend(paint.display_linize(self.current_cursor_line, self.width))
         self.display_lines.extend(paint.display_linize("KeyboardInterrupt", self.width))
+        self.display_buffer = []
+        self.buffer = []
+        self.cursor_offset_in_line = 0
         self.saved_indent = 0
         self._current_line = ''
         self.cursor_offset_in_line = len(self._current_line)
@@ -641,7 +649,7 @@ def paint(self, about_to_exit=False):
                     if self.presentation_mode:
                         rows = arr.height
                         columns = arr.width
-                        last_key_box = paint.paint_last_events(rows, columns, [pp_event(x) for x in self.last_events if x])
+                        last_key_box = paint.paint_last_events(rows, columns, [events.pp_event(x) for x in self.last_events if x])
                         arr[arr.height-last_key_box.height:arr.height, arr.width-last_key_box.width:arr.width] = last_key_box
             else:
                 statusbar_row = min_height + 1 if arr.height == min_height else arr.height
