Compare commits
2 Commits
710f5f197f
...
84702fa47d
Author | SHA1 | Date | |
---|---|---|---|
84702fa47d | |||
b315892249 |
@ -268,6 +268,7 @@ 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);
|
||||||
@ -360,16 +361,14 @@ input_rl_set_prompt (struct input *input, char *prompt)
|
|||||||
free (self->prompt);
|
free (self->prompt);
|
||||||
self->prompt = prompt;
|
self->prompt = prompt;
|
||||||
|
|
||||||
if (!self->active)
|
if (!self->active || self->prompt_shown <= 0)
|
||||||
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 ();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2716,6 +2715,7 @@ 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);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user