X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=18375d9b75cca9a6ceee2c8f1af1949e34169311;hp=5a2e659d159e6b6225b5ec94adc2796138d5b358;hb=565c034fe5346b83171ba41ef05bc4e2272168f7;hpb=f76ab46a9216133332cb7e17d38d392caeca22cb

diff --git a/gui.c b/gui.c
index 5a2e659d..18375d9b 100644
--- a/gui.c
+++ b/gui.c
@@ -56,7 +56,7 @@ static unsigned scroll_position;
 static int curses_active;
 static pid_t cmd_pid;
 
-static int command_fds[2];
+static int command_fds[2] = {-1, -1};
 static int stat_pipe = -1;
 static struct gui_args_info conf;
 
@@ -80,18 +80,6 @@ struct gui_command {
 	void (*handler)(void);
 };
 
-struct stat_item {
-	char name[MAXLINE];
-	char prefix[MAXLINE];
-	char postfix[MAXLINE];
-	unsigned y;
-	unsigned x;
-	unsigned len;
-	int fg, bg;
-	int align;
-	char content[MAXLINE];
-};
-
 static struct gui_theme theme;
 
 static int _argc;
@@ -361,7 +349,7 @@ __printf_2_3 static void print_in_bar(int color, const char *fmt,...)
 	xvasprintf(&msg, fmt, ap);
 	va_end(ap);
 	wmove(in.win, 0, 0);
-	align_str(in.win, msg, sb.cols, LEFT);
+	align_str(in.win, msg, in.cols, LEFT);
 	free(msg);
 	wrefresh(in.win);
 }
@@ -384,7 +372,7 @@ static void print_status_bar(void)
 
 /*
  * get the number of the oldest rbe that is (partially) visible. On return,
- * lines contains the sum of the number of lines of all visable entries. If the
+ * lines contains the sum of the number of lines of all visible entries. If the
  * first one is only partially visible, lines is greater than bot.lines.
  */
 static int first_visible_rbe(unsigned *lines)
@@ -518,6 +506,7 @@ __printf_2_3 static void outputf(int color, const char* fmt,...)
 static int add_output_line(char *line, void *data)
 {
 	int color = *(int *)data? COLOR_ERRMSG : COLOR_OUTPUT;
+
 	if (!curses_active)
 		return 1;
 	rb_add_entry(color, para_strdup(line));
@@ -835,7 +824,7 @@ static void init_colors_or_die(void)
 static void init_curses(void)
 {
 	curses_active = 1;
-	if (top.win && refresh() == ERR) /* refesh is really needed */
+	if (top.win && refresh() == ERR) /* refresh is really needed */
 		msg_n_exit(EXIT_FAILURE, "refresh() failed\n");
 	if (LINES < theme.lines_min || COLS < theme.cols_min)
 		msg_n_exit(EXIT_FAILURE, "Error: Terminal (%dx%d) too small"
@@ -860,6 +849,7 @@ static void check_sigchld(void)
 {
 	int ret;
 	pid_t pid;
+
 reap_next_child:
 	ret = para_reap_child(&pid);
 	if (ret <= 0)
@@ -1054,6 +1044,7 @@ repeat:
 				close(command_fds[i]);
 				command_fds[i] = -1;
 				flags[i] = 0;
+				cbo[i] = 0;
 				if (command_fds[!i] < 0) /* both fds closed */
 					return 0;
 			}
@@ -1182,6 +1173,7 @@ static void print_scroll_msg(void)
 {
 	unsigned lines_total, filled = ringbuffer_filled(bot_win_rb);
 	int first_rbe = first_visible_rbe(&lines_total);
+
 	print_in_bar(COLOR_MSG, "scrolled view: %d-%d/%d\n", filled - first_rbe,
 		filled - scroll_position, ringbuffer_filled(bot_win_rb));
 }
@@ -1225,6 +1217,7 @@ static void com_page_down(void)
 {
 	unsigned lines = 0;
 	int i = scroll_position;
+
 	while (lines < bot.lines && --i > 0) {
 		struct rb_entry *rbe = ringbuffer_get(bot_win_rb, i);
 		if (!rbe)
@@ -1347,7 +1340,7 @@ static void com_ll_incr(void)
  */
 static void com_reread_conf(void)
 {
-	char *cf =configfile_exists();
+	char *cf = configfile_exists();
 	struct gui_cmdline_parser_params params = {
 		.override = 1,
 		.initialize = 1,
@@ -1362,7 +1355,13 @@ static void com_reread_conf(void)
 	}
 	PARA_INFO_LOG("rereading command line options and config file");
 	gui_cmdline_parser_ext(_argc, _argv, &conf, &params);
+	/*
+	 * Despite .print_errors is set to 0, gengetopt will print to stderr
+	 * anyway, and exit on errors. So we have to shutdown curses first.
+	 */
+	shutdown_curses();
 	gui_cmdline_parser_config_file(cf, &conf, &params);
+	init_curses();
 	PARA_NOTICE_LOG("config file reloaded");
 	if (check_key_map_args() < 0)
 		finish(EXIT_FAILURE);
@@ -1472,7 +1471,7 @@ static void handle_command(int c)
 {
 	int i;
 
-	/* first check user's key bindings */
+	/* first check user-defined key bindings */
 	for (i = 0; i < conf.key_map_given; ++i) {
 		char *tmp, *handler, *arg;