console: fix ^C^C^C-to-exit

Author: none

TODO

@@ -1,5 +1,4 @@
 Things to investigate / fix:
-  ✔ exceptions in callbacks should be suitably fatal, not ignored @high @done (22-06-21 21:45)
   ☐ symbolication for e.g. address zero is printing vector names
     ☐ MAP operations should not symbolicate
 
@@ -8,9 +7,8 @@ Features:
 Musashi:
   ☐ recursive bus errors should just be double bus faults @high
 Console:
-  ✔ Characters not making it to apps: ^S, ^Q, ^Z (suspends console), ^Y (suspends console) @done (22-06-21 19:43)
   ☐ Characters not making it to apps: ESC, cursor keys (timing?)
-  ☐ Consider using Textual to build a better console? (plus other stuff)
+  ☐ Consider using Textual to build a better console? (plus other stuff) @low
 Tracing:
   Needs a complete rethink
   ☐ trace message via NatFeat
@@ -51,7 +49,6 @@ P90MB:
     ☐ RC2014 boards
   ☐ UART: seem to be losing transmit-complete interrupts
     hard to reproduce
-  ✔ UART: reduce character delay for snappier user experience @done (22-06-21 19:44)
 
 Rosco M68k v2:
 
@@ -74,6 +71,10 @@ Documentation:
   ☐ update README.md
 
 Archive:
+ ✔ ^C^C^C not exiting console @high @done (22-06-22 18:49) @project(Console)
+ ✔ exceptions in callbacks should be suitably fatal, not ignored @high @done (22-06-21 21:45) @project(Things to investigate / fix)
+ ✔ UART: reduce character delay for snappier user experience @done (22-06-21 19:44) @project(P90MB)
+ ✔ Characters not making it to apps: ^S, ^Q, ^Z (suspends console), ^Y (suspends console) @done (22-06-21 19:43) @project(Console)
  ✘ I2C realtime clock device @cancelled (22-06-19 12:27) @project(Tiny68k)
   clock on the board is busted, not worth it
  ✔ fix console in/output paths to be bytes all the way through @done (22-06-19 12:25) @project(Things to investigate / fix)

consoleserver.py

@@ -48,7 +48,6 @@ def __init__(self):
         self._want_exit = False
 
     def run(self):
-        signal.signal(signal.SIGINT, self._keyboard_interrupt)
         curses.wrapper(self._run)
 
     def _run(self, win):
@@ -141,13 +140,15 @@ def _update(self):
 
         input = self._win.getch()
         if input != -1:
+            if input == 3:
+                self._ctrl_c()
             if input in ConsoleServer.input_keymap:
                 for c in ConsoleServer.input_keymap[input]:
                     self._handle_input(ord(c))
             else:
                 self._handle_input(input)
 
-    def _keyboard_interrupt(self, signal=None, frame=None):
+    def _ctrl_c(self):
         now = time.time()
         interval = now - self._first_interrupt_time