cc88a640ca
[patch 0/3] readline-6.2 rebase http://sourceware.org/ml/gdb-patches/2011-05/msg00003.html [patch 1/3] readline-6.2: Merge of already posted patches http://sourceware.org/ml/gdb-patches/2011-05/msg00004.html = [Bug-readline] [RFC/readline] bind.c, rl_function_dumper, Free allocated http://lists.gnu.org/archive/html/bug-readline/2011-03/msg00000.html [Bug-readline] [patch] Fix underquotation in readline/examples/rlfe/conf http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00001.html [Bug-readline] [patch] Makefile.in htm<->html http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00002.html Re: [Bug-readline] [patch] Makefile.in dependency: callback.o: xmalloc.h http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00004.html [Bug-readline] [patch] Remove . from the VPATH directive http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00005.html Eli Zaretskii's __MSDOS__ / __GO32__ / __MINGW32__ / __DJGPP__ stuff: http://sourceware.org/ml/gdb/2011-04/msg00002.html Jan Kratochvil's patch for FSF GDB tree local-specific changes: http://sourceware.org/ml/gdb/2011-04/msg00006.html Preservation of existing ChangeLog.gdb files, their updates. [patch 2/3] readline-6.2: Workaround "ask" regression http://sourceware.org/ml/gdb-patches/2011-05/msg00005.html [patch 3/3] readline-6.2: Revert 5.x compat., apply 6.x compat. http://sourceware.org/ml/gdb-patches/2011-05/msg00006.html [patch 4/3] readline-6.2: Substitute inc-hist.texinfo http://sourceware.org/ml/gdb-patches/2011-05/msg00010.html readline/ Workaround gdb.base/completion.exp regression on readline-6.2. * complete.c (get_y_or_n): Disable the return on RL_STATE_CALLBACK. Imported readline 6.2, and upstream patch 001. * configure: Regenerate. readline/doc/ * hsuser.texi (Using History Interactively): Disable !BashFeatures @defcodeindex. Make the `Programming with GNU History' reference external. * inc-hist.texinfo: Remove. Imported readline 6.2, and upstream patch 001. readline/examples/ Imported readline 6.2, and upstream patch 001. readline/examples/rlfe/ Imported readline 6.2, and upstream patch 001. gdb/ * config.in: Regenerate. * configure: Regenerate. * configure.ac <--with-system-readline> (for readline_echoing_p): Remove the test. * tui/tui-io.c (tui_old_readline_echoing_p): Rename to ... (tui_old_rl_echoing_p): ... here. (tui_setup_io): Rename extern declaration readline_echoing_p to _rl_echoing_p. Adjust assignments for the both renames. gdb/doc/ * Makefile.in (GDB_DOC_SOURCE_INCLUDES): Rename inc-hist.texinfo to hsuser.texi. * gdb.texinfo <!SYSTEM_READLINE>: Rename inc-hist.texinfo inclusion and comment to hsuser.texi. Change rluser.texi name in the comment.
274 lines
7.3 KiB
C
274 lines
7.3 KiB
C
/* callback.c -- functions to use readline as an X `callback' mechanism. */
|
|
|
|
/* Copyright (C) 1987-2009 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU Readline Library (Readline), a library
|
|
for reading lines of text with interactive input and history editing.
|
|
|
|
Readline 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.
|
|
|
|
Readline 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 Readline. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#define READLINE_LIBRARY
|
|
|
|
#if defined (HAVE_CONFIG_H)
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include "rlconf.h"
|
|
|
|
#if defined (READLINE_CALLBACKS)
|
|
|
|
#include <sys/types.h>
|
|
|
|
#ifdef HAVE_STDLIB_H
|
|
# include <stdlib.h>
|
|
#else
|
|
# include "ansi_stdlib.h"
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
|
|
/* System-specific feature definitions and include files. */
|
|
#include "rldefs.h"
|
|
#include "readline.h"
|
|
#include "rlprivate.h"
|
|
#include "xmalloc.h"
|
|
|
|
/* Private data for callback registration functions. See comments in
|
|
rl_callback_read_char for more details. */
|
|
_rl_callback_func_t *_rl_callback_func = 0;
|
|
_rl_callback_generic_arg *_rl_callback_data = 0;
|
|
|
|
/* **************************************************************** */
|
|
/* */
|
|
/* Callback Readline Functions */
|
|
/* */
|
|
/* **************************************************************** */
|
|
|
|
/* Allow using readline in situations where a program may have multiple
|
|
things to handle at once, and dispatches them via select(). Call
|
|
rl_callback_handler_install() with the prompt and a function to call
|
|
whenever a complete line of input is ready. The user must then
|
|
call rl_callback_read_char() every time some input is available, and
|
|
rl_callback_read_char() will call the user's function with the complete
|
|
text read in at each end of line. The terminal is kept prepped and
|
|
signals handled all the time, except during calls to the user's function. */
|
|
|
|
rl_vcpfunc_t *rl_linefunc; /* user callback function */
|
|
static int in_handler; /* terminal_prepped and signals set? */
|
|
|
|
/* Make sure the terminal is set up, initialize readline, and prompt. */
|
|
static void
|
|
_rl_callback_newline ()
|
|
{
|
|
rl_initialize ();
|
|
|
|
if (in_handler == 0)
|
|
{
|
|
in_handler = 1;
|
|
|
|
if (rl_prep_term_function)
|
|
(*rl_prep_term_function) (_rl_meta_flag);
|
|
|
|
#if defined (HANDLE_SIGNALS)
|
|
rl_set_signals ();
|
|
#endif
|
|
}
|
|
|
|
readline_internal_setup ();
|
|
RL_CHECK_SIGNALS ();
|
|
}
|
|
|
|
/* Install a readline handler, set up the terminal, and issue the prompt. */
|
|
void
|
|
rl_callback_handler_install (prompt, linefunc)
|
|
const char *prompt;
|
|
rl_vcpfunc_t *linefunc;
|
|
{
|
|
rl_set_prompt (prompt);
|
|
RL_SETSTATE (RL_STATE_CALLBACK);
|
|
rl_linefunc = linefunc;
|
|
_rl_callback_newline ();
|
|
}
|
|
|
|
/* Read one character, and dispatch to the handler if it ends the line. */
|
|
void
|
|
rl_callback_read_char ()
|
|
{
|
|
char *line;
|
|
int eof, jcode;
|
|
static procenv_t olevel;
|
|
|
|
if (rl_linefunc == NULL)
|
|
{
|
|
_rl_errmsg ("readline_callback_read_char() called with no handler!");
|
|
abort ();
|
|
}
|
|
|
|
memcpy ((void *)olevel, (void *)_rl_top_level, sizeof (procenv_t));
|
|
jcode = setjmp (_rl_top_level);
|
|
if (jcode)
|
|
{
|
|
(*rl_redisplay_function) ();
|
|
_rl_want_redisplay = 0;
|
|
memcpy ((void *)_rl_top_level, (void *)olevel, sizeof (procenv_t));
|
|
return;
|
|
}
|
|
|
|
do
|
|
{
|
|
RL_CHECK_SIGNALS ();
|
|
if (RL_ISSTATE (RL_STATE_ISEARCH))
|
|
{
|
|
eof = _rl_isearch_callback (_rl_iscxt);
|
|
if (eof == 0 && (RL_ISSTATE (RL_STATE_ISEARCH) == 0) && RL_ISSTATE (RL_STATE_INPUTPENDING))
|
|
rl_callback_read_char ();
|
|
|
|
return;
|
|
}
|
|
else if (RL_ISSTATE (RL_STATE_NSEARCH))
|
|
{
|
|
eof = _rl_nsearch_callback (_rl_nscxt);
|
|
return;
|
|
}
|
|
#if defined (VI_MODE)
|
|
else if (RL_ISSTATE (RL_STATE_VIMOTION))
|
|
{
|
|
eof = _rl_vi_domove_callback (_rl_vimvcxt);
|
|
/* Should handle everything, including cleanup, numeric arguments,
|
|
and turning off RL_STATE_VIMOTION */
|
|
if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
|
|
_rl_internal_char_cleanup ();
|
|
|
|
return;
|
|
}
|
|
#endif
|
|
else if (RL_ISSTATE (RL_STATE_NUMERICARG))
|
|
{
|
|
eof = _rl_arg_callback (_rl_argcxt);
|
|
if (eof == 0 && (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) && RL_ISSTATE (RL_STATE_INPUTPENDING))
|
|
rl_callback_read_char ();
|
|
/* XXX - this should handle _rl_last_command_was_kill better */
|
|
else if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
|
|
_rl_internal_char_cleanup ();
|
|
|
|
return;
|
|
}
|
|
else if (RL_ISSTATE (RL_STATE_MULTIKEY))
|
|
{
|
|
eof = _rl_dispatch_callback (_rl_kscxt); /* For now */
|
|
while ((eof == -1 || eof == -2) && RL_ISSTATE (RL_STATE_MULTIKEY) && _rl_kscxt && (_rl_kscxt->flags & KSEQ_DISPATCHED))
|
|
eof = _rl_dispatch_callback (_rl_kscxt);
|
|
if (RL_ISSTATE (RL_STATE_MULTIKEY) == 0)
|
|
{
|
|
_rl_internal_char_cleanup ();
|
|
_rl_want_redisplay = 1;
|
|
}
|
|
}
|
|
else if (_rl_callback_func)
|
|
{
|
|
/* This allows functions that simply need to read an additional
|
|
character (like quoted-insert) to register a function to be
|
|
called when input is available. _rl_callback_data is simply a
|
|
pointer to a struct that has the argument count originally
|
|
passed to the registering function and space for any additional
|
|
parameters. */
|
|
eof = (*_rl_callback_func) (_rl_callback_data);
|
|
/* If the function `deregisters' itself, make sure the data is
|
|
cleaned up. */
|
|
if (_rl_callback_func == 0)
|
|
{
|
|
if (_rl_callback_data)
|
|
{
|
|
_rl_callback_data_dispose (_rl_callback_data);
|
|
_rl_callback_data = 0;
|
|
}
|
|
_rl_internal_char_cleanup ();
|
|
}
|
|
}
|
|
else
|
|
eof = readline_internal_char ();
|
|
|
|
RL_CHECK_SIGNALS ();
|
|
if (rl_done == 0 && _rl_want_redisplay)
|
|
{
|
|
(*rl_redisplay_function) ();
|
|
_rl_want_redisplay = 0;
|
|
}
|
|
|
|
if (rl_done)
|
|
{
|
|
line = readline_internal_teardown (eof);
|
|
|
|
if (rl_deprep_term_function)
|
|
(*rl_deprep_term_function) ();
|
|
#if defined (HANDLE_SIGNALS)
|
|
rl_clear_signals ();
|
|
#endif
|
|
in_handler = 0;
|
|
(*rl_linefunc) (line);
|
|
|
|
/* If the user did not clear out the line, do it for him. */
|
|
if (rl_line_buffer[0])
|
|
_rl_init_line_state ();
|
|
|
|
/* Redisplay the prompt if readline_handler_{install,remove}
|
|
not called. */
|
|
if (in_handler == 0 && rl_linefunc)
|
|
_rl_callback_newline ();
|
|
}
|
|
}
|
|
while (rl_pending_input || _rl_pushed_input_available () || RL_ISSTATE (RL_STATE_MACROINPUT));
|
|
}
|
|
|
|
/* Remove the handler, and make sure the terminal is in its normal state. */
|
|
void
|
|
rl_callback_handler_remove ()
|
|
{
|
|
rl_linefunc = NULL;
|
|
RL_UNSETSTATE (RL_STATE_CALLBACK);
|
|
RL_CHECK_SIGNALS ();
|
|
if (in_handler)
|
|
{
|
|
in_handler = 0;
|
|
if (rl_deprep_term_function)
|
|
(*rl_deprep_term_function) ();
|
|
#if defined (HANDLE_SIGNALS)
|
|
rl_clear_signals ();
|
|
#endif
|
|
}
|
|
}
|
|
|
|
_rl_callback_generic_arg *
|
|
_rl_callback_data_alloc (count)
|
|
int count;
|
|
{
|
|
_rl_callback_generic_arg *arg;
|
|
|
|
arg = (_rl_callback_generic_arg *)xmalloc (sizeof (_rl_callback_generic_arg));
|
|
arg->count = count;
|
|
|
|
arg->i1 = arg->i2 = 0;
|
|
|
|
return arg;
|
|
}
|
|
|
|
void _rl_callback_data_dispose (arg)
|
|
_rl_callback_generic_arg *arg;
|
|
{
|
|
xfree (arg);
|
|
}
|
|
|
|
#endif
|