Mercurial > hg > octave-nkf
view liboctave/util/glob-match.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 | 049e8bbff782 |
children | d63878346099 |
line wrap: on
line source
/* Copyright (C) 1996-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_glob_match_h) #define octave_glob_match_h 1 #include <string> #include "Array.h" #include "str-vec.h" class OCTAVE_API glob_match { public: enum opts { pathname = 1, // No wildcard can ever match '/'. noescape = 2, // Backslashes don't quote special chars. period = 4 // Leading '.' is matched only explicitly. }; glob_match (const std::string& p, unsigned int xopts = pathname|noescape|period) : pat (p), fnmatch_flags (opts_to_fnmatch_flags (xopts)) { } glob_match (const string_vector& p = string_vector (), unsigned int xopts = pathname|noescape|period) : pat (p), fnmatch_flags (opts_to_fnmatch_flags (xopts)) { } glob_match (const glob_match& gm) : pat (gm.pat), fnmatch_flags (gm.fnmatch_flags) { } glob_match& operator = (const glob_match& gm) { if (this != &gm) { pat = gm.pat; fnmatch_flags = gm.fnmatch_flags; } return *this; } ~glob_match (void) { } void set_pattern (const std::string& p) { pat = p; } void set_pattern (const string_vector& p) { pat = p; } bool match (const std::string& str) const; Array<bool> match (const string_vector& str) const { int n = str.length (); Array<bool> retval (dim_vector (n, 1)); for (int i = 0; i < n; i++) retval(i) = match (str[i]); return retval; } // We forward to glob_internal here to avoid problems with gnulib's // glob.h defining glob to be rpl_glob. string_vector glob (void) const; private: // Globbing pattern(s). string_vector pat; // Option flags. int fnmatch_flags; int opts_to_fnmatch_flags (unsigned int xopts) const; }; #endif