i9e: print warning if keyseq can not be mapped.

[paraslash.git] / interactive.c

diff --git a/interactive.c b/interactive.c
index cab8d9033ba6c817f01e858a7d4ef4946a36e3a7..9f8a5013b44e3bc3cb1119483b30c0687bb08010 100644 (file)
--- a/interactive.c
+++ b/interactive.c
@@ -413,10 +413,6 @@ 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;
@@ -444,6 +440,7 @@ 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]);
@@ -471,10 +468,12 @@ 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 (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)
@@ -483,7 +482,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;