X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=e854294ece0a4db3667480c80ed06160dd980f13;hp=2a0174b8e92e7dfa9ff0c4fee7f8929b9cbb7b20;hb=0569a928e03cb1489d04e1b89be32b24d59de0e3;hpb=8ea82f861ae1dd0d842b1fe035d0b23d7b5d3ed7

diff --git a/gui.c b/gui.c
index 2a0174b8..e854294e 100644
--- a/gui.c
+++ b/gui.c
@@ -34,7 +34,7 @@ static char *stat_content[NUM_STAT_ITEMS];
 
 static int signal_pipe;
 
-static struct win_data {
+static struct gui_window {
 	WINDOW *win;
 	size_t begx;
 	size_t begy;
@@ -53,10 +53,10 @@ 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];
+static int command_fds[2] = {-1, -1};
 static int stat_pipe = -1;
 static struct gui_args_info conf;
 
@@ -80,18 +80,6 @@ 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;
 
 static int _argc;
@@ -361,7 +349,7 @@ __printf_2_3 static void print_in_bar(int color, const char *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, in.cols, LEFT);
 	free(msg);
 	wrefresh(in.win);
 }
@@ -384,7 +372,7 @@ static void print_status_bar(void)
 
 /*
  * 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)
@@ -518,6 +506,7 @@ __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)
 		return 1;
 	rb_add_entry(color, para_strdup(line));
@@ -575,7 +564,7 @@ static void shutdown_curses(void)
 	if (!curses_active)
 		return;
 	def_prog_mode();
-	curses_active = 0;
+	curses_active = false;
 	endwin();
 }
 
@@ -834,8 +823,8 @@ 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 */
+	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)
 		msg_n_exit(EXIT_FAILURE, "Error: Terminal (%dx%d) too small"
@@ -860,6 +849,7 @@ static void check_sigchld(void)
 {
 	int ret;
 	pid_t pid;
+
 reap_next_child:
 	ret = para_reap_child(&pid);
 	if (ret <= 0)
@@ -897,25 +887,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;
 }
@@ -938,13 +928,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:
@@ -1049,7 +1039,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;
@@ -1059,7 +1049,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;
 			}
@@ -1120,9 +1110,9 @@ static void send_output(void)
 	if (ret < 0)
 		goto fail;
 	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:
@@ -1183,6 +1173,7 @@ 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));
 }
@@ -1226,6 +1217,7 @@ static void com_page_down(void)
 {
 	unsigned lines = 0;
 	int i = scroll_position;
+
 	while (lines < bot.lines && --i > 0) {
 		struct rb_entry *rbe = ringbuffer_get(bot_win_rb, i);
 		if (!rbe)
@@ -1348,7 +1340,7 @@ static void com_ll_incr(void)
  */
 static void com_reread_conf(void)
 {
-	char *cf =configfile_exists();
+	char *cf = configfile_exists();
 	struct gui_cmdline_parser_params params = {
 		.override = 1,
 		.initialize = 1,
@@ -1358,10 +1350,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
@@ -1370,7 +1362,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);
 }
@@ -1415,7 +1407,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);
@@ -1427,7 +1419,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);
@@ -1461,7 +1453,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)
@@ -1479,7 +1471,7 @@ static void handle_command(int c)
 {
 	int i;
 
-	/* first check user's key bindings */
+	/* first check user-defined key bindings */
 	for (i = 0; i < conf.key_map_given; ++i) {
 		char *tmp, *handler, *arg;
 
@@ -1561,7 +1553,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, "");