Mercurial > octave-nkf
view libinterp/interpfcn/octave-link.h @ 16431:5982d469f79b
use signal for setting, appending to, and clearing history widget
* history-dockwidget.h, history-dockwidget.cc
(history_dock_widget::request_history_model_update,
history_dock_widget::reset_model,
history_dock_widget::update_history_callback): Delete.
(history_dock_widget::set_history,
history_dock_widget::append_history,
history_dock_widget::clear_history): New functions.
* main-window.h, main-window.cc (main_window::update_history): Delete.
(main_window::construct): Delete connection from
_octave_qt_event_listener::update_history_signal to
main_window::update_history.
Connect _octave_qt_link::set_history_signal to
_history_dock_widget::set_history.
Connect _octave_qt_link::append_history_signal to
_history_dock_widget::append_history.
Connect _octave_qt_link::clear_history_signal to
_history_dock_widget::clear_history.
(main_window::clear_history_callback): Call Fhistory instead of
command_history::clear and _history_dock_widget->reset_model.
* octave-main-thread.cc (octave_main_thread::run): Don't call
octave_link::update_history.
* octave-qt-event-listener.h, octave-qt-event-listener.cc
(octave_qt_event_listener::update_history): Delete.
(octave_qt_event_listener::update_history_signal): Delete.
* octave-qt-link.h, octave-qt-link.cc
(octave_qt_link::do_update_history): Delete.
(octave_qt_link::do_set_history,octave_qt_link::do_append_history,
octave_qt_link::do_clear_history): New functions.
(octave_qt_link::do_post_input_event): Don't call do_update_history.
(set_history_signal, append_history_signal, clear_history_signal):
New signals.
* octave-event-listener.h (octave_event_listener::update_history):
Delete.
* input.cc (octave_base_reader::octave_gets): Call command_history::add.
* oct-hist.cc (do_history): New option, -c. Call octave_link history
functions as needed.
(initialize_history): Call octave_link::set_history.
(octave_history_write_timestamp): Call octave_link::append_history.
(Fedit_history): Document -c.
* octave-link.h (octave_link::update_history,
octave_link::do_update_history): Delete.
(octave_link::set_history, octave_link::append_history,
octave_link::clear_history, octave_link::do_set_history,
octave_link::do_append_history, octave_link::do_clear_history,
octave_link::do_pre_input_event, octave_link::do_post_input_event):
New functions.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 04 Apr 2013 13:20:43 -0400 |
parents | 203976ae18d1 |
children | 919796a440c6 |
line wrap: on
line source
/* Copyright (C) 2013 John W. Eaton Copyright (C) 2011-2012 Jacob Dawid Copyright (C) 2011-2012 John P. Swensen This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_link_h) #define octave_link_h 1 #include <string> #include "event-queue.h" #include "octave-event-listener.h" class octave_mutex; class string_vector; // \class OctaveLink // \brief Provides threadsafe access to octave. // \author Jacob Dawid // // This class is a wrapper around octave and provides thread safety by // buffering access operations to octave and executing them in the // readline event hook, which lives in the octave thread. class octave_link { protected: octave_link (void); public: virtual ~octave_link (void) { } static void register_event_listener (octave_event_listener *el) { if (instance_ok ()) instance->do_register_event_listener (el); } static void generate_events (void) { if (instance_ok ()) instance->do_generate_events (); } static void process_events (void) { if (instance_ok ()) instance->do_process_events (); } template <class T> static void post_event (T *obj, void (T::*method) (void)) { if (instance_ok ()) instance->do_post_event (obj, method); } template <class T, class A> static void post_event (T *obj, void (T::*method) (A), A arg) { if (instance_ok ()) instance->do_post_event (obj, method, arg); } template <class T, class A> static void post_event (T *obj, void (T::*method) (const A&), const A& arg) { if (instance_ok ()) instance->do_post_event (obj, method, arg); } static void about_to_exit (void) { if (instance_ok ()) instance->do_about_to_exit (); } static void entered_readline_hook (void) { if (instance_ok ()) instance->do_entered_readline_hook (); } static void finished_readline_hook (void) { if (instance_ok ()) instance->do_finished_readline_hook (); } static std::string last_working_directory (void) { return instance_ok () ? instance->do_last_working_directory () : std::string (); } static void update_workspace (void) { if (instance_ok ()) instance->do_update_workspace (); } static void set_history (const string_vector& hist) { if (instance_ok ()) instance->do_set_history (hist); } static void append_history (const std::string& hist_entry) { if (instance_ok ()) instance->do_append_history (hist_entry); } static void clear_history (void) { if (instance_ok ()) instance->do_clear_history (); } static void pre_input_event (void) { if (instance_ok ()) instance->do_pre_input_event (); } static void post_input_event (void) { if (instance_ok ()) instance->do_post_input_event (); } static void enter_debugger_event (const std::string& file, int line) { if (instance_ok ()) instance->do_enter_debugger_event (file, line); } static void exit_debugger_event (const std::string& file, int line) { if (instance_ok ()) instance->do_exit_debugger_event (file, line); } static void update_breakpoint (bool insert, const std::string& file, int line) { if (instance_ok ()) instance->do_update_breakpoint (insert, file, line); } static bool edit_file (const std::string& file) { return instance_ok () ? instance->do_edit_file (file) : false; } static void connect_link (octave_link *); private: static octave_link *instance; static void cleanup_instance (void) { delete instance; instance = 0; } // No copying! octave_link (const octave_link&); octave_link& operator = (const octave_link&); static bool instance_ok (void); protected: octave_event_listener *event_listener; // Semaphore to lock access to the event queue. octave_mutex *event_queue_mutex; // Event Queue. event_queue gui_event_queue; // Stores the last known current working directory of octave. std::string last_cwd; bool debugging; void do_register_event_listener (octave_event_listener *oel); void do_generate_events (void); void do_process_events (void); template <class T> void do_post_event (T *obj, void (T::*method) (void)) { gui_event_queue.add_method (obj, method); } template <class T, class A> void do_post_event (T *obj, void (T::*method) (A), A arg) { gui_event_queue.add_method (obj, method, arg); } template <class T, class A> void do_post_event (T *obj, void (T::*method) (const A&), const A& arg) { gui_event_queue.add_method (obj, method, arg); } void do_about_to_exit (void); void do_entered_readline_hook (void) { } void do_finished_readline_hook (void) { } std::string do_last_working_directory (void); virtual void do_update_workspace (void) = 0; virtual void do_set_history (const string_vector& hist) = 0; virtual void do_append_history (const std::string& hist_entry) = 0; virtual void do_clear_history (void) = 0; virtual void do_pre_input_event (void) = 0; virtual void do_post_input_event (void) = 0; virtual void do_enter_debugger_event (const std::string& file, int line) = 0; virtual void do_exit_debugger_event (const std::string& file, int line) = 0; virtual void do_update_breakpoint (bool insert, const std::string& file, int line) = 0; virtual bool do_edit_file (const std::string& file) = 0; }; #endif // OCTAVELINK_H