Mercurial > hg > octave-lyh
view libinterp/interpfcn/octave-link.h @ 16479:7a71ea0b7ae9
eliminate event listener class
* main-window.h, main-window.cc (main_window::exit): New function.
(main_window::_ocxtave_qt_event_listener): Delete member variable and
all uses.
main_window::construct_octave_qt_link): connect
_octave_qt_link::octave_thread_finished to main_window::exit.
* octave-qt-event-listener.h, octave-qt-event-listener.cc: Delete.
* libgui/src/module.mk (octave_gui_MOC, noinst_HEADERS,
src_libgui_src_la_SOURCES): Update lists.
* octave-qt-link.h, octave-qt-link.cc
(octave_qt_link::octave_thread_finished): New signal.
(octave_qt_link::~octave_qt_link): Delete main_thread.
(octave_qt_link::octave_qt_link): Connect main_thread::finished and
main_thread::terminated to octave_qt_link::octave_thread_finished
signal.
* octave-event-listener.h: Delete.
* libinterp/interp-core/module.mk (INTERPFCN_INC): Remove it from the
list.
* octave-link.h, octave-link.cc (octave_exit_hook): Delete.
(octave_link::discard_events, octave_link::do_discard_events,
octave_link::exit, octave_link::do_exit): New functions.
(octave_link::event_listener): Delete member variable and all uses.
(octave_link::about_to_exit, octave_link::register_event_listener,
octave_link::do_about_to_exit,
octave_link::do_register_event_listener): Delete.
(octave_link::accepting_events): New member variable.
(octave_link::octave_link): Set octave_exit to octave_link::exit.
Initialize accepting_events.
(octave_link::do_post_event): Only add to gui_event_queue if
accepting_events is true.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 09 Apr 2013 13:47:43 -0400 |
parents | 0f143f68078d |
children | 8b783661e03f |
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" class octave_mutex; class string_vector; class workspace_element; // \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 generate_events (void) { if (instance_ok ()) instance->do_generate_events (); } static void process_events (void) { if (instance_ok ()) instance->do_process_events (); } static void discard_events (void) { if (instance_ok ()) instance->do_discard_events (); } static void exit (int status) { if (instance_ok ()) instance->do_exit (status); } 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 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 bool edit_file (const std::string& file) { return instance_ok () ? instance->do_edit_file (file) : false; } static void change_directory (const std::string& dir) { if (instance_ok ()) instance->do_change_directory (dir); } static void set_workspace (const std::list<workspace_element>& ws) { if (instance_ok ()) instance->do_set_workspace (ws); } static void clear_workspace (void) { if (instance_ok ()) instance->do_clear_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->debugging = true; instance->do_enter_debugger_event (file, line); } } static void execute_in_debugger_event (const std::string& file, int line) { if (instance_ok ()) instance->do_execute_in_debugger_event (file, line); } static void exit_debugger_event (void) { if (instance_ok () && instance->debugging) { instance->debugging = false; instance->do_exit_debugger_event (); } } static void update_breakpoint (bool insert, const std::string& file, int line) { if (instance_ok ()) instance->do_update_breakpoint (insert, file, line); } 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: // Semaphore to lock access to the event queue. octave_mutex *event_queue_mutex; // Event Queue. event_queue gui_event_queue; bool debugging; bool accepting_events; void do_generate_events (void); void do_process_events (void); void do_discard_events (void); void do_exit (int status); template <class T> void do_post_event (T *obj, void (T::*method) (void)) { if (accepting_events) gui_event_queue.add_method (obj, method); } template <class T, class A> void do_post_event (T *obj, void (T::*method) (A), A arg) { if (accepting_events) 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) { if (accepting_events) gui_event_queue.add_method (obj, method, arg); } void do_entered_readline_hook (void) { } void do_finished_readline_hook (void) { } virtual bool do_edit_file (const std::string& file) = 0; virtual void do_change_directory (const std::string& dir) = 0; virtual void do_set_workspace (const std::list<workspace_element>& ws) = 0; virtual void do_clear_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_execute_in_debugger_event (const std::string& file, int line) = 0; virtual void do_exit_debugger_event (void) = 0; virtual void do_update_breakpoint (bool insert, const std::string& file, int line) = 0; }; #endif // OCTAVELINK_H