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

annotate libinterp/interpfcn/octave-link.h @ 16468:0f143f68078d

use signal/slot for updating workspace instead of using event listener * main-window.h, main-window.cc: Clean up list of include files. (main_window::prepare_to_exit): Rename from prepare_to_quit. Change all uses. (main_window::update_workspace): Delete. (main_window::construct): Don't connect _octave_qt_event_listener:update_workspace_signal to main_window::update_workspace. (main_window::construct_octave_qt_link): Connect _octave_qt_link::set_workspace_signal to _workspace_model::set_workspace. Connect _octave_qt_link::clear_workspace_signal to _workspace_model::clear_workspace. * symbol-information.h, symbol-information.cc: Delete * libgui/src/module.mk (noinst_HEADERS, src_libgui_src_la_SOURCES): Remove them from the lists. * octave-qt-link.h, octave-qt-link.cc: Don't use symbol_information to store workspace info. (octave_qt_link::do_update_workspace): Delete. (octave_qt_link::do_set_workspace, octave_qt_link::do_clear_workspace): New functions. (octave_qt_link::do_pre_input_event): Don't call do_update_workspace. (octave_qt_link::set_workspace_signal, octave_qt_link::clear_workspace_signal): New signals. * workspace-model.h, workspace-model.cc: Don't use symbol_information to store workspace info. Accept workspace info through a signal/slot combination, not by asking the symbol table. (workspace_model::request_update_workspace, (workspace_model::update_workspace_callback): Delete. (workspace_model::set_workspace, workspace_model::clear_workspace, workspace_model::clear_data, workspace_model::clear_tree, workspace_model::update_tree, workspace_model::append_tree): New functions. * workspace-view.h, workspace-view.cc (workspace_view::model_changed): Don't call update_workspace_callback. The model now signals the view when it has changed. * input.cc (octave_base_reader::octave_gets, get_debug_input): Call octave_link::set_workspace just prior to prompting for input. * workspace-element.h: New file. * libinterp/interpfcn/module.mk (INTERPFCN_INC): Include it in the list. * octave-link.cc: Don't include symtab.h. * octave-link.h (octave_link::update_workspace): Delete. (octave_link::set_workspace, octave_link::do_set_workspace, * octave_link::clear_workspace, octave_link::do_clear_workspace): New functions. * symtab.h, symtab.cc (symbol_table::workspace_info, symbol_table::do_workspace_info): New functions. * ov.h (octave_value::short_disp): New function. * ov-base.h, ov-base.cc (octave_base_value::short_disp): New function. * ov-base-scalar.h, ov-base-scalar.cc (octave_base_scalar<ST>::short_disp): New function. * ov-range.h, ov-range.cc (octave_range::short_disp): New function.

author	John W. Eaton <jwe@octave.org>
date	Mon, 08 Apr 2013 12:01:24 -0400
parents	7a2ee6ea7800
children	7a71ea0b7ae9

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"
81ec95768520 use octave-link instead of hook for edit function John W. Eaton <jwe@octave.org> parents: 16419 diff changeset	31 #include "octave-event-listener.h"
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16350 diff changeset	32
16420 81ec95768520 use octave-link instead of hook for edit function John W. Eaton <jwe@octave.org> parents: 16419 diff changeset	33 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	34 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	35 class workspace_element;
13541 b48ac9ad8de0 Highly improved separation of model and view classes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13522 diff changeset	36
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	37 // \class OctaveLink
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	38 // \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	39 // \author Jacob Dawid
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	40 //
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	41 // 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	42 // 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	43 // 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	44
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	45 class octave_link
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	46 {
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	47 protected:
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	48
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	49 octave_link (void);
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	50
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	51 public:
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	52
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	53 virtual ~octave_link (void) { }
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	54
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	55 static void register_event_listener (octave_event_listener *el)
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	56 {
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	57 if (instance_ok ())
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	58 instance->do_register_event_listener (el);
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	59 }
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	60
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	61 static void generate_events (void)
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	62 {
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	63 if (instance_ok ())
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	64 instance->do_generate_events ();
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	65 }
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	66
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	67 static void process_events (void)
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	68 {
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	69 if (instance_ok ())
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	70 instance->do_process_events ();
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	71 }
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	72
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	73 template <class T>
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	74 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	75 {
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	76 if (instance_ok ())
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	77 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	78 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	79
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	80 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	81 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	82 {
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	83 if (instance_ok ())
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	84 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	85 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	86
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	87 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	88 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	89 {
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	90 if (instance_ok ())
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	91 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	92 }
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	93
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	94 static void about_to_exit (void)
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	95 {
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	96 if (instance_ok ())
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	97 instance->do_about_to_exit ();
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	98 }
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	99
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	100 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	101 {
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	102 if (instance_ok ())
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	103 instance->do_entered_readline_hook ();
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	104 }
14713 565ddd85565e Added comments for the octave-adapter module. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	105
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	106 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	107 {
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	108 if (instance_ok ())
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	109 instance->do_finished_readline_hook ();
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
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	112 static bool
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	113 edit_file (const std::string& file)
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	114 {
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	115 return instance_ok () ? instance->do_edit_file (file) : false;
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	116 }
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	117
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	118 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	119 {
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	120 if (instance_ok ())
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	121 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	122 }
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	123
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	124 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	125 {
d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	126 if (instance_ok ())
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	127 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	128 }
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	129
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	130 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	131 {
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	132 if (instance_ok ())
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	133 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	134 }
d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	135
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	136 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	137 {
d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	138 if (instance_ok ())
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	139 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	140 }
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	141
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	142 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	143 {
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	144 if (instance_ok ())
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	145 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	146 }
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	147
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	148 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	149 {
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	150 if (instance_ok ())
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	151 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	152 }
d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	153
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	154 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	155 {
d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	156 if (instance_ok ())
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	157 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	158 }
d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	159
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	160 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	161 {
d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	162 if (instance_ok ())
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	163 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	164 }
d4b6ad43bc87 use direct callbacks instead to handle history and workspace list updates John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	165
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	166 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	167 {
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16350 diff changeset	168 if (instance_ok ())
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	169 {
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	170 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	171
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	172 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	173 }
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16386 diff changeset	174 }
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16386 diff changeset	175
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	176 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	177 {
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16386 diff changeset	178 if (instance_ok ())
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	179 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	180 }
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	181
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	182 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	183 {
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	184 if (instance_ok () && instance->debugging)
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	185 {
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	186 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	187
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	188 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	189 }
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16350 diff changeset	190 }
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16350 diff changeset	191
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	192 static void
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	193 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	194 {
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	195 if (instance_ok ())
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	196 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	197 }
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	198
16421 40d1ddca4db5 improve use of octave_link John W. Eaton <jwe@octave.org> parents: 16420 diff changeset	199 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	200
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	201 private:
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	202
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	203 static octave_link *instance;
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	204
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	205 static void cleanup_instance (void) { delete instance; instance = 0; }
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	206
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	207 // No copying!
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	208
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	209 octave_link (const octave_link&);
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	210
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	211 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	212
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	213 static bool instance_ok (void);
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	214
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	215 protected:
14719 89c64340e9ab Extended event based communication model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14718 diff changeset	216
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	217 octave_event_listener *event_listener;
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	218
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	219 // 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	220 octave_mutex *event_queue_mutex;
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	221
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	222 // Event Queue.
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	223 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	224
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	225 bool debugging;
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	226
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	227 void do_register_event_listener (octave_event_listener *oel);
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	228
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	229 void do_generate_events (void);
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	230 void do_process_events (void);
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	231
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	232 template <class T>
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	233 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	234 {
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	235 gui_event_queue.add_method (obj, method);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	236 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	237
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	238 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	239 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	240 {
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	241 gui_event_queue.add_method (obj, method, arg);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	242 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	243
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, class A>
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) (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	246 {
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	247 gui_event_queue.add_method (obj, method, arg);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	248 }
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	249
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	250 void do_about_to_exit (void);
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	251
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	252 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	253 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	254
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	255 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	256
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	257 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	258
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	259 virtual void
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	260 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	261
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	262 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	263
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	264 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	265 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	266 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	267
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	268 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	269 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	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_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	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
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	275 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	276
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	277 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	278
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: 16399 diff changeset	279 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	280 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	281 };
14713 565ddd85565e Added comments for the octave-adapter module. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	282
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	283 #endif // OCTAVELINK_H

Mercurial > octave

annotate libinterp/interpfcn/octave-link.h @ 16468:0f143f68078d