X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=38addd9815cc5bf2775c80278679a1e9c64e872e;hp=fff5741dca26c6a472cd67b2fdd7d638131fe3b6;hb=69a7e7aa11d8bf9b05d6431c57276befbc9b35a3;hpb=821c67c164f932a189927f62b3ddcf2ee95b455a

diff --git a/gui.c b/gui.c
index fff5741d..38addd98 100644
--- a/gui.c
+++ b/gui.c
@@ -1,38 +1,36 @@
 /*
- * Copyright (C) 1998-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1998-2011 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file gui.c ncurses-based interface for paraslash */
+/** \file gui.c Curses-based interface for paraslash. */
+
+#include <regex.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <curses.h>
 
 #include "gui.cmdline.h"
 #include "para.h"
-#include <curses.h>
-#include "ringbuffer.h"
+#include "gui.h"
 #include "string.h"
-
-extern const char *status_item_list[NUM_STAT_ITEMS];
+#include "ringbuffer.h"
+#include "fd.h"
+#include "error.h"
+#include "list.h"
+#include "sched.h"
+#include "signal.h"
+
+/** define the array of error lists needed by para_gui */
+INIT_GUI_ERRLISTS;
 static char *stat_content[NUM_STAT_ITEMS];
 
-#define STANDARD_STATUS_BAR "para_gui " VERSION " (hit ? for help)"
+#define STANDARD_STATUS_BAR "para_gui " PACKAGE_VERSION " (hit ? for help)"
 
 static int signal_pipe;
 
-static void finish(int sig);
-
 static struct win_data {
 	WINDOW *win;
 	NCURSES_SIZE_T begx;
@@ -47,35 +45,35 @@ struct rb_entry {
 	size_t len;
 	int color;
 };
-void *bot_win_rb;
+static struct ringbuffer *bot_win_rb;
 #define NUM_LINES(len) (1 + (len) / bot.cols)
 
 static unsigned scroll_position;
 
-static int external_cmd_died, curses_active;
-static pid_t external_cmd_pid;
+static int cmd_died, curses_active;
+static pid_t cmd_pid;
 
 static int command_pipe = -1;
-static int audiod_pipe = -1;
-static struct gengetopt_args_info conf;
+static int stat_pipe = -1;
+static struct gui_args_info conf;
 
 enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE};
 
 
-#define COLOR_STATUSBAR 32
-#define COLOR_COMMAND 33
-#define COLOR_OUTPUT 34
-#define COLOR_MSG 35
-#define COLOR_ERRMSG 36
-#define COLOR_WELCOME 37
-#define COLOR_SEPARATOR 38
-#define COLOR_TOP 39
-#define COLOR_BOT 40
+#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
 
 struct gui_command {
-	char *key;
-	char *name;
-	char *description;
+	const char *key;
+	const char *name;
+	const char *description;
 	void (*handler)(void);
 };
 
@@ -93,8 +91,8 @@ struct stat_item {
 
 static struct gui_theme theme;
 
-int _argc;
-char **_argv;
+static int _argc;
+static char **_argv;
 
 static void com_help(void);
 static void com_reread_conf(void);
@@ -111,8 +109,10 @@ 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);
 
