X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=ffd1ea842039760bd6a1ec268a01423334bbb368;hp=a347e79c155d47186f7fe006759dfb05ba34e0cc;hb=b8bc24e242b088195249574bb90cda2e1ee1d9e4;hpb=4b4c68de8d7390f966e46d9402d5499d2e8ee227

diff --git a/gui.c b/gui.c
index a347e79c..ffd1ea84 100644
--- a/gui.c
+++ b/gui.c
@@ -23,7 +23,11 @@
 #include <curses.h>
 #include "ringbuffer.h"
 #include "string.h"
+#include "fd.h"
+#include "error.h"
 
+/** define the array of error lists needed by para_gui */
+INIT_GUI_ERRLISTS;
 extern const char *status_item_list[NUM_STAT_ITEMS];
 static char *stat_content[NUM_STAT_ITEMS];
 
@@ -57,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};
 
@@ -73,9 +77,9 @@ enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE};
 #define COLOR_BOT 40
 
 struct gui_command {
-	char *key;
-	char *name;
-	char *description;
+	const char *key;
+	const char *name;
+	const char *description;
 	void (*handler)(void);
 };
 
@@ -284,7 +288,7 @@ 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, char *string, unsigned int len,
+static int align_str(WINDOW* win, const char *string, unsigned int len,
 		unsigned int align)
 {
 	int num; /* of spaces */
@@ -313,7 +317,7 @@ static int align_str(WINDOW* win, char *string, unsigned int len,
 	return 1;
 }
 
-__printf_2_3 static void print_in_bar(int color, char *fmt,...)
+__printf_2_3 static void print_in_bar(int color, const char *fmt,...)
 {
 	char *msg;
 
@@ -442,7 +446,7 @@ static void rb_add_entry(int color, char *msg)
 /*
  * print formated output to bot win and refresh
  */
-__printf_2_3 static void outputf(int color, char* fmt,...)
+__printf_2_3 static void outputf(int color, const char* fmt,...)
 {
 	char *msg;
 
@@ -460,7 +464,7 @@ static void add_output_line(char *line)
 	rb_add_entry(COLOR_OUTPUT, para_strdup(line));
 }
 
-void para_log(int ll, char *fmt,...)
+void para_log(int ll, const char *fmt,...)
 {
 	int color;
 	char *msg;
@@ -519,7 +523,7 @@ static void finish(int ret)
 /*
  * exit curses and print given message to stdout/stderr
  */
-__printf_2_3 static void msg_n_exit(int ret, char* fmt, ...)
+__printf_2_3 static void msg_n_exit(int ret, const char* fmt, ...)
 {
 	va_list argp;
 	FILE *outfd = ret? stderr: stdout;
@@ -882,31 +886,22 @@ 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);
-	}
-	FD_SET(STDIN_FILENO, &rfds);
-	ret = select(max_fileno + 1, &rfds, NULL, NULL, &tv);
-//	PARA_DEBUG_LOG("select returned %d\n", ret);
-
+	if (command_pipe >= 0 && mode == COMMAND_MODE)
+		para_fd_set(command_pipe, &rfds, &max_fileno);
+	ret = para_select(max_fileno + 1, &rfds, NULL, &tv);
+	if (ret <= 0)
+		goto check_return; /* skip fd checks */
 	/* signals */
 	if (FD_ISSET(signal_pipe, &rfds)) {
 		int sig_nr = para_next_signal();
 		if (sig_nr > 0)
 			handle_signal(sig_nr);
 	}
-	if (ret <= 0)
-		goto check_return; /* skip fd checks */
 	/* read command pipe if ready */
 	if (command_pipe >= 0 && mode == COMMAND_MODE &&
 			FD_ISSET(command_pipe, &rfds)) {
@@ -937,7 +932,7 @@ check_return:
 		if (cp_numread <= 0 && !cbo) /* command complete */
 			return 0;
 		if (cbo)
-			cbo = for_each_line(command_buf, cbo, &add_output_line, 0);
+			cbo = for_each_line(command_buf, cbo, &add_output_line);
 		if (cp_numread <= 0)
 			cbo = 0;
 		wrefresh(bot.win);
@@ -1088,22 +1083,22 @@ static void com_scroll_up(void)
 {
 	struct rb_entry *rbe = NULL;
 	unsigned lines;
-	int i, first_rbe, scroll;
+	int i, first_rbe, num_scroll;
 
 	/* the entry that is going to vanish */
 	rbe = ringbuffer_get(bot_win_rb, scroll_position);
 	if (!rbe)
 		goto err_out;
-	scroll = NUM_LINES(rbe->len);
+	num_scroll = NUM_LINES(rbe->len);
 	first_rbe = first_visible_rbe(&lines);
 	if (first_rbe < 0 || (first_rbe == ringbuffer_filled(bot_win_rb) - 1))
 		goto err_out;
 	scroll_position++;
-	wscrl(bot.win, -scroll);
+	wscrl(bot.win, -num_scroll);
 	i = draw_top_rbe(&lines);
 	if (i < 0)
 		goto err_out;
-	while (i > 0 && lines < scroll) {
+	while (i > 0 && lines < num_scroll) {
 		int rbe_lines;
 		rbe = ringbuffer_get(bot_win_rb, --i);
 		if (!rbe)
@@ -1159,8 +1154,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);
@@ -1171,24 +1166,26 @@ static void com_help(void)
 	int i;
 
 	for (i = 0; i < conf.key_map_given; ++i) {
-		char *s = conf.key_map_arg[i], *handler, *arg,
-			*desc = "", tmp[MAXLINE];
+		char *handler, *arg, *tmp = para_strdup(conf.key_map_arg[i]);
+		const char *handler_text = "???", *desc = NULL;
 
-		strcpy(tmp, s);
-		if (!split_key_map(tmp, &handler, &arg))
+		if (!split_key_map(tmp, &handler, &arg)) {
+			free(tmp);
 			return;
-		switch(*handler) {
+		}
+		switch (*handler) {
 			case 'i':
-				handler = "internal";
+				handler_text = "internal";
 				desc = command_list[find_cmd_byname(arg)].description;
 				break;
-			case 'x': handler = "external"; break;
-			case 'd': handler = "display "; break;
-			case 'p': handler = "para    "; break;
+			case 'x': handler_text = "external"; break;
+			case 'd': handler_text = "display "; break;
+			case 'p': handler_text = "para    "; break;
 		}
-		outputf(COLOR_MSG, "%s\t%s\t%s%s\t%s", tmp, handler, arg,
+		outputf(COLOR_MSG, "%s\t%s\t%s%s\t%s", tmp, handler_text, arg,
 			strlen(arg) < 8? "\t" : "",
-			desc);
+			desc? desc : "");
+		free(tmp);
 	}
 	for (i = 0; command_list[i].handler; i++) {
 		struct gui_command gc = command_list[i];
@@ -1199,7 +1196,6 @@ static void com_help(void)
 	}
 	print_in_bar(COLOR_MSG, "try \"para_gui -h\" or \"para_client help\" "
 		"for more info");
-	return;
 }
 
 static void com_shrink_top_win(void)
@@ -1316,7 +1312,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);
 	}
@@ -1333,7 +1329,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);