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

Compare commits

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

No commits in common. "84702fa47da5d2d4e872245a907a282fadccbc22" and "710f5f197fda31101e21bc349d6db0eb985b3bae" have entirely different histories.
84702fa47d ... 710f5f197f

1 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

6
json-rpc-shell.c
View File

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