X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=0bee5c669b1b83c3c70c2f720b42deeeecc3a093;hp=5092315e681f086c365f4af2644ec7e540532817;hb=437f43a249386381f49cfb42536353f3df1fa824;hpb=b01605d7062e4d1f005d5aaaaed158d8efe06d79

diff --git a/gui.c b/gui.c
index 5092315e..0bee5c66 100644
--- a/gui.c
+++ b/gui.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1998-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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 */
@@ -55,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;
 
@@ -79,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;
@@ -293,7 +282,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);
@@ -360,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);
 }
@@ -525,7 +514,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;
@@ -559,7 +548,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 +592,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);
 }
 
@@ -1054,6 +1042,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;
 			}
@@ -1362,7 +1351,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);
@@ -1431,8 +1426,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 +1505,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 +1523,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",