X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gui.c;h=3b001a7da191a7c5f52a177ee73e0045c81ce05c;hb=133240840bd45fbbe4f4be4c52343e0cd32f7e21;hp=dbe0a19ced1d1da9e2d588a2498dfc931371ee65;hpb=9b565c60fd159e12d255bb18db9dbff066deebea;p=paraslash.git

diff --git a/gui.c b/gui.c
index dbe0a19c..3b001a7d 100644
--- a/gui.c
+++ b/gui.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1998-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -294,9 +294,9 @@ static int align_str(WINDOW* win, char *str, unsigned int len,
 		str[len] = '\0';
 		num = 0;
 	}
-	/* replace newlines by spaces */
+	/* replace control characters by spaces */
 	for (i = 0; i < len && str[i]; i++) {
-		if (str[i] == '\n')
+		if (str[i] == '\n' || str[i] == '\r' || str[i] == '\f')
 			str[i] = ' ';
 	}
 	if (align == LEFT) {
@@ -1228,7 +1228,8 @@ static void com_reread_conf(void)
 		.override = 1,
 		.initialize = 1,
 		.check_required = 0,
-		.check_ambiguity = 0
+		.check_ambiguity = 0,
+		.print_errors = 0,
 	};
 
 	if (!cf) {
@@ -1236,8 +1237,11 @@ static void com_reread_conf(void)
 		return;
 	}
 	PARA_INFO_LOG("rereading command line options and config file");
-	gui_cmdline_parser(_argc, _argv, &conf);
-	gui_cmdline_parser_config_file(cf, &conf, &params);
+	gui_cmdline_parser_ext(_argc, _argv, &conf, &params);
+	if (gui_cmdline_parser_config_file(cf, &conf, &params) != 0) {
+		PARA_EMERG_LOG("errors in config file");
+		finish(EXIT_FAILURE);
+	}
 	PARA_NOTICE_LOG("config file reloaded");
 	if (check_key_map_args() < 0)
 		finish(EXIT_FAILURE);
@@ -1394,17 +1398,9 @@ int main(int argc, char *argv[])
 	_argc = argc;
 	_argv = argv;
 
-	if (gui_cmdline_parser(argc, argv, &conf)) {
-		fprintf(stderr, "parse error while reading command line\n");
+	if (gui_cmdline_parser(argc, argv, &conf) != 0)
 		exit(EXIT_FAILURE);
-	}
 	HANDLE_VERSION_FLAG("gui", conf);
-	init_theme(0, &theme);
-	top.lines = theme.top_lines_default;
-	if (check_key_map_args() < 0) {
-		fprintf(stderr, "invalid key map\n");
-		exit(EXIT_FAILURE);
-	}
 	cf = configfile_exists();
 	if (!cf && conf.config_file_given) {
 		fprintf(stderr, "can not read config file %s\n",
@@ -1416,15 +1412,19 @@ int main(int argc, char *argv[])
 			.override = 0,
 			.initialize = 0,
 			.check_required = 0,
-			.check_ambiguity = 0
+			.check_ambiguity = 0,
+			.print_errors = 1,
 		};
-		gui_cmdline_parser_config_file(cf, &conf, &params);
+		if (gui_cmdline_parser_config_file(cf, &conf, &params) != 0)
+			exit(EXIT_FAILURE);
 	}
 	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	if (check_key_map_args() < 0) {
-		fprintf(stderr, "invalid key map in config file\n");
+		fprintf(stderr, "invalid key map\n");
 		exit(EXIT_FAILURE);
 	}
+	init_theme_or_die(conf.theme_arg, &theme);
+	top.lines = theme.top_lines_default;
 	setup_signal_handling();
 	bot_win_rb = ringbuffer_new(RINGBUFFER_SIZE);
 	initscr(); /* needed only once, always successful */