X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=f33fa7c8c42f81ab0f9ea4c724473d9861dd91e2;hp=8c0da59e704a4408322b7729a2042a7f8cc0613b;hb=192417698d9dab017ef6108fa6e9fd5ea1dc5633;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf

diff --git a/gui.c b/gui.c
index 8c0da59e..f33fa7c8 100644
--- a/gui.c
+++ b/gui.c
@@ -6,14 +6,19 @@
 
 /** \file gui.c ncurses-based interface for paraslash */
 
+#include <signal.h>
+#include <sys/types.h>
+#include <dirent.h>
 #include "gui.cmdline.h"
 #include "para.h"
 #include "gui.h"
 #include <curses.h>
 #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 +452,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,...)
@@ -484,7 +490,7 @@ static void setup_signal_handling(void)
 	para_install_sighandler(SIGCHLD);
 	para_install_sighandler(SIGWINCH);
 	para_install_sighandler(SIGUSR1);
-	signal(SIGPIPE, SIG_IGN);
+//	signal(SIGPIPE, SIG_IGN);
 	signal(SIGHUP, SIG_IGN);
 }
 
@@ -720,10 +726,11 @@ static void init_curses(void)
 
 static void check_sigchld(void)
 {
+	int ret;
 	pid_t pid;
 reap_next_child:
-	pid = para_reap_child();
-	if (pid <= 0)
+	ret = para_reap_child(&pid);
+	if (ret <= 0)
 		return;
 	if (pid == cmd_pid) {
 		cmd_pid = 0;
@@ -735,7 +742,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 +754,7 @@ static void check_stat_line(char *line)
 		stat_content[i] = para_strdup(line);
 		print_stat_item(i);
 	}
-	return;
+	return 1;
 }
 
 /*
@@ -911,8 +918,8 @@ repeat:
 			close(audiod_pipe);
 			audiod_pipe = -1;
 			clear_all_items();
-			free(stat_content[SI_STATUS_BAR]);
-			stat_content[SI_STATUS_BAR] =
+			free(stat_content[SI_BASENAME]);
+			stat_content[SI_BASENAME] =
 				para_strdup("audiod not running!?");
 			print_all_items();
 		}
@@ -922,7 +929,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);
@@ -1149,6 +1157,12 @@ static void com_ll_incr(void)
 static void com_reread_conf(void)
 {
 	char *cf =configfile_exists();
+	struct gui_cmdline_parser_params params = {
+		.override = 1,
+		.initialize = 1,
+		.check_required = 0,
+		.check_ambiguity = 0
+	};
 
 	if (!cf) {
 		PARA_WARNING_LOG("%s", "there is no configuration to read");
@@ -1156,7 +1170,7 @@ static void com_reread_conf(void)
 	}
 	PARA_INFO_LOG("%s", "rereading command line options and config file");
 	gui_cmdline_parser(_argc, _argv, &conf);
-	gui_cmdline_parser_configfile(cf, &conf, 1, 1, 0);
+	gui_cmdline_parser_config_file(cf, &conf, &params);
 	PARA_NOTICE_LOG("%s", "config file reloaded");
 	if (check_key_map_args() < 0)
 		finish(EXIT_FAILURE);
@@ -1331,8 +1345,15 @@ int main(int argc, char *argv[])
 			conf.config_file_arg);
 		exit(EXIT_FAILURE);
 	}
-	if (cf)
-		gui_cmdline_parser_configfile(cf, &conf, 0, 0, 0);
+	if (cf) {
+		struct gui_cmdline_parser_params params = {
+			.override = 0,
+			.initialize = 0,
+			.check_required = 0,
+			.check_ambiguity = 0
+		};
+		gui_cmdline_parser_config_file(cf, &conf, &params);
+	}
 	if (check_key_map_args() < 0) {
 		fprintf(stderr, "invalid key map in config file\n");
 		exit(EXIT_FAILURE);