X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=interactive.c;h=b72148cc41df54e79f0da53bd4853ba979674a0c;hp=a18d82b717846d1deeec01c3dcaf88587837bc43;hb=bc78a94412b17dfd445d6bb88f752041df3cf7ba;hpb=901f6642a51445accaf88ab80f6bc80757f74149 diff --git a/interactive.c b/interactive.c index a18d82b7..b72148cc 100644 --- a/interactive.c +++ b/interactive.c @@ -1,21 +1,19 @@ /* - * Copyright (C) 2011-2012 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,10 +26,13 @@ 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; + char key_sequence[32]; + unsigned key_sequence_length; + struct task *task; struct btr_node *stdout_btrn; - bool line_handler_running; + bool last_write_was_status; bool input_eof; bool caught_sigint; bool caught_sigterm; @@ -51,7 +52,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) @@ -226,6 +227,7 @@ static void wipe_bottom_line(void) fprintf(i9ep->stderr_stream, "\r"); } +#ifndef RL_FREE_KEYMAP_DECLARED /** * Free all storage associated with a keymap. * @@ -236,6 +238,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. @@ -271,6 +274,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; } @@ -289,29 +293,33 @@ 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 void i9e_post_select(__a_unused struct sched *s, 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; char *buf; - size_t sz; + size_t sz, consumed = 0; ret = -E_I9E_EOF; if (i9ep->input_eof) @@ -322,8 +330,26 @@ static void i9e_post_select(__a_unused struct sched *s, struct task *t) ret = 0; if (i9ep->caught_sigint) goto rm_btrn; - while (input_available()) + while (input_available()) { + if (i9ep->stdout_btrn) { + unsigned len = i9ep->key_sequence_length; + assert(len < sizeof(i9ep->key_sequence) - 1); + buf = i9ep->key_sequence + len; + ret = read(i9ep->ici->fds[0], buf, 1); + if (ret < 0) { + ret = -ERRNO_TO_PARA_ERROR(errno); + goto rm_btrn; + } + ret = -E_I9E_EOF; + if (ret == 0) + goto rm_btrn; + buf[1] = '\0'; + i9ep->key_sequence_length++; + rl_stuff_char((int)(unsigned char)*buf); + } rl_callback_read_char(); + ret = 0; + } if (!i9ep->stdout_btrn) goto out; ret = btr_node_status(i9ep->stdout_btrn, 0, BTR_NT_LEAF); @@ -333,16 +359,24 @@ static void i9e_post_select(__a_unused struct sched *s, struct task *t) } if (ret == 0) goto out; +again: sz = btr_next_buffer(i9ep->stdout_btrn, &buf); if (sz == 0) goto out; + if (i9ep->last_write_was_status) + fprintf(i9ep->stderr_stream, "\n"); + i9ep->last_write_was_status = false; ret = xwrite(ici->fds[1], buf, sz); if (ret < 0) goto rm_btrn; btr_consume(i9ep->stdout_btrn, ret); + consumed += ret; + if (ret == sz && consumed < 10000) + goto again; goto out; rm_btrn: if (i9ep->stdout_btrn) { + wipe_bottom_line(); btr_remove_node(&i9ep->stdout_btrn); rl_set_keymap(i9ep->standard_km); rl_set_prompt(i9ep->ici->prompt); @@ -352,10 +386,10 @@ rm_btrn: wipe_bottom_line(); out: i9ep->caught_sigint = false; - t->error = ret; + 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; @@ -399,19 +433,30 @@ 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; +again: + if (i9ep->key_sequence_length == 0) + return 0; + for (i = i9ep->num_key_bindings - 1; i >= 0; i--) { + if (strcmp(i9ep->key_sequence, i9ep->ici->bound_keyseqs[i])) + continue; + i9ep->key_sequence[0] = '\0'; + i9ep->key_sequence_length = 0; + ret = i9ep->ici->key_handler(i); + return ret < 0? ret : 0; + } + PARA_WARNING_LOG("ignoring key %d\n", i9ep->key_sequence[0]); + /* + * We received an undefined key sequence. Throw away the first byte, + * and try to parse the remainder. + */ + memmove(i9ep->key_sequence, i9ep->key_sequence + 1, + i9ep->key_sequence_length); /* move also terminating zero byte */ + i9ep->key_sequence_length--; + goto again; } /** @@ -423,12 +468,12 @@ 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) { int ret; + memset(i9ep, 0, sizeof(struct i9e_private)); if (!isatty(ici->fds[0])) return -E_I9E_SETUPTERM; ret = mark_fd_nonblocking(ici->fds[0]); @@ -437,10 +482,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; @@ -453,13 +501,18 @@ 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 our dispatcher */ + for (i = 0; (seq = ici->bound_keyseqs[i]); i++) { + if (strlen(seq) >= sizeof(i9ep->key_sequence) - 1) { + PARA_WARNING_LOG("ignoring overlong key %s\n", + seq); + continue; + } + if (rl_bind_keyseq_in_map(seq, + dispatch_key, i9ep->bare_km) != 0) + PARA_WARNING_LOG("could not bind #%d: %s\n", i, seq); } + i9ep->num_key_bindings = i; } if (ici->history_file) read_history(ici->history_file); @@ -467,7 +520,6 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s) if (ici->producer) { rl_callback_handler_install("", i9e_line_handler); i9e_attach_to_stdout(ici->producer); - rl_set_keymap(i9ep->bare_km); } else rl_callback_handler_install(i9ep->ici->prompt, i9e_line_handler); return 1; @@ -503,14 +555,47 @@ __printf_2_3 void i9e_log(int ll, const char* fmt,...) vfprintf(i9ep->stderr_stream, fmt, argp); va_end(argp); reset_line_state(); + i9ep->last_write_was_status = false; +} + +/** + * Print the current status to stderr. + * + * \param buf The text to print. + * \param len The number of bytes in \a buf. + * + * This clears the bottom line, moves to the beginning of the line and prints + * the given text. If the length of this text exceeds the width of the + * terminal, the text is shortened by leaving out a part in the middle. + */ +void ie9_print_status_bar(char *buf, unsigned len) +{ + size_t x = i9ep->num_columns, y = (x - 4) / 2; + + assert(x >= 6); + if (len > x) { + buf[y] = '\0'; + fprintf(i9ep->stderr_stream, "\r%s", buf); + fprintf(i9ep->stderr_stream, " .. "); + fprintf(i9ep->stderr_stream, "%s", buf + len - y); + } else { + char scratch[1000]; + + y = x - len; + scratch[0] = '\r'; + strcpy(scratch + 1, buf); + memset(scratch + 1 + len, ' ', y); + scratch[1 + len + y] = '\r'; + scratch[2 + len + y] = '\0'; + fprintf(i9ep->stderr_stream, "\r%s", scratch); + } + i9ep->last_write_was_status = true; } /** * 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) {