X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=e734b10c8e9e57438075a14a2cc1941f0c28a7b1;hp=21770ca86a368e177b5d9923f51743fe1932999c;hb=01117585;hpb=bced94f9f81fdf355b61738e968aa8b61bfc36e7;ds=sidebyside

diff --git a/gui.c b/gui.c
index 21770ca8..e734b10c 100644
--- a/gui.c
+++ b/gui.c
@@ -294,20 +294,23 @@ static void add_spaces(WINDOW* win, unsigned int num)
  * print aligned string to curses window. This function always prints
  * exactly len chars.
  */
-static int align_str(WINDOW* win, const char *string, unsigned int len,
+static int align_str(WINDOW* win, char *str, unsigned int len,
 		unsigned int align)
 {
-	int num; /* of spaces */
-	char *str;
+	int i, num; /* of spaces */
 
-	if (!win || !string)
+	if (!win || !str)
 		return -1;
-	num = len - strlen(string);
-	str = para_strdup(string);
+	num = len - strlen(str);
 	if (num < 0) {
 		str[len] = '\0';
 		num = 0;
 	}
+	/* replace newlines by spaces */
+	for (i = 0; i < len; i++) {
+		if (str[i] == '\n')
+			str[i] = ' ';
+	}
 	if (align == LEFT) {
 		waddstr(win, str);
 		add_spaces(win, num);
@@ -319,7 +322,6 @@ static int align_str(WINDOW* win, const char *string, unsigned int len,
 		waddstr(win, str[0]? str: "");
 		add_spaces(win, num - num / 2);
 	}
-	free(str);
 	return 1;
 }
 
@@ -342,10 +344,14 @@ __printf_2_3 static void print_in_bar(int color, const char *fmt,...)
  */
 static void print_status_bar(void)
 {
+	char *tmp;
+
 	if (!curses_active)
 		return;
+	tmp = para_strdup(STANDARD_STATUS_BAR);
 	wmove(sb.win, 0, 0);
-	align_str(sb.win, STANDARD_STATUS_BAR, sb.cols, CENTER);
+	align_str(sb.win, tmp, sb.cols, CENTER);
+	free(tmp);
 	wrefresh(sb.win);
 }
 
@@ -669,9 +675,6 @@ static void print_stat_item(int i)
 	wrefresh(top.win);
 }
 
-/*
- * print status line if line starts with known command.
- */
 static int update_item(int item_num, char *buf)
 {
 	free(stat_content[item_num]);