p
/
json-rpc-shell
1
1
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 2 Wiki Activity

Fix newer libedit (2021-08-29)

This commit is contained in:
Přemysl Eric Janouch 2021-10-28 08:29:20 +02:00
parent 990cf5a1d4
commit 87a644cc59
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
json-rpc-shell.c
View File

@ -535,22 +535,12 @@ input_el_wcstombs (const wchar_t *s)
return mb; return mb;
} }
static int
input_el_get_termios (int character, int fallback)
{
if (!g_terminal.initialized)
return fallback;
cc_t value = g_terminal.termios.c_cc[character];
if (value == _POSIX_VDISABLE)
return fallback;
return value;
}
static void static void
input_el_redisplay (struct input_el *self) input_el_redisplay (struct input_el *self)
{ {
char x[] = { input_el_get_termios (VREPRINT, 'R' - 0x40), 0 }; // See rl_redisplay(), however NetBSD editline's map.c v1.54 breaks VREPRINT
// so we bind redisplay somewhere else in input_el_start()
char x[] = { 'q' & 31, 0 };
el_push (self->editline, x); el_push (self->editline, x);
// We have to do this or it gets stuck and nothing is done // We have to do this or it gets stuck and nothing is done
@ -683,6 +673,8 @@ input_el_start (struct input *input, const char *program_name)
el_set (self->editline, EL_BIND, "^w", "ed-delete-prev-word", NULL); el_set (self->editline, EL_BIND, "^w", "ed-delete-prev-word", NULL);
// Just what are you doing? // Just what are you doing?
el_set (self->editline, EL_BIND, "^u", "vi-kill-line-prev", NULL); el_set (self->editline, EL_BIND, "^u", "vi-kill-line-prev", NULL);
// See input_el_redisplay(), functionally important
el_set (self->editline, EL_BIND, "^q", "ed-redisplay", NULL);
// It's probably better to handle these ourselves // It's probably better to handle these ourselves
input_el_addbind (self->editline, "send-line", "Send line", input_el_addbind (self->editline, "send-line", "Send line",