Mercurial > octave-nkf

comparison libinterp/interpfcn/octave-link.cc @ 16485:8b783661e03f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7f2395651a1c
comparison
equal deleted inserted replaced
16484:fa842e78f491 16485:8b783661e03f
48 48
49 octave_link *octave_link::instance = 0; 49 octave_link *octave_link::instance = 0;
50 50
51 octave_link::octave_link (void) 51 octave_link::octave_link (void)
52 : event_queue_mutex (new octave_mutex ()), gui_event_queue (), 52 : event_queue_mutex (new octave_mutex ()), gui_event_queue (),
53 debugging (false), accepting_events (true) 53 debugging (false), link_enabled (true)
54 { 54 {
55 command_editor::add_event_hook (octave_readline_hook); 55 command_editor::add_event_hook (octave_readline_hook);
56
57 octave_exit = octave_link::exit;
58 } 56 }
59 57
60 // OBJ should be an object of a class that is derived from the base 58 // OBJ should be an object of a class that is derived from the base
61 // class octave_link, or 0 to disconnect the link. It is the 59 // class octave_link, or 0 to disconnect the link. It is the
62 // responsibility of the caller to delete obj. 60 // responsibility of the caller to delete obj.
93 gui_event_queue.discard (); 91 gui_event_queue.discard ();
94 92
95 event_queue_mutex->unlock (); 93 event_queue_mutex->unlock ();
96 } 94 }
97 95
98 void
99 octave_link::do_exit (int)
100 {
101 accepting_events = false;
102
103 do_process_events ();
104 }
105
106 bool
107 octave_link::instance_ok (void)
108 {
109 return instance != 0;
110 }
111
112 DEFUN (__octave_link_edit_file__, args, , 96 DEFUN (__octave_link_edit_file__, args, ,
113 "-*- texinfo -*-\n\ 97 "-*- texinfo -*-\n\
114 @deftypefn {Built-in Function} {} __octave_link_edit_file__ (@var{file})\n\ 98 @deftypefn {Built-in Function} {} __octave_link_edit_file__ (@var{file})\n\
115 Undocumented internal function.\n\ 99 Undocumented internal function.\n\
116 @end deftypefn") 100 @end deftypefn")