X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=interactive.c;h=4de81d0d4a394df6d20f5b3a427ee768118e7981;hp=e4bd6ba20338cfc951613c4e4dca12160f4da068;hb=c0162946c2124d1afd09bc7fc3b0aa4bb386f9f8;hpb=f167629b3191c57a6b691cd2a6af04a45a74ccb0

diff --git a/interactive.c b/interactive.c
index e4bd6ba2..4de81d0d 100644
--- a/interactive.c
+++ b/interactive.c
@@ -6,14 +6,14 @@
 
 /** \file interactive.c Readline abstraction for interactive sessions. */
 
+#include "para.h"
+
 #include <regex.h>
-#include <curses.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 #include <sys/ioctl.h>
 #include <signal.h>
 
-#include "para.h"
 #include "fd.h"
 #include "buffer_tree.h"
 #include "list.h"
@@ -26,6 +26,7 @@ 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 btr_node *stdout_btrn;
@@ -417,15 +418,17 @@ static void update_winsize(void)
  * 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);
 }
 
 /**
@@ -469,13 +472,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);