-struct gui_command command_list[] = {
+static struct gui_command command_list[] = {
 	{
 		.key = "?",
 		.name = "help",
@@ -188,6 +188,16 @@ struct gui_command command_list[] = {
 		.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
 	}
@@ -232,6 +242,14 @@ static char *km_keyname(int c)
 		sprintf(buf, "<ppage>");
 		return buf;
 	}
+	if (c == KEY_HOME) {
+		sprintf(buf, "<home>");
+		return buf;
+	}
+	if (c == KEY_END) {
+		sprintf(buf, "<end>");
+		return buf;
+	}
 	if (c < 256 && c > -128 && iscntrl((unsigned char) c)) {
 		if (c < 0)
 			c += 256;
@@ -284,20 +302,23 @@ static void add_spaces(WINDOW* win, unsigned int num)
  * print aligned string to curses window. This function always prints
  * exactly len chars.
  */
-static int align_str(WINDOW* win, char *string, unsigned int len,
+static int align_str(WINDOW* win, char *str, unsigned int len,
 		unsigned int align)
 {
-	int num; /* of spaces */
-	char *str;
+	int i, num; /* of spaces */
 
-	if (!win || !string)
+	if (!win || !str)
 		return -1;
-	num = len - strlen(string);
-	str = para_strdup(string);
+	num = len - strlen(str);
 	if (num < 0) {
 		str[len] = '\0';
 		num = 0;
 	}
+	/* replace control characters by spaces */
+	for (i = 0; i < len && str[i]; i++) {
+		if (str[i] == '\n' || str[i] == '\r' || str[i] == '\f')
+			str[i] = ' ';
+	}
 	if (align == LEFT) {
 		waddstr(win, str);
 		add_spaces(win, num);
@@ -309,11 +330,10 @@ static int align_str(WINDOW* win, char *string, unsigned int len,
 		waddstr(win, str[0]? str: "");
 		add_spaces(win, num - num / 2);
 	}
-	free(str);
 	return 1;
 }
 
-__printf_2_3 static void print_in_bar(int color, char *fmt,...)
+__printf_2_3 static void print_in_bar(int color, const char *fmt,...)
 {
 	char *msg;
 
@@ -332,10 +352,14 @@ __printf_2_3 static void print_in_bar(int color, char *fmt,...)
  */
 static void print_status_bar(void)
 {
+	char *tmp;
+
 	if (!curses_active)
 		return;
+	tmp = para_strdup(STANDARD_STATUS_BAR);
 	wmove(sb.win, 0, 0);
-	align_str(sb.win,STANDARD_STATUS_BAR, sb.cols, CENTER);
+	align_str(sb.win, tmp, sb.cols, CENTER);
+	free(tmp);
 	wrefresh(sb.win);
 }
 
@@ -376,11 +400,13 @@ static int draw_top_rbe(unsigned *lines)
 	rbe = ringbuffer_get(bot_win_rb, fvr);
 	if (!rbe)
 		return -1;
-	/* first rbe might be only partially visible */
-	offset = (*lines - bot.lines) * bot.cols;
 	len = strlen(rbe->msg);
-	if (offset < 0 || len < offset)
-		return -1;
+	if (*lines > bot.lines) {
+		/* first rbe is only partially visible */
+		offset = (*lines - bot.lines) * bot.cols;
+		assert(offset <= len);
+	} else
+		offset = 0;
 	wattron(bot.win, COLOR_PAIR(rbe->color));
 	waddstr(bot.win, rbe->msg + offset);
 	*lines = NUM_LINES(len - offset);
@@ -442,7 +468,7 @@ static void rb_add_entry(int color, char *msg)
 /*
  * print formated output to bot win and refresh
  */
-__printf_2_3 static void outputf(int color, char* fmt,...)
+__printf_2_3 static void outputf(int color, const char* fmt,...)
 {
 	char *msg;
 
@@ -453,24 +479,27 @@ __printf_2_3 static void outputf(int color, char* fmt,...)
 	wrefresh(bot.win);
 }
 
-static void add_output_line(char *line)
+static int add_output_line(char *line, __a_unused void *data)
 {
 	if (!curses_active)
-		return;
+		return 1;
 	rb_add_entry(COLOR_OUTPUT, para_strdup(line));
+	return 1;
 }
 
-void para_log(int ll, char *fmt,...)
+static int loglevel;
+
+__printf_2_3 void para_log(int ll, const char *fmt,...)
 {
 	int color;
 	char *msg;
 
-	if (ll < conf.loglevel_arg || !curses_active)
+	if (ll < loglevel || !curses_active)
 		return;
 	switch (ll) {
-		case DEBUG:
-		case INFO:
-		case NOTICE:
+		case LL_DEBUG:
+		case LL_INFO:
+		case LL_NOTICE:
 			color = COLOR_MSG;
 			break;
 		default:
@@ -490,13 +519,12 @@ static void setup_signal_handling(void)
 	para_install_sighandler(SIGCHLD);
 	para_install_sighandler(SIGWINCH);
 	para_install_sighandler(SIGUSR1);
-	signal(SIGPIPE, SIG_IGN);
-	signal(SIGHUP, SIG_IGN);
+	para_sigaction(SIGHUP, SIG_IGN);
 }
 
-static void do_exit(int ret)
+__noreturn static void do_exit(int ret)
 {
-	signal(SIGTERM, SIG_IGN);
+	para_sigaction(SIGTERM, SIG_IGN);
 	kill(0, SIGTERM);
 	exit(ret);
 }
@@ -510,7 +538,7 @@ static void shutdown_curses(void)
 	endwin();
 }
 
-static void finish(int ret)
+__noreturn static void finish(int ret)
 {
 	shutdown_curses();
 	do_exit(ret);
@@ -519,7 +547,7 @@ static void finish(int ret)
 /*
  * exit curses and print given message to stdout/stderr
  */
-__printf_2_3 static void msg_n_exit(int ret, char* fmt, ...)
+__noreturn __printf_2_3 static void msg_n_exit(int ret, const char* fmt, ...)
 {
 	va_list argp;
 	FILE *outfd = ret? stderr: stdout;
@@ -533,10 +561,9 @@ __printf_2_3 static void msg_n_exit(int ret, char* fmt, ...)
 
 static void print_welcome(void)
 {
-	int ll = conf.loglevel_arg;
-	if (ll > NOTICE)
+	if (loglevel > LL_NOTICE)
 		return;
-	outputf(COLOR_WELCOME, "Welcome to para_gui " VERSION
+	outputf(COLOR_WELCOME, "Welcome to para_gui " PACKAGE_VERSION
 		" \"" CODENAME "\". Theme: %s", theme.name);
 	wclrtoeol(bot.win);
 }
@@ -630,14 +657,6 @@ static void init_wins(int top_lines)
 	doupdate();
 }
 
-static void check_geometry(void)
-{
-	if (LINES < theme.lines_min || COLS < theme.cols_min)
-		msg_n_exit(EXIT_FAILURE, "Error: Terminal (%dx%d) too small"
-			" (need at least %dx%d)\n", COLS, LINES,
-			theme.cols_min, theme.lines_min);
-}
-
 /*
  * Print stat item #i to curses window
  */
@@ -650,7 +669,6 @@ static void print_stat_item(int i)
 	if (!curses_active || !d.len || !c)
 		return;
 	tmp = make_message("%s%s%s", d.prefix, c, d.postfix);
-//	PARA_DEBUG_LOG("%s: read: %s\n", __func__, tmp);
 	wmove(top.win, d.y * top.lines / 100, d.x * COLS / 100);
 	wrefresh(top.win);
 	wattron(top.win, COLOR_PAIR(i + 1));
@@ -659,103 +677,159 @@ static void print_stat_item(int i)
 	wrefresh(top.win);
 }
 
+static int update_item(int item_num, char *buf)
+{
+	char **c = stat_content + item_num;
+
+	free(*c);
+	if (buf && buf[0])
+		goto dup;
+	switch (item_num) {
+	case SI_ARTIST:
+		*c = para_strdup("(artist tag not set)");
+		goto print;
+	case SI_TITLE:
+		*c = para_strdup("(title tag not set)");
+		goto print;
+	case SI_YEAR:
+		*c = para_strdup("????");
+		goto print;
+	case SI_ALBUM:
+		*c = para_strdup("(album tag not set)");
+		goto print;
+	case SI_COMMENT:
+		*c = para_strdup("(comment tag not set)");
+		goto print;
+	}
+dup:
+	*c = para_strdup(buf);
+print:
+	print_stat_item(item_num);
+	return 1;
+}
+
+static int read_stat_pipe(fd_set *rfds)
+{
+	static char *buf;
+	static int bufsize, loaded;
+	int ret, ret2;
+	size_t sz;
+
+	if (stat_pipe < 0)
+		return 0;
+	if (loaded >= bufsize) {
+		if (bufsize > 1000 * 1000) {
+			loaded = 0;
+			return 0;
+		}
+		bufsize += bufsize + 1000;
+		buf = para_realloc(buf, bufsize);
+	}
+	assert(loaded < bufsize);
+	ret = read_nonblock(stat_pipe, buf + loaded, bufsize - loaded,
+		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;
+	}
+	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)
 {
 	int i;
 
 	if (!curses_active)
 		return;
-	for (i = 0; i < NUM_STAT_ITEMS; i++)
+	FOR_EACH_STATUS_ITEM(i)
 		print_stat_item(i);
 }
+
 static void clear_all_items(void)
 {
 	int i;
 
-	for (i = 0; i < NUM_STAT_ITEMS; i++) {
+	FOR_EACH_STATUS_ITEM(i) {
 		free(stat_content[i]);
 		stat_content[i] = para_strdup("");
 	}
 }
 
-static void init_colors(void)
+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");
+}
+
+static void init_colors_or_die(void)
 {
 	int i;
+
 	if (!has_colors())
-		msg_n_exit(EXIT_FAILURE, "Error: No color term\n");
-	start_color();
-	for (i = 0; i < NUM_STAT_ITEMS; i++)
+		msg_n_exit(EXIT_FAILURE, "fatal: No color term\n");
+	if (start_color() == ERR)
+		msg_n_exit(EXIT_FAILURE, "fatal: failed to start colors\n");
+	FOR_EACH_STATUS_ITEM(i)
 		if (theme.data[i].len)
-			init_pair(i + 1, theme.data[i].fg, theme.data[i].bg);
-	init_pair(COLOR_STATUSBAR, theme.sb_fg, theme.sb_bg);
-	init_pair(COLOR_COMMAND, theme.cmd_fg, theme.cmd_bg);
-	init_pair(COLOR_OUTPUT, theme.output_fg, theme.output_bg);
-	init_pair(COLOR_MSG, theme.msg_fg, theme.msg_bg);
-	init_pair(COLOR_ERRMSG, theme.err_msg_fg, theme.err_msg_bg);
-	init_pair(COLOR_WELCOME, theme.welcome_fg, theme.welcome_bg);
-	init_pair(COLOR_SEPARATOR, theme.sep_fg, theme.sep_bg);
-	init_pair(COLOR_TOP, theme.default_fg, theme.default_bg);
-	init_pair(COLOR_BOT, theme.default_fg, theme.default_bg);
+			init_pair_or_die(i + 1, theme.data[i].fg,
+				theme.data[i].bg);
+	init_pair_or_die(COLOR_STATUSBAR, theme.sb_fg, theme.sb_bg);
+	init_pair_or_die(COLOR_COMMAND, theme.cmd_fg, theme.cmd_bg);
+	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);
 }
 
-/*
- * (re-)initialize the curses library  FIXME: Error checking
- */
+/* (Re-)initialize the curses library. */
 static void init_curses(void)
 {
 	curses_active = 1;
-	if (top.win && refresh() == ERR) { /* refesh is really needed */
+	if (top.win && refresh() == ERR) /* refesh is really needed */
 		msg_n_exit(EXIT_FAILURE, "refresh() failed\n");
-	}
-	check_geometry();
+	if (LINES < theme.lines_min || COLS < theme.cols_min)
+		msg_n_exit(EXIT_FAILURE, "Error: 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 */
-//	if (noraw() == ERR);
-//		msg_n_exit(EXIT_FAILURE, "can not place terminal out of "
-//			"raw mode\n");
-	nonl(); /* tell curses not to do NL->CR/NL on output */
-	noecho(); /* don't echo input */
-	cbreak(); /* take input chars one at a time, no wait for \n */
-	//reset_prog_mode();
-	init_colors();
-	clear();
+	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");
+	/* take input chars one at a time, no wait for \n */
+	if (cbreak() == ERR)
+		msg_n_exit(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 */
+	// noecho(); /* don't echo input */
 }
 
-
 static void check_sigchld(void)
 {
+	int ret;
 	pid_t pid;
 reap_next_child:
-	pid = para_reap_child();
-	if (pid <= 0)
+	ret = para_reap_child(&pid);
+	if (ret <= 0)
 		return;
-	if (pid == external_cmd_pid) {
-		external_cmd_pid = 0;
-		external_cmd_died = 1;
+	if (pid == cmd_pid) {
+		cmd_pid = 0;
+		cmd_died = 1;
 	}
 	goto reap_next_child;
 }
 
-/*
- * print status line if line starts with known command.
- */
-static void check_stat_line(char *line)
-{
-	int i;
-
-//	PARA_INFO_LOG("%s: checking: %s\n", __func__, line);
-	i = stat_line_valid(line);
-	if (i >= 0) {
-		line += strlen(status_item_list[i]) + 1;
-		free(stat_content[i]);
-		stat_content[i] = para_strdup(line);
-		print_stat_item(i);
-	}
-	return;
-}
-
 /*
  * This sucker modifies its first argument. *handler and *arg are
  * pointers to 0-terminated strings (inside line). Crap.
@@ -825,13 +899,13 @@ static void handle_signal(int sig)
 		}
 		return;
 	case SIGINT:
-		PARA_WARNING_LOG("%s", "caught SIGINT, reset");
-		/* Nothing to do. SIGINT killed our child, para_client stat.
-		 * This get noticed by do_select which resets everything
+		PARA_WARNING_LOG("caught SIGINT, reset");
+		/* Nothing to do. SIGINT killed our child which gets noticed
+		 * by do_select and resets everything.
 		 */
 		return;
 	case SIGUSR1:
-		PARA_NOTICE_LOG("%s", "got SIGUSR1, rereading configuration");
+		PARA_NOTICE_LOG("got SIGUSR1, rereading configuration");
 		com_reread_conf();
 		return;
 	case SIGCHLD:
@@ -840,15 +914,30 @@ static void handle_signal(int sig)
 	}
 }
 
-static int open_audiod_pipe(void)
+static int open_stat_pipe(void)
 {
 	static int init = 1;
+	int ret, fds[3] = {0, 1, 0};
+	pid_t pid;
 
 	if (init)
 		init = 0;
 	else
-		sleep(1);
-	return para_open_audiod_pipe(conf.stat_cmd_arg);
+		/*
+		 * Sleep a bit to avoid a busy loop. As the call to sleep() may
+		 * be interrupted by SIGCHLD, we simply wait until the call
+		 * succeeds.
+		 */
+		while (sleep(2))
+			; /* nothing */
+	ret = para_exec_cmdline_pid(&pid, conf.stat_cmd_arg, fds);
+	if (ret < 0)
+		return ret;
+	ret = mark_fd_nonblocking(fds[1]);
+	if (ret >= 0)
+		return fds[1];
+	close(fds[1]);
+	return ret;
 }
 
 /*
@@ -862,15 +951,15 @@ static int open_audiod_pipe(void)
  * when any key is pressed.
  *
  * EXTERNAL_MODE: Check only signal pipe. Used when an external command
- * is running. During that thime curses is disabled.  Returns when
- * external_cmd_pid == 0.
+ * is running. During that time curses is disabled.  Returns when
+ * cmd_pid == 0.
  */
 static int do_select(int mode)
 {
 	fd_set rfds;
 	int ret;
-	int max_fileno, cp_numread = 1;
-	char command_buf[STRINGSIZE] = "";
+	int max_fileno;
+	char command_buf[4096] = "";
 	int cbo = 0; /* command buf offset */
 	struct timeval tv;
 repeat:
@@ -879,69 +968,64 @@ repeat:
 //	ret = refresh_status();
 	FD_ZERO(&rfds);
 	max_fileno = 0;
-	/* audiod pipe */
-	if (audiod_pipe < 0)
-		audiod_pipe = open_audiod_pipe();
-	if (audiod_pipe >= 0) {
-		FD_SET(audiod_pipe, &rfds);
-		max_fileno = MAX(max_fileno, audiod_pipe);
-	}
-
+	if (stat_pipe < 0)
+		stat_pipe = open_stat_pipe();
+	if (stat_pipe >= 0)
+		para_fd_set(stat_pipe, &rfds, &max_fileno);
 	/* signal pipe */
-	FD_SET(signal_pipe, &rfds);
-	max_fileno = MAX(max_fileno, signal_pipe);
+	para_fd_set(signal_pipe, &rfds, &max_fileno);
 	/* command pipe only for COMMAND_MODE */
-	if (command_pipe >= 0 && mode == COMMAND_MODE) {
-		FD_SET(command_pipe, &rfds);
-		max_fileno = MAX(max_fileno, command_pipe);
-	}
-	if (curses_active)
-		FD_SET(STDIN_FILENO, &rfds);
-	ret = select(max_fileno + 1, &rfds, NULL, NULL, &tv);
-//	PARA_DEBUG_LOG("select returned %d\n", ret);
-
-	/* signals */
-	if (FD_ISSET(signal_pipe, &rfds)) {
-		int sig_nr = para_next_signal();
-		if (sig_nr > 0)
-			handle_signal(sig_nr);
-	}
+	if (command_pipe >= 0 && mode == COMMAND_MODE)
+		para_fd_set(command_pipe, &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 (command_pipe >= 0 && mode == COMMAND_MODE &&
-			FD_ISSET(command_pipe, &rfds)) {
-		cp_numread = read(command_pipe, command_buf + cbo,
-			STRINGSIZE - 1 - cbo);
-		if (cp_numread >= 0)
-			cbo += cp_numread;
-		else {
-			if (cp_numread < 0)
-				PARA_ERROR_LOG("read error (%d)", cp_numread);
+	if (command_pipe >= 0 && mode == COMMAND_MODE) {
+		size_t sz;
+		ret = read_nonblock(command_pipe, command_buf + cbo,
+			sizeof(command_buf) - 1 - cbo, &rfds, &sz);
+		cbo += sz;
+		sz = cbo;
+		cbo = for_each_line(command_buf, cbo, &add_output_line, NULL);
+		if (sz != cbo)
+			wrefresh(bot.win);
+		if (ret < 0) {
+			PARA_NOTICE_LOG("closing command pipe: %s",
+				para_strerror(-ret));
 			close(command_pipe);
 			command_pipe = -1;
+			return 0;
 		}
 	}
-	if (audiod_pipe >= 0 && FD_ISSET(audiod_pipe, &rfds))
-		if (read_audiod_pipe(audiod_pipe, check_stat_line) <= 0) {
-			close(audiod_pipe);
-			audiod_pipe = -1;
-			clear_all_items();
-			free(stat_content[SI_STATUS_BAR]);
-			stat_content[SI_STATUS_BAR] =
-				para_strdup("audiod not running!?");
-			print_all_items();
-		}
+	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:
-		if (cp_numread <= 0 && !cbo) /* command complete */
-			return 0;
-		if (cbo)
-			cbo = for_each_line(command_buf, cbo, &add_output_line);
-		if (cp_numread <= 0)
-			cbo = 0;
-		wrefresh(bot.win);
+		ret = wgetch(top.win);
+		if (ret != ERR && ret != KEY_RESIZE) {
+			if (command_pipe) {
+				close(command_pipe);
+				command_pipe = -1;
+			}
+			if (cmd_pid)
+				kill(cmd_pid, SIGTERM);
+			return -1;
+		}
 		break;
 	case GETCH_MODE:
 		ret = wgetch(top.win);
@@ -949,8 +1033,8 @@ check_return:
 			return ret;
 		break;
 	case EXTERNAL_MODE:
-		if (external_cmd_died) {
-			external_cmd_died = 0;
+		if (cmd_died) {
+			cmd_died = 0;
 			return 0;
 		}
 	}
@@ -962,25 +1046,31 @@ check_return:
  */
 static int send_output(void)
 {
+	int ret;
+
 	if (command_pipe < 0)
 		return 0;
+	ret = mark_fd_nonblocking(command_pipe);
+	if (ret < 0) {
+		close(command_pipe);
+		return ret;
+	}
 	if (do_select(COMMAND_MODE) >= 0)
-		PARA_INFO_LOG("%s", "command complete");
+		PARA_INFO_LOG("command complete");
 	else
-		PARA_NOTICE_LOG("%s", "command aborted");
+		PARA_NOTICE_LOG("command aborted");
 	print_in_bar(COLOR_MSG, " ");
 	return 1;
 }
 
 static int client_cmd_cmdline(char *cmd)
 {
-	pid_t pid;
 	int ret, fds[3] = {0, 1, 0};
-	char *c = make_message(BINDIR "/para_client %s", cmd);
+	char *c = make_message(BINDIR "/para_client -- %s", cmd);
 
 	outputf(COLOR_COMMAND, "%s", c);
-	print_in_bar(COLOR_MSG, "executing client command, hit q to abort\n");
-	ret = para_exec_cmdline_pid(&pid, c, fds);
+	print_in_bar(COLOR_MSG, "executing client command, hit any key to abort\n");
+	ret = para_exec_cmdline_pid(&cmd_pid, c, fds);
 	free(c);
 	if (ret < 0)
 		return -1;
@@ -993,12 +1083,11 @@ static int client_cmd_cmdline(char *cmd)
  */
 static int display_cmd(char *cmd)
 {
-	pid_t pid;
 	int fds[3] = {0, 1, 0};
 
-	print_in_bar(COLOR_MSG, "executing display command, hit q to abort");
+	print_in_bar(COLOR_MSG, "executing display command, hit any key to abort");
 	outputf(COLOR_COMMAND, "%s", cmd);
-	if (para_exec_cmdline_pid(&pid, cmd, fds) < 0)
+	if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0)
 		return -1;
 	command_pipe = fds[1];
 	return send_output();
@@ -1011,10 +1100,11 @@ static int external_cmd(char *cmd)
 {
 	int fds[3] = {-1, -1, -1};
 
-	if (external_cmd_pid)
+	if (cmd_pid)
 		return -1;
 	shutdown_curses();
-	para_exec_cmdline_pid(&external_cmd_pid, cmd, fds);
+	para_exec_cmdline_pid(&cmd_pid, cmd, fds);
+	cmd_died = 0;
 	do_select(EXTERNAL_MODE);
 	init_curses();
 	return 0;
@@ -1028,6 +1118,41 @@ static void print_scroll_msg(void)
 		filled - scroll_position, ringbuffer_filled(bot_win_rb));
 }
 
+static void com_scroll_top(void)
+{
+	int i = RINGBUFFER_SIZE - 1;
+	unsigned lines = 0;
+
+	while (i > 0 && !ringbuffer_get(bot_win_rb, i))
+		i--;
+	/* i is oldest entry */
+	for (; lines < bot.lines && i >= 0; i--) {
+		struct rb_entry *rbe = ringbuffer_get(bot_win_rb, i);
+		if (!rbe)
+			break;
+		lines += NUM_LINES(strlen(rbe->msg));
+	}
+	i++;
+	if (lines > 0 && scroll_position != i) {
+		scroll_position = i;
+		redraw_bot_win();
+		print_scroll_msg();
+		return;
+	}
+	print_in_bar(COLOR_ERRMSG, "top of buffer is shown\n");
+}
+
+static void com_cancel_scrolling(void)
+{
+
+	if (scroll_position == 0) {
+		print_in_bar(COLOR_ERRMSG, "bottom of buffer is shown\n");
+		return;
+	}
+	scroll_position = 0;
+	redraw_bot_win();
+}
+
 static void com_page_down(void)
 {
 	unsigned lines = 0;
@@ -1051,13 +1176,14 @@ static void com_page_up(void)
 {
 	unsigned lines;
 	int fvr = first_visible_rbe(&lines);
+
 	if (fvr < 0 || fvr + 1 >= ringbuffer_filled(bot_win_rb)) {
 		print_in_bar(COLOR_ERRMSG, "top of buffer is shown\n");
 		return;
 	}
 	scroll_position = fvr + 1;
 	for (; scroll_position > 0; scroll_position--) {
-		fvr = first_visible_rbe(&lines);
+		first_visible_rbe(&lines);
 		if (lines == bot.lines)
 			break;
 	}
@@ -1089,22 +1215,22 @@ static void com_scroll_up(void)
 {
 	struct rb_entry *rbe = NULL;
 	unsigned lines;
-	int i, first_rbe, scroll;
+	int i, first_rbe, num_scroll;
 
 	/* the entry that is going to vanish */
 	rbe = ringbuffer_get(bot_win_rb, scroll_position);
 	if (!rbe)
 		goto err_out;
-	scroll = NUM_LINES(rbe->len);
+	num_scroll = NUM_LINES(rbe->len);
 	first_rbe = first_visible_rbe(&lines);
 	if (first_rbe < 0 || (first_rbe == ringbuffer_filled(bot_win_rb) - 1))
 		goto err_out;
 	scroll_position++;
-	wscrl(bot.win, -scroll);
+	wscrl(bot.win, -num_scroll);
 	i = draw_top_rbe(&lines);
 	if (i < 0)
 		goto err_out;
-	while (i > 0 && lines < scroll) {
+	while (i > 0 && lines < num_scroll) {
 		int rbe_lines;
 		rbe = ringbuffer_get(bot_win_rb, --i);
 		if (!rbe)
@@ -1128,24 +1254,24 @@ err_out:
 
 static void com_ll_decr(void)
 {
-	if (conf.loglevel_arg <= DEBUG) {
+	if (loglevel <= LL_DEBUG) {
 		print_in_bar(COLOR_ERRMSG,
 			"loglevel already at maximal verbosity\n");
 		return;
 	}
-	conf.loglevel_arg--;
-	print_in_bar(COLOR_MSG, "loglevel set to %d\n", conf.loglevel_arg);
+	loglevel--;
+	print_in_bar(COLOR_MSG, "loglevel set to %d\n", loglevel);
 }
 
 static void com_ll_incr(void)
 {
-	if (conf.loglevel_arg >= EMERG) {
+	if (loglevel >= LL_EMERG) {
 		print_in_bar(COLOR_ERRMSG,
-			"loglevel already at miminal verbosity\n");
+			"loglevel already at minimal verbosity\n");
 		return;
 	}
-	conf.loglevel_arg++;
-	print_in_bar(COLOR_MSG, "loglevel set to %d\n", conf.loglevel_arg);
+	loglevel++;
+	print_in_bar(COLOR_MSG, "loglevel set to %d\n", loglevel);
 }
 
 /*
@@ -1154,15 +1280,25 @@ static void com_ll_incr(void)
 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("%s", "there is no configuration to read");
+		PARA_WARNING_LOG("there is no configuration to read");
 		return;
 	}
-	PARA_INFO_LOG("%s", "rereading command line options and config file");
-	cmdline_parser(_argc, _argv, &conf);
-	cmdline_parser_configfile(cf, &conf, 1, 1, 0);
-	PARA_NOTICE_LOG("%s", "configuration read");
+	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);
+	}
+	PARA_NOTICE_LOG("config file reloaded");
 	if (check_key_map_args() < 0)
 		finish(EXIT_FAILURE);
 }
@@ -1172,24 +1308,26 @@ static void com_help(void)
 	int i;
 
 	for (i = 0; i < conf.key_map_given; ++i) {
-		char *s = conf.key_map_arg[i], *handler, *arg,
-			*desc = "", tmp[MAXLINE];
+		char *handler, *arg, *tmp = para_strdup(conf.key_map_arg[i]);
+		const char *handler_text = "???", *desc = NULL;
 
-		strcpy(tmp, s);
-		if (!split_key_map(tmp, &handler, &arg))
+		if (!split_key_map(tmp, &handler, &arg)) {
+			free(tmp);
 			return;
-		switch(*handler) {
+		}
+		switch (*handler) {
 			case 'i':
-				handler = "internal";
+				handler_text = "internal";
 				desc = command_list[find_cmd_byname(arg)].description;
 				break;
-			case 'x': handler = "external"; break;
-			case 'd': handler = "display "; break;
-			case 'p': handler = "para    "; break;
+			case 'x': handler_text = "external"; break;
+			case 'd': handler_text = "display "; break;
+			case 'p': handler_text = "para    "; break;
 		}
-		outputf(COLOR_MSG, "%s\t%s\t%s%s\t%s", tmp, handler, arg,
+		outputf(COLOR_MSG, "%s\t%s\t%s%s\t%s", tmp, handler_text, arg,
 			strlen(arg) < 8? "\t" : "",
-			desc);
+			desc? desc : "");
+		free(tmp);
 	}
 	for (i = 0; command_list[i].handler; i++) {
 		struct gui_command gc = command_list[i];
@@ -1200,13 +1338,12 @@ static void com_help(void)
 	}
 	print_in_bar(COLOR_MSG, "try \"para_gui -h\" or \"para_client help\" "
 		"for more info");
-	return;
 }
 
 static void com_shrink_top_win(void)
 {
 	if (top.lines <= theme.top_lines_min) {
-		PARA_WARNING_LOG("%s", "can not decrease top window");
+		PARA_WARNING_LOG("can not decrease top window");
 		return;
 	}
 	init_wins(top.lines - 1);
@@ -1218,7 +1355,7 @@ static void com_shrink_top_win(void)
 static void com_enlarge_top_win(void)
 {
 	if (bot.lines < 3) {
-		PARA_WARNING_LOG("%s", "can not increase top window");
+		PARA_WARNING_LOG("can not increase top window");
 		return;
 	}
 	init_wins(top.lines + 1);
@@ -1229,10 +1366,11 @@ static void com_enlarge_top_win(void)
 
 static void com_version(void)
 {
-	print_in_bar(COLOR_MSG, "para_gui " VERSION " \"" CODENAME "\"");
+	print_in_bar(COLOR_MSG, "para_gui " PACKAGE_VERSION " \""
+		CODENAME "\"");
 }
 
-static void com_quit(void)
+__noreturn static void com_quit(void)
 {
 	finish(0);
 }
@@ -1272,31 +1410,30 @@ static void handle_command(int c)
 
 	/* first check user's key bindings */
 	for (i = 0; i < conf.key_map_given; ++i) {
-		char tmp[MAXLINE], *handler, *arg;
+		char *tmp, *handler, *arg;
 
-		strcpy(tmp, conf.key_map_arg[i]);
-		if (!split_key_map(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))) {
-			if (*handler == 'd') {
-				display_cmd(arg);
-				return;
-			}
-			if (*handler == 'x') {
-				external_cmd(arg);
-				return;
-			}
-			if (*handler == 'p') {
-				client_cmd_cmdline(arg);
-				return;
-			}
-			if (*handler == 'i') {
-				int num = find_cmd_byname(arg);
-				if (num >= 0)
-					command_list[num].handler();
-				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')
+			client_cmd_cmdline(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++) {
@@ -1317,28 +1454,33 @@ int main(int argc, char *argv[])
 	_argc = argc;
 	_argv = argv;
 
-	if (cmdline_parser(argc, argv, &conf)) {
-		fprintf(stderr, "parse error while reading command line\n");
+	if (gui_cmdline_parser(argc, argv, &conf) != 0)
 		exit(EXIT_FAILURE);
-	}
-	init_theme(0, &theme);
-	top.lines = theme.top_lines_default;
-	if (check_key_map_args() < 0) {
-		fprintf(stderr, "invalid key map\n");
-		exit(EXIT_FAILURE);
-	}
+	HANDLE_VERSION_FLAG("gui", conf);
 	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)
-		cmdline_parser_configfile(cf, &conf, 0, 0, 0);
+	if (cf) {
+		struct gui_cmdline_parser_params params = {
+			.override = 0,
+			.initialize = 0,
+			.check_required = 0,
+			.check_ambiguity = 0,
+			.print_errors = 1,
+		};
+		if (gui_cmdline_parser_config_file(cf, &conf, &params) != 0)
+			exit(EXIT_FAILURE);
+	}
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	if (check_key_map_args() < 0) {
-		fprintf(stderr, "invalid key map in config file\n");
+		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();
 	bot_win_rb = ringbuffer_new(RINGBUFFER_SIZE);
 	initscr(); /* needed only once, always successful */