X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=gui.c;h=c20bb7ac98c5d05a9c63c9103a69873b257f0dad;hb=191e65bdb00536514b8051b6d8e5b4d6772e948f;hp=5092315e681f086c365f4af2644ec7e540532817;hpb=b01605d7062e4d1f005d5aaaaed158d8efe06d79;p=paraslash.git

diff --git a/gui.c b/gui.c
index 5092315e..c20bb7ac 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);
@@ -559,7 +560,6 @@ static void setup_signal_handling(void)
 	para_install_sighandler(SIGCHLD);
 	para_install_sighandler(SIGWINCH);
 	para_install_sighandler(SIGUSR1);
-	para_sigaction(SIGHUP, SIG_IGN);
 }
 
 /* kill every process in the process group and exit */
@@ -604,8 +604,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);
 }
 
@@ -1431,8 +1431,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)
@@ -1511,6 +1510,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;
@@ -1520,8 +1528,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",