X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=318418ea1e7959ba2aeba35d7df7af01da779338;hp=01af3227ffda5227d8243c9c8ec5a51ea79b62c9;hb=f840be8d;hpb=c2ff586ae77f1ab640d5f8b3ceb12786fcc4cbaa

diff --git a/gui.c b/gui.c
index 01af3227..318418ea 100644
--- a/gui.c
+++ b/gui.c
@@ -34,10 +34,6 @@ static int signal_pipe;
 
 static struct gui_window {
 	WINDOW *win;
-	size_t begx;
-	size_t begy;
-	size_t cols;
-	size_t lines;
 } top, bot, sb, in, sep;
 
 #define RINGBUFFER_SIZE 512
@@ -47,16 +43,15 @@ struct rb_entry {
 	int color;
 };
 static struct ringbuffer *bot_win_rb;
-#define NUM_LINES(len) (1 + (len) / bot.cols)
 
 static unsigned scroll_position;
 
-static bool curses_active;
 static pid_t cmd_pid;
 
 static int command_fds[2] = {-1, -1};
 static int stat_pipe = -1;
 static struct gui_args_info conf;
+static int loglevel;
 
 enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE};
 
@@ -87,9 +82,6 @@ struct gui_command {
 
 static struct gui_theme theme;
 
-static int _argc;
-static char **_argv;
-
 static void com_help(void);
 static void com_reread_conf(void);
 static void com_enlarge_top_win(void);
@@ -209,6 +201,37 @@ static int find_cmd_byname(char *name)
 	return -1;
 }
 
+/*
+ * Even though ncurses provides getmaxx and getmaxy, these functions/macros are
+ * not described in the XSI Curses standard.
+ */
+static int get_num_lines(struct gui_window *w)
+{
+	int lines;
+	__a_unused int cols; /* avoid "set but not used" warnings */
+
+	getmaxyx(w->win, lines, cols);
+	return lines;
+}
+
+static int get_num_cols(struct gui_window *w)
+{
+	__a_unused int lines; /* avoid "set but not used" warnings */
+	int cols;
+
+	getmaxyx(w->win, lines, cols);
+	return cols;
+}
+
+/** Number of lines of the window are occupied by an output line. */
+#define NUM_LINES(len) (1 + (len) / get_num_cols(&bot))
+
+/* isendwin() returns false before initscr() was called */
+static bool curses_active(void)
+{
+	return top.win && !isendwin();
+}
+
 /* taken from mutt */
 static char *km_keyname(int c)
 {
@@ -265,24 +288,6 @@ static char *km_keyname(int c)
 	return buf;
 }
 
-static char *configfile_exists(void)
-{
-	static char *config_file;
-	char *tmp;
-
-	if (!conf.config_file_given) {
-		if (!config_file) {
-			char *home = para_homedir();
-			config_file = make_message("%s/.paraslash/gui.conf",
-				home);
-			free(home);
-		}
-		tmp = config_file;
-	} else
-		tmp = conf.config_file_arg;
-	return file_exists(tmp)? tmp: NULL;
-}
-
 /* Print given number of spaces to curses window. */
 static void add_spaces(WINDOW* win, unsigned int num)
 {
@@ -347,14 +352,14 @@ __printf_2_3 static void print_in_bar(int color, const char *fmt,...)
 	char *msg;
 	va_list ap;
 
-	if (!curses_active)
+	if (!curses_active())
 		return;
 	wattron(in.win, COLOR_PAIR(color));
 	va_start(ap, fmt);
 	xvasprintf(&msg, fmt, ap);
 	va_end(ap);
 	wmove(in.win, 0, 0);
-	align_str(in.win, msg, in.cols, LEFT);
+	align_str(in.win, msg, get_num_cols(&in), LEFT);
 	free(msg);
 	wrefresh(in.win);
 }
@@ -365,7 +370,7 @@ static void print_status_bar(void)
 
 	tmp = para_strdup("para_gui " PACKAGE_VERSION " (hit ? for help)");
 	wmove(sb.win, 0, 0);
-	align_str(sb.win, tmp, sb.cols, CENTER);
+	align_str(sb.win, tmp, get_num_cols(&sb), CENTER);
 	free(tmp);
 }
 
