X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=01af3227ffda5227d8243c9c8ec5a51ea79b62c9;hp=284de0cb7778444c2b6936eb6c8d8a765370070e;hb=c2ff586ae77f1ab640d5f8b3ceb12786fcc4cbaa;hpb=1833dfd4333e8c3099ba2fac39245e11fd123ae0

diff --git a/gui.c b/gui.c
index 284de0cb..01af3227 100644
--- a/gui.c
+++ b/gui.c
@@ -519,6 +519,7 @@ static __printf_2_3 void curses_log(int ll, const char *fmt,...)
 	int color;
 	char *msg;
 	va_list ap;
+	unsigned bytes;
 
 	if (ll < loglevel || !curses_active)
 		return;
@@ -532,9 +533,10 @@ static __printf_2_3 void curses_log(int ll, const char *fmt,...)
 			color = COLOR_ERRMSG;
 	}
 	va_start(ap, fmt);
-	xvasprintf(&msg, fmt, ap);
+	bytes = xvasprintf(&msg, fmt, ap);
 	va_end(ap);
-	chop(msg);
+	if (bytes > 0 && msg[bytes - 1] == '\n')
+		msg[bytes - 1] = '\0'; /* cut trailing newline */
 	rb_add_entry(color, msg);
 	wrefresh(bot.win);
 }
@@ -593,8 +595,6 @@ __noreturn __printf_2_3 static void msg_n_exit(int ret, const char* fmt, ...)
  */
 static void init_wins(int top_lines)
 {
-	int i;
-
 	top.lines = top_lines;
 	top.cols = COLS;
 	top.begy = 0;
@@ -622,20 +622,20 @@ static void init_wins(int top_lines)
 
 	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(top.win, top.begy, top.begx);
 
-		mvwin(sb.win, sb.begy, sb.begx);
 		wresize(sb.win, sb.lines, sb.cols);
+		mvwin(sb.win, sb.begy, sb.begx);
 
-		mvwin(sep.win, sep.begy, sep.begx);
 		wresize(sep.win, sep.lines, sep.cols);
+		mvwin(sep.win, sep.begy, sep.begx);
 
-		mvwin(bot.win, bot.begy, bot.begx);
 		wresize(bot.win, bot.lines, bot.cols);
+		mvwin(bot.win, bot.begy, bot.begx);
 
-		mvwin(in.win, in.begy, in.begx);
 		wresize(in.win, in.lines, in.cols);
+		mvwin(in.win, in.begy, in.begx);
 	} else {
 		sep.win = newwin(sep.lines, sep.cols, sep.begy, sep.begx);
 		top.win = newwin(top.lines, top.cols, top.begy, top.begx);
@@ -663,8 +663,7 @@ static void init_wins(int top_lines)
 		keypad(in.win, 1);
 	}
 	wmove(sep.win, 0, 0);
-	for (i = 1; i <= COLS; i++)
-		waddstr(sep.win, theme.sep_str);
+	whline(sep.win, theme.sep_char, COLS);
 	wclear(top.win);
 	//wclear(bot.win);
 	wnoutrefresh(top.win);
@@ -1412,29 +1411,18 @@ 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\n", 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);
+	theme_prev(&theme);
+	com_refresh();
 }
 
-
 static void handle_command(int c)
 {
 	int i;
@@ -1520,7 +1508,7 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "invalid key map\n");
 		exit(EXIT_FAILURE);
 	}
-	init_theme_or_die(conf.theme_arg, &theme);
+	theme_init(conf.theme_arg, &theme);
 	setup_signal_handling();
 	bot_win_rb = ringbuffer_new(RINGBUFFER_SIZE);
 	setlocale(LC_CTYPE, "");