X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=182545c89e6376d4b430606f19b3464f7889e9c5;hp=4d2c9f72a5fe7ba303653654df82fc84d3f4ed0e;hb=ee0098c5a8b4519d77e2c52fd33ccfc9bd3a87dd;hpb=be2f6b93943c955481ad616412ef42e929b31974

diff --git a/gui.c b/gui.c
index 4d2c9f72..182545c8 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.
  */
@@ -30,16 +30,8 @@
 INIT_GUI_ERRLISTS;
 static char *stat_content[NUM_STAT_ITEMS];
 
-#define STANDARD_STATUS_BAR "para_gui " PACKAGE_VERSION " (hit ? for help)"
-
-static int signal_pipe;
-
-static struct win_data {
+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
@@ -49,29 +41,38 @@ struct rb_entry {
 	int color;
 };
 static struct ringbuffer *bot_win_rb;
-#define NUM_LINES(len) (1 + (len) / bot.cols)
 
 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;
+static int loglevel;
 
-enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE};
-
+enum cmd_status {
+	CMDS_IDLE, /* no command running */
+	CMDS_DCMD, /* para or display command running */
+	CMDS_XCMD, /* external command running */
+};
 
-#define COLOR_STATUSBAR 52
-#define COLOR_COMMAND 53
-#define COLOR_OUTPUT 54
-#define COLOR_MSG 55
-#define COLOR_ERRMSG 56
-#define COLOR_WELCOME 57
-#define COLOR_SEPARATOR 58
-#define COLOR_TOP 59
-#define COLOR_BOT 60
+/**
+ * Codes for various colors.
+ *
+ * Each status item has its own color pair. The ones defined here start at a
+ * higher number so that they do not overlap with these.
+ */
+enum gui_color_pair {
+	COLOR_STATUSBAR = NUM_STAT_ITEMS + 1,
+	COLOR_COMMAND,
+	COLOR_OUTPUT,
+	COLOR_MSG,
+	COLOR_ERRMSG,
+	COLOR_SEPARATOR,
+	COLOR_TOP,
+	COLOR_BOT,
+};
 
 struct gui_command {
 	const char *key;
@@ -80,130 +81,55 @@ 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;
+
+#define GUI_COMMANDS \
+	GUI_COMMAND(help, "?", "print help") \
+	GUI_COMMAND(enlarge_top_win, "+", "enlarge the top window") \
+	GUI_COMMAND(shrink_top_win, "-", "shrink the top window") \
+	GUI_COMMAND(reread_conf, "r", "reread configuration file") \
+	GUI_COMMAND(quit, "q", "exit para_gui") \
+	GUI_COMMAND(refresh, "^L", "redraw the screen") \
+	GUI_COMMAND(next_theme, ".", "switch to next theme") \
+	GUI_COMMAND(prev_theme, ",", "switch to previous theme") \
+	GUI_COMMAND(ll_incr, ">", "increase loglevel (decreases verbosity)") \
+	GUI_COMMAND(ll_decr, "<", "decrease loglevel (increases verbosity)") \
+	GUI_COMMAND(version, "V", "show the para_gui version") \
+	GUI_COMMAND(scroll_up, "<up>", "scroll up one line") \
+	GUI_COMMAND(scroll_down, "<down>", "scroll_down") \
+	GUI_COMMAND(page_up, "<ppage>", "scroll up one page") \
+	GUI_COMMAND(page_down, "<npage>", "scroll down one page") \
+	GUI_COMMAND(scroll_top, "<home>", "scroll to top of buffer") \
+	GUI_COMMAND(cancel_scroll, "<end>", "deactivate scroll mode") \
+
+/* declare command handlers */
+#define GUI_COMMAND(_c, _k, _d) \
+	static void com_ ## _c(void);
+GUI_COMMANDS
+
+#undef GUI_COMMAND
+
+/* define command array */
+#define GUI_COMMAND(_c, _k, _d) \
+	{ \
+		.key = _k, \
+		.name = #_c, \
+		.description = _d, \
+		.handler = com_ ## _c \
+	},
+
+static struct gui_command command_list[] = {GUI_COMMANDS {.name = NULL}};
+
+struct input_task {
+	struct task task;
 };
 
-static struct gui_theme theme;
+struct status_task {
+	struct task task;
+};
 
-static int _argc;
-static char **_argv;
-
-static void com_help(void);
-static void com_reread_conf(void);
-static void com_enlarge_top_win(void);
-static void com_shrink_top_win(void);
-static void com_version(void);
-__noreturn static void com_quit(void);
-static void com_refresh(void);
-static void com_ll_incr(void);
-static void com_ll_decr(void);
-static void com_prev_theme(void);
-static void com_next_theme(void);
-static void com_scroll_up(void);
-static void com_scroll_down(void);
-static void com_page_up(void);
-static void com_page_down(void);
-static void com_cancel_scrolling(void);
-static void com_scroll_top(void);
-
-static struct gui_command command_list[] = {
-	{
-		.key = "?",
-		.name = "help",
-		.description = "print help",
-		.handler = com_help
-	}, {
-		.key = "+",
-		.name = "enlarge_win",
-		.description = "enlarge the top window",
-		.handler = com_enlarge_top_win
-	}, {
-		.key = "-",
-		.name = "shrink_win",
-		.description = "shrink the top window",
-		.handler = com_shrink_top_win
-	}, {
-		.key = "r",
-		.name = "reread_conf",
-		.description = "reread configuration file",
-		.handler = com_reread_conf
-	}, {
-		.key = "q",
-		.name = "quit",
-		.description = "exit para_gui",
-		.handler = com_quit
-	}, {
-		.key = "^L",
-		.name = "refresh",
-		.description = "redraw the screen",
-		.handler = com_refresh
-	}, {
-		.key = ".",
-		.name = "next_theme",
-		.description = "switch to next theme",
-		.handler = com_next_theme
-	}, {
-		.key = ",",
-		.name = "prev_theme",
-		.description = "switch to previous stream",
-		.handler = com_prev_theme
-	}, {
-		.key = ">",
-		.name = "ll_incr",
-		.description = "increase loglevel (decreases verbosity)",
-		.handler = com_ll_incr
-	}, {
-		.key = "<",
-		.name = "ll_decr",
-		.description = "decrease loglevel (increases verbosity)",
-		.handler = com_ll_decr
-	}, {
-		.key = "V",
-		.name = "version",
-		.description = "show the para_gui version",
-		.handler = com_version
-	}, {
-		.key = "<up>",
-		.name = "scroll_up",
-		.description = "scroll up one line",
-		.handler = com_scroll_up
-	}, {
-		.key = "<down>",
-		.name = "scroll_down",
-		.description = "scroll down one line",
-		.handler = com_scroll_down
-	}, {
-		.key = "<ppage>",
-		.name = "page_up",
-		.description = "scroll up one page",
-		.handler = com_page_up
-	}, {
-		.key = "<npage>",
-		.name = "page_down",
-		.description = "scroll down one page",
-		.handler = com_page_down
-	}, {
-		.key = "<home>",
-		.name = "scroll_top",
-		.description = "scroll to top of buffer",
-		.handler = com_scroll_top
-	}, {
-		.key = "<end>",
-		.name = "cancel_scroll",
-		.description = "deactivate scroll mode",
-		.handler = com_cancel_scrolling
-	}, {
-		.handler = NULL
-	}
+struct cmd_task {
+	struct task task;
 };
 
 static int find_cmd_byname(char *name)
@@ -216,6 +142,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)
 {
@@ -272,29 +229,11 @@ 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)
 {
 	char space[] = "                                ";
-	unsigned sz = sizeof(space);
+	unsigned sz = sizeof(space) - 1; /* number of spaces */
 
 	while (num >= sz)  {
 		waddstr(win, space);
@@ -354,54 +293,48 @@ __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, sb.cols, LEFT);
+	align_str(in.win, msg, get_num_cols(&in), LEFT);
 	free(msg);
 	wrefresh(in.win);
 }
 
-/*
- * update the status bar
- */
 static void print_status_bar(void)
 {
 	char *tmp;
 
-	if (!curses_active)
-		return;
-	tmp = para_strdup(STANDARD_STATUS_BAR);
+	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);
-	wrefresh(sb.win);
 }
 
 /*
  * get the number of the oldest rbe that is (partially) visible. On return,
- * lines contains the sum of the number of lines of all visable entries. If the
+ * lines contains the sum of the number of lines of all visible entries. If the
  * first one is only partially visible, lines is greater than bot.lines.
  */
 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;
