X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gui.c;h=cf25cd4588524afa70989c4212dfecd377c8f538;hb=bf94a866ee741567b4cf8e35d8e6a0565cdfe9bb;hp=f5e65c8bb900b65fc299d0a30842f192450f217a;hpb=73414e9b5d2fcf5b3c65558fbd715148a1a38a2b;p=paraslash.git

diff --git a/gui.c b/gui.c
index f5e65c8b..cf25cd45 100644
--- a/gui.c
+++ b/gui.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1998-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -45,7 +45,7 @@ struct rb_entry {
 	size_t len;
 	int color;
 };
-void *bot_win_rb;
+struct ringbuffer *bot_win_rb;
 #define NUM_LINES(len) (1 + (len) / bot.cols)
 
 static unsigned scroll_position;
@@ -649,7 +649,6 @@ static void print_stat_item(int i)
 	if (!curses_active || !d.len || !c)
 		return;
 	tmp = make_message("%s%s%s", d.prefix, c, d.postfix);
-//	PARA_DEBUG_LOG("%s: read: %s\n", __func__, tmp);
 	wmove(top.win, d.y * top.lines / 100, d.x * COLS / 100);
 	wrefresh(top.win);
 	wattron(top.win, COLOR_PAIR(i + 1));
@@ -681,6 +680,7 @@ static void clear_all_items(void)
 static void init_colors(void)
 {
 	int i;
+
 	if (!has_colors())
 		msg_n_exit(EXIT_FAILURE, "Error: No color term\n");
 	start_color();
@@ -749,7 +749,9 @@ static int check_stat_line(char *line, __a_unused void *data)
 //	PARA_INFO_LOG("%s: checking: %s\n", __func__, line);
 	i = stat_line_valid(line);
 	if (i >= 0) {
-		line += strlen(status_item_list[i]) + 2;
+		line += strlen(status_item_list[i]) + 1;
+		if (*line == ' ')
+			line++;
 		free(stat_content[i]);
 		stat_content[i] = para_strdup(line);
 		print_stat_item(i);
@@ -977,7 +979,7 @@ static int send_output(void)
 static int client_cmd_cmdline(char *cmd)
 {
 	int ret, fds[3] = {0, 1, 0};
-	char *c = make_message(BINDIR "/para_client %s", cmd);
+	char *c = make_message(BINDIR "/para_client -- %s", cmd);
 
 	outputf(COLOR_COMMAND, "%s", c);
 	print_in_bar(COLOR_MSG, "executing client command, hit any key to abort\n");