@@ -376,19 +381,19 @@ static void print_status_bar(void)
  */
 static int first_visible_rbe(unsigned *lines)
 {
-	int i;
+	int i, bot_lines = get_num_lines(&bot);
+
 	*lines = 0;
 	for (i = scroll_position; i < RINGBUFFER_SIZE; i++) {
 		struct rb_entry *rbe = ringbuffer_get(bot_win_rb, i);
 		int rbe_lines;
 		if (!rbe)
 			return i - 1;
-//		fprintf(stderr, "found: %s\n", rbe->msg);
 		rbe_lines = NUM_LINES(rbe->len);
-		if (rbe_lines > bot.lines)
+		if (rbe_lines > bot_lines)
 			return -1;
 		*lines += rbe_lines;
-		if (*lines >= bot.lines)
+		if (*lines >= bot_lines)
 			return i;
 	}
 	return RINGBUFFER_SIZE - 1;
@@ -399,7 +404,7 @@ returns number of first visible rbe, *lines is the number of lines drawn.
  */
 static int draw_top_rbe(unsigned *lines)
 {
-	int ret, fvr = first_visible_rbe(lines);
+	int bot_cols, bot_lines, ret, fvr = first_visible_rbe(lines);
 	struct rb_entry *rbe;
 	size_t bytes_to_skip, cells_to_skip, width;
 
@@ -409,9 +414,10 @@ static int draw_top_rbe(unsigned *lines)
 	rbe = ringbuffer_get(bot_win_rb, fvr);
 	if (!rbe)
 		return -1;
-	if (*lines > bot.lines) {
+	getmaxyx(bot.win, bot_lines, bot_cols);
+	if (*lines > bot_lines) {
 		/* rbe is partially visible multi-line */
-		cells_to_skip = (*lines - bot.lines) * bot.cols;
+		cells_to_skip = (*lines - bot_lines) * bot_cols;
 		ret = skip_cells(rbe->msg, cells_to_skip, &bytes_to_skip);
 		if (ret < 0)
 			return ret;
@@ -431,14 +437,14 @@ static int draw_top_rbe(unsigned *lines)
 static void redraw_bot_win(void)
 {
 	unsigned lines;
-	int i;
+	int i, bot_lines = get_num_lines(&bot);
 
 	wmove(bot.win, 0, 0);
 	wclear(bot.win);
 	i = draw_top_rbe(&lines);
 	if (i <= 0)
 		goto out;
-	while (i > 0 && lines < bot.lines) {
+	while (i > 0 && lines < bot_lines) {
 		struct rb_entry *rbe = ringbuffer_get(bot_win_rb, --i);
 		if (!rbe) {
 			lines++;
@@ -467,7 +473,6 @@ static void rb_add_entry(int color, char *msg)
 	new->len = len;
 	new->msg = msg;
 	old = ringbuffer_add(bot_win_rb, new);
-//	fprintf(stderr, "added: %s\n", new->msg);
 	if (old) {
 		free(old->msg);
 		free(old);
@@ -493,7 +498,7 @@ __printf_2_3 static void outputf(int color, const char* fmt,...)
 	char *msg;
 	va_list ap;
 
-	if (!curses_active)
+	if (!curses_active())
 		return;
 	va_start(ap, fmt);
 	xvasprintf(&msg, fmt, ap);
@@ -506,39 +511,30 @@ static int add_output_line(char *line, void *data)
 {
 	int color = *(int *)data? COLOR_ERRMSG : COLOR_OUTPUT;
 
-	if (!curses_active)
+	if (!curses_active())
 		return 1;
 	rb_add_entry(color, para_strdup(line));
 	return 1;
 }
 
-static int loglevel;
-
 static __printf_2_3 void curses_log(int ll, const char *fmt,...)
 {
-	int color;
-	char *msg;
 	va_list ap;
-	unsigned bytes;
 
-	if (ll < loglevel || !curses_active)
+	if (ll < loglevel)
 		return;
-	switch (ll) {
-		case LL_DEBUG:
-		case LL_INFO:
-		case LL_NOTICE:
-			color = COLOR_MSG;
-			break;
-		default:
-			color = COLOR_ERRMSG;
-	}
 	va_start(ap, fmt);
-	bytes = xvasprintf(&msg, fmt, ap);
+	if (curses_active()) {
+		int color = ll <= LL_NOTICE? COLOR_MSG : COLOR_ERRMSG;
+		char *msg;
+		unsigned bytes = xvasprintf(&msg, fmt, ap);
+		if (bytes > 0 && msg[bytes - 1] == '\n')
+			msg[bytes - 1] = '\0'; /* cut trailing newline */
+		rb_add_entry(color, msg);
+		wrefresh(bot.win);
+	} else if (cmd_pid <= 0) /* no external command running */
+		vfprintf(stderr, fmt, ap);
 	va_end(ap);
-	if (bytes > 0 && msg[bytes - 1] == '\n')
-		msg[bytes - 1] = '\0'; /* cut trailing newline */
-	rb_add_entry(color, msg);
-	wrefresh(bot.win);
 }
 __printf_2_3 void (*para_log)(int, const char*, ...) = curses_log;
 
@@ -552,127 +548,25 @@ static void setup_signal_handling(void)
 	para_install_sighandler(SIGUSR1);
 }
 
-/* kill every process in the process group and exit */
-__noreturn static void kill_pg_and_die(int ret)
-{
-	para_sigaction(SIGTERM, SIG_IGN);
-	kill(0, SIGTERM);
-	exit(ret);
-}
-
 static void shutdown_curses(void)
 {
-	if (!curses_active)
-		return;
 	def_prog_mode();
-	curses_active = false;
 	endwin();
 }
 
-__noreturn static void finish(int ret)
-{
-	shutdown_curses();
-	kill_pg_and_die(ret);
-}
-
-/*
- * exit curses and print given message to stdout/stderr
- */
-__noreturn __printf_2_3 static void msg_n_exit(int ret, const char* fmt, ...)
+/* disable curses, print a message, kill running processes and exit */
+__noreturn __printf_2_3 static void die(int exit_code, const char* fmt, ...)
 {
 	va_list argp;
-	FILE *outfd = ret? stderr: stdout;
 
 	shutdown_curses();
 	va_start(argp, fmt);
-	vfprintf(outfd, fmt, argp);
+	vfprintf(stderr, fmt, argp);
 	va_end(argp);
-	kill_pg_and_die(ret);
-}
-
-/*
- * init all windows
- */
-static void init_wins(int top_lines)
-{
-	top.lines = top_lines;
-	top.cols = COLS;
-	top.begy = 0;
-	top.begx = 0;
-
-	bot.lines = LINES - top.lines - 3;
-	bot.cols = COLS;
-	bot.begy = top.lines + 1;
-	bot.begx = 0;
-
-	sb.lines = 1;
-	sb.cols = COLS;
-	sb.begy = LINES - 2;
-	sb.begx = 0;
-
-	in.lines = 1;
-	in.cols = COLS;
-	in.begy = LINES - 1;
-	in.begx = 0;
-
-	sep.lines = 1;
-	sep.cols = COLS;
-	sep.begy = top.lines;
-	sep.begx = 0;
-
-	assume_default_colors(theme.default_fg, theme.default_bg);
-	if (top.win) {
-		wresize(top.win, top.lines, top.cols);
-		mvwin(top.win, top.begy, top.begx);
-
-		wresize(sb.win, sb.lines, sb.cols);
-		mvwin(sb.win, sb.begy, sb.begx);
-
-		wresize(sep.win, sep.lines, sep.cols);
-		mvwin(sep.win, sep.begy, sep.begx);
-
-		wresize(bot.win, bot.lines, bot.cols);
-		mvwin(bot.win, bot.begy, bot.begx);
-
-		wresize(in.win, in.lines, in.cols);
-		mvwin(in.win, in.begy, in.begx);
-	} else {
-		sep.win = newwin(sep.lines, sep.cols, sep.begy, sep.begx);
-		top.win = newwin(top.lines, top.cols, top.begy, top.begx);
-		bot.win = newwin(bot.lines, bot.cols, bot.begy, bot.begx);
-		sb.win = newwin(sb.lines, sb.cols, sb.begy, sb.begx);
-		in.win = newwin(in.lines, in.cols, in.begy, in.begx);
-		if (!top.win || !bot.win || !sb.win || !in.win || !sep.win)
-			msg_n_exit(1, "Error: Cannot create curses windows\n");
-		wclear(bot.win);
-		wclear(sb.win);
-		wclear(in.win);
-		scrollok(bot.win, 1);
-		wattron(sb.win, COLOR_PAIR(COLOR_STATUSBAR));
-		wattron(sep.win, COLOR_PAIR(COLOR_SEPARATOR));
-		wattron(bot.win, COLOR_PAIR(COLOR_BOT));
-		wattron(top.win, COLOR_PAIR(COLOR_TOP));
-		nodelay(top.win, 1);
-		nodelay(bot.win, 1);
-		nodelay(sb.win, 1);
-		nodelay(in.win, 0);
-
-		keypad(top.win, 1);
-		keypad(bot.win, 1);
-		keypad(sb.win, 1);
-		keypad(in.win, 1);
-	}
-	wmove(sep.win, 0, 0);
-	whline(sep.win, theme.sep_char, COLS);
-	wclear(top.win);
-	//wclear(bot.win);
-	wnoutrefresh(top.win);
-	wnoutrefresh(bot.win);
-	print_status_bar();
-	wnoutrefresh(sb.win);
-	wnoutrefresh(in.win);
-	wnoutrefresh(sep.win);
-	doupdate();
+	/* kill every process in the process group and exit */
+	para_sigaction(SIGTERM, SIG_IGN);
+	kill(0, SIGTERM);
+	exit(exit_code);
 }
 
 /*
@@ -683,11 +577,12 @@ static void print_stat_item(int i)
 	char *tmp;
 	struct stat_item_data d = theme.data[i];
 	char *c = stat_content[i];
+	int top_lines = get_num_lines(&top);
 
-	if (!curses_active || !d.len || !c)
+	if (!curses_active() || !d.len || !c)
 		return;
 	tmp = make_message("%s%s%s", d.prefix, c, d.postfix);
-	wmove(top.win, d.y * top.lines / 100, d.x * COLS / 100);
+	wmove(top.win, d.y * top_lines / 100, d.x * COLS / 100);
 	wrefresh(top.win);
 	wattron(top.win, COLOR_PAIR(i + 1));
 	align_str(top.win, tmp, d.len * COLS / 100, d.align);
@@ -726,7 +621,27 @@ print:
 	return 1;
 }
 
-static int read_stat_pipe(fd_set *rfds)
+static void print_all_items(void)
+{
+	int i;
+
+	if (!curses_active())
+		return;
+	FOR_EACH_STATUS_ITEM(i)
+		print_stat_item(i);
+}
+
+static void clear_all_items(void)
+{
+	int i;
+
+	FOR_EACH_STATUS_ITEM(i) {
+		free(stat_content[i]);
+		stat_content[i] = para_strdup("");
+	}
+}
+
+static void status_post_select(fd_set *rfds)
 {
 	static char *buf;
 	static int bufsize, loaded;
@@ -734,11 +649,11 @@ static int read_stat_pipe(fd_set *rfds)
 	size_t sz;
 
 	if (stat_pipe < 0)
-		return 0;
+		return;
 	if (loaded >= bufsize) {
 		if (bufsize > 1000 * 1000) {
 			loaded = 0;
-			return 0;
+			return;
 		}
 		bufsize += bufsize + 1000;
 		buf = para_realloc(buf, bufsize);
@@ -750,39 +665,92 @@ static int read_stat_pipe(fd_set *rfds)
 	ret2 = for_each_stat_item(buf, loaded, update_item);
 	if (ret < 0 || ret2 < 0) {
 		loaded = 0;
-		return ret2 < 0? ret2 : ret;
+		PARA_NOTICE_LOG("closing stat pipe: %s\n", para_strerror(-ret));
+		close(stat_pipe);
+		stat_pipe = -1;
+		clear_all_items();
+		free(stat_content[SI_BASENAME]);
+		stat_content[SI_BASENAME] =
+			para_strdup("stat command terminated!?");
+		print_all_items();
+		return;
 	}
 	sz = ret2; /* what is left */
 	if (sz > 0 && sz < loaded)
 		memmove(buf, buf + loaded - sz, sz);
 	loaded = sz;
-	return 1;
 }
 
-static void print_all_items(void)
+/*
+ * init all windows
+ */
+static void init_wins(int top_lines)
 {
-	int i;
+	int top_y = 0, bot_y = top_lines + 1, sb_y = LINES - 2,
+		in_y = LINES - 1, sep_y = top_lines;
+	int bot_lines = LINES - top_lines - 3, sb_lines = 1, in_lines = 1,
+		sep_lines = 1;
 
-	if (!curses_active)
-		return;
-	FOR_EACH_STATUS_ITEM(i)
-		print_stat_item(i);
-}
+	assume_default_colors(theme.default_fg, theme.default_bg);
+	if (top.win) {
+		wresize(top.win, top_lines, COLS);
+		mvwin(top.win, top_y, 0);
 
-static void clear_all_items(void)
-{
-	int i;
+		wresize(sb.win, sb_lines, COLS);
+		mvwin(sb.win, sb_y, 0);
 
-	FOR_EACH_STATUS_ITEM(i) {
-		free(stat_content[i]);
-		stat_content[i] = para_strdup("");
+		wresize(sep.win, sep_lines, COLS);
+		mvwin(sep.win, sep_y, 0);
+
+		wresize(bot.win, bot_lines, COLS);
+		mvwin(bot.win, bot_y, 0);
+
+		wresize(in.win, in_lines, COLS);
+		mvwin(in.win, in_y, 0);
+	} else {
+		sep.win = newwin(sep_lines, COLS, sep_y, 0);
+		top.win = newwin(top_lines, COLS, top_y, 0);
+		bot.win = newwin(bot_lines, COLS, bot_y, 0);
+		sb.win = newwin(sb_lines, COLS, sb_y, 0);
+		in.win = newwin(in_lines, COLS, in_y, 0);
+		if (!top.win || !bot.win || !sb.win || !in.win || !sep.win)
+			die(EXIT_FAILURE, "Error: Cannot create curses windows\n");
+		wclear(bot.win);
+		wclear(sb.win);
+		wclear(in.win);
+		scrollok(bot.win, 1);
+		wattron(sb.win, COLOR_PAIR(COLOR_STATUSBAR));
+		wattron(sep.win, COLOR_PAIR(COLOR_SEPARATOR));
+		wattron(bot.win, COLOR_PAIR(COLOR_BOT));
+		wattron(top.win, COLOR_PAIR(COLOR_TOP));
+		nodelay(top.win, 1);
+		nodelay(bot.win, 1);
+		nodelay(sb.win, 1);
+		nodelay(in.win, 0);
+
+		keypad(top.win, 1);
+		keypad(bot.win, 1);
+		keypad(sb.win, 1);
+		keypad(in.win, 1);
 	}
+	wmove(sep.win, 0, 0);
+	whline(sep.win, theme.sep_char, COLS);
+	wclear(top.win);
+	print_all_items();
+	//wclear(bot.win);
+	wnoutrefresh(top.win);
+	wnoutrefresh(bot.win);
+	print_status_bar();
+	wnoutrefresh(sb.win);
+	wnoutrefresh(in.win);
+	wnoutrefresh(sep.win);
+	doupdate();
 }
 
 static void init_pair_or_die(short pair, short f, short b)
 {
 	if (init_pair(pair, f, b) == ERR)
-		msg_n_exit(EXIT_FAILURE, "fatal: init_pair() failed\n");
+		die(EXIT_FAILURE, "fatal: init_pair() failed\n");
 }
 
 static void init_colors_or_die(void)
@@ -790,9 +758,9 @@ static void init_colors_or_die(void)
 	int i;
 
 	if (!has_colors())
-		msg_n_exit(EXIT_FAILURE, "fatal: No color term\n");
+		die(EXIT_FAILURE, "fatal: No color term\n");
 	if (start_color() == ERR)
-		msg_n_exit(EXIT_FAILURE, "fatal: failed to start colors\n");
+		die(EXIT_FAILURE, "fatal: failed to start colors\n");
 	FOR_EACH_STATUS_ITEM(i)
 		if (theme.data[i].len)
 			init_pair_or_die(i + 1, theme.data[i].fg,
@@ -810,25 +778,25 @@ static void init_colors_or_die(void)
 /* (Re-)initialize the curses library. */
 static void init_curses(void)
 {
-	curses_active = true;
+	if (curses_active())
+		return;
 	if (top.win && refresh() == ERR) /* refresh is really needed */
-		msg_n_exit(EXIT_FAILURE, "refresh() failed\n");
+		die(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"
+		die(EXIT_FAILURE, "Terminal (%dx%d) too small"
 			" (need at least %dx%d)\n", COLS, LINES,
 			theme.cols_min, theme.lines_min);
 	curs_set(0); /* make cursor invisible, ignore errors */
 	nonl(); /* do not NL->CR/NL on output, always returns OK */
 	/* don't echo input */
 	if (noecho() == ERR)
-		msg_n_exit(EXIT_FAILURE, "fatal: noecho() failed\n");
+		die(EXIT_FAILURE, "fatal: noecho() failed\n");
 	/* take input chars one at a time, no wait for \n */
 	if (cbreak() == ERR)
-		msg_n_exit(EXIT_FAILURE, "fatal: cbreak() failed\n");
+		die(EXIT_FAILURE, "fatal: cbreak() failed\n");
 	init_colors_or_die();
 	clear(); /* ignore non-fatal errors */
 	init_wins(theme.top_lines_default);
-	print_all_items();
 	// noecho(); /* don't echo input */
 }
 
@@ -865,36 +833,84 @@ err_out:
 	return 0;
 }
 
-static int check_key_map_args(void)
+static void check_key_map_args_or_die(void)
 {
-	char *s;
-	int i, ret = -1;
-	char *tmp = NULL, *handler, *arg;
+	int i;
+	char *tmp = NULL;
 
 	for (i = 0; i < conf.key_map_given; ++i) {
-		s = conf.key_map_arg[i];
-		if (!(*s))
-			goto out;
+		char *handler, *arg;
+
 		free(tmp);
-		tmp = para_strdup(s);
+		tmp = para_strdup(conf.key_map_arg[i]);
 		if (!split_key_map(tmp, &handler, &arg))
-			goto out;
+			break;
 		if (strlen(handler) != 1)
-			goto out;
-		if (*handler != 'x'
-			&& *handler != 'd'
-			&& *handler != 'i'
-			&& *handler != 'p')
-			goto out;
+			break;
+		if (*handler != 'x' && *handler != 'd' && *handler != 'i'
+				&& *handler != 'p')
+			break;
 		if (*handler != 'i')
 			continue;
 		if (find_cmd_byname(arg) < 0)
-			goto out;
+			break;
 	}
-	ret = 0;
-out:
+	if (i != conf.key_map_given)
+		die(EXIT_FAILURE, "invalid key map: %s\n", conf.key_map_arg[i]);
 	free(tmp);
-	return ret;
+}
+
+static void parse_config_file_or_die(bool override)
+{
+	bool err;
+	char *config_file;
+	struct gui_cmdline_parser_params params = {
+		.override = override,
+		.initialize = 0,
+		.check_required = !override,
+		.check_ambiguity = 0,
+		.print_errors = 1,
+	};
+
+	if (conf.config_file_given)
+		config_file = para_strdup(conf.config_file_arg);
+	else {
+		char *home = para_homedir();
+		config_file = make_message("%s/.paraslash/gui.conf", home);
+		free(home);
+	}
+	if (!file_exists(config_file)) {
+		if (!conf.config_file_given)
+			err = false;
+		else {
+			PARA_EMERG_LOG("config file %s does not exist\n",
+				config_file);
+			err = true;
+		}
+		goto out;
+	}
+	gui_cmdline_parser_config_file(config_file, &conf, &params);
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
+	check_key_map_args_or_die();
+	theme_init(conf.theme_arg, &theme);
+	err = false;
+out:
+	free(config_file);
+	if (err)
+		exit(EXIT_FAILURE);
+}
+
+/* reread configuration, terminate on errors */
+static void reread_conf(void)
+{
+	/*
+	 * gengetopt might print to stderr and exit on errors. So we have to
+	 * shutdown curses first.
+	 */
+	shutdown_curses();
+	parse_config_file_or_die(true /* override */);
+	init_curses();
+	print_in_bar(COLOR_MSG, "config file reloaded\n");
 }
 
 /*
@@ -904,11 +920,10 @@ static void handle_signal(int sig)
 {
 	switch (sig) {
 	case SIGTERM:
-		msg_n_exit(EXIT_FAILURE,
-			"only the good die young (caught SIGTERM))\n");
+		die(EXIT_FAILURE, "only the good die young (caught SIGTERM)\n");
 		return;
 	case SIGWINCH:
-		if (curses_active) {
+		if (curses_active()) {
 			shutdown_curses();
 			init_curses();
 			redraw_bot_win();
@@ -922,7 +937,7 @@ static void handle_signal(int sig)
 		return;
 	case SIGUSR1:
 		PARA_NOTICE_LOG("got SIGUSR1, rereading configuration\n");
-		com_reread_conf();
+		reread_conf();
 		return;
 	case SIGCHLD:
 		check_sigchld();
@@ -1042,17 +1057,7 @@ repeat:
 			}
 		}
 	}
-	ret = read_stat_pipe(&rfds);
-	if (ret < 0) {
-		PARA_NOTICE_LOG("closing stat pipe: %s\n", para_strerror(-ret));
-		close(stat_pipe);
-		stat_pipe = -1;
-		clear_all_items();
-		free(stat_content[SI_BASENAME]);
-		stat_content[SI_BASENAME] =
-			para_strdup("stat command terminated!?");
-		print_all_items();
-	}
+	status_post_select(&rfds);
 check_return:
 	switch (mode) {
 	case COMMAND_MODE:
@@ -1147,13 +1152,13 @@ static void print_scroll_msg(void)
 
 static void com_scroll_top(void)
 {
-	int i = RINGBUFFER_SIZE - 1;
+	int i = RINGBUFFER_SIZE - 1, bot_lines = get_num_lines(&bot);
 	unsigned lines = 0;
 
 	while (i > 0 && !ringbuffer_get(bot_win_rb, i))
 		i--;
 	/* i is oldest entry */
-	for (; lines < bot.lines && i >= 0; i--) {
+	for (; lines < bot_lines && i >= 0; i--) {
 		struct rb_entry *rbe = ringbuffer_get(bot_win_rb, i);
 		if (!rbe)
 			break;
@@ -1183,9 +1188,9 @@ static void com_cancel_scrolling(void)
 static void com_page_down(void)
 {
 	unsigned lines = 0;
-	int i = scroll_position;
+	int i = scroll_position, bot_lines = get_num_lines(&bot);
 
-	while (lines < bot.lines && --i > 0) {
+	while (lines < bot_lines && --i > 0) {
 		struct rb_entry *rbe = ringbuffer_get(bot_win_rb, i);
 		if (!rbe)
 			break;
@@ -1203,7 +1208,7 @@ static void com_page_down(void)
 static void com_page_up(void)
 {
 	unsigned lines;
-	int fvr = first_visible_rbe(&lines);
+	int fvr = first_visible_rbe(&lines), bot_lines = get_num_lines(&bot);
 
 	if (fvr < 0 || fvr + 1 >= ringbuffer_filled(bot_win_rb)) {
 		print_in_bar(COLOR_ERRMSG, "top of buffer is shown\n");
@@ -1212,7 +1217,7 @@ static void com_page_up(void)
 	scroll_position = fvr + 1;
 	for (; scroll_position > 0; scroll_position--) {
 		first_visible_rbe(&lines);
-		if (lines == bot.lines)
+		if (lines == bot_lines)
 			break;
 	}
 	redraw_bot_win();
@@ -1222,7 +1227,7 @@ static void com_page_up(void)
 static void com_scroll_down(void)
 {
 	struct rb_entry *rbe;
-	int rbe_lines;
+	int rbe_lines, bot_lines = get_num_lines(&bot);
 
 	if (!scroll_position) {
 		print_in_bar(COLOR_ERRMSG, "bottom of buffer is shown\n");
@@ -1232,7 +1237,7 @@ static void com_scroll_down(void)
 	rbe = ringbuffer_get(bot_win_rb, scroll_position);
 	rbe_lines = NUM_LINES(rbe->len);
 	wscrl(bot.win, rbe_lines);
-	wmove(bot.win, bot.lines - rbe_lines, 0);
+	wmove(bot.win, bot_lines - rbe_lines, 0);
 	wattron(bot.win, COLOR_PAIR(rbe->color));
 	waddstr(bot.win, rbe->msg);
 	wrefresh(bot.win);
@@ -1265,7 +1270,6 @@ static void com_scroll_up(void)
 			break;
 		rbe_lines = NUM_LINES(rbe->len);
 		lines += rbe_lines;
-//		fprintf(stderr, "msg: %s\n", rbe->msg);
 		wattron(bot.win, COLOR_PAIR(rbe->color));
 		waddstr(bot.win, "\n");
 		waddstr(bot.win, rbe->msg);
@@ -1302,36 +1306,9 @@ static void com_ll_incr(void)
 	print_in_bar(COLOR_MSG, "loglevel set to %d\n", loglevel);
 }
 
-/*
- * reread configuration, terminate on errors
- */
 static void com_reread_conf(void)
 {
-	char *cf = configfile_exists();
-	struct gui_cmdline_parser_params params = {
-		.override = 1,
-		.initialize = 1,
-		.check_required = 0,
-		.check_ambiguity = 0,
-		.print_errors = 0,
-	};
-
-	if (!cf) {
-		PARA_WARNING_LOG("there is no configuration to read\n");
-		return;
-	}
-	PARA_INFO_LOG("rereading command line options and config file\n");
-	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\n");
-	if (check_key_map_args() < 0)
-		finish(EXIT_FAILURE);
+	reread_conf();
 }
 
 static void com_help(void)
@@ -1373,25 +1350,25 @@ static void com_help(void)
 
 static void com_shrink_top_win(void)
 {
-	if (top.lines <= theme.top_lines_min) {
+	int top_lines = get_num_lines(&top);
+
+	if (top_lines <= theme.top_lines_min) {
 		PARA_WARNING_LOG("can not decrease top window\n");
 		return;
 	}
-	init_wins(top.lines - 1);
-	wclear(top.win);
-	print_all_items();
+	init_wins(top_lines - 1);
 	print_in_bar(COLOR_MSG, "%s", "decreased top window");
 }
 
 static void com_enlarge_top_win(void)
 {
-	if (bot.lines < 3) {
+	int top_lines = get_num_lines(&top), bot_lines = get_num_lines(&bot);
+
+	if (bot_lines < 3) {
 		PARA_WARNING_LOG("can not increase top window\n");
 		return;
 	}
-	init_wins(top.lines + 1);
-	wclear(top.win);
-	print_all_items();
+	init_wins(top_lines + 1);
 	print_in_bar(COLOR_MSG, "increased top window");
 }
 
@@ -1402,7 +1379,7 @@ static void com_version(void)
 
 __noreturn static void com_quit(void)
 {
-	finish(0);
+	die(EXIT_SUCCESS, "%s", "");
 }
 
 static void com_refresh(void)
@@ -1477,38 +1454,13 @@ __noreturn static void print_help_and_die(void)
 int main(int argc, char *argv[])
 {
 	int ret;
-	char *cf;
-
-	_argc = argc;
-	_argv = argv;
 
 	gui_cmdline_parser(argc, argv, &conf); /* exits on errors */
 	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",
-			conf.config_file_arg);
-		exit(EXIT_FAILURE);
-	}
-	if (cf) {
-		struct gui_cmdline_parser_params params = {
-			.override = 0,
-			.initialize = 0,
-			.check_required = 0,
-			.check_ambiguity = 0,
-			.print_errors = 1,
-		};
-		gui_cmdline_parser_config_file(cf, &conf, &params);
-		loglevel = get_loglevel_by_name(conf.loglevel_arg);
-	}
-	if (check_key_map_args() < 0) {
-		fprintf(stderr, "invalid key map\n");
-		exit(EXIT_FAILURE);
-	}
-	theme_init(conf.theme_arg, &theme);
+	parse_config_file_or_die(false /* override */);
 	setup_signal_handling();
 	bot_win_rb = ringbuffer_new(RINGBUFFER_SIZE);
 	setlocale(LC_CTYPE, "");