X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gui.c;h=63e0090f03ca3641aa9f3675f438c8c02128e0d5;hb=cbb35a07b0edb1db499d07894d4c01d220def2cf;hp=18375d9b75cca9a6ceee2c8f1af1949e34169311;hpb=565c034fe5346b83171ba41ef05bc4e2272168f7;p=paraslash.git

diff --git a/gui.c b/gui.c
index 18375d9b..63e0090f 100644
--- a/gui.c
+++ b/gui.c
@@ -30,11 +30,9 @@
 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;
@@ -53,7 +51,7 @@ static struct ringbuffer *bot_win_rb;
 
 static unsigned scroll_position;
 
-static int curses_active;
+static bool curses_active;
 static pid_t cmd_pid;
 
 static int command_fds[2] = {-1, -1};
@@ -63,15 +61,23 @@ static struct gui_args_info conf;
 enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE};
 
 
-#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_WELCOME,
+	COLOR_SEPARATOR,
+	COLOR_TOP,
+	COLOR_BOT,
+};
 
 struct gui_command {
 	const char *key;
@@ -354,20 +360,14 @@ __printf_2_3 static void print_in_bar(int color, const char *fmt,...)
 	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);
 	free(tmp);
-	wrefresh(sb.win);
 }
 
 /*
@@ -564,7 +564,7 @@ static void shutdown_curses(void)
 	if (!curses_active)
 		return;
 	def_prog_mode();
-	curses_active = 0;
+	curses_active = false;
 	endwin();
 }
 
@@ -671,7 +671,6 @@ static void init_wins(int top_lines)
 		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++)
@@ -680,8 +679,8 @@ static void init_wins(int top_lines)
 	//wclear(bot.win);
 	wnoutrefresh(top.win);
 	wnoutrefresh(bot.win);
-	//wnoutrefresh(sb.win);
 	print_status_bar();
+	wnoutrefresh(sb.win);
 	wnoutrefresh(in.win);
 	wnoutrefresh(sep.win);
 	doupdate();
@@ -823,7 +822,7 @@ static void init_colors_or_die(void)
 /* (Re-)initialize the curses library. */
 static void init_curses(void)
 {
-	curses_active = 1;
+	curses_active = true;
 	if (top.win && refresh() == ERR) /* refresh is really needed */
 		msg_n_exit(EXIT_FAILURE, "refresh() failed\n");
 	if (LINES < theme.lines_min || COLS < theme.cols_min)
@@ -887,25 +886,25 @@ static int check_key_map_args(void)
 	for (i = 0; i < conf.key_map_given; ++i) {
 		s = conf.key_map_arg[i];
 		if (!(*s))
-			goto err_out;
+			goto out;
 		free(tmp);
 		tmp = para_strdup(s);
 		if (!split_key_map(tmp, &handler, &arg))
-			goto err_out;
+			goto out;
 		if (strlen(handler) != 1)
-			goto err_out;
+			goto out;
 		if (*handler != 'x'
 			&& *handler != 'd'
 			&& *handler != 'i'
 			&& *handler != 'p')
-			goto err_out;
+			goto out;
 		if (*handler != 'i')
 			continue;
 		if (find_cmd_byname(arg) < 0)
-			goto err_out;
+			goto out;
 	}
 	ret = 0;
-err_out:
+out:
 	free(tmp);
 	return ret;
 }
@@ -928,13 +927,13 @@ static void handle_signal(int sig)
 		}
 		return;
 	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;
 	case SIGUSR1:
-		PARA_NOTICE_LOG("got SIGUSR1, rereading configuration");
+		PARA_NOTICE_LOG("got SIGUSR1, rereading configuration\n");
 		com_reread_conf();
 		return;
 	case SIGCHLD:
@@ -1039,7 +1038,7 @@ repeat:
 				flags[i] = 0;
 			}
 			if (ret < 0) {
-				PARA_NOTICE_LOG("closing command fd %d: %s",
+				PARA_NOTICE_LOG("closing command fd %d: %s\n",
 					i, para_strerror(-ret));
 				close(command_fds[i]);
 				command_fds[i] = -1;
@@ -1049,7 +1048,7 @@ repeat:
 					return 0;
 			}
 			if (cbo[i] == COMMAND_BUF_SIZE - 1) {
-				PARA_NOTICE_LOG("discarding overlong line");
+				PARA_NOTICE_LOG("discarding overlong line\n");
 				cbo[i] = 0;
 				flags[i] = FELF_DISCARD_FIRST;
 			}
@@ -1071,14 +1070,6 @@ check_return:
 	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;
@@ -1096,23 +1087,27 @@ check_return:
 	goto repeat;
 }
 
-/*
- * read from command pipe and print data to bot window
- */
-static void send_output(void)
+/* read from command pipe and print data to bot window */
+static void exec_and_display_cmd(const char *cmd)
 {
-	int ret;
+	int ret, fds[3] = {0, 1, 1};
 
-	ret = mark_fd_nonblocking(command_fds[0]);
+	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;
+	command_fds[0] = fds[1];
+	command_fds[1] = fds[2];
 	if (do_select(COMMAND_MODE) >= 0)
-		PARA_INFO_LOG("command complete");
+		PARA_INFO_LOG("command complete\n");
 	else
-		PARA_NOTICE_LOG("command aborted");
+		PARA_NOTICE_LOG("command aborted\n");
 	print_in_bar(COLOR_MSG, " ");
 	return;
 fail:
@@ -1123,34 +1118,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);
 }
 
 /*
@@ -1350,10 +1329,10 @@ static void com_reread_conf(void)
 	};
 
 	if (!cf) {
-		PARA_WARNING_LOG("there is no configuration to read");
+		PARA_WARNING_LOG("there is no configuration to read\n");
 		return;
 	}
-	PARA_INFO_LOG("rereading command line options and config file");
+	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
@@ -1362,7 +1341,7 @@ static void com_reread_conf(void)
 	shutdown_curses();
 	gui_cmdline_parser_config_file(cf, &conf, &params);
 	init_curses();
-	PARA_NOTICE_LOG("config file reloaded");
+	PARA_NOTICE_LOG("config file reloaded\n");
 	if (check_key_map_args() < 0)
 		finish(EXIT_FAILURE);
 }
@@ -1407,7 +1386,7 @@ 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");
+		PARA_WARNING_LOG("can not decrease top window\n");
 		return;
 	}
 	init_wins(top.lines - 1);
@@ -1419,7 +1398,7 @@ static void com_shrink_top_win(void)
 static void com_enlarge_top_win(void)
 {
 	if (bot.lines < 3) {
-		PARA_WARNING_LOG("can not increase top window");
+		PARA_WARNING_LOG("can not increase top window\n");
 		return;
 	}
 	init_wins(top.lines + 1);
@@ -1453,7 +1432,7 @@ static void change_theme(int next)
 	/* This seems to be needed twice, why? */
 	com_refresh();
 	com_refresh();
-	PARA_NOTICE_LOG("new theme: %s", theme.name);
+	PARA_NOTICE_LOG("new theme: %s\n", theme.name);
 }
 
 static void com_next_theme(void)
@@ -1553,7 +1532,6 @@ int main(int argc, char *argv[])
 		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);
 	setlocale(LC_CTYPE, "");