X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=interactive.c;h=b72148cc41df54e79f0da53bd4853ba979674a0c;hp=9f8a5013b44e3bc3cb1119483b30c0687bb08010;hb=de9ce9690ac6194e8e7eaacd10baf21d827e42a4;hpb=72330a682b4db019af84bf9a9ee09bb78681d4ad

diff --git a/interactive.c b/interactive.c
index 9f8a5013..b72148cc 100644
--- a/interactive.c
+++ b/interactive.c
@@ -28,6 +28,8 @@ 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;
@@ -328,8 +330,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);
@@ -417,13 +437,26 @@ 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;
 }
 
 /**
@@ -470,6 +503,11 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s)
 		int i;
 		/* 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);