Mercurial > hg > octave-lyh
comparison 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 |
comparison
equal
deleted
inserted
replaced
16484:fa842e78f491 | 16485:8b783661e03f |
---|---|
32 | 32 |
33 #include "workspace-element.h" | 33 #include "workspace-element.h" |
34 | 34 |
35 #include "octave-qt-link.h" | 35 #include "octave-qt-link.h" |
36 | 36 |
37 octave_qt_link::octave_qt_link (void) | 37 octave_qt_link::octave_qt_link (octave_main_thread *mt) |
38 : octave_link (), main_thread (new octave_main_thread) | 38 : octave_link (), main_thread (mt) |
39 { | 39 { } |
40 connect (main_thread, SIGNAL (finished ()), | |
41 this, SIGNAL (octave_thread_finished ())); | |
42 } | |
43 | 40 |
44 octave_qt_link::~octave_qt_link (void) | 41 octave_qt_link::~octave_qt_link (void) { } |
45 { | |
46 delete main_thread; | |
47 } | |
48 | 42 |
49 void | 43 void |
50 octave_qt_link::execute_interpreter (void) | 44 octave_qt_link::execute_interpreter (void) |
51 { | 45 { |
52 main_thread->execute_interpreter (); | 46 main_thread->execute_interpreter (); |
47 } | |
48 | |
49 bool | |
50 octave_qt_link::do_exit (int status) | |
51 { | |
52 emit exit_signal (status); | |
53 | |
54 return true; | |
53 } | 55 } |
54 | 56 |
55 bool | 57 bool |
56 octave_qt_link::do_edit_file (const std::string& file) | 58 octave_qt_link::do_edit_file (const std::string& file) |
57 { | 59 { |