X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=interactive.c;h=9f4dec175caf12c9ff3bf9ad30b2c90281a9828e;hb=refs%2Fheads%2Fmaint;hp=c34a0f6eb3c5ff3fd6fcb0e85546a180d21fd880;hpb=dda88dcb390a44e1f1f68f6248ed513c75dce4bf;p=paraslash.git

diff --git a/interactive.c b/interactive.c
index c34a0f6e..9f4dec17 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. */
 
@@ -206,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
@@ -335,22 +312,27 @@ static int i9e_post_select(__a_unused struct sched *s, __a_unused void *context)
 		goto rm_btrn;
 	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;
+			while (i9ep->key_sequence_length < sizeof(i9ep->key_sequence) - 1) {
+				buf = i9ep->key_sequence + i9ep->key_sequence_length;
+				ret = read(i9ep->ici->fds[0], buf, 1);
+				if (ret < 0) {
+					ret = -ERRNO_TO_PARA_ERROR(errno);
+					goto rm_btrn;
+				}
+				if (ret == 0) {
+					ret = -E_I9E_EOF;
+					goto rm_btrn;
+				}
+				buf[1] = '\0';
+				i9ep->key_sequence_length++;
+				rl_stuff_char((int)(unsigned char)*buf);
+				rl_callback_read_char();
+				if (!input_available())
+					break;
 			}
-			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();
+			i9ep->key_sequence_length = 0;
+		} else
+			rl_callback_read_char();
 		ret = 0;
 	}
 	if (!i9ep->stdout_btrn)
@@ -785,17 +767,25 @@ int i9e_print_completions(struct i9e_completer *completers)
 	ci.argc = create_argv(ci.buffer, " ", &ci.argv);
 	ci.word_num = compute_word_num(ci.buffer, " ", ci.point);
 
+	/* determine the current word to complete */
 	end = ci.buffer + ci.point;
+
+	if (*end == ' ') {
+		if (ci.point == 0 || ci.buffer[ci.point - 1] == ' ') {
+			ci.word = para_strdup(NULL);
+			goto create_matches;
+		} else /* The cursor is positioned right after a word */
+			end--;
+	}
 	for (p = end; p > ci.buffer && *p != ' '; p--)
 		; /* nothing */
 	if (*p == ' ')
 		p++;
-
 	n = end - p + 1;
 	ci.word = para_malloc(n + 1);
 	strncpy(ci.word, p, n);
 	ci.word[n] = '\0';
-
+create_matches:
 	PARA_DEBUG_LOG("line: %s, point: %d (%c), wordnum: %d, word: %s\n",
 		ci.buffer, ci.point, ci.buffer[ci.point], ci.word_num, ci.word);
 	if (ci.word_num == 0)