p/xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 11 Wiki Activity

degesch: make readline work better

Browse Source 
By randomly poking at it until it stops being a little shit.

Still no Meta keys.
This commit is contained in:
Přemysl Eric Janouch 2015-04-18 16:03:50 +02:00
parent 869781c33a
commit 932548ef4b
1 changed files with 56 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
degesch.c
View File

@ -446,7 +446,7 @@ static void
app_readline_hide (struct app_readline_state *state) app_readline_hide (struct app_readline_state *state)
{ {
state->saved_point = rl_point; state->saved_point = rl_point;
state->saved_point = rl_mark; state->saved_mark = rl_mark;
state->saved_line = rl_copy_text (0, rl_end); state->saved_line = rl_copy_text (0, rl_end);
rl_set_prompt (""); rl_set_prompt ("");
rl_replace_line ("", 0); rl_replace_line ("", 0);
@ -464,6 +464,16 @@ app_readline_restore (struct app_readline_state *state, const char *prompt)
free (state->saved_line); free (state->saved_line);
} }
static void
app_readline_erase_to_bol (const char *prompt)
{
rl_set_prompt ("");
rl_replace_line ("", 0);
rl_point = rl_mark = 0;
rl_redisplay ();
rl_set_prompt (prompt);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
typedef int (*terminal_printer_fn) (int); typedef int (*terminal_printer_fn) (int);
@ -1045,10 +1055,10 @@ initiate_quit (struct app_context *ctx)
{ {
// First get rid of readline // First get rid of readline
if (ctx->readline_prompt_shown) if (ctx->readline_prompt_shown)
rl_crlf (); {
app_readline_erase_to_bol (ctx->readline_prompt);
rl_callback_handler_remove ();
ctx->readline_prompt_shown = false; ctx->readline_prompt_shown = false;
}
// Initiate a connection close // Initiate a connection close
buffer_send_status (ctx, ctx->global_buffer, "shutting down"); buffer_send_status (ctx, ctx->global_buffer, "shutting down");
@ -1441,6 +1451,37 @@ on_readline_next_buffer (int count, int key)
return 0; return 0;
} }
static int
on_readline_return (int count, int key)
{
(void) count;
(void) key;
struct app_context *ctx = g_ctx;
// Let readline pass the line to our input handler
rl_done = 1;
// Save readline state
int saved_point = rl_point;
int saved_mark = rl_mark;
char *saved_line = rl_copy_text (0, rl_end);
// Erase the entire line from screen
rl_set_prompt ("");
rl_replace_line ("", 0);
rl_redisplay ();
ctx->readline_prompt_shown = false;
// Restore readline state
rl_set_prompt (ctx->readline_prompt);
rl_replace_line (saved_line, 0);
rl_point = saved_point;
rl_mark = saved_mark;
free (saved_line);
return 0;
}
static int static int
init_readline (void) init_readline (void)
{ {
@ -1464,6 +1505,8 @@ init_readline (void)
rl_bind_keyseq ("\\M-p", rl_named_function ("previous-history")); rl_bind_keyseq ("\\M-p", rl_named_function ("previous-history"));
rl_bind_keyseq ("\\M-n", rl_named_function ("next-history")); rl_bind_keyseq ("\\M-n", rl_named_function ("next-history"));
rl_bind_key (RETURN, on_readline_return);
return 0; return 0;
} }
@ -2233,9 +2276,6 @@ on_tty_readable (const struct pollfd *fd, struct app_context *ctx)
static void static void
on_readline_input (char *line) on_readline_input (char *line)
{ {
// Otherwise the prompt is shown at all times
g_ctx->readline_prompt_shown = false;
if (line) if (line)
{ {
if (*line) if (*line)
@ -2245,11 +2285,15 @@ on_readline_input (char *line)
free (line); free (line);
} }
else else
// Anything better to do? {
rl_crlf (); app_readline_erase_to_bol (g_ctx->readline_prompt);
rl_ding ();
}
if (g_ctx->quitting)
rl_callback_handler_remove ();
else
// initiate_quit() disables readline; we just wait then // initiate_quit() disables readline; we just wait then
if (!g_ctx->quitting)
g_ctx->readline_prompt_shown = true; g_ctx->readline_prompt_shown = true;
} }
@ -2584,7 +2628,6 @@ main (int argc, char *argv[])
if (ctx.readline_prompt_shown) if (ctx.readline_prompt_shown)
rl_callback_handler_remove (); rl_callback_handler_remove ();
putchar ('\n');
app_context_free (&ctx); app_context_free (&ctx);
free_terminal (); free_terminal ();