X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=interactive.c;h=6831643878761be2da1c4ee8f79b7ce6ccf2f21f;hp=f75e4be531d94521bf87f8baf19b5f4dfb5b6739;hb=6cb789ba07d3830f1d7fbff9daa059eb1c99c166;hpb=3ba7724e92b52f5933632ff7d948d0f9491440db

diff --git a/interactive.c b/interactive.c
index f75e4be5..68316438 100644
--- a/interactive.c
+++ b/interactive.c
@@ -38,6 +38,20 @@ struct i9e_private {
 };
 static struct i9e_private i9e_private, *i9ep = &i9e_private;
 
+/**
+ * Return the error state of the i9e task.
+ *
+ * This is mainly useful for other tasks to tell whether the i9e task is still
+ * running.
+ *
+ * \return A negative return value of zero means the i9e task terminated. Only
+ * in this case it is safe to call ie9_close().
+ */
+int i9e_get_error(void)
+{
+	return i9ep->task.error;
+}
+
 static bool is_prefix(const char *partial, const char *full, size_t len)
 {
 	if (len == 0)
@@ -187,7 +201,26 @@ void i9e_attach_to_stdout(struct btr_node *producer)
 
 static void wipe_bottom_line(void)
 {
-	fprintf(i9ep->stderr_stream, "\r%s\r", i9ep->empty_line);
+	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");
 }
 
 /**
@@ -388,7 +421,11 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s)
 	if (ici->history_file)
 		read_history(ici->history_file);
 	update_winsize();
-	rl_callback_handler_install(i9ep->ici->prompt, i9e_line_handler);
+	if (ici->producer) {
+		rl_callback_handler_install("", i9e_line_handler);
+		i9e_attach_to_stdout(ici->producer);
+	} else
+		rl_callback_handler_install(i9ep->ici->prompt, i9e_line_handler);
 	return 1;
 }