X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=interactive.c;h=bb121f429426f7291c07a7a31a1d0f40f1186c40;hp=f281901248e3aebe878553220dda938d1c3fbece;hb=a09c549cb3f6e24b6d68700f854731aea8b8d1a4;hpb=58864df1c0784c58e421949b67a091fd0a60e140 diff --git a/interactive.c b/interactive.c index f2819012..bb121f42 100644 --- a/interactive.c +++ b/interactive.c @@ -1,21 +1,19 @@ /* - * Copyright (C) 2011-2013 Andre Noll + * Copyright (C) 2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file interactive.c Readline abstraction for interactive sessions. */ +#include "para.h" + #include -#include -#include #include #include #include -#include #include -#include "para.h" #include "fd.h" #include "buffer_tree.h" #include "list.h" @@ -28,11 +26,11 @@ struct i9e_private { struct i9e_client_info *ici; FILE *stderr_stream; int num_columns; + int num_key_bindings; char empty_line[1000]; - struct task task; + struct task *task; struct btr_node *stdout_btrn; bool last_write_was_status; - bool line_handler_running; bool input_eof; bool caught_sigint; bool caught_sigterm; @@ -52,7 +50,7 @@ static struct i9e_private i9e_private, *i9ep = &i9e_private; */ int i9e_get_error(void) { - return i9ep->task.error; + return task_status(i9ep->task); } static bool is_prefix(const char *partial, const char *full, size_t len) @@ -227,6 +225,7 @@ static void wipe_bottom_line(void) fprintf(i9ep->stderr_stream, "\r"); } +#ifndef RL_FREE_KEYMAP_DECLARED /** * Free all storage associated with a keymap. * @@ -237,6 +236,7 @@ static void wipe_bottom_line(void) * \param keymap The keymap to deallocate. */ void rl_free_keymap(Keymap keymap); +#endif /** * Reset the terminal and save the in-memory command line history. @@ -272,6 +272,7 @@ static void clear_bottom_line(void) rl_redisplay(); wipe_bottom_line(); /* wipe out the prompt */ rl_insert_text(text); + free(text); rl_point = point; } @@ -290,24 +291,28 @@ static bool input_available(void) static void i9e_line_handler(char *line) { int ret; + struct btr_node *dummy; + if (!line) { + i9ep->input_eof = true; + return; + } + if (!*line) + goto free_line; + rl_set_prompt(""); + dummy = btr_new_node(&(struct btr_node_description) + EMBRACE(.name = "dummy line handler")); + i9e_attach_to_stdout(dummy); ret = i9ep->ici->line_handler(line); if (ret < 0) PARA_WARNING_LOG("%s\n", para_strerror(-ret)); - rl_set_prompt(""); - if (line) { - if (!*line) - rl_set_prompt(i9ep->ici->prompt); - else - add_history(line); - free(line); - } else { - rl_set_prompt(""); - i9ep->input_eof = true; - } + add_history(line); + btr_remove_node(&dummy); +free_line: + free(line); } -static int i9e_post_select(__a_unused struct sched *s, __a_unused struct task *t) +static int i9e_post_select(__a_unused struct sched *s, __a_unused void *context) { int ret; struct i9e_client_info *ici = i9ep->ici; @@ -364,7 +369,7 @@ out: return ret; } -static void i9e_pre_select(struct sched *s, __a_unused struct task *t) +static void i9e_pre_select(struct sched *s, __a_unused void *context) { int ret; @@ -408,19 +413,17 @@ static void update_winsize(void) i9ep->empty_line[i9ep->num_columns] = '\0'; } -/** - * Defined key sequences are mapped to keys starting with this offset. I.e. - * pressing the first defined key sequence yields the key number \p KEY_OFFSET. - */ -#define KEY_OFFSET 64 - -static int dispatch_key(__a_unused int count, int key) +static int dispatch_key(__a_unused int count, __a_unused int key) { - int ret; + int i, ret; - assert(key >= KEY_OFFSET); - ret = i9ep->ici->key_handler(key - KEY_OFFSET); - return ret < 0? ret : 0; + for (i = i9ep->num_key_bindings - 1; i >= 0; i--) { + if (strcmp(rl_executing_keyseq, i9ep->ici->bound_keyseqs[i])) + continue; + ret = i9ep->ici->key_handler(i); + return ret < 0? ret : 0; + } + assert(0); } /** @@ -432,7 +435,6 @@ static int dispatch_key(__a_unused int count, int key) * The caller must allocate and initialize the structure \a ici points to. * * \return Standard. - * \sa \ref register_task(). */ int i9e_open(struct i9e_client_info *ici, struct sched *s) { @@ -446,10 +448,13 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s) ret = mark_fd_nonblocking(ici->fds[1]); if (ret < 0) return ret; - i9ep->task.pre_select = i9e_pre_select; - i9ep->task.post_select = i9e_post_select; - sprintf(i9ep->task.status, "i9e"); - register_task(s, &i9ep->task); + i9ep->task = task_register(&(struct task_info) { + .name = "i9e", + .pre_select = i9e_pre_select, + .post_select = i9e_post_select, + .context = i9ep, + }, s); + rl_readline_name = "para_i9e"; rl_basic_word_break_characters = " "; rl_attempted_completion_function = i9e_completer; @@ -462,13 +467,11 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s) if (ici->bound_keyseqs) { char *seq; int i; - /* FIXME: This is an arbitrary constant. */ - for (i = 0; i < 32 && (seq = ici->bound_keyseqs[i]); i++) { - char buf[2] = {KEY_OFFSET + i, '\0'}; - /* readline needs an allocated buffer for the macro */ - rl_generic_bind(ISMACR, seq, para_strdup(buf), i9ep->bare_km); - rl_bind_key_in_map(KEY_OFFSET + i, dispatch_key, i9ep->bare_km); - } + /* bind each key sequence to the our dispatcher */ + for (i = 0; (seq = ici->bound_keyseqs[i]); i++) + rl_generic_bind(ISFUNC, seq, (char *)dispatch_key, + i9ep->bare_km); + i9ep->num_key_bindings = i; } if (ici->history_file) read_history(ici->history_file); @@ -553,8 +556,6 @@ void ie9_print_status_bar(char *buf, unsigned len) * Tell i9e that the caller received a signal. * * \param sig_num The number of the signal received. - * - * Currently the function only cares about \p SIGINT, but this may change. */ void i9e_signal_dispatch(int sig_num) {