X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=8b1b39a876e3ea84cc6cde1800edb4df3bdf026a;hp=232572914bd9b7ca83038a334a7cff1b3ce2fdaf;hb=6570e0e4433a5e5d7987697716a1f993c96eb1bb;hpb=e57d2b9211bb734b71838142a7936fe6dfdc449c

diff --git a/gui.c b/gui.c
index 23257291..8b1b39a8 100644
--- a/gui.c
+++ b/gui.c
@@ -61,7 +61,7 @@ static pid_t external_cmd_pid;
 
 static int command_pipe = -1;
 static int audiod_pipe = -1;
-static struct gengetopt_args_info conf;
+static struct gui_args_info conf;
 
 enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE};
 
@@ -886,21 +886,15 @@ repeat:
 	/* audiod pipe */
 	if (audiod_pipe < 0)
 		audiod_pipe = open_audiod_pipe();
-	if (audiod_pipe >= 0) {
-		FD_SET(audiod_pipe, &rfds);
-		max_fileno = MAX(max_fileno, audiod_pipe);
-	}
-
+	if (audiod_pipe >= 0)
+		para_fd_set(audiod_pipe, &rfds, &max_fileno);
 	/* signal pipe */
-	FD_SET(signal_pipe, &rfds);
-	max_fileno = MAX(max_fileno, signal_pipe);
+	para_fd_set(signal_pipe, &rfds, &max_fileno);
 	/* command pipe only for COMMAND_MODE */
-	if (command_pipe >= 0 && mode == COMMAND_MODE) {
-		FD_SET(command_pipe, &rfds);
-		max_fileno = MAX(max_fileno, command_pipe);
-	}
+	if (command_pipe >= 0 && mode == COMMAND_MODE)
+		para_fd_set(command_pipe, &rfds, &max_fileno);
 	if (curses_active)
-		FD_SET(STDIN_FILENO, &rfds);
+		para_fd_set(STDIN_FILENO, &rfds, &max_fileno);
 	ret = para_select(max_fileno + 1, &rfds, NULL, &tv);
 //	PARA_DEBUG_LOG("select returned %d\n", ret);
 	if (ret <= 0)
@@ -1163,8 +1157,8 @@ static void com_reread_conf(void)
 		return;
 	}
 	PARA_INFO_LOG("%s", "rereading command line options and config file");
-	cmdline_parser(_argc, _argv, &conf);
-	cmdline_parser_configfile(cf, &conf, 1, 1, 0);
+	gui_cmdline_parser(_argc, _argv, &conf);
+	gui_cmdline_parser_configfile(cf, &conf, 1, 1, 0);
 	PARA_NOTICE_LOG("%s", "configuration read");
 	if (check_key_map_args() < 0)
 		finish(EXIT_FAILURE);
@@ -1321,7 +1315,7 @@ int main(int argc, char *argv[])
 	_argc = argc;
 	_argv = argv;
 
-	if (cmdline_parser(argc, argv, &conf)) {
+	if (gui_cmdline_parser(argc, argv, &conf)) {
 		fprintf(stderr, "parse error while reading command line\n");
 		exit(EXIT_FAILURE);
 	}
@@ -1338,7 +1332,7 @@ int main(int argc, char *argv[])
 		exit(EXIT_FAILURE);
 	}
 	if (cf)
-		cmdline_parser_configfile(cf, &conf, 0, 0, 0);
+		gui_cmdline_parser_configfile(cf, &conf, 0, 0, 0);
 	if (check_key_map_args() < 0) {
 		fprintf(stderr, "invalid key map in config file\n");
 		exit(EXIT_FAILURE);