Mercurial > octave-nkf
view libgui/src/terminal-dock-widget.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 | 86c6ae5f969e |
children | 155d8e90ee1f |
line wrap: on
line source
/* Copyright (C) 2013 John W. Eaton Copyright (C) 2011-2013 Jacob Dawid This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "terminal-dock-widget.h" terminal_dock_widget::terminal_dock_widget (QWidget *p) : octave_dock_widget (p), terminal (QTerminal::create (p)) { terminal->setObjectName ("OctaveTerminal"); terminal->setFocusPolicy (Qt::StrongFocus); setObjectName ("TerminalDockWidget"); setWindowIcon (QIcon (":/actions/icons/logo.png")); set_title (tr ("Command Window")); setWidget (terminal); connect (terminal, SIGNAL (interrupt_signal (void)), this, SLOT (terminal_interrupt ())); } bool terminal_dock_widget::has_focus (void) const { QWidget *w = widget (); return w->hasFocus (); } void terminal_dock_widget::focus (void) { octave_dock_widget::focus (); QWidget *w = widget (); w->setFocus (); w->activateWindow (); w->raise (); } void terminal_dock_widget::terminal_interrupt (void) { emit interrupt_signal (); }