27916d7c22
PR/51518: Jay West: prompt is interleaved with client output Both these issues are caused by rl_restore_handler not DTRT; fix it so that it kills the internal libedit state completely. This is inefficient, but it works. Also fix: 1. add append_history()/H_NSAVE_FP 2. call the rl_startup_hook before printing the first prompt as documented. callint it from rl_initialize breaks python, because the callback ends up being invoked before the readline module is installed, and we end up dereferencing a NULL pointer. 3. add el_resize_terminal. With those changes, s/lreadline/ledit/g in python works.
81 lines
3.4 KiB
C
81 lines
3.4 KiB
C
/* $NetBSD: hist.h,v 1.23 2017/09/01 10:19:10 christos Exp $ */
|
|
|
|
/*-
|
|
* Copyright (c) 1992, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* Christos Zoulas of Cornell University.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* @(#)hist.h 8.1 (Berkeley) 6/4/93
|
|
*/
|
|
|
|
/*
|
|
* el.hist.c: History functions
|
|
*/
|
|
#ifndef _h_el_hist
|
|
#define _h_el_hist
|
|
|
|
typedef int (*hist_fun_t)(void *, HistEventW *, int, ...);
|
|
|
|
typedef struct el_history_t {
|
|
wchar_t *buf; /* The history buffer */
|
|
size_t sz; /* Size of history buffer */
|
|
wchar_t *last; /* The last character */
|
|
int eventno; /* Event we are looking for */
|
|
void *ref; /* Argument for history fcns */
|
|
hist_fun_t fun; /* Event access */
|
|
HistEventW ev; /* Event cookie */
|
|
} el_history_t;
|
|
|
|
#define HIST_FUN_INTERNAL(el, fn, arg) \
|
|
((((*(el)->el_history.fun) ((el)->el_history.ref, &(el)->el_history.ev, \
|
|
fn, arg)) == -1) ? NULL : (el)->el_history.ev.str)
|
|
#define HIST_FUN(el, fn, arg) \
|
|
(((el)->el_flags & NARROW_HISTORY) ? hist_convert(el, fn, arg) : \
|
|
HIST_FUN_INTERNAL(el, fn, arg))
|
|
|
|
#define HIST_NEXT(el) HIST_FUN(el, H_NEXT, NULL)
|
|
#define HIST_FIRST(el) HIST_FUN(el, H_FIRST, NULL)
|
|
#define HIST_LAST(el) HIST_FUN(el, H_LAST, NULL)
|
|
#define HIST_PREV(el) HIST_FUN(el, H_PREV, NULL)
|
|
#define HIST_SET(el, num) HIST_FUN(el, H_SET, num)
|
|
#define HIST_LOAD(el, fname) HIST_FUN(el, H_LOAD fname)
|
|
#define HIST_SAVE(el, fname) HIST_FUN(el, H_SAVE fname)
|
|
#define HIST_SAVE_FP(el, fp) HIST_FUN(el, H_SAVE_FP, fp)
|
|
#define HIST_NSAVE_FP(el, n, fp) HIST_FUN(el, H_NSAVE_FP, n, fp)
|
|
|
|
libedit_private int hist_init(EditLine *);
|
|
libedit_private void hist_end(EditLine *);
|
|
libedit_private el_action_t hist_get(EditLine *);
|
|
libedit_private int hist_set(EditLine *, hist_fun_t, void *);
|
|
libedit_private int hist_command(EditLine *, int, const wchar_t **);
|
|
libedit_private int hist_enlargebuf(EditLine *, size_t, size_t);
|
|
libedit_private wchar_t *hist_convert(EditLine *, int, void *);
|
|
|
|
#endif /* _h_el_hist */
|