@@ -412,7 +345,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;
 
@@ -422,9 +355,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;
@@ -444,14 +378,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++;
@@ -480,7 +414,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);
@@ -506,7 +439,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);
@@ -518,185 +451,53 @@ __printf_2_3 static void outputf(int color, const char* fmt,...)
 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;
-
-__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;
 	va_list ap;
 
-	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);
-	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);
-	chop(msg);
-	rb_add_entry(color, msg);
-	wrefresh(bot.win);
 }
 __printf_2_3 void (*para_log)(int, const char*, ...) = curses_log;
 
-static void setup_signal_handling(void)
-{
-	signal_pipe = para_signal_init();
-	para_install_sighandler(SIGINT);
-	para_install_sighandler(SIGTERM);
-	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 */
-__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 = 0;
 	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);
-}
-
-static void print_welcome(void)
-{
-	if (loglevel > LL_NOTICE)
-		return;
-	outputf(COLOR_WELCOME, "Welcome to %s. Theme: %s",
-		version_single_line("gui"), theme.name);
-	wclrtoeol(bot.win);
-}
-
-/*
- * init all windows
- */
-static void init_wins(int top_lines)
-{
-	int i;
-
-	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) {
-		mvwin(top.win, top.begy, top.begx);
-		wresize(top.win, top.lines, top.cols);
-
-		mvwin(sb.win, sb.begy, sb.begx);
-		wresize(sb.win, sb.lines, sb.cols);
-
-		mvwin(sep.win, sep.begy, sep.begx);
-		wresize(sep.win, sep.lines, sep.cols);
-
-		mvwin(bot.win, bot.begy, bot.begx);
-		wresize(bot.win, bot.lines, bot.cols);
-
-		mvwin(in.win, in.begy, in.begx);
-		wresize(in.win, in.lines, in.cols);
-	} 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);
-		print_status_bar();
-	}
-	wmove(sep.win, 0, 0);
-	for (i = 1; i <= COLS; i++)
-		waddstr(sep.win, theme.sep_str);
-	wclear(top.win);
-	//wclear(bot.win);
-	wnoutrefresh(top.win);
-	wnoutrefresh(bot.win);
-	//wnoutrefresh(sb.win);
-	print_status_bar();
-	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);
 }
 
 /*
@@ -707,11 +508,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);
@@ -750,15 +552,61 @@ 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 struct timeval next_exec;
+
+static void status_pre_select(struct sched *s, __a_unused struct task *t)
+{
+	if (stat_pipe >= 0)
+		return para_fd_set(stat_pipe, &s->rfds, &s->max_fileno);
+	sched_request_barrier_or_min_delay(&next_exec, s);
+}
+
+static int status_post_select(struct sched *s, __a_unused struct task *t)
 {
 	static char *buf;
 	static int bufsize, loaded;
-	int ret, ret2;
 	size_t sz;
+	pid_t pid;
+	int ret, ret2;
 
-	if (stat_pipe < 0)
+	if (stat_pipe < 0) {
+		int fds[3] = {0, 1, 0};
+		/* Avoid busy loop */
+		if (tv_diff(&next_exec, now, NULL) > 0)
+			return 0;
+		next_exec.tv_sec = now->tv_sec + 2;
+		ret = para_exec_cmdline_pid(&pid, conf.stat_cmd_arg, fds);
+		if (ret < 0)
+			return 0;
+		ret = mark_fd_nonblocking(fds[1]);
+		if (ret < 0) {
+			close(fds[1]);
+			return 0;
+		}
+		stat_pipe = fds[1];
 		return 0;
