X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=54fc9db98bd91ad836eb79288d42927eadcb1fcf;hp=096beb93bfd82f91a68c454779edaa6c59e8a565;hb=fb4022dfafa1d6f86f741767ecaed8e41c53352a;hpb=d46a0767b58654f15f16406cf99296287bd0d534

diff --git a/gui.c b/gui.c
index 096beb93..54fc9db9 100644
--- a/gui.c
+++ b/gui.c
@@ -23,6 +23,7 @@
 #include "list.h"
 #include "sched.h"
 #include "signal.h"
+#include "ggo.h"
 #include "version.h"
 
 /** define the array of error lists needed by para_gui */
@@ -293,7 +294,7 @@ static char *configfile_exists(void)
 static void add_spaces(WINDOW* win, unsigned int num)
 {
 	char space[] = "                                ";
-	unsigned sz = sizeof(space);
+	unsigned sz = sizeof(space) - 1; /* number of spaces */
 
 	while (num >= sz)  {
 		waddstr(win, space);
@@ -525,7 +526,7 @@ static int add_output_line(char *line, void *data)
 
 static int loglevel;
 
-__printf_2_3 void curses_log(int ll, const char *fmt,...)
+static __printf_2_3 void curses_log(int ll, const char *fmt,...)
 {
 	int color;
 	char *msg;
@@ -604,8 +605,8 @@ static void print_welcome(void)
 {
 	if (loglevel > LL_NOTICE)
 		return;
-	outputf(COLOR_WELCOME, "Welcome to para_gui " PACKAGE_VERSION
-		" \"" CODENAME "\". Theme: %s", theme.name);
+	outputf(COLOR_WELCOME, "Welcome to %s. Theme: %s",
+		version_single_line("gui"), theme.name);
 	wclrtoeol(bot.win);
 }
 
@@ -1362,10 +1363,7 @@ static void com_reread_conf(void)
 	}
 	PARA_INFO_LOG("rereading command line options and config file");
 	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);
-	}
+	gui_cmdline_parser_config_file(cf, &conf, &params);
 	PARA_NOTICE_LOG("config file reloaded");
 	if (check_key_map_args() < 0)
 		finish(EXIT_FAILURE);
@@ -1434,8 +1432,7 @@ static void com_enlarge_top_win(void)
 
 static void com_version(void)
 {
-	print_in_bar(COLOR_MSG, "para_gui " PACKAGE_VERSION " \""
-		CODENAME "\"");
+	print_in_bar(COLOR_MSG, "%s", version_single_line("gui"));
 }
 
 __noreturn static void com_quit(void)
@@ -1514,6 +1511,15 @@ static void handle_command(int c)
 		km_keyname(c));
 }
 
+__noreturn static void print_help_and_die(void)
+{
+	struct ggo_help h = DEFINE_GGO_HELP(gui);
+	bool d = conf.detailed_help_given;
+
+	ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
+	exit(0);
+}
+
 int main(int argc, char *argv[])
 {
 	int ret;
@@ -1523,7 +1529,10 @@ int main(int argc, char *argv[])
 	_argv = argv;
 
 	gui_cmdline_parser(argc, argv, &conf); /* exits on errors */
-	HANDLE_VERSION_FLAG("gui", conf);
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
+	version_handle_flag("gui", conf.version_given);
+	if (conf.help_given || conf.detailed_help_given)
+		print_help_and_die();
 	cf = configfile_exists();
 	if (!cf && conf.config_file_given) {
 		fprintf(stderr, "can not read config file %s\n",
@@ -1538,10 +1547,9 @@ int main(int argc, char *argv[])
 			.check_ambiguity = 0,
 			.print_errors = 1,
 		};
-		if (gui_cmdline_parser_config_file(cf, &conf, &params) != 0)
-			exit(EXIT_FAILURE);
+		gui_cmdline_parser_config_file(cf, &conf, &params);
+		loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	}
-	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	if (check_key_map_args() < 0) {
 		fprintf(stderr, "invalid key map\n");
 		exit(EXIT_FAILURE);