Mercurial > hg > octave-nkf
view liboctave/util/oct-mutex.h @ 16570:d5ae5aa80d42
preserve pending command line input when running commands from GUI actions
* QTerminal.h, QTerminal.cc (QTerminal::relay_command): Delete.
* file-editor-tab.cc (file_editor_tab::run_file_callback): New
argument, bp_info. Save pending command line input and execute
command.
(file_editor_tab::run_file): Use octave_link to execute file.
* main-window.h, main-window.cc
(main_window::execute_command_in_terminal): Rename from
main_window::handle_command_double_clicked. Post event through
octave_link to execute command.
(main_window::construct_octave_qt_link): Connect
_octave_qt_link::execute_command_in_terminal_signal to
main_window::execute_command_in_terminal.
(main_window::execute_command_callback): New function.
(main_window::relay_command_signal): Delete signal. Remove all uses.
* octave-qt-link.h, octave-qt-link.cc
(octave_qt_link::do_execute_command_in_terminal): New function.
(octave_qt_link::execute_command_in_terminal_signal): New signal.
* terminal-dock-widget.h, terminal-dock-widget.cc
(terminal_dock_widget::relay_command_signal): Delete signal. Remove
all uses.
* octave-link.h (octave_link::execute_command_in_terminal,
octave_link::do_execute_command_in_terminal): New functions.
* cmd-edit.h, cmd-edit.cc
(command_editor::pre_input_hook_set): New variable.
(gnu_readline::previous_pre_input_hook,
command_editor::intial_input): New member variables.
(command_editor::restore_pre_input_hook,
command_editor::do_get_current_line,
command_editor::do_replace_line, command_editor::set_pre_input_hook,
gnu_readline::do_get_current_line, gnu_readline::do_replace_line,
gnu_readline::set_pre_input_hook, command_editor::set_initial_input,
gnu_readline::restore_pre_input_hook,
default_command_editor::do_get_current_line,
default_command_editor::do_replace_line,
command_editor::insert_initial_input,
command_editor::pre_input_handler, command_editor::get_current_line,
command_editor::replace_line, command_editor::add_pre_input_hook,
command_editor::do_insert_initial_input,
command_editor::set_pre_input_hook,
command_editor::restore_pre_input_hook): New functions.
(command_editor::readline): Handle initial input.
(command_editor::interrupt): Give argument a default value.
* oct-rl-edit.h, oct-rl-edit.c (octave_rl_copy_line,
octave_rl_replace_line, octave_rl_set_pre_input_hook,
octave_rl_get_pre_input_hook): New functions.
(rl_pre_input_hook_fcn_ptr): New typedef.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 25 Apr 2013 17:57:55 -0400 |
parents | 648dabbb4c6b |
children | d63878346099 |
line wrap: on
line source
/* Copyright (C) 2008-2012 Michael Goffioul 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_octave_mutex_h) #define octave_octave_mutex_h 1 #include "oct-refcount.h" class octave_mutex; class octave_base_mutex { public: friend class octave_mutex; octave_base_mutex (void) : count (1) { } virtual ~octave_base_mutex (void) { } virtual void lock (void); virtual void unlock (void); virtual bool try_lock (void); private: octave_refcount<int> count; }; class OCTAVE_API octave_mutex { public: octave_mutex (void); octave_mutex (const octave_mutex& m) : rep (m.rep) { rep->count++; } ~octave_mutex (void) { if (--rep->count == 0) delete rep; } octave_mutex& operator = (const octave_mutex& m) { if (rep != m.rep) { if (--rep->count == 0) delete rep; rep = m.rep; rep->count++; } return *this; } void lock (void) { rep->lock (); } void unlock (void) { rep->unlock (); } bool try_lock (void) { return rep->try_lock (); } protected: octave_base_mutex *rep; }; class octave_autolock { public: octave_autolock (const octave_mutex& m, bool block = true) : mutex (m), lock_result (false) { if (block) { mutex.lock (); lock_result = true; } else lock_result = mutex.try_lock (); } ~octave_autolock (void) { if (lock_result) mutex.unlock (); } bool ok (void) const { return lock_result; } operator bool (void) const { return ok (); } private: // No copying or default constructor! octave_autolock (void); octave_autolock (const octave_autolock&); octave_autolock& operator = (const octave_autolock&); private: octave_mutex mutex; bool lock_result; }; class OCTAVE_API octave_thread { public: static void init (void); static bool is_octave_thread (void); }; #endif