+	}
+
 	if (loaded >= bufsize) {
 		if (bufsize > 1000 * 1000) {
 			loaded = 0;
@@ -769,44 +617,98 @@ static int read_stat_pipe(fd_set *rfds)
 	}
 	assert(loaded < bufsize);
 	ret = read_nonblock(stat_pipe, buf + loaded, bufsize - loaded,
-		rfds, &sz);
+		&s->rfds, &sz);
 	loaded += sz;
 	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 0;
 	}
 	sz = ret2; /* what is left */
 	if (sz > 0 && sz < loaded)
 		memmove(buf, buf + loaded - sz, sz);
 	loaded = sz;
-	return 1;
+	return 0;
 }
 
-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)
@@ -814,9 +716,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,
@@ -826,7 +728,6 @@ static void init_colors_or_die(void)
 	init_pair_or_die(COLOR_OUTPUT, theme.output_fg, theme.output_bg);
 	init_pair_or_die(COLOR_MSG, theme.msg_fg, theme.msg_bg);
 	init_pair_or_die(COLOR_ERRMSG, theme.err_msg_fg, theme.err_msg_bg);
-	init_pair_or_die(COLOR_WELCOME, theme.welcome_fg, theme.welcome_bg);
 	init_pair_or_die(COLOR_SEPARATOR, theme.sep_fg, theme.sep_bg);
 	init_pair_or_die(COLOR_TOP, theme.default_fg, theme.default_bg);
 	init_pair_or_die(COLOR_BOT, theme.default_fg, theme.default_bg);
