Skip to content
Permalink
Browse files

Merge pull request #6213 from nyalldawson/interrupt_console

[console] Allow breaking execution of scripts via Ctrl-C
  • Loading branch information
jef-n committed Feb 2, 2018
2 parents 5c5ef3b + f6269c4 commit ad21d371b80e1281e56edb0dafc0d834f0ab6e13
Showing with 21 additions and 2 deletions.
  1. +5 −0 python/console/console_output.py
  2. +16 −2 python/console/console_sci.py
@@ -39,6 +39,7 @@ def __init__(self, shellOut, out=None, style=None):
self.sO = shellOut
self.out = None
self.style = style
self.fire_keyboard_interrupt = False

def write(self, m):
if self.style == "_traceback":
@@ -62,6 +63,10 @@ def write(self, m):
if self.style != "_traceback":
QCoreApplication.processEvents()

if self.fire_keyboard_interrupt:
self.fire_keyboard_interrupt = False
raise KeyboardInterrupt

def move_cursor_to_end(self):
"""Move cursor to end of text"""
line, index = self.get_end_pos()
@@ -378,9 +378,16 @@ def keyPressEvent(self, e):
if not self.is_cursor_on_edition_zone() or startLine < endLine:
# allow copying and selecting
if e.modifiers() & (Qt.ControlModifier | Qt.MetaModifier):
if e.key() in (Qt.Key_C, Qt.Key_A):
if e.key() == Qt.Key_C:
# only catch and return from Ctrl-C here if there's a selection
if self.hasSelectedText():
QsciScintilla.keyPressEvent(self, e)
return
elif e.key() == Qt.Key_A:
QsciScintilla.keyPressEvent(self, e)
return
return
else:
return
# allow selection
if e.modifiers() & Qt.ShiftModifier:
if e.key() in (Qt.Key_Left, Qt.Key_Right, Qt.Key_Home, Qt.Key_End):
@@ -389,6 +396,11 @@ def keyPressEvent(self, e):
# all other keystrokes get sent to the input line
self.move_cursor_to_end()

if e.modifiers() & (Qt.ControlModifier | Qt.MetaModifier) and e.key() == Qt.Key_C and not self.hasSelectedText():
# keyboard interrupt
sys.stdout.fire_keyboard_interrupt = True
return

line, index = self.getCursorPosition()
cmd = self.text(line)

@@ -602,12 +614,14 @@ def write(self, txt):
sys.stderr.write(txt)

def writeCMD(self, txt):
sys.stdout.fire_keyboard_interrupt = False
if len(txt) > 0:
getCmdString = self.text()
prompt = getCmdString[0:4]
sys.stdout.write(prompt + txt + '\n')

def runsource(self, source, filename='<input>', symbol='single'):
sys.stdout.fire_keyboard_interrupt = False
hook = sys.excepthook
try:
def excepthook(etype, value, tb):

0 comments on commit ad21d37

Please sign in to comment.
You can’t perform that action at this time.