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

Compare commits

base: p:710f5f197fda31101e21bc349d6db0eb985b3bae
Branches Tags
p:master
p:v1.2.0
p:v1.1.0
p:v1.0.0
...
compare: p:84702fa47da5d2d4e872245a907a282fadccbc22
Branches Tags
p:master
p:v1.2.0
p:v1.1.0
p:v1.0.0

2 Commits
710f5f197f ... 84702fa47d

Author SHA1 Message Date
Přemysl Eric Janouch
84702fa47d
Fix handling terminal resizes while the terminal is suspended 
GNU Readline has a misfeature.
 2020-10-09 20:21:52 +02:00
Přemysl Eric Janouch
b315892249
Readline: fix a dormant bug in prompt changes 
For details, see a similar change in degesch from uirc3.
 2020-10-09 20:17:17 +02:00
1 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

10
json-rpc-shell.c
View File

@ -268,6 +268,7 @@ input_rl_start (struct input *input, const char *program_name)
rl_readline_name = slash ? ++slash : program_name;
rl_startup_hook = input_rl_on_startup;
rl_catch_sigwinch = false;
rl_change_environment = false;
hard_assert (self->prompt != NULL);
rl_callback_handler_install (self->prompt, input_rl_on_input);
@ -360,17 +361,15 @@ input_rl_set_prompt (struct input *input, char *prompt)
free (self->prompt);
self->prompt = prompt;
if (!self->active)
if (!self->active || self->prompt_shown <= 0)
return;
// First reset the prompt to work around a bug in readline
rl_set_prompt ("");
if (self->prompt_shown > 0)
rl_redisplay ();
rl_redisplay ();
rl_set_prompt (self->prompt);
if (self->prompt_shown > 0)
rl_redisplay ();
rl_redisplay ();
}
static bool
@ -2716,6 +2715,7 @@ static void
resume_terminal (struct app_context *ctx)
{
ctx->input->vtable->prepare (ctx->input, true);
ctx->input->vtable->on_terminal_resized (ctx->input);
ev_io_start (EV_DEFAULT_ &ctx->tty_watcher);
ctx->input->vtable->show (ctx->input);
}