X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=64fab61b7859e5192a3d1583a693622be8977087;hp=6806cc8fcc662435cf53a3c01a7b1f6b4607386f;hb=98f2c8aea52a49fad3fd6df67b1eb32c1499176c;hpb=337d7784b0f8bc30b1fa9af56ace503acd97d40d

diff --git a/gui.c b/gui.c
index 6806cc8f..64fab61b 100644
--- a/gui.c
+++ b/gui.c
@@ -1,19 +1,21 @@
 /*
- * Copyright (C) 1998-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1998-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \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 "gui.h"
 #include "string.h"
-#include <curses.h>
 #include "ringbuffer.h"
 #include "fd.h"
 #include "error.h"
@@ -43,7 +45,7 @@ struct rb_entry {
 	size_t len;
 	int color;
 };
-struct ringbuffer *bot_win_rb;
+static struct ringbuffer *bot_win_rb;
 #define NUM_LINES(len) (1 + (len) / bot.cols)
 
 static unsigned scroll_position;
@@ -89,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);
@@ -108,7 +110,7 @@ static void com_scroll_down(void);
 static void com_page_up(void);
 static void com_page_down(void);
 
-struct gui_command command_list[] = {
+static struct gui_command command_list[] = {
 	{
 		.key = "?",
 		.name = "help",
@@ -294,20 +296,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, const 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 newlines by spaces */
+	for (i = 0; i < len && str[i]; i++) {
+		if (str[i] == '\n')
+			str[i] = ' ';
+	}
 	if (align == LEFT) {
 		waddstr(win, str);
 		add_spaces(win, num);
@@ -319,7 +324,6 @@ static int align_str(WINDOW* win, const char *string, unsigned int len,
 		waddstr(win, str[0]? str: "");
 		add_spaces(win, num - num / 2);
 	}
-	free(str);
 	return 1;
 }
 
@@ -342,10 +346,14 @@ __printf_2_3 static void print_in_bar(int color, const 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);
 }
 
@@ -669,32 +677,61 @@ static void print_stat_item(int i)
 	wrefresh(top.win);
 }
 
-/*
- * print status line if line starts with known command.
- */
 static int update_item(int item_num, char *buf)
 {
-	free(stat_content[item_num]);
-	stat_content[item_num] = para_strdup(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_audiod_pipe(int fd)
 {
-	static char buf[8192];
-	static int loaded;
+	static char *buf;
+	static int bufsize, loaded;
 	int ret;
 
-	if (loaded >= sizeof(buf)) /* overflow */
-		return 0;
-	ret = read(fd, buf + loaded, sizeof(buf) - loaded);
+	if (loaded >= bufsize) {
+		if (bufsize > 1000 * 1000) {
+			loaded = 0;
+			return 0;
+		}
+		bufsize += bufsize + 1000;
+		buf = para_realloc(buf, bufsize);
+	}
+	assert(loaded < bufsize);
+	ret = read(fd, buf + loaded, bufsize - loaded);
 	if (ret <= 0)
 		return ret;
 	loaded += ret;
 	ret = for_each_stat_item(buf, loaded, update_item);
 	if (ret < 0)
 		return ret;
+	if (ret > 0 && ret < loaded)
+		memmove(buf, buf + loaded - ret, ret);
 	loaded = ret;
 	return 1;
 }
@@ -1313,31 +1350,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++) {