| history.h | | history.h | |
|
| /* History.h -- the names of functions that you can call in history. */ | | /* history.h -- the names of functions that you can call in history. */ | |
| /* Copyright (C) 1989, 1992 Free Software Foundation, Inc. | | /* Copyright (C) 1989-2003 Free Software Foundation, Inc. | |
| | | | |
| This file contains the GNU History Library (the Library), a set of | | This file contains the GNU History Library (the Library), a set of | |
| routines for managing the text of previously typed lines. | | routines for managing the text of previously typed lines. | |
| | | | |
| The Library is free software; you can redistribute it and/or modify | | The Library is free software; you can redistribute it and/or modify | |
| it under the terms of the GNU General Public License as published by | | it under the terms of the GNU General Public License as published by | |
| the Free Software Foundation; either version 2, or (at your option) | | the Free Software Foundation; either version 2, or (at your option) | |
| any later version. | | any later version. | |
| | | | |
| The Library is distributed in the hope that it will be useful, but | | The Library is distributed in the hope that it will be useful, but | |
| | | | |
| skipping to change at line 29 | | skipping to change at line 29 | |
| have a copy of the license, write to the Free Software Foundation, | | have a copy of the license, write to the Free Software Foundation, | |
| 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ | | 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ | |
| | | | |
| #ifndef _HISTORY_H_ | | #ifndef _HISTORY_H_ | |
| #define _HISTORY_H_ | | #define _HISTORY_H_ | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| | | | |
|
| | | #include <time.h> /* XXX - for history timestamp code */ | |
| | | | |
| #if defined READLINE_LIBRARY | | #if defined READLINE_LIBRARY | |
| # include "rlstdc.h" | | # include "rlstdc.h" | |
| # include "rltypedefs.h" | | # include "rltypedefs.h" | |
| #else | | #else | |
| # include <readline/rlstdc.h> | | # include <readline/rlstdc.h> | |
| # include <readline/rltypedefs.h> | | # include <readline/rltypedefs.h> | |
| #endif | | #endif | |
| | | | |
| #ifdef __STDC__ | | #ifdef __STDC__ | |
| typedef void *histdata_t; | | typedef void *histdata_t; | |
| #else | | #else | |
| typedef char *histdata_t; | | typedef char *histdata_t; | |
| #endif | | #endif | |
| | | | |
| /* The structure used to store a history entry. */ | | /* The structure used to store a history entry. */ | |
| typedef struct _hist_entry { | | typedef struct _hist_entry { | |
| char *line; | | char *line; | |
|
| | | char *timestamp; /* char * rather than time_t for read/write
*/ | |
| histdata_t data; | | histdata_t data; | |
| } HIST_ENTRY; | | } HIST_ENTRY; | |
| | | | |
|
| | | /* Size of the history-library-managed space in history entry HS. */ | |
| | | #define HISTENT_BYTES(hs) (strlen ((hs)->line) + strlen ((hs)->timesta | |
| | | mp)) | |
| | | | |
| /* A structure used to pass the current state of the history stuff around.
*/ | | /* A structure used to pass the current state of the history stuff around.
*/ | |
| typedef struct _hist_state { | | typedef struct _hist_state { | |
| HIST_ENTRY **entries; /* Pointer to the entries themselves
. */ | | HIST_ENTRY **entries; /* Pointer to the entries themselves
. */ | |
| int offset; /* The location pointer within this array. *
/ | | int offset; /* The location pointer within this array. *
/ | |
| int length; /* Number of elements within this array. */ | | int length; /* Number of elements within this array. */ | |
| int size; /* Number of slots allocated to this array.
*/ | | int size; /* Number of slots allocated to this array.
*/ | |
| int flags; | | int flags; | |
| } HISTORY_STATE; | | } HISTORY_STATE; | |
| | | | |
| /* Flag values for the `flags' member of HISTORY_STATE. */ | | /* Flag values for the `flags' member of HISTORY_STATE. */ | |
| | | | |
| skipping to change at line 79 | | skipping to change at line 85 | |
| | | | |
| /* Set the state of the current history array to STATE. */ | | /* Set the state of the current history array to STATE. */ | |
| extern void history_set_history_state PARAMS((HISTORY_STATE *)); | | extern void history_set_history_state PARAMS((HISTORY_STATE *)); | |
| | | | |
| /* Manage the history list. */ | | /* Manage the history list. */ | |
| | | | |
| /* Place STRING at the end of the history list. | | /* Place STRING at the end of the history list. | |
| The associated data field (if any) is set to NULL. */ | | The associated data field (if any) is set to NULL. */ | |
| extern void add_history PARAMS((const char *)); | | extern void add_history PARAMS((const char *)); | |
| | | | |
|
| | | /* Change the timestamp associated with the most recent history entry to | |
| | | STRING. */ | |
| | | extern void add_history_time PARAMS((const char *)); | |
| | | | |
| /* A reasonably useless function, only here for completeness. WHICH | | /* A reasonably useless function, only here for completeness. WHICH | |
| is the magic number that tells us which element to delete. The | | is the magic number that tells us which element to delete. The | |
| elements are numbered from 0. */ | | elements are numbered from 0. */ | |
| extern HIST_ENTRY *remove_history PARAMS((int)); | | extern HIST_ENTRY *remove_history PARAMS((int)); | |
| | | | |
|
| | | /* Free the history entry H and return any application-specific data | |
| | | associated with it. */ | |
| | | extern histdata_t free_history_entry PARAMS((HIST_ENTRY *)); | |
| | | | |
| /* Make the history entry at WHICH have LINE and DATA. This returns | | /* Make the history entry at WHICH have LINE and DATA. This returns | |
| the old entry so you can dispose of the data. In the case of an | | the old entry so you can dispose of the data. In the case of an | |
| invalid WHICH, a NULL pointer is returned. */ | | invalid WHICH, a NULL pointer is returned. */ | |
| extern HIST_ENTRY *replace_history_entry PARAMS((int, const char *, histdat
a_t)); | | extern HIST_ENTRY *replace_history_entry PARAMS((int, const char *, histdat
a_t)); | |
| | | | |
| /* Clear the history list and start over. */ | | /* Clear the history list and start over. */ | |
| extern void clear_history PARAMS((void)); | | extern void clear_history PARAMS((void)); | |
| | | | |
| /* Stifle the history list, remembering only MAX number of entries. */ | | /* Stifle the history list, remembering only MAX number of entries. */ | |
| extern void stifle_history PARAMS((int)); | | extern void stifle_history PARAMS((int)); | |
| | | | |
| skipping to change at line 122 | | skipping to change at line 136 | |
| extern int where_history PARAMS((void)); | | extern int where_history PARAMS((void)); | |
| | | | |
| /* Return the history entry at the current position, as determined by | | /* Return the history entry at the current position, as determined by | |
| history_offset. If there is no entry there, return a NULL pointer. */ | | history_offset. If there is no entry there, return a NULL pointer. */ | |
| extern HIST_ENTRY *current_history PARAMS((void)); | | extern HIST_ENTRY *current_history PARAMS((void)); | |
| | | | |
| /* Return the history entry which is logically at OFFSET in the history | | /* Return the history entry which is logically at OFFSET in the history | |
| array. OFFSET is relative to history_base. */ | | array. OFFSET is relative to history_base. */ | |
| extern HIST_ENTRY *history_get PARAMS((int)); | | extern HIST_ENTRY *history_get PARAMS((int)); | |
| | | | |
|
| | | /* Return the timestamp associated with the HIST_ENTRY * passed as an | |
| | | argument */ | |
| | | extern time_t history_get_time PARAMS((HIST_ENTRY *)); | |
| | | | |
| /* Return the number of bytes that the primary history entries are using. | | /* Return the number of bytes that the primary history entries are using. | |
| This just adds up the lengths of the_history->lines. */ | | This just adds up the lengths of the_history->lines. */ | |
| extern int history_total_bytes PARAMS((void)); | | extern int history_total_bytes PARAMS((void)); | |
| | | | |
| /* Moving around the history list. */ | | /* Moving around the history list. */ | |
| | | | |
| /* Set the position in the history list to POS. */ | | /* Set the position in the history list to POS. */ | |
| extern int history_set_pos PARAMS((int)); | | extern int history_set_pos PARAMS((int)); | |
| | | | |
| /* Back up history_offset to the previous history entry, and return | | /* Back up history_offset to the previous history entry, and return | |
| | | | |
| skipping to change at line 234 | | skipping to change at line 252 | |
| extern int history_length; | | extern int history_length; | |
| extern int history_max_entries; | | extern int history_max_entries; | |
| extern char history_expansion_char; | | extern char history_expansion_char; | |
| extern char history_subst_char; | | extern char history_subst_char; | |
| extern char *history_word_delimiters; | | extern char *history_word_delimiters; | |
| extern char history_comment_char; | | extern char history_comment_char; | |
| extern char *history_no_expand_chars; | | extern char *history_no_expand_chars; | |
| extern char *history_search_delimiter_chars; | | extern char *history_search_delimiter_chars; | |
| extern int history_quotes_inhibit_expansion; | | extern int history_quotes_inhibit_expansion; | |
| | | | |
|
| | | extern int history_write_timestamps; | |
| | | | |
| /* Backwards compatibility */ | | /* Backwards compatibility */ | |
| extern int max_input_history; | | extern int max_input_history; | |
| | | | |
| /* If set, this function is called to decide whether or not a particular | | /* If set, this function is called to decide whether or not a particular | |
| history expansion should be treated as a special case for the calling | | history expansion should be treated as a special case for the calling | |
| application and not expanded. */ | | application and not expanded. */ | |
| extern rl_linebuf_func_t *history_inhibit_expansion_function; | | extern rl_linebuf_func_t *history_inhibit_expansion_function; | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| | | | |
End of changes. 8 change blocks. |
| 2 lines changed or deleted | | 23 lines changed or added | |
|
| readline.h | | readline.h | |
| /* Readline.h -- the names of functions callable from within readline. */ | | /* Readline.h -- the names of functions callable from within readline. */ | |
| | | | |
|
| /* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc. | | /* Copyright (C) 1987-2004 Free Software Foundation, Inc. | |
| | | | |
| This file is part of the GNU Readline Library, a library for | | This file is part of the GNU Readline Library, a library for | |
| reading lines of text with interactive input and history editing. | | reading lines of text with interactive input and history editing. | |
| | | | |
| The GNU Readline Library is free software; you can redistribute it | | The GNU Readline Library is free software; you can redistribute it | |
| and/or modify it under the terms of the GNU General Public License | | and/or modify it under the terms of the GNU General Public License | |
| as published by the Free Software Foundation; either version 2, or | | as published by the Free Software Foundation; either version 2, or | |
| (at your option) any later version. | | (at your option) any later version. | |
| | | | |
| The GNU Readline Library is distributed in the hope that it will be | | The GNU Readline Library is distributed in the hope that it will be | |
| | | | |
| skipping to change at line 43 | | skipping to change at line 43 | |
| # include "keymaps.h" | | # include "keymaps.h" | |
| # include "tilde.h" | | # include "tilde.h" | |
| #else | | #else | |
| # include <readline/rlstdc.h> | | # include <readline/rlstdc.h> | |
| # include <readline/rltypedefs.h> | | # include <readline/rltypedefs.h> | |
| # include <readline/keymaps.h> | | # include <readline/keymaps.h> | |
| # include <readline/tilde.h> | | # include <readline/tilde.h> | |
| #endif | | #endif | |
| | | | |
| /* Hex-encoded Readline version number. */ | | /* Hex-encoded Readline version number. */ | |
|
| #define RL_READLINE_VERSION 0x0403 /* Readline 4.3 */ | | #define RL_READLINE_VERSION 0x0500 /* Readline 5.0 */ | |
| #define RL_VERSION_MAJOR 4 | | #define RL_VERSION_MAJOR 5 | |
| #define RL_VERSION_MINOR 3 | | #define RL_VERSION_MINOR 0 | |
| | | | |
| /* Readline data structures. */ | | /* Readline data structures. */ | |
| | | | |
| /* Maintaining the state of undo. We remember individual deletes and inser
ts | | /* Maintaining the state of undo. We remember individual deletes and inser
ts | |
| on a chain of things to do. */ | | on a chain of things to do. */ | |
| | | | |
| /* The actions that undo knows how to undo. Notice that UNDO_DELETE means | | /* The actions that undo knows how to undo. Notice that UNDO_DELETE means | |
| to insert some text, and UNDO_INSERT means to delete some text. I.e., | | to insert some text, and UNDO_INSERT means to delete some text. I.e., | |
| the code tells undo what to undo, not how to undo it. */ | | the code tells undo what to undo, not how to undo it. */ | |
| enum undo_code { UNDO_DELETE, UNDO_INSERT, UNDO_BEGIN, UNDO_END }; | | enum undo_code { UNDO_DELETE, UNDO_INSERT, UNDO_BEGIN, UNDO_END }; | |
| | | | |
| skipping to change at line 163 | | skipping to change at line 163 | |
| extern int rl_insert_completions PARAMS((int, int)); | | extern int rl_insert_completions PARAMS((int, int)); | |
| extern int rl_menu_complete PARAMS((int, int)); | | extern int rl_menu_complete PARAMS((int, int)); | |
| | | | |
| /* Bindable commands for killing and yanking text, and managing the kill ri
ng. */ | | /* Bindable commands for killing and yanking text, and managing the kill ri
ng. */ | |
| extern int rl_kill_word PARAMS((int, int)); | | extern int rl_kill_word PARAMS((int, int)); | |
| extern int rl_backward_kill_word PARAMS((int, int)); | | extern int rl_backward_kill_word PARAMS((int, int)); | |
| extern int rl_kill_line PARAMS((int, int)); | | extern int rl_kill_line PARAMS((int, int)); | |
| extern int rl_backward_kill_line PARAMS((int, int)); | | extern int rl_backward_kill_line PARAMS((int, int)); | |
| extern int rl_kill_full_line PARAMS((int, int)); | | extern int rl_kill_full_line PARAMS((int, int)); | |
| extern int rl_unix_word_rubout PARAMS((int, int)); | | extern int rl_unix_word_rubout PARAMS((int, int)); | |
|
| | | extern int rl_unix_filename_rubout PARAMS((int, int)); | |
| extern int rl_unix_line_discard PARAMS((int, int)); | | extern int rl_unix_line_discard PARAMS((int, int)); | |
| extern int rl_copy_region_to_kill PARAMS((int, int)); | | extern int rl_copy_region_to_kill PARAMS((int, int)); | |
| extern int rl_kill_region PARAMS((int, int)); | | extern int rl_kill_region PARAMS((int, int)); | |
| extern int rl_copy_forward_word PARAMS((int, int)); | | extern int rl_copy_forward_word PARAMS((int, int)); | |
| extern int rl_copy_backward_word PARAMS((int, int)); | | extern int rl_copy_backward_word PARAMS((int, int)); | |
| extern int rl_yank PARAMS((int, int)); | | extern int rl_yank PARAMS((int, int)); | |
| extern int rl_yank_pop PARAMS((int, int)); | | extern int rl_yank_pop PARAMS((int, int)); | |
| extern int rl_yank_nth_arg PARAMS((int, int)); | | extern int rl_yank_nth_arg PARAMS((int, int)); | |
| extern int rl_yank_last_arg PARAMS((int, int)); | | extern int rl_yank_last_arg PARAMS((int, int)); | |
| /* Not available unless __CYGWIN__ is defined. */ | | /* Not available unless __CYGWIN__ is defined. */ | |
| | | | |
| skipping to change at line 261 | | skipping to change at line 262 | |
| extern int rl_vi_overstrike_delete PARAMS((int, int)); | | extern int rl_vi_overstrike_delete PARAMS((int, int)); | |
| extern int rl_vi_replace PARAMS((int, int)); | | extern int rl_vi_replace PARAMS((int, int)); | |
| extern int rl_vi_set_mark PARAMS((int, int)); | | extern int rl_vi_set_mark PARAMS((int, int)); | |
| extern int rl_vi_goto_mark PARAMS((int, int)); | | extern int rl_vi_goto_mark PARAMS((int, int)); | |
| | | | |
| /* VI-mode utility functions. */ | | /* VI-mode utility functions. */ | |
| extern int rl_vi_check PARAMS((void)); | | extern int rl_vi_check PARAMS((void)); | |
| extern int rl_vi_domove PARAMS((int, int *)); | | extern int rl_vi_domove PARAMS((int, int *)); | |
| extern int rl_vi_bracktype PARAMS((int)); | | extern int rl_vi_bracktype PARAMS((int)); | |
| | | | |
|
| | | extern void rl_vi_start_inserting PARAMS((int, int, int)); | |
| | | | |
| /* VI-mode pseudo-bindable commands, used as utility functions. */ | | /* VI-mode pseudo-bindable commands, used as utility functions. */ | |
| extern int rl_vi_fWord PARAMS((int, int)); | | extern int rl_vi_fWord PARAMS((int, int)); | |
| extern int rl_vi_bWord PARAMS((int, int)); | | extern int rl_vi_bWord PARAMS((int, int)); | |
| extern int rl_vi_eWord PARAMS((int, int)); | | extern int rl_vi_eWord PARAMS((int, int)); | |
| extern int rl_vi_fword PARAMS((int, int)); | | extern int rl_vi_fword PARAMS((int, int)); | |
| extern int rl_vi_bword PARAMS((int, int)); | | extern int rl_vi_bword PARAMS((int, int)); | |
| extern int rl_vi_eword PARAMS((int, int)); | | extern int rl_vi_eword PARAMS((int, int)); | |
| | | | |
| /* **************************************************************** */ | | /* **************************************************************** */ | |
| /* */ | | /* */ | |
| | | | |
| skipping to change at line 293 | | skipping to change at line 296 | |
| | | | |
| /* Undocumented; unused by readline */ | | /* Undocumented; unused by readline */ | |
| extern int rl_discard_argument PARAMS((void)); | | extern int rl_discard_argument PARAMS((void)); | |
| | | | |
| /* Utility functions to bind keys to readline commands. */ | | /* Utility functions to bind keys to readline commands. */ | |
| extern int rl_add_defun PARAMS((const char *, rl_command_func_t *, int)); | | extern int rl_add_defun PARAMS((const char *, rl_command_func_t *, int)); | |
| extern int rl_bind_key PARAMS((int, rl_command_func_t *)); | | extern int rl_bind_key PARAMS((int, rl_command_func_t *)); | |
| extern int rl_bind_key_in_map PARAMS((int, rl_command_func_t *, Keymap)); | | extern int rl_bind_key_in_map PARAMS((int, rl_command_func_t *, Keymap)); | |
| extern int rl_unbind_key PARAMS((int)); | | extern int rl_unbind_key PARAMS((int)); | |
| extern int rl_unbind_key_in_map PARAMS((int, Keymap)); | | extern int rl_unbind_key_in_map PARAMS((int, Keymap)); | |
|
| | | extern int rl_bind_key_if_unbound PARAMS((int, rl_command_func_t *)); | |
| | | extern int rl_bind_key_if_unbound_in_map PARAMS((int, rl_command_func_t *, | |
| | | Keymap)); | |
| extern int rl_unbind_function_in_map PARAMS((rl_command_func_t *, Keymap)); | | extern int rl_unbind_function_in_map PARAMS((rl_command_func_t *, Keymap)); | |
| extern int rl_unbind_command_in_map PARAMS((const char *, Keymap)); | | extern int rl_unbind_command_in_map PARAMS((const char *, Keymap)); | |
|
| extern int rl_set_key PARAMS((const char *, rl_command_func_t *, Keymap)); | | extern int rl_bind_keyseq PARAMS((const char *, rl_command_func_t *)); | |
| | | extern int rl_bind_keyseq_in_map PARAMS((const char *, rl_command_func_t *, | |
| | | Keymap)); | |
| | | extern int rl_bind_keyseq_if_unbound PARAMS((const char *, rl_command_func_ | |
| | | t *)); | |
| | | extern int rl_bind_keyseq_if_unbound_in_map PARAMS((const char *, rl_comman | |
| | | d_func_t *, Keymap)); | |
| extern int rl_generic_bind PARAMS((int, const char *, char *, Keymap)); | | extern int rl_generic_bind PARAMS((int, const char *, char *, Keymap)); | |
| extern int rl_variable_bind PARAMS((const char *, const char *)); | | extern int rl_variable_bind PARAMS((const char *, const char *)); | |
| | | | |
|
| | | /* Backwards compatibility, use rl_bind_keyseq_in_map instead. */ | |
| | | extern int rl_set_key PARAMS((const char *, rl_command_func_t *, Keymap)); | |
| | | | |
| /* Backwards compatibility, use rl_generic_bind instead. */ | | /* Backwards compatibility, use rl_generic_bind instead. */ | |
| extern int rl_macro_bind PARAMS((const char *, const char *, Keymap)); | | extern int rl_macro_bind PARAMS((const char *, const char *, Keymap)); | |
| | | | |
| /* Undocumented in the texinfo manual; not really useful to programs. */ | | /* Undocumented in the texinfo manual; not really useful to programs. */ | |
| extern int rl_translate_keyseq PARAMS((const char *, char *, int *)); | | extern int rl_translate_keyseq PARAMS((const char *, char *, int *)); | |
| extern char *rl_untranslate_keyseq PARAMS((int)); | | extern char *rl_untranslate_keyseq PARAMS((int)); | |
| | | | |
| extern rl_command_func_t *rl_named_function PARAMS((const char *)); | | extern rl_command_func_t *rl_named_function PARAMS((const char *)); | |
| extern rl_command_func_t *rl_function_of_keyseq PARAMS((const char *, Keyma
p, int *)); | | extern rl_command_func_t *rl_function_of_keyseq PARAMS((const char *, Keyma
p, int *)); | |
| | | | |
| | | | |
| skipping to change at line 361 | | skipping to change at line 372 | |
| | | | |
| /* Functions for redisplay. */ | | /* Functions for redisplay. */ | |
| extern void rl_redisplay PARAMS((void)); | | extern void rl_redisplay PARAMS((void)); | |
| extern int rl_on_new_line PARAMS((void)); | | extern int rl_on_new_line PARAMS((void)); | |
| extern int rl_on_new_line_with_prompt PARAMS((void)); | | extern int rl_on_new_line_with_prompt PARAMS((void)); | |
| extern int rl_forced_update_display PARAMS((void)); | | extern int rl_forced_update_display PARAMS((void)); | |
| extern int rl_clear_message PARAMS((void)); | | extern int rl_clear_message PARAMS((void)); | |
| extern int rl_reset_line_state PARAMS((void)); | | extern int rl_reset_line_state PARAMS((void)); | |
| extern int rl_crlf PARAMS((void)); | | extern int rl_crlf PARAMS((void)); | |
| | | | |
|
| #if (defined (__STDC__) || defined (__cplusplus)) && defined (USE_VARARGS)
&& defined (PREFER_STDARG) | | #if defined (USE_VARARGS) && defined (PREFER_STDARG) | |
| extern int rl_message (const char *, ...) __attribute__((__format__ (print
f, 1, 2))); | | extern int rl_message (const char *, ...) __attribute__((__format__ (print
f, 1, 2))); | |
| #else | | #else | |
| extern int rl_message (); | | extern int rl_message (); | |
| #endif | | #endif | |
| | | | |
| extern int rl_show_char PARAMS((int)); | | extern int rl_show_char PARAMS((int)); | |
| | | | |
| /* Undocumented in texinfo manual. */ | | /* Undocumented in texinfo manual. */ | |
| extern int rl_character_len PARAMS((int, int)); | | extern int rl_character_len PARAMS((int, int)); | |
| | | | |
| | | | |
| skipping to change at line 387 | | skipping to change at line 398 | |
| extern void rl_replace_line PARAMS((const char *, int)); | | extern void rl_replace_line PARAMS((const char *, int)); | |
| extern int rl_insert_text PARAMS((const char *)); | | extern int rl_insert_text PARAMS((const char *)); | |
| extern int rl_delete_text PARAMS((int, int)); | | extern int rl_delete_text PARAMS((int, int)); | |
| extern int rl_kill_text PARAMS((int, int)); | | extern int rl_kill_text PARAMS((int, int)); | |
| extern char *rl_copy_text PARAMS((int, int)); | | extern char *rl_copy_text PARAMS((int, int)); | |
| | | | |
| /* Terminal and tty mode management. */ | | /* Terminal and tty mode management. */ | |
| extern void rl_prep_terminal PARAMS((int)); | | extern void rl_prep_terminal PARAMS((int)); | |
| extern void rl_deprep_terminal PARAMS((void)); | | extern void rl_deprep_terminal PARAMS((void)); | |
| extern void rl_tty_set_default_bindings PARAMS((Keymap)); | | extern void rl_tty_set_default_bindings PARAMS((Keymap)); | |
|
| | | extern void rl_tty_unset_default_bindings PARAMS((Keymap)); | |
| | | | |
| extern int rl_reset_terminal PARAMS((const char *)); | | extern int rl_reset_terminal PARAMS((const char *)); | |
| extern void rl_resize_terminal PARAMS((void)); | | extern void rl_resize_terminal PARAMS((void)); | |
| extern void rl_set_screen_size PARAMS((int, int)); | | extern void rl_set_screen_size PARAMS((int, int)); | |
| extern void rl_get_screen_size PARAMS((int *, int *)); | | extern void rl_get_screen_size PARAMS((int *, int *)); | |
| | | | |
| extern char *rl_get_termcap PARAMS((const char *)); | | extern char *rl_get_termcap PARAMS((const char *)); | |
| | | | |
| /* Functions for character input. */ | | /* Functions for character input. */ | |
| extern int rl_stuff_char PARAMS((int)); | | extern int rl_stuff_char PARAMS((int)); | |
| | | | |
| skipping to change at line 606 | | skipping to change at line 618 | |
| extern rl_completion_func_t *rl_attempted_completion_function; | | extern rl_completion_func_t *rl_attempted_completion_function; | |
| | | | |
| /* The basic list of characters that signal a break between words for the | | /* The basic list of characters that signal a break between words for the | |
| completer routine. The initial contents of this variable is what | | completer routine. The initial contents of this variable is what | |
| breaks words in the shell, i.e. "n\"\\'`@$>". */ | | breaks words in the shell, i.e. "n\"\\'`@$>". */ | |
| extern const char *rl_basic_word_break_characters; | | extern const char *rl_basic_word_break_characters; | |
| | | | |
| /* The list of characters that signal a break between words for | | /* The list of characters that signal a break between words for | |
| rl_complete_internal. The default list is the contents of | | rl_complete_internal. The default list is the contents of | |
| rl_basic_word_break_characters. */ | | rl_basic_word_break_characters. */ | |
|
| extern const char *rl_completer_word_break_characters; | | extern /*const*/ char *rl_completer_word_break_characters; | |
| | | | |
| | | /* Hook function to allow an application to set the completion word | |
| | | break characters before readline breaks up the line. Allows | |
| | | position-dependent word break characters. */ | |
| | | extern rl_cpvfunc_t *rl_completion_word_break_hook; | |
| | | | |
| /* List of characters which can be used to quote a substring of the line. | | /* List of characters which can be used to quote a substring of the line. | |
| Completion occurs on the entire substring, and within the substring | | Completion occurs on the entire substring, and within the substring | |
| rl_completer_word_break_characters are treated as any other character, | | rl_completer_word_break_characters are treated as any other character, | |
| unless they also appear within this list. */ | | unless they also appear within this list. */ | |
| extern const char *rl_completer_quote_characters; | | extern const char *rl_completer_quote_characters; | |
| | | | |
| /* List of quote characters which cause a word break. */ | | /* List of quote characters which cause a word break. */ | |
| extern const char *rl_basic_quote_characters; | | extern const char *rl_basic_quote_characters; | |
| | | | |
| | | | |
| skipping to change at line 690 | | skipping to change at line 707 | |
| | | | |
| /* Non-zero means to suppress normal filename completion after the | | /* Non-zero means to suppress normal filename completion after the | |
| user-specified completion function has been called. */ | | user-specified completion function has been called. */ | |
| extern int rl_attempted_completion_over; | | extern int rl_attempted_completion_over; | |
| | | | |
| /* Set to a character describing the type of completion being attempted by | | /* Set to a character describing the type of completion being attempted by | |
| rl_complete_internal; available for use by application completion | | rl_complete_internal; available for use by application completion | |
| functions. */ | | functions. */ | |
| extern int rl_completion_type; | | extern int rl_completion_type; | |
| | | | |
|
| | | /* Up to this many items will be displayed in response to a | |
| | | possible-completions call. After that, we ask the user if she | |
| | | is sure she wants to see them all. The default value is 100. */ | |
| | | extern int rl_completion_query_items; | |
| | | | |
| /* Character appended to completed words when at the end of the line. The | | /* Character appended to completed words when at the end of the line. The | |
| default is a space. Nothing is added if this is '\0'. */ | | default is a space. Nothing is added if this is '\0'. */ | |
| extern int rl_completion_append_character; | | extern int rl_completion_append_character; | |
| | | | |
| /* If set to non-zero by an application completion function, | | /* If set to non-zero by an application completion function, | |
| rl_completion_append_character will not be appended. */ | | rl_completion_append_character will not be appended. */ | |
| extern int rl_completion_suppress_append; | | extern int rl_completion_suppress_append; | |
| | | | |
|
| /* Up to this many items will be displayed in response to a | | /* Set to any quote character readline thinks it finds before any applicati | |
| possible-completions call. After that, we ask the user if she | | on | |
| is sure she wants to see them all. The default value is 100. */ | | completion function is called. */ | |
| extern int rl_completion_query_items; | | extern int rl_completion_quote_character; | |
| | | | |
| | | /* Set to a non-zero value if readline found quoting anywhere in the word t | |
| | | o | |
| | | be completed; set before any application completion function is called. | |
| | | */ | |
| | | extern int rl_completion_found_quote; | |
| | | | |
| | | /* If non-zero, the completion functions don't append any closing quote. | |
| | | This is set to 0 by rl_complete_internal and may be changed by an | |
| | | application-specific completion function. */ | |
| | | extern int rl_completion_suppress_quote; | |
| | | | |
| /* If non-zero, a slash will be appended to completed filenames that are | | /* If non-zero, a slash will be appended to completed filenames that are | |
| symbolic links to directory names, subject to the value of the | | symbolic links to directory names, subject to the value of the | |
| mark-directories variable (which is user-settable). This exists so | | mark-directories variable (which is user-settable). This exists so | |
| that application completion functions can override the user's preference | | that application completion functions can override the user's preference | |
| (set via the mark-symlinked-directories variable) if appropriate. | | (set via the mark-symlinked-directories variable) if appropriate. | |
| It's set to the value of _rl_complete_mark_symlink_dirs in | | It's set to the value of _rl_complete_mark_symlink_dirs in | |
| rl_complete_internal before any application-specific completion | | rl_complete_internal before any application-specific completion | |
| function is called, so without that function doing anything, the user's | | function is called, so without that function doing anything, the user's | |
| preferences are honored. */ | | preferences are honored. */ | |
| | | | |
| skipping to change at line 752 | | skipping to change at line 782 | |
| #define RL_STATE_NSEARCH 0x00100 /* doing non-inc search */ | | #define RL_STATE_NSEARCH 0x00100 /* doing non-inc search */ | |
| #define RL_STATE_SEARCH 0x00200 /* doing a history s
earch */ | | #define RL_STATE_SEARCH 0x00200 /* doing a history s
earch */ | |
| #define RL_STATE_NUMERICARG 0x00400 /* reading numeric argument
*/ | | #define RL_STATE_NUMERICARG 0x00400 /* reading numeric argument
*/ | |
| #define RL_STATE_MACROINPUT 0x00800 /* getting input from a macr
o */ | | #define RL_STATE_MACROINPUT 0x00800 /* getting input from a macr
o */ | |
| #define RL_STATE_MACRODEF 0x01000 /* defining keyboard macro *
/ | | #define RL_STATE_MACRODEF 0x01000 /* defining keyboard macro *
/ | |
| #define RL_STATE_OVERWRITE 0x02000 /* overwrite mode */ | | #define RL_STATE_OVERWRITE 0x02000 /* overwrite mode */ | |
| #define RL_STATE_COMPLETING 0x04000 /* doing completion */ | | #define RL_STATE_COMPLETING 0x04000 /* doing completion */ | |
| #define RL_STATE_SIGHANDLER 0x08000 /* in readline sighandler */ | | #define RL_STATE_SIGHANDLER 0x08000 /* in readline sighandler */ | |
| #define RL_STATE_UNDOING 0x10000 /* doing an undo */ | | #define RL_STATE_UNDOING 0x10000 /* doing an undo */ | |
| #define RL_STATE_INPUTPENDING 0x20000 /* rl_execute_next called */ | | #define RL_STATE_INPUTPENDING 0x20000 /* rl_execute_next called */ | |
|
| | | #define RL_STATE_TTYCSAVED 0x40000 /* tty special chars saved *
/ | |
| | | | |
| #define RL_STATE_DONE 0x80000 /* done; accepted line */ | | #define RL_STATE_DONE 0x80000 /* done; accepted line */ | |
| | | | |
| #define RL_SETSTATE(x) (rl_readline_state |= (x)) | | #define RL_SETSTATE(x) (rl_readline_state |= (x)) | |
| #define RL_UNSETSTATE(x) (rl_readline_state &= ~(x)) | | #define RL_UNSETSTATE(x) (rl_readline_state &= ~(x)) | |
| #define RL_ISSTATE(x) (rl_readline_state & (x)) | | #define RL_ISSTATE(x) (rl_readline_state & (x)) | |
| | | | |
| struct readline_state { | | struct readline_state { | |
| /* line state */ | | /* line state */ | |
| int point; | | int point; | |
| | | | |
| skipping to change at line 788 | | skipping to change at line 819 | |
| int kseqlen; | | int kseqlen; | |
| FILE *inf; | | FILE *inf; | |
| FILE *outf; | | FILE *outf; | |
| int pendingin; | | int pendingin; | |
| char *macro; | | char *macro; | |
| | | | |
| /* signal state */ | | /* signal state */ | |
| int catchsigs; | | int catchsigs; | |
| int catchsigwinch; | | int catchsigwinch; | |
| | | | |
|
| | | /* search state */ | |
| | | | |
| | | /* completion state */ | |
| | | | |
| | | /* options state */ | |
| | | | |
| /* reserved for future expansion, so the struct size doesn't change */ | | /* reserved for future expansion, so the struct size doesn't change */ | |
| char reserved[64]; | | char reserved[64]; | |
| }; | | }; | |
| | | | |
| extern int rl_save_state PARAMS((struct readline_state *)); | | extern int rl_save_state PARAMS((struct readline_state *)); | |
| extern int rl_restore_state PARAMS((struct readline_state *)); | | extern int rl_restore_state PARAMS((struct readline_state *)); | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
End of changes. 14 change blocks. |
| 11 lines changed or deleted | | 55 lines changed or added | |
|