@@ -835,25 +736,25 @@ static void init_colors_or_die(void)
 /* (Re-)initialize the curses library. */
 static void init_curses(void)
 {
-	curses_active = 1;
-	if (top.win && refresh() == ERR) /* refesh is really needed */
-		msg_n_exit(EXIT_FAILURE, "refresh() failed\n");
+	if (curses_active())
+		return;
+	if (top.win && refresh() == ERR) /* refresh is really needed */
+		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 */
 }
 
@@ -861,12 +762,16 @@ static void check_sigchld(void)
 {
 	int ret;
 	pid_t pid;
+
 reap_next_child:
 	ret = para_reap_child(&pid);
 	if (ret <= 0)
 		return;
-	if (pid == cmd_pid)
+	if (pid == cmd_pid) {
 		cmd_pid = 0;
+		init_curses();
+		print_in_bar(COLOR_MSG, " ");
+	}
 	goto reap_next_child;
 }
 
@@ -889,241 +794,216 @@ 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 err_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 err_out;
+			break;
 		if (strlen(handler) != 1)
-			goto err_out;
-		if (*handler != 'x'
-			&& *handler != 'd'
-			&& *handler != 'i'
-			&& *handler != 'p')
-			goto err_out;
+			break;
+		if (*handler != 'x' && *handler != 'd' && *handler != 'i'
+				&& *handler != 'p')
+			break;
 		if (*handler != 'i')
 			continue;
 		if (find_cmd_byname(arg) < 0)
-			goto err_out;
+			break;
 	}
-	ret = 0;
-err_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");
 }
 
 /*
  * React to various signal-related events
  */
