X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=28291a867fd99aea2f6d4abeb96c7e671abc8fc3;hp=a2d3e6cd5b63c5d867d793939dbae219196b6bab;hb=c34f298fa8e51980b7b3e97aa995acb263ea8bed;hpb=8dffec19598a4a0ed77fa082abaf52c8fe66d889 diff --git a/gui.c b/gui.c index a2d3e6cd..28291a86 100644 --- a/gui.c +++ b/gui.c @@ -11,9 +11,11 @@ #include "gui.h" #include #include "ringbuffer.h" -#include "string.h" +#include "gui_common.h" #include "fd.h" #include "error.h" +#include "list.h" +#include "sched.h" #include "signal.h" /** define the array of error lists needed by para_gui */ @@ -447,11 +449,12 @@ __printf_2_3 static void outputf(int color, const char* fmt,...) wrefresh(bot.win); } -static void add_output_line(char *line) +static int add_output_line(char *line, __a_unused void *data) { if (!curses_active) - return; + return 1; rb_add_entry(COLOR_OUTPUT, para_strdup(line)); + return 1; } void para_log(int ll, const char *fmt,...) @@ -735,7 +738,7 @@ reap_next_child: /* * print status line if line starts with known command. */ -static void check_stat_line(char *line) +static int check_stat_line(char *line, __a_unused void *data) { int i; @@ -747,7 +750,7 @@ static void check_stat_line(char *line) stat_content[i] = para_strdup(line); print_stat_item(i); } - return; + return 1; } /* @@ -922,7 +925,8 @@ check_return: if (cp_numread <= 0 && !cbo) /* command complete */ return 0; if (cbo) - cbo = for_each_line(command_buf, cbo, &add_output_line); + cbo = for_each_line(command_buf, cbo, + &add_output_line, NULL); if (cp_numread <= 0) cbo = 0; wrefresh(bot.win);