Mercurial > hg > octave-nkf
view liboctave/util/lo-traits.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) 2009-2012 John W. Eaton 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_liboctave_traits_h) #define octave_liboctave_traits_h 1 // Ideas for these classes taken from C++ Templates, The Complete // Guide by David Vandevoorde and Nicolai M. Josuttis, Addison-Wesley // (2003). // Select a type based on the value of a constant expression. template <bool cond, typename T1, typename T2> class if_then_else; template<typename T1, typename T2> class if_then_else<true, T1, T2> { public: typedef T1 result; }; template<typename T1, typename T2> class if_then_else<false, T1, T2> { public: typedef T2 result; }; // Determine whether two types are equal. template <class T1, class T2> class equal_types { public: static const bool value = false; }; template <class T> class equal_types <T, T> { public: static const bool value = true; }; // Determine whether a type is an instance of a template. template <template <class> class Template, class T> class is_instance { public: static const bool value = false; }; template <template <class> class Template, class T> class is_instance <Template, Template<T> > { public: static const bool value = true; }; // Determine whether a template paramter is a class type. template<typename T1> class is_class_type { private: typedef char one; typedef struct { char c[2]; } two; // Classes can have pointers to members. template<typename T2> static one is_class_type_test (int T2::*); // Catch everything else. template<typename T2> static two is_class_type_test (...); public: enum { yes = sizeof (is_class_type_test<T1> (0)) == 1 }; enum { no = ! yes }; }; // Define typename ref_param<T>::type as T const& if T is a class // type. Otherwise, define it to be T. template<typename T> class ref_param { public: typedef typename if_then_else<is_class_type<T>::no, T, T const&>::result type; }; // Will turn TemplatedClass<T> to T, leave T otherwise. // Useful for stripping wrapper classes, like octave_int. template<template<typename> class TemplatedClass, typename T> class strip_template_param { public: typedef T type; }; template<template<typename> class TemplatedClass, typename T> class strip_template_param<TemplatedClass, TemplatedClass<T> > { public: typedef T type; }; // Will turn TemplatedClass<T> to TemplatedClass<S>, T to S otherwise. // Useful for generic promotions. template<template<typename> class TemplatedClass, typename T, typename S> class subst_template_param { public: typedef S type; }; template<template<typename> class TemplatedClass, typename T, typename S> class subst_template_param<TemplatedClass, TemplatedClass<T>, S> { public: typedef TemplatedClass<S> type; }; #endif