-static void handle_signal(int sig)
+static int signal_post_select(struct sched *s, __a_unused struct task *t)
 {
-	switch (sig) {
+	int ret = para_next_signal(&s->rfds);
+
+	if (ret <= 0)
+		return 0;
+	switch (ret) {
 	case SIGTERM:
-		msg_n_exit(EXIT_FAILURE,
-			"only the good die young (caught SIGTERM))\n");
-		return;
+		die(EXIT_FAILURE, "only the good die young (caught SIGTERM)\n");
+		return 1;
 	case SIGWINCH:
-		if (curses_active) {
+		if (curses_active()) {
 			shutdown_curses();
 			init_curses();
 			redraw_bot_win();
 		}
-		return;
+		return 1;
 	case SIGINT:
-		PARA_WARNING_LOG("caught SIGINT, reset");
+		PARA_WARNING_LOG("caught SIGINT, reset\n");
 		/* Nothing to do. SIGINT killed our child which gets noticed
 		 * by do_select and resets everything.
 		 */
-		return;
+		return 1;
 	case SIGUSR1:
-		PARA_NOTICE_LOG("got SIGUSR1, rereading configuration");
-		com_reread_conf();
-		return;
+		PARA_NOTICE_LOG("got SIGUSR1, rereading configuration\n");
+		reread_conf();
+		return 1;
 	case SIGCHLD:
 		check_sigchld();
-		return;
+		return 1;
 	}
+	return 1;
 }
 
-static void status_pre_select(fd_set *rfds, int *max_fileno, struct timeval *tv)
+#define COMMAND_BUF_SIZE 32768
+
+static enum cmd_status cmd_status(void)
 {
-	static struct timeval next_exec, atm, diff;
-	int ret, fds[3] = {0, 1, 0};
-	pid_t pid;
+	if (command_fds[0] >= 0 || command_fds[1] >= 0)
+		return CMDS_DCMD;
+	if (cmd_pid > 0)
+		return CMDS_XCMD;
+	return CMDS_IDLE;
+}
 
-	if (stat_pipe >= 0)
-		goto success;
-	/* Avoid busy loop */
-	gettimeofday(&atm, NULL);
-	if (tv_diff(&next_exec, &atm, &diff) > 0) {
-		if (tv_diff(&diff, tv, NULL) < 0)
-			*tv = diff;
-		return;
-	}
-	next_exec.tv_sec = atm.tv_sec + 2;
-	ret = para_exec_cmdline_pid(&pid, conf.stat_cmd_arg, fds);
-	if (ret < 0)
-		return;
-	ret = mark_fd_nonblocking(fds[1]);
-	if (ret < 0) {
-		close(fds[1]);
+static void command_pre_select(struct sched *s, __a_unused struct task *t)
+{
+	enum cmd_status cmds = cmd_status();
+
+	if (cmds != CMDS_DCMD)
 		return;
-	}
-	stat_pipe = fds[1];
-success:
-	para_fd_set(stat_pipe, rfds, max_fileno);
+	if (command_fds[0] >= 0)
+		para_fd_set(command_fds[0], &s->rfds, &s->max_fileno);
+	if (command_fds[1] >= 0)
+		para_fd_set(command_fds[1], &s->rfds, &s->max_fileno);
 }
 
-#define COMMAND_BUF_SIZE 32768
+static int command_post_select(struct sched *s, __a_unused struct task *t)
+{
+	int i, ret;
+	static char command_buf[2][COMMAND_BUF_SIZE];
+	static int cbo[2]; /* command buf offsets */
+	static unsigned flags[2]; /* for for_each_line() */
+	enum cmd_status cmds = cmd_status();
 
-/*
- * This is the core select loop. Besides the (internal) signal
- * pipe, the following other fds are checked according to the mode:
- *
- * GETCH_MODE: check stdin, return when key is pressed
- *
- * COMMAND_MODE: check command fds and stdin. Return when peer has closed both
- * stdout and stderr or when any key is pressed.
- *
- * EXTERNAL_MODE: Check only signal pipe. Used when an external command
- * is running. During that time curses is disabled.  Returns when
- * cmd_pid == 0.
- */
-static int do_select(int mode)
-{
-	fd_set rfds;
-	int ret, i, max_fileno;
-	char command_buf[2][COMMAND_BUF_SIZE] = {"", ""};
-	int cbo[2] = {0, 0}; /* command buf offsets */
-	struct timeval tv;
-	unsigned flags[2] = {0, 0}; /* for for_each_line() */
-
-repeat:
-	tv.tv_sec = conf.timeout_arg  / 1000;
-	tv.tv_usec = (conf.timeout_arg % 1000) * 1000;
-//	ret = refresh_status();
-	FD_ZERO(&rfds);
-	max_fileno = 0;
-	status_pre_select(&rfds, &max_fileno, &tv);
-	/* signal pipe */
-	para_fd_set(signal_pipe, &rfds, &max_fileno);
-	/* command pipe only for COMMAND_MODE */
-	if (mode == COMMAND_MODE) {
-		if (command_fds[0] >= 0)
-			para_fd_set(command_fds[0], &rfds, &max_fileno);
-		if (command_fds[1] >= 0)
-			para_fd_set(command_fds[1], &rfds, &max_fileno);
-	}
-	if (mode == GETCH_MODE || mode == COMMAND_MODE)
-		para_fd_set(STDIN_FILENO, &rfds, &max_fileno);
-	ret = para_select(max_fileno + 1, &rfds, NULL, &tv);
-	if (ret <= 0)
-		goto check_return; /* skip fd checks */
-	/* signals */
-	ret = para_next_signal(&rfds);
-	if (ret > 0)
-		handle_signal(ret);
-	/* read command pipe if ready */
-	if (mode == COMMAND_MODE) {
-		for (i = 0; i < 2; i++) {
-			size_t sz;
-			if (command_fds[i] < 0)
-				continue;
-			ret = read_nonblock(command_fds[i],
-				command_buf[i] + cbo[i],
-				COMMAND_BUF_SIZE - 1 - cbo[i], &rfds, &sz);
-			cbo[i] += sz;
-			sz = cbo[i];
-			cbo[i] = for_each_line(flags[i], command_buf[i], cbo[i],
-				add_output_line, &i);
-			if (sz != cbo[i]) { /* at least one line found */
-				wrefresh(bot.win);
-				flags[i] = 0;
-			}
-			if (ret < 0) {
+	if (cmds != CMDS_DCMD)
+		return 0;
+	for (i = 0; i < 2; i++) {
+		size_t sz;
+		if (command_fds[i] < 0)
+			continue;
+		ret = read_nonblock(command_fds[i],
+			command_buf[i] + cbo[i],
+			COMMAND_BUF_SIZE - 1 - cbo[i], &s->rfds, &sz);
+		cbo[i] += sz;
+		sz = cbo[i];
+		cbo[i] = for_each_line(flags[i], command_buf[i], cbo[i],
+			add_output_line, &i);
+		if (sz != cbo[i]) { /* at least one line found */
+			wrefresh(bot.win);
+			flags[i] = 0;
+		}
+		if (ret < 0 || cmd_pid == 0) {
+			if (ret < 0)
 				PARA_NOTICE_LOG("closing command fd %d: %s",
 					i, para_strerror(-ret));
-				close(command_fds[i]);
-				command_fds[i] = -1;
-				flags[i] = 0;
-				if (command_fds[!i] < 0) /* both fds closed */
-					return 0;
-			}
-			if (cbo[i] == COMMAND_BUF_SIZE - 1) {
-				PARA_NOTICE_LOG("discarding overlong line");
-				cbo[i] = 0;
-				flags[i] = FELF_DISCARD_FIRST;
-			}
+			close(command_fds[i]);
+			command_fds[i] = -1;
+			flags[i] = 0;
+			cbo[i] = 0;
+			if (command_fds[!i] < 0) /* both fds closed */
+				return 1;
 		}
-	}
-	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();
-	}
-check_return:
-	switch (mode) {
-	case COMMAND_MODE:
-		ret = wgetch(top.win);
-		if (ret != ERR && ret != KEY_RESIZE) {
-			if (command_fds[0] >= 0) {
-				close(command_fds[0]);
-				command_fds[0] = -1;
-			}
-			if (command_fds[1] >= 0) {
-				close(command_fds[1]);
-				command_fds[1] = -1;
-			}
-			if (cmd_pid)
-				kill(cmd_pid, SIGTERM);
-			return -1;
+		if (cbo[i] == COMMAND_BUF_SIZE - 1) {
+			PARA_NOTICE_LOG("discarding overlong line");
+			cbo[i] = 0;
+			flags[i] = FELF_DISCARD_FIRST;
 		}
-		break;
-	case GETCH_MODE:
-		ret = wgetch(top.win);
-		if (ret != ERR && ret != KEY_RESIZE)
-			return ret;
-		break;
-	case EXTERNAL_MODE:
-		if (cmd_pid == 0)
-			return 0;
 	}
-	goto repeat;
+	return 0;
 }
 
-/*
- * read from command pipe and print data to bot window
- */
-static void send_output(void)
+static void input_pre_select(struct sched *s, __a_unused struct task *t)
 {
-	int ret;
+	enum cmd_status cmds = cmd_status();
+
+	if (cmds != CMDS_XCMD)
+		para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
+}
 
-	ret = mark_fd_nonblocking(command_fds[0]);
+/* read from command pipe and print data to bot window */
+static void exec_and_display_cmd(const char *cmd)
+{
+	int ret, fds[3] = {0, 1, 1};
+
+	outputf(COLOR_COMMAND, "%s", cmd);
+	ret = para_exec_cmdline_pid(&cmd_pid, cmd, fds);
+	if (ret < 0)
+		return;
+	ret = mark_fd_nonblocking(fds[1]);
 	if (ret < 0)
 		goto fail;
-	ret = mark_fd_nonblocking(command_fds[1]);
+	ret = mark_fd_nonblocking(fds[2]);
 	if (ret < 0)
 		goto fail;
-	if (do_select(COMMAND_MODE) >= 0)
-		PARA_INFO_LOG("command complete");
-	else
-		PARA_NOTICE_LOG("command aborted");
-	print_in_bar(COLOR_MSG, " ");
+	command_fds[0] = fds[1];
+	command_fds[1] = fds[2];
 	return;
 fail:
 	PARA_ERROR_LOG("%s\n", para_strerror(-ret));
@@ -1133,34 +1013,18 @@ fail:
 
 static void para_cmd(char *cmd)
 {
-	int ret, fds[3] = {0, 1, 1};
-	char *c = make_message(BINDIR "/para_client -- %s", cmd);
+	char *c;
 
-	outputf(COLOR_COMMAND, "%s", c);
 	print_in_bar(COLOR_MSG, "executing client command, hit any key to abort\n");
-	ret = para_exec_cmdline_pid(&cmd_pid, c, fds);
+	c = make_message(BINDIR "/para_client -- %s", cmd);
+	exec_and_display_cmd(c);
 	free(c);
-	if (ret < 0)
-		return;
-	command_fds[0] = fds[1];
-	command_fds[1] = fds[2];
-	send_output();
 }
 
-/*
- * exec command and print output to bot win
- */
 static void display_cmd(char *cmd)
 {
-	int fds[3] = {0, 1, 1};
-
 	print_in_bar(COLOR_MSG, "executing display command, hit any key to abort");
-	outputf(COLOR_COMMAND, "%s", cmd);
-	if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0)
-		return;
-	command_fds[0] = fds[1];
-	command_fds[1] = fds[2];
-	send_output();
+	exec_and_display_cmd(cmd);
 }
 
 /*
@@ -1173,29 +1037,94 @@ static void external_cmd(char *cmd)
 	if (cmd_pid)
 		return;
 	shutdown_curses();
-	if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0)
+	para_exec_cmdline_pid(&cmd_pid, cmd, fds);
+}
+
+static void handle_command(int c)
+{
+	int i;
+
+	/* first check user-defined key bindings */
+	for (i = 0; i < conf.key_map_given; ++i) {
+		char *tmp, *handler, *arg;
+
+		tmp = para_strdup(conf.key_map_arg[i]);
+		if (!split_key_map(tmp, &handler, &arg)) {
+			free(tmp);
+			return;
+		}
+		if (strcmp(tmp, km_keyname(c))) {
+			free(tmp);
+			continue;
+		}
+		if (*handler == 'd')
+			display_cmd(arg);
+		else if (*handler == 'x')
+			external_cmd(arg);
+		else if (*handler == 'p')
+			para_cmd(arg);
+		else if (*handler == 'i') {
+			int num = find_cmd_byname(arg);
+			if (num >= 0)
+				command_list[num].handler();
+		}
+		free(tmp);
 		return;
-	do_select(EXTERNAL_MODE);
-	init_curses();
+	}
+	/* not found, check internal key bindings */
+	for (i = 0; command_list[i].handler; i++) {
+		if (!strcmp(km_keyname(c), command_list[i].key)) {
+			command_list[i].handler();
+			return;
+		}
+	}
+	print_in_bar(COLOR_ERRMSG, "key '%s' is not bound, press ? for help",
+		km_keyname(c));
+}
+
+static int input_post_select(__a_unused struct sched *s, __a_unused struct task *t)
+{
+	int ret;
+	enum cmd_status cmds = cmd_status();
+
+	if (cmds == CMDS_XCMD)
+		return 0;
+	ret = wgetch(top.win);
+	if (ret == ERR || ret == KEY_RESIZE)
+		return 0;
+	if (cmds == CMDS_IDLE) {
+		handle_command(ret);
+		return 0;
+	}
+	if (cmd_pid != 0)
+		kill(cmd_pid, SIGTERM);
+	return 0;
+}
+
+static void signal_pre_select(struct sched *s, struct task *t)
+{
+	struct signal_task *st = container_of(t, struct signal_task, task);
+	para_fd_set(st->fd, &s->rfds, &s->max_fileno);
 }
 
 static void print_scroll_msg(void)
 {
 	unsigned lines_total, filled = ringbuffer_filled(bot_win_rb);
 	int first_rbe = first_visible_rbe(&lines_total);
+
 	print_in_bar(COLOR_MSG, "scrolled view: %d-%d/%d\n", filled - first_rbe,
 		filled - scroll_position, ringbuffer_filled(bot_win_rb));
 }
 
 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;
@@ -1211,7 +1140,7 @@ static void com_scroll_top(void)
 	print_in_bar(COLOR_ERRMSG, "top of buffer is shown\n");
 }
 
-static void com_cancel_scrolling(void)
+static void com_cancel_scroll(void)
 {
 
 	if (scroll_position == 0) {
@@ -1225,8 +1154,9 @@ static void com_cancel_scrolling(void)
 static void com_page_down(void)
 {
 	unsigned lines = 0;
-	int i = scroll_position;
-	while (lines < bot.lines && --i > 0) {
+	int i = scroll_position, bot_lines = get_num_lines(&bot);
+
+	while (lines < bot_lines && --i > 0) {
 		struct rb_entry *rbe = ringbuffer_get(bot_win_rb, i);
 		if (!rbe)
 			break;
@@ -1244,7 +1174,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");
@@ -1253,7 +1183,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();
@@ -1263,7 +1193,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");
@@ -1273,7 +1203,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);
@@ -1306,7 +1236,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);
@@ -1343,30 +1272,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");
-		return;
-	}
-	PARA_INFO_LOG("rereading command line options and config file");
-	gui_cmdline_parser_ext(_argc, _argv, &conf, &params);
-	gui_cmdline_parser_config_file(cf, &conf, &params);
-	PARA_NOTICE_LOG("config file reloaded");
-	if (check_key_map_args() < 0)
-		finish(EXIT_FAILURE);
+	reread_conf();
 }
 
 static void com_help(void)
@@ -1408,25 +1316,25 @@ static void com_help(void)
 
 static void com_shrink_top_win(void)
 {
-	if (top.lines <= theme.top_lines_min) {
-		PARA_WARNING_LOG("can not decrease top window");
+	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) {
-		PARA_WARNING_LOG("can not increase top window");
+	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");
 }
 
@@ -1437,7 +1345,7 @@ static void com_version(void)
 
 __noreturn static void com_quit(void)
 {
-	finish(0);
+	die(EXIT_SUCCESS, "%s", "");
 }
 
 static void com_refresh(void)
@@ -1446,69 +1354,16 @@ static void com_refresh(void)
 	init_curses();
 }
 
-static void change_theme(int next)
-{
-	if (next)
-		next_theme(&theme);
-	else
-		prev_theme(&theme);
-	/* This seems to be needed twice, why? */
-	com_refresh();
-	com_refresh();
-	PARA_NOTICE_LOG("new theme: %s", theme.name);
-}
-
 static void com_next_theme(void)
 {
-	change_theme(1);
+	theme_next(&theme);
+	com_refresh();
 }
 
 static void com_prev_theme(void)
 {
-	change_theme(0);
-}
-
-
-static void handle_command(int c)
-{
-	int i;
-
-	/* first check user's key bindings */
-	for (i = 0; i < conf.key_map_given; ++i) {
-		char *tmp, *handler, *arg;
-
-		tmp = para_strdup(conf.key_map_arg[i]);
-		if (!split_key_map(tmp, &handler, &arg)) {
-			free(tmp);
-			return;
-		}
-		if (strcmp(tmp, km_keyname(c))) {
-			free(tmp);
-			continue;
-		}
-		if (*handler == 'd')
-			display_cmd(arg);
-		else if (*handler == 'x')
-			external_cmd(arg);
-		else if (*handler == 'p')
-			para_cmd(arg);
-		else if (*handler == 'i') {
-			int num = find_cmd_byname(arg);
-			if (num >= 0)
-				command_list[num].handler();
-		}
-		free(tmp);
-		return;
-	}
-	/* not found, check internal key bindings */
-	for (i = 0; command_list[i].handler; i++) {
-		if (!strcmp(km_keyname(c), command_list[i].key)) {
-			command_list[i].handler();
-			return;
-		}
-	}
-	print_in_bar(COLOR_ERRMSG, "key '%s' is not bound, press ? for help",
-		km_keyname(c));
+	theme_prev(&theme);
+	com_refresh();
 }
 
 __noreturn static void print_help_and_die(void)
@@ -1520,54 +1375,67 @@ __noreturn static void print_help_and_die(void)
 	exit(0);
 }
 
-int main(int argc, char *argv[])
+static int setup_tasks_and_schedule(void)
 {
-	int ret;
-	char *cf;
+	struct sched sched = {
+		.default_timeout = {
+			.tv_sec = conf.timeout_arg  / 1000,
+			.tv_usec = (conf.timeout_arg % 1000) * 1000,
+		},
+	};
+	struct cmd_task cmd_task = {
+		.task = {
+			.status = "cmd",
+			.pre_select = command_pre_select,
+			.post_select = command_post_select,
+		},
+	};
+	struct status_task status_task = {
+		.task = {
+			.status = "status",
+			.pre_select = status_pre_select,
+			.post_select = status_post_select,
+		},
+	};
+	struct input_task input_task = {
+		.task = {
+			.status = "input",
+			.pre_select = input_pre_select,
+			.post_select = input_post_select,
+		},
+	};
+	struct signal_task signal_task = {
+		.task = {
+			.status = "signal",
+			.pre_select = signal_pre_select,
+			.post_select = signal_post_select,
+		},
+	};
+	signal_task.fd = para_signal_init();
+	para_install_sighandler(SIGINT);
+	para_install_sighandler(SIGTERM);
+	para_install_sighandler(SIGCHLD);
+	para_install_sighandler(SIGWINCH);
+	para_install_sighandler(SIGUSR1);
 
-	_argc = argc;
-	_argv = argv;
+	register_task(&sched, &cmd_task.task);
+	register_task(&sched, &status_task.task);
+	register_task(&sched, &input_task.task);
+	register_task(&sched, &signal_task.task);
+	return schedule(&sched);
+}
 
+int main(int argc, char *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);
-	}
-	init_theme_or_die(conf.theme_arg, &theme);
-	top.lines = theme.top_lines_default;
-	setup_signal_handling();
+	parse_config_file_or_die(false /* override */);
 	bot_win_rb = ringbuffer_new(RINGBUFFER_SIZE);
 	setlocale(LC_CTYPE, "");
 	initscr(); /* needed only once, always successful */
 	init_curses();
-	print_welcome();
-	for (;;) {
-		print_status_bar();
-		ret = do_select(GETCH_MODE);
-		if (!ret)
-			continue;
-		print_in_bar(COLOR_MSG, " ");
-		handle_command(ret);
-	}
+	return setup_tasks_and_schedule() < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }