X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=interactive.c;h=190cdf295130a2d711074e7c5f5927174b312076;hp=ce48af329e45c31961a0a39dbba3b975d67ec207;hb=99f21f0b6ecf29f949cdbce285e241a2e3ef3093;hpb=9d8fdf8898418711558f70a9630b2444036d8285

diff --git a/interactive.c b/interactive.c
index ce48af32..190cdf29 100644
--- a/interactive.c
+++ b/interactive.c
@@ -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,6 +24,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;
@@ -36,6 +34,7 @@ struct i9e_private {
 	bool caught_sigterm;
 	Keymap standard_km;
 	Keymap bare_km;
+	int fd_flags[2];
 };
 static struct i9e_private i9e_private, *i9ep = &i9e_private;
 
@@ -203,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
@@ -252,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)
@@ -328,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);
@@ -417,13 +417,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;
 }
 
 /**
@@ -440,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;
@@ -467,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)