Mercurial > hg > octave-lyh
view libgui/src/octave-qt-link.cc @ 16485:8b783661e03f
improve exit sequence for GUI
* octave-link.h, octave-link.cc (octave_link::accepting_events):
Delete variable and all uses.
(octave_link::link_enabled): New data member.
(octave_link::octave_link): Don't set octave_exit. Initialize
link_enabled.
(octave_link::do_exit): Delete definition. Now pure virtual.
Return bool.
(octave_link::exit): Call instance->do_exit.
(octave_link::enabled): New function.
(ocave_link::process_events): New arg, disable. Optionally disable
event processing.
Use octave_link::enabled instead of instance_ok everywhere except for
octave_link::exit.
(octave_link::cleanup_instance): Delete.
* octave-qt-link.h, octave-qt-link.cc
(octave_qt_link::octave_qt_link): Accept thread as argument.
Don't connect main_thread::finished signal.
(octave_qt_link::~octave_qt_link): Don't delete main_thread.
(octave_qt_link::do_exit): Emit exit_signal and return true.
(octave_qt_link::exit_signal: New signal.
(octave_qt_link::void octave_thread_finished_signal): Delete.
* main-window.h, main-window.cc (main_window::_octave_main_thread):
New member variable.
(main_window::main_window): Initialize _octave_main_thread and
_octave_qt_link to 0.
(main_window::~main_window): Don't call octave_link::connect_link.
Delete _octave_main_thread.
(main_window::exit): Accept exit status as argument and call
QApplication::exit instead of quit.
(main_window::construct): Don't connect qApp::aboutToQuit to
main_window::prepare_to_exit.
(main_window::construct_octave_qt_link): Create _octave_main_thread
and pass to _octave_qt_link. Don't connect
_octave_qt_link::octave_thread_finished to main_window::exit.
Connect _octave_qt_link::exit_signal to main_window::exit.
* toplev.h, toplev.cc (main_loop): If quitting_gracefully, just return
exit status instead of calling clean_up_and_exit.
(do_octave_atexit): Now static. Call octave_link::process_events with
disable arg set to true.
(octave_atexit_functions): Now static.
(clean_up_and_exit): New argument, safe_to_return.
Call octave_link::exit and possibly return or wait for
octave_link::exit to terminate the process.
* octave.cc (octave_execute_interpreter): Don't alter return value
from main_loop. Pass safe_to_return = true to clean_up_and_exit.
Return retval instead of 0.
(octave_initialize_interpreter): Don't call atexit.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 09 Apr 2013 23:08:24 -0400 |
parents | 7a71ea0b7ae9 |
children | 45ae1038ee89 |
line wrap: on
line source
/* Copyright (C) 2013 John W. Eaton Copyright (C) 2011-2012 Jacob Dawid Copyright (C) 2011-2012 John P. Swensen 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 <QStringList> #include "str-vec.h" #include "workspace-element.h" #include "octave-qt-link.h" octave_qt_link::octave_qt_link (octave_main_thread *mt) : octave_link (), main_thread (mt) { } octave_qt_link::~octave_qt_link (void) { } void octave_qt_link::execute_interpreter (void) { main_thread->execute_interpreter (); } bool octave_qt_link::do_exit (int status) { emit exit_signal (status); return true; } bool octave_qt_link::do_edit_file (const std::string& file) { emit edit_file_signal (QString::fromStdString (file)); return true; } void octave_qt_link::do_change_directory (const std::string& dir) { emit change_directory_signal (QString::fromStdString (dir)); } void octave_qt_link::do_set_workspace (const std::list<workspace_element>& ws) { QString scopes; QStringList symbols; QStringList class_names; QStringList dimensions; QStringList values; for (std::list<workspace_element>::const_iterator it = ws.begin (); it != ws.end (); it++) { scopes.append (it->scope ()); symbols.append (QString::fromStdString (it->symbol ())); class_names.append (QString::fromStdString (it->class_name ())); dimensions.append (QString::fromStdString (it->dimension ())); values.append (QString::fromStdString (it->value ())); } emit set_workspace_signal (scopes, symbols, class_names, dimensions, values); } void octave_qt_link::do_clear_workspace (void) { emit clear_workspace_signal (); } void octave_qt_link::do_set_history (const string_vector& hist) { QStringList qt_hist; for (octave_idx_type i = 0; i < hist.length (); i++) qt_hist.append (QString::fromStdString (hist[i])); emit set_history_signal (qt_hist); } void octave_qt_link::do_append_history (const std::string& hist_entry) { emit append_history_signal (QString::fromStdString (hist_entry)); } void octave_qt_link::do_clear_history (void) { emit clear_history_signal (); } void octave_qt_link::do_pre_input_event (void) { } void octave_qt_link::do_post_input_event (void) { } void octave_qt_link::do_enter_debugger_event (const std::string& file, int line) { do_insert_debugger_pointer (file, line); emit enter_debugger_signal (); } void octave_qt_link::do_execute_in_debugger_event (const std::string& file, int line) { do_delete_debugger_pointer (file, line); } void octave_qt_link::do_exit_debugger_event (void) { emit exit_debugger_signal (); } void octave_qt_link::do_update_breakpoint (bool insert, const std::string& file, int line) { emit update_breakpoint_marker_signal (insert, QString::fromStdString (file), line); } void octave_qt_link::do_insert_debugger_pointer (const std::string& file, int line) { emit insert_debugger_pointer_signal (QString::fromStdString (file), line); } void octave_qt_link::do_delete_debugger_pointer (const std::string& file, int line) { emit delete_debugger_pointer_signal (QString::fromStdString (file), line); }