octave-nkf: libinterp/interpfcn/octave-link.h annotate

annotate libinterp/interpfcn/octave-link.h @ 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

rev	line source
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	1 /*
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	2
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	3 Copyright (C) 2013 John W. Eaton
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	4 Copyright (C) 2011-2012 Jacob Dawid
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	5 Copyright (C) 2011-2012 John P. Swensen
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	6
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	7 This file is part of Octave.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	8
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	9 Octave is free software; you can redistribute it and/or modify it
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	10 under the terms of the GNU General Public License as published by the
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	11 Free Software Foundation; either version 3 of the License, or (at your
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	12 option) any later version.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	13
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	14 Octave is distributed in the hope that it will be useful, but WITHOUT
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	17 for more details.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	18
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	19 You should have received a copy of the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	20 along with Octave; see the file COPYING. If not, see
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	21 <http://www.gnu.org/licenses/>.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	22
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	23 */
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	24
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	25 #if !defined (octave_link_h)
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	26 #define octave_link_h 1
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	27
15155 9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 15080 diff changeset	28 #include <string>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	29
16420 81ec95768520 use octave-link instead of hook for edit function John W. Eaton <jwe@octave.org> parents: 16419 diff changeset	30 #include "event-queue.h"
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16350 diff changeset	31
16420 81ec95768520 use octave-link instead of hook for edit function John W. Eaton <jwe@octave.org> parents: 16419 diff changeset	32 class octave_mutex;
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	33 class string_vector;
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	34 class workspace_element;
13541 b48ac9ad8de0 Highly improved separation of model and view classes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13522 diff changeset	35
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	36 // \class OctaveLink
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	37 // \brief Provides threadsafe access to octave.
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	38 // \author Jacob Dawid
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	39 //
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	40 // This class is a wrapper around octave and provides thread safety by
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	41 // buffering access operations to octave and executing them in the
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	42 // readline event hook, which lives in the octave thread.
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	43
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	44 class octave_link
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	45 {
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	46 protected:
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	47
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	48 octave_link (void);
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	49
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	50 public:
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	51
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	52 virtual ~octave_link (void) { }
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	53
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	54 static void generate_events (void)
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	55 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	56 if (enabled ())
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	57 instance->do_generate_events ();
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	58 }
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	59
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	60 // If disable is TRUE, then no additional events will be processed
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	61 // other than exit.
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	62
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	63 static void process_events (bool disable = false)
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	64 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	65 if (enabled ())
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	66 {
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	67 if (disable)
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	68 instance->link_enabled = false;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	69
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	70 instance->do_process_events ();
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	71 }
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	72 }
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	73
16479 7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	74 static void discard_events (void)
7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	75 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	76 if (enabled ())
16479 7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	77 instance->do_discard_events ();
7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	78 }
7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	79
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	80 static bool exit (int status)
16479 7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	81 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	82 bool retval = false;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	83
16479 7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	84 if (instance_ok ())
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	85 retval = instance->do_exit (status);
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	86
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	87 return retval;
16479 7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	88 }
7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	89
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	90 template <class T>
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	91 static void post_event (T obj, void (T::method) (void))
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	92 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	93 if (enabled ())
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	94 instance->do_post_event (obj, method);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	95 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	96
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	97 template <class T, class A>
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	98 static void post_event (T obj, void (T::method) (A), A arg)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	99 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	100 if (enabled ())
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	101 instance->do_post_event (obj, method, arg);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	102 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	103
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	104 template <class T, class A>
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	105 static void post_event (T obj, void (T::method) (const A&), const A& arg)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	106 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	107 if (enabled ())
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	108 instance->do_post_event (obj, method, arg);
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	109 }
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	110
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	111 static void entered_readline_hook (void)
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	112 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	113 if (enabled ())
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	114 instance->do_entered_readline_hook ();
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	115 }
14713 565ddd85565e Added comments for the octave-adapter module. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	116
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	117 static void finished_readline_hook (void)
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	118 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	119 if (enabled ())
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	120 instance->do_finished_readline_hook ();
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	121 }
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	122
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	123 static bool
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	124 edit_file (const std::string& file)
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	125 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	126 return enabled () ? instance->do_edit_file (file) : false;
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	127 }
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	128
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	129 static void change_directory (const std::string& dir)
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	130 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	131 if (enabled ())
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	132 instance->do_change_directory (dir);
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	133 }
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	134
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	135 static void set_workspace (const std::list<workspace_element>& ws)
16350 d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	136 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	137 if (enabled ())
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	138 instance->do_set_workspace (ws);
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	139 }
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	140
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	141 static void clear_workspace (void)
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	142 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	143 if (enabled ())
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	144 instance->do_clear_workspace ();
16350 d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	145 }
d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	146
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	147 static void set_history (const string_vector& hist)
16350 d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	148 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	149 if (enabled ())
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	150 instance->do_set_history (hist);
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	151 }
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	152
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	153 static void append_history (const std::string& hist_entry)
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	154 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	155 if (enabled ())
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	156 instance->do_append_history (hist_entry);
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	157 }
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	158
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	159 static void clear_history (void)
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	160 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	161 if (enabled ())
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	162 instance->do_clear_history ();
16350 d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	163 }
d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	164
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	165 static void pre_input_event (void)
16350 d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	166 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	167 if (enabled ())
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	168 instance->do_pre_input_event ();
16350 d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	169 }
d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	170
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	171 static void post_input_event (void)
16350 d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	172 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	173 if (enabled ())
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	174 instance->do_post_input_event ();
16350 d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	175 }
d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	176
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	177 static void enter_debugger_event (const std::string& file, int line)
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16350 diff changeset	178 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	179 if (enabled ())
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	180 {
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	181 instance->debugging = true;
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	182
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	183 instance->do_enter_debugger_event (file, line);
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	184 }
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16386 diff changeset	185 }
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16386 diff changeset	186
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	187 static void execute_in_debugger_event (const std::string& file, int line)
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16386 diff changeset	188 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	189 if (enabled ())
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	190 instance->do_execute_in_debugger_event (file, line);
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	191 }
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	192
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	193 static void exit_debugger_event (void)
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	194 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	195 if (enabled () && instance->debugging)
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	196 {
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	197 instance->debugging = false;
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	198
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	199 instance->do_exit_debugger_event ();
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	200 }
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16350 diff changeset	201 }
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16350 diff changeset	202
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	203 static void
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	204 update_breakpoint (bool insert, const std::string& file, int line)
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	205 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	206 if (enabled ())
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	207 instance->do_update_breakpoint (insert, file, line);
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	208 }
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	209
16421 40d1ddca4db5 improve use of octave_link John W. Eaton <jwe@octave.org> parents: 16420 diff changeset	210 static void connect_link (octave_link *);
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	211
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	212 private:
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	213
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	214 static octave_link *instance;
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	215
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	216 // No copying!
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	217
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	218 octave_link (const octave_link&);
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	219
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	220 octave_link& operator = (const octave_link&);
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	221
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	222 static bool instance_ok (void) { return instance != 0; }
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	223
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	224 static bool enabled (void)
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	225 {
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	226 return instance_ok () ? instance->link_enabled : false;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	227 }
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	228
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	229 protected:
14719 89c64340e9ab Extended event based communication model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14718 diff changeset	230
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	231 // Semaphore to lock access to the event queue.
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	232 octave_mutex *event_queue_mutex;
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	233
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	234 // Event Queue.
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	235 event_queue gui_event_queue;
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	236
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	237 bool debugging;
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	238 bool link_enabled;
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	239
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	240 void do_generate_events (void);
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	241 void do_process_events (void);
16479 7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	242 void do_discard_events (void);
7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	243
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	244 template <class T>
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	245 void do_post_event (T obj, void (T::method) (void))
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	246 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	247 gui_event_queue.add_method (obj, method);
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	248 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	249
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	250 template <class T, class A>
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	251 void do_post_event (T obj, void (T::method) (A), A arg)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	252 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	253 gui_event_queue.add_method (obj, method, arg);
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	254 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	255
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	256 template <class T, class A>
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	257 void do_post_event (T obj, void (T::method) (const A&), const A& arg)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	258 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	259 gui_event_queue.add_method (obj, method, arg);
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	260 }
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	261
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	262 void do_entered_readline_hook (void) { }
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	263 void do_finished_readline_hook (void) { }
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	264
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	265 virtual bool do_exit (int status) = 0;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	266
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	267 virtual bool do_edit_file (const std::string& file) = 0;
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	268
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	269 virtual void do_change_directory (const std::string& dir) = 0;
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	270
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	271 virtual void
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	272 do_set_workspace (const std::list<workspace_element>& ws) = 0;
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	273
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	274 virtual void do_clear_workspace (void) = 0;
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	275
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	276 virtual void do_set_history (const string_vector& hist) = 0;
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	277 virtual void do_append_history (const std::string& hist_entry) = 0;
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	278 virtual void do_clear_history (void) = 0;
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	279
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	280 virtual void do_pre_input_event (void) = 0;
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	281 virtual void do_post_input_event (void) = 0;
16399 f9a737fd8829 allow command-line edit function to use GUI editor John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	282
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	283 virtual void
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	284 do_enter_debugger_event (const std::string& file, int line) = 0;
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	285
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	286 virtual void
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	287 do_execute_in_debugger_event (const std::string& file, int line) = 0;
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	288
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	289 virtual void do_exit_debugger_event (void) = 0;
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	290
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	291 virtual void do_update_breakpoint (bool insert,
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	292 const std::string& file, int line) = 0;
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	293 };
14713 565ddd85565e Added comments for the octave-adapter module. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	294
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	295 #endif // OCTAVELINK_H

Mercurial > hg > octave-nkf

annotate libinterp/interpfcn/octave-link.h @ 16485:8b783661e03f