Mercurial > hg > octave-jordi
view libgui/src/octave-qt-link.h @ 16438:a971d8bdaadc
use signals instead of event queue for entering/leaving debug mode
* file-editor-interface.h
(file_editor_interface::handle_enter_debug_mode): Rename from
file_editor_interface::handle_entered_debug_mode. Change all uses.
(file_editor_interface::handle_exit_debug_mode): Rename from
file_editor_interface::handle_quit_debug_mode. Change all uses.
* file_editor.h, file_editor.cc
(file_editor::handle_enter_debug_mode): Rename from
file_editor::handle_entered_debug_mode. Change all uses.
(file_editor::handle_exit_debug_mode): Rename from
file_editor::handle_quit_debug_mode. Change all uses.
* main-window.h, main-window.cc (main_window::handle_enter_debugger):
Rename from main_window::handle_entered_debug_mode. Change all uses.
(main_window::handle_exit_debugger): Rename from
main_window::handle_quit_debug_mode. Change all uses.
(main_window::construct): Delete signal connection from
_octave_qt_event_listener::entered_debug_mode_signal to
main_window::handle_entered_debug_mode.
Delete signal connection from
_octave_qt_event_listener::quit_debug_mode_signal to
main_window::handle_quit_debug_mode.
Connect _octave_qt_link::enter_debugger_signal signal to
main_window::handle_enter_debugger.
Connect _octave_qt_link::exit_debugger_signal signal to
main_window::handle_exit_debugger.
* octave-qt-event-listener.h, octave-qt-event-listener.cc
(octave_qt_event_listener::entered_debug_mode,
octave_qt_event_listener::quit_debug_mode): Delete.
(octave_qt_event_listener::entered_debug_mode_signal,
octave_qt_event_listener::quit_debug_mode_signal): Delete signals.
* octave-qt-link.h, octave-qt-link.cc
(octave_qt_link::do_enter_debugger_event): Emit enter_debugger_signal.
(octave_qt_link::do_execute_in_debugger_event): New function.
(octave_qt_link::do_exit_debugger_event): Emit exit_debugger_signal.
(octave_qt_link::enter_debugger_signal,
octave_qt_link::exit_debugger_signal): New signals.
* octave-event-listener.h (octave_event_listener::entered_debug_mode,
octave_event_listener::quit_debug_mode): Delete.
* input.cc (octave_base_reader::octave_gets): Call
octave_link::exit_debugger_event if not debugging.
(execute_in_debugger_handler): Rename from exit_debugger_handler.
Change all uses.
Call octave_link::execute_in_debugger_event instead of
octave_link::exit_debugger_event.
* octave-link.h, octave-link.cc (octave_link::do_generate_events):
Don't call debugging mode functions here.
(octave_link::enter_debugger_event): Set instance->debugging to true.
(octave_link::execute_in_debugger_event): New function.
(octave_link::exit_debugger_event): Don't do anything unless
instance->debugging is true. Toggle instance->debugging.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 05 Apr 2013 03:04:56 -0400 |
parents | 919796a440c6 |
children | 7a2ee6ea7800 |
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/>. */ #ifndef OCTAVE_QT_LINK_H #define OCTAVE_QT_LINK_H #include <string> #include <QObject> #include <QString> #include "octave-link.h" #include "octave-main-thread.h" // \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_qt_link : public QObject, public octave_link { Q_OBJECT public: octave_qt_link (void); ~octave_qt_link (void) { } void execute_interpreter (void); void do_change_directory (const std::string& dir); void do_update_workspace (void); void do_set_history (const string_vector& hist); void do_append_history (const std::string& hist_entry); void do_clear_history (void); void do_pre_input_event (void); void do_post_input_event (void); void do_enter_debugger_event (const std::string& file, int line); void do_execute_in_debugger_event (const std::string& file, int line); void do_exit_debugger_event (void); void do_update_breakpoint (bool insert, const std::string& file, int line); bool do_edit_file (const std::string& file); private: // No copying! octave_qt_link (const octave_qt_link&); octave_qt_link& operator = (const octave_qt_link&); void do_insert_debugger_pointer (const std::string& file, int line); void do_delete_debugger_pointer (const std::string& file, int line); // Thread running octave_main. octave_main_thread *main_thread; signals: void change_directory_signal (const QString& dir); void set_history_signal (const QStringList& hist); void append_history_signal (const QString& hist_entry); void clear_history_signal (void); void enter_debugger_signal (void); void exit_debugger_signal (void); void update_dbstop_marker_signal (bool insert, const QString& file, int line); void edit_file_signal (const QString& file); void insert_debugger_pointer_signal (const QString&, int); void delete_debugger_pointer_signal (const QString&, int); }; #endif