Mercurial > octave
diff libgui/src/main-window.cc @ 17920:5c3f22dd0bbb
raise SIGINT in octave_interpreter instead of in QTerminal
* QTerminal.h (QTerminal::interrupt_signal): New signal.
(QTerminal::terminal_interrupt): New slot.
* QUnixTerminalImpl.cpp (QUnixTerminalImpl::initialize): Connect
m_terminalView::interrupt_signal to QTerminal::terminal_interrupt.
* TerminalView.h (TerminalView::interrupt_signal): New signal.
* TerminalView.cpp (TerminalView::copyClipboard): Emit
interrupt_signal instead of calling raising SIGINT signal.
* terminal-dock-widget.h, terminal-dock-widget.cc
(terminal_dock_widget::interrupt_signal): New signal.
(terminal_dock_widget::terminal_interrupt): New slot.
(terminal_dock_widget::terminal_dock_widget): Connect
terminal::interrupt_signal to
terminal_dock_widget::terminal_interrupt slot.
(terminal_dock_widget::terminal_interrupt): New function. Emit
terminal_dock_widget::interrupt_signal.
* QWinTerminalImpl.cpp (QWinTerminalImpl::copyClipboard): Call
terminal_interrupt instead of raising SIGINT signal.
main-window.cc (main_window::construct_octave_qt_link): Connect
command_window::interrupt_signal to
_octave_qt_link::terminal_interrupt slot.
* octave-qt-link.h, octave-qt-link.cc
(octave_qt_link::terminal_interrupt): New slot.
* octave-interpreter.h, octave_interpreter.cc
(octave_interpreter::interrupt): New slot. Raise SIGINT here.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 12 Nov 2013 15:46:59 -0500 |
parents | a38cee8f0a9b |
children | 97bde75d4119 |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Tue Nov 12 12:36:30 2013 -0500 +++ b/libgui/src/main-window.cc Tue Nov 12 15:46:59 2013 -0500 @@ -1080,6 +1080,9 @@ SLOT (handle_rename_variable_request (const QString&, const QString&))); + connect (command_window, SIGNAL (interrupt_signal (void)), + _octave_qt_link, SLOT (terminal_interrupt (void))); + _octave_qt_link->execute_interpreter (); octave_link::connect_link (_octave_qt_link);