compress: Overhaul the meaning of --aggressiveness.
[paraslash.git] / interactive.c
index 4de81d0..190cdf2 100644 (file)
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2011 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2011 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file interactive.c Readline abstraction for interactive sessions. */
 
@@ -28,15 +24,17 @@ struct i9e_private {
        int num_columns;
        int num_key_bindings;
        char empty_line[1000];
+       char key_sequence[32];
+       unsigned key_sequence_length;
        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;
        Keymap standard_km;
        Keymap bare_km;
+       int fd_flags[2];
 };
 static struct i9e_private i9e_private, *i9ep = &i9e_private;
 
@@ -204,26 +202,7 @@ void i9e_attach_to_stdout(struct btr_node *producer)
 
 static void wipe_bottom_line(void)
 {
-       char x[] = "          ";
-       int n = i9ep->num_columns;
-
-       /*
-        * For reasons beyond my understanding, writing more than 68 characters
-        * here causes MacOS to mess up the terminal. Writing a line of spaces
-        * in smaller chunks works fine though. Weird.
-        */
-       fprintf(i9ep->stderr_stream, "\r");
-       while (n > 0) {
-               if (n >= sizeof(x)) {
-                       fprintf(i9ep->stderr_stream, "%s", x);
-                       n -= sizeof(x);
-                       continue;
-               }
-               x[n] = '\0';
-               fprintf(i9ep->stderr_stream, "%s", x);
-               break;
-       }
-       fprintf(i9ep->stderr_stream, "\r");
+       fprintf(i9ep->stderr_stream, "\r%s\r", i9ep->empty_line);
 }
 
 #ifndef RL_FREE_KEYMAP_DECLARED
@@ -253,6 +232,8 @@ void i9e_close(void)
        if (hf)
                write_history(hf);
        wipe_bottom_line();
+       fcntl(i9ep->ici->fds[0], F_SETFL, i9ep->fd_flags[0]);
+       fcntl(i9ep->ici->fds[1], F_SETFL, i9ep->fd_flags[1]);
 }
 
 static void clear_bottom_line(void)
@@ -329,8 +310,26 @@ static int i9e_post_select(__a_unused struct sched *s, __a_unused void *context)
        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);
@@ -414,21 +413,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.
- */
 static int dispatch_key(__a_unused int count, __a_unused int key)
 {
        int i, ret;
 
+again:
+       if (i9ep->key_sequence_length == 0)
+               return 0;
        for (i = i9ep->num_key_bindings - 1; i >= 0; i--) {
-               if (strcmp(rl_executing_keyseq, i9ep->ici->bound_keyseqs[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;
        }
-       assert(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;
 }
 
 /**
@@ -445,8 +453,17 @@ 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 = fcntl(ici->fds[0], F_GETFL);
+       if (ret < 0)
+               return -E_I9E_SETUPTERM;
+       i9ep->fd_flags[0] = ret;
+       ret = fcntl(ici->fds[1], F_GETFL);
+       if (ret < 0)
+               return -E_I9E_SETUPTERM;
+       i9ep->fd_flags[1] = ret;
        ret = mark_fd_nonblocking(ici->fds[0]);
        if (ret < 0)
                return ret;
@@ -472,10 +489,17 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s)
        if (ici->bound_keyseqs) {
                char *seq;
                int i;
-               /* 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);
+               /* 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)
@@ -484,7 +508,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;
@@ -561,8 +584,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)
 {