X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=933729a26c9e530570a8bf01418f6e839fcf535d;hp=a71a2a7c4ab2bf7355401f32450cdbab47837ae3;hb=cd8bb5a2d51179a31842a2cd7012cad28deea78d;hpb=9ae4e1bcaf7bdcc902b70428afa766ab332a5b23

diff --git a/gui.c b/gui.c
index a71a2a7c..933729a2 100644
--- a/gui.c
+++ b/gui.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 1998-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1998-2008 Andre Noll <maan@systemlinux.org>
  *
  * 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 <signal.h>
 #include <sys/types.h>
@@ -12,9 +12,9 @@
 #include "gui.cmdline.h"
 #include "para.h"
 #include "gui.h"
+#include "string.h"
 #include <curses.h>
 #include "ringbuffer.h"
-#include "gui_common.h"
 #include "fd.h"
 #include "error.h"
 #include "list.h"
@@ -23,15 +23,12 @@
 
 /** define the array of error lists needed by para_gui */
 INIT_GUI_ERRLISTS;
-extern const char *status_item_list[NUM_STAT_ITEMS];
 static char *stat_content[NUM_STAT_ITEMS];
 
 #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;
@@ -46,7 +43,7 @@ struct rb_entry {
 	size_t len;
 	int color;
 };
-void *bot_win_rb;
+struct ringbuffer *bot_win_rb;
 #define NUM_LINES(len) (1 + (len) / bot.cols)
 
 static unsigned scroll_position;
@@ -61,15 +58,15 @@ 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 {
 	const char *key;
@@ -192,6 +189,38 @@ struct gui_command command_list[] = {
 	}
 };
 
+static int para_open_audiod_pipe(char *cmd)
+{
+	int fds[3] = {0, 1, 0};
+	pid_t pid;
+	int ret = para_exec_cmdline_pid(&pid, cmd, fds);
+	if (ret < 0)
+		return ret;
+	ret = mark_fd_nonblocking(fds[1]);
+	if (ret > 0)
+		return fds[1];
+	close(fds[1]);
+	return ret;
+}
+
+static int read_audiod_pipe(int fd, line_handler_t *line_handler)
+{
+	static char buf[4096];
+	const ssize_t bufsize = sizeof(buf) - 1;
+	static ssize_t loaded;
+	ssize_t ret;
+
+	if (loaded >= bufsize)
+		loaded = 0;
+	ret = read(fd, buf + loaded, bufsize - loaded);
+	if (ret > 0) {
+		loaded += ret;
+		buf[loaded] = '\0';
+		loaded = for_each_line(buf, loaded, line_handler, NULL);
+	}
+	return ret;
+}
+
 static int find_cmd_byname(char *name)
 {
 	int i;
@@ -490,7 +519,7 @@ static void setup_signal_handling(void)
 	para_install_sighandler(SIGCHLD);
 	para_install_sighandler(SIGWINCH);
 	para_install_sighandler(SIGUSR1);
-	signal(SIGPIPE, SIG_IGN);
+//	signal(SIGPIPE, SIG_IGN);
 	signal(SIGHUP, SIG_IGN);
 }
 
@@ -650,7 +679,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));
@@ -665,14 +693,15 @@ static void print_all_items(void)
 
 	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("");
 	}
@@ -681,10 +710,11 @@ static void clear_all_items(void)
 static void init_colors(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++)
+	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);
@@ -750,6 +780,8 @@ static int check_stat_line(char *line, __a_unused void *data)
 	i = stat_line_valid(line);
 	if (i >= 0) {
 		line += strlen(status_item_list[i]) + 1;
+		if (*line == ' ')
+			line++;
 		free(stat_content[i]);
 		stat_content[i] = para_strdup(line);
 		print_stat_item(i);
@@ -918,8 +950,8 @@ repeat:
 			close(audiod_pipe);
 			audiod_pipe = -1;
 			clear_all_items();
-			free(stat_content[SI_STATUS_BAR]);
-			stat_content[SI_STATUS_BAR] =
+			free(stat_content[SI_BASENAME]);
+			stat_content[SI_BASENAME] =
 				para_strdup("audiod not running!?");
 			print_all_items();
 		}
@@ -964,8 +996,15 @@ 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");
 	else
@@ -977,7 +1016,7 @@ static int send_output(void)
 static int client_cmd_cmdline(char *cmd)
 {
 	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 any key to abort\n");
@@ -986,7 +1025,6 @@ static int client_cmd_cmdline(char *cmd)
 	if (ret < 0)
 		return -1;
 	command_pipe = fds[1];
-	mark_fd_nonblock(command_pipe);
 	return send_output();
 }
 
@@ -1002,7 +1040,6 @@ static int display_cmd(char *cmd)
 	if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0)
 		return -1;
 	command_pipe = fds[1];
-	mark_fd_nonblock(command_pipe);
 	return send_output();
 }