X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Flist_window.c;h=3fbe531571584b13164a99cbbf55235732c50557;hb=f507bd330a4bd1c3fd3208f6719864d32ab1e86f;hp=bca8a199388d8c1198243f92ce680d4d54abe030;hpb=db1783283e873581dd693b85e9edaf18c71dba86;p=ncmpc.git

diff --git a/src/list_window.c b/src/list_window.c
index bca8a19..3fbe531 100644
--- a/src/list_window.c
+++ b/src/list_window.c
@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "list_window.h"
 #include "config.h"
@@ -24,7 +24,8 @@
 #include "match.h"
 #include "command.h"
 #include "colors.h"
-#include "screen_message.h"
+#include "paint.h"
+#include "screen_status.h"
 #include "i18n.h"
 
 #include <assert.h>
@@ -59,46 +60,30 @@ void
 list_window_reset(struct list_window *lw)
 {
 	lw->selected = 0;
-	lw->selected_start = 0;
-	lw->selected_end = 0;
 	lw->range_selection = false;
 	lw->range_base = 0;
 	lw->start = 0;
 }
 
+static unsigned
+list_window_validate_index(const struct list_window *lw, unsigned i)
+{
+	if (lw->length == 0)
+		return 0;
+	else if (i >= lw->length)
+		return lw->length - 1;
+	else
+		return i;
+}
+
 static void
 list_window_check_selected(struct list_window *lw)
 {
-	if (lw->length == 0)
-		lw->selected = 0;
-	else if (lw->selected >= lw->length)
-		lw->selected = lw->length - 1;
+	lw->selected = list_window_validate_index(lw, lw->selected);
 
 	if(lw->range_selection)
-	{
-		if (lw->length == 0) {
-			lw->selected_start = 0;
-			lw->selected_end = 0;
-			lw->range_base = 0;
-		} else {
-			if (lw->selected_start >= lw->length)
-				lw->selected_start = lw->length - 1;
-			if (lw->selected_end >= lw->length)
-				lw->selected_end = lw->length - 1;
-			if (lw->range_base >= lw->length)
-				lw->range_base = lw->length - 1;
-		}
-
-		if(lw->range_base > lw->selected_end)
-			  lw->selected_end = lw->selected;
-		if(lw->range_base < lw->selected_start)
-			  lw->selected_start = lw->selected;
-	}
-	else
-	{
-		lw->selected_start = lw->selected;
-		lw->selected_end = lw->selected;
-	}
+		lw->range_base =
+			list_window_validate_index(lw, lw->range_base);
 }
 
 /**
@@ -108,26 +93,7 @@ list_window_check_selected(struct list_window *lw)
 static void
 list_window_check_origin(struct list_window *lw)
 {
-	int start = lw->start;
-
-	if ((unsigned) options.scroll_offset * 2 >= lw->rows)
-		// Center if the offset is more than half the screen
-		start = lw->selected - lw->rows / 2;
-	else {
-		if (lw->selected < lw->start + options.scroll_offset)
-			start = lw->selected - options.scroll_offset;
-
-		if (lw->selected >= lw->start + lw->rows - options.scroll_offset)
-			start = lw->selected - lw->rows + 1 + options.scroll_offset;
-	}
-
-	if (start + lw->rows > lw->length)
-		start = lw->length - lw->rows;
-
-	if (start < 0 || lw->length == 0)
-		start = 0;
-
-	lw->start = start;
+	list_window_scroll_to(lw, lw->selected);
 }
 
 void
@@ -142,6 +108,9 @@ list_window_resize(struct list_window *lw, unsigned width, unsigned height)
 void
 list_window_set_length(struct list_window *lw, unsigned length)
 {
+	if (length == lw->length)
+		return;
+
 	lw->length = length;
 
 	list_window_check_selected(lw);
@@ -164,13 +133,36 @@ list_window_center(struct list_window *lw, unsigned n)
 	}
 }
 
+void
+list_window_scroll_to(struct list_window *lw, unsigned n)
+{
+	int start = lw->start;
+
+	if ((unsigned) options.scroll_offset * 2 >= lw->rows)
+		// Center if the offset is more than half the screen
+		start = n - lw->rows / 2;
+	else {
+		if (n < lw->start + options.scroll_offset)
+			start = n - options.scroll_offset;
+
+		if (n >= lw->start + lw->rows - options.scroll_offset)
+			start = n - lw->rows + 1 + options.scroll_offset;
+	}
+
+	if (start + lw->rows > lw->length)
+		start = lw->length - lw->rows;
+
+	if (start < 0 || lw->length == 0)
+		start = 0;
+
+	lw->start = start;
+}
+
 void
 list_window_set_cursor(struct list_window *lw, unsigned i)
 {
 	lw->range_selection = false;
 	lw->selected = i;
-	lw->selected_start = i;
-	lw->selected_end = i;
 
 	list_window_check_selected(lw);
 	list_window_check_origin(lw);
@@ -180,24 +172,6 @@ void
 list_window_move_cursor(struct list_window *lw, unsigned n)
 {
 	lw->selected = n;
-	if(lw->range_selection)
-	{
-		if(n >= lw->range_base)
-		{
-			lw->selected_end = n;
-			lw->selected_start = lw->range_base;
-		}
-		if(n <= lw->range_base)
-		{
-			lw->selected_start = n;
-			lw->selected_end = lw->range_base;
-		}
-	}
-	else
-	{
-		lw->selected_start = n;
-		lw->selected_end = n;
-	}
 
 	list_window_check_selected(lw);
 	list_window_check_origin(lw);
@@ -206,34 +180,35 @@ list_window_move_cursor(struct list_window *lw, unsigned n)
 void
 list_window_fetch_cursor(struct list_window *lw)
 {
-	if (lw->selected < lw->start + options.scroll_offset) {
-		if (lw->start > 0)
-			lw->selected = lw->start + options.scroll_offset;
-		if (lw->range_selection) {
-			if (lw->selected > lw->range_base) {
-				lw->selected_end = lw->selected;
-				lw->selected_start = lw->range_base;
-			} else {
-				lw->selected_start = lw->selected;
-			}
-		} else {
-			lw->selected_start = lw->selected;
-			lw->selected_end = lw->selected;
-		}
-	} else if (lw->selected > lw->start + lw->rows - 1 - options.scroll_offset) {
-		if (lw->start + lw->rows < lw->length)
-			lw->selected = lw->start + lw->rows - 1 - options.scroll_offset;
-		if (lw->range_selection) {
-			if (lw->selected < lw->range_base) {
-				lw->selected_start = lw->selected;
-				lw->selected_end = lw->range_base;
-			} else {
-				lw->selected_end = lw->selected;
-			}
+	if (lw->start > 0 &&
+	    lw->selected < lw->start + options.scroll_offset)
+		list_window_move_cursor(lw, lw->start + options.scroll_offset);
+	else if (lw->start + lw->rows < lw->length &&
+		 lw->selected > lw->start + lw->rows - 1 - options.scroll_offset)
+		list_window_move_cursor(lw, lw->start + lw->rows - 1 - options.scroll_offset);
+}
+
+void
+list_window_get_range(const struct list_window *lw,
+		      struct list_window_range *range)
+{
+	if (lw->length == 0) {
+		/* empty list - no selection */
+		range->start = 0;
+		range->end = 0;
+	} else if (lw->range_selection) {
+		/* a range selection */
+		if (lw->range_base < lw->selected) {
+			range->start = lw->range_base;
+			range->end = lw->selected + 1;
 		} else {
-			lw->selected_start = lw->selected;
-			lw->selected_end = lw->selected;
+			range->start = lw->selected;
+			range->end = lw->range_base + 1;
 		}
+	} else {
+		/* no range, just the cursor */
+		range->start = lw->selected;
+		range->end = lw->selected + 1;
 	}
 }
 
@@ -346,7 +321,7 @@ list_window_scroll_down(struct list_window *lw, unsigned n)
 {
 	if (lw->start + lw->rows < lw->length)
 	{
-		if ( lw->start + lw->rows + n > lw->length - 1)
+		if (lw->start + lw->rows + n > lw->length - 1)
 			lw->start = lw->length - lw->rows;
 		else
 			lw->start += n;
@@ -356,76 +331,65 @@ list_window_scroll_down(struct list_window *lw, unsigned n)
 }
 
 static void
-list_window_paint_row(WINDOW *w, unsigned y, unsigned width,
-		      bool selected, bool highlight,
-		      const char *text, const char *second_column)
+list_window_paint_row(WINDOW *w, unsigned width, bool selected,
+		      const char *text)
 {
-	unsigned text_width = utf8_width(text);
-	unsigned second_column_width;
+	row_paint_text(w, width, COLOR_LIST,
+		       selected, text);
+}
 
-#ifdef NCMPC_MINI
-	second_column = NULL;
-	highlight = false;
-#endif /* NCMPC_MINI */
-
-	if (second_column != NULL) {
-		second_column_width = utf8_width(second_column) + 1;
-		if (second_column_width < width)
-			width -= second_column_width;
-		else
-			second_column_width = 0;
-	} else
-		second_column_width = 0;
+void
+list_window_paint(const struct list_window *lw,
+		  list_window_callback_fn_t callback,
+		  void *callback_data)
+{
+	bool show_cursor = !lw->hide_cursor &&
+		(!options.hardware_cursor || lw->range_selection);
+	struct list_window_range range;
 
-	if (highlight)
-		colors_use(w, COLOR_LIST_BOLD);
-	else
-		colors_use(w, COLOR_LIST);
+	if (show_cursor)
+		list_window_get_range(lw, &range);
+
+	for (unsigned i = 0; i < lw->rows; i++) {
+		wmove(lw->w, i, 0);
 
-	if (selected)
-		wattron(w, A_REVERSE);
+		if (lw->start + i >= lw->length) {
+			wclrtobot(lw->w);
+			break;
+		}
 
-	waddstr(w, text);
-	if (options.wide_cursor && text_width < width)
-		whline(w, ' ', width - text_width);
+		const char *label = callback(lw->start + i, callback_data);
+		assert(label != NULL);
 
-	if (second_column_width > 0) {
-		wmove(w, y, width);
-		waddch(w, ' ');
-		waddstr(w, second_column);
+		list_window_paint_row(lw->w, lw->cols,
+				      show_cursor &&
+				      lw->start + i >= range.start &&
+				      lw->start + i < range.end,
+				      label);
 	}
 
-	if (selected)
-		wattroff(w, A_REVERSE);
+	row_color_end(lw->w);
 
-	if (!options.wide_cursor && text_width < width) {
-		if (second_column_width == 0)
-			/* the cursor is at the end of the text; clear
-			   the rest of this row */
-			wclrtoeol(w);
-		else
-			/* there's a second column: clear the space
-			   between the first and the second column */
-			mvwhline(w, y, text_width, ' ', width - text_width);
+	if (options.hardware_cursor && lw->selected >= lw->start &&
+	    lw->selected < lw->start + lw->rows) {
+		curs_set(1);
+		wmove(lw->w, lw->selected - lw->start, 0);
 	}
 }
 
 void
-list_window_paint(const struct list_window *lw,
-		  list_window_callback_fn_t callback,
-		  void *callback_data)
+list_window_paint2(const struct list_window *lw,
+		   list_window_paint_callback_t paint_callback,
+		   const void *callback_data)
 {
-	unsigned i;
-	bool show_cursor = !lw->hide_cursor;
-
-	show_cursor = show_cursor &&
+	bool show_cursor = !lw->hide_cursor &&
 		(!options.hardware_cursor || lw->range_selection);
+	struct list_window_range range;
 
-	for (i = 0; i < lw->rows; i++) {
-		const char *label;
-		bool highlight = false;
-		char *second_column = NULL;
+	if (show_cursor)
+		list_window_get_range(lw, &range);
 
+	for (unsigned i = 0; i < lw->rows; i++) {
 		wmove(lw->w, i, 0);
 
 		if (lw->start + i >= lw->length) {
@@ -433,23 +397,12 @@ list_window_paint(const struct list_window *lw,
 			break;
 		}
 
-		label = callback(lw->start + i, &highlight, &second_column, callback_data);
-		assert(label != NULL);
-
-#ifdef NCMPC_MINI
-		highlight = false;
-		second_column = NULL;
-#endif /* NCMPC_MINI */
-
-		list_window_paint_row(lw->w, i, lw->cols,
-				      show_cursor &&
-				      lw->start + i >= lw->selected_start &&
-				      lw->start + i <= lw->selected_end,
-				      highlight,
-				      label, second_column);
+		bool selected = show_cursor &&
+			lw->start + i >= range.start &&
+			lw->start + i < range.end;
 
-		if (second_column != NULL)
-			g_free(second_column);
+		paint_callback(lw->w, lw->start + i, i, lw->cols,
+			       selected, callback_data);
 	}
 
 	if (options.hardware_cursor && lw->selected >= lw->start &&
@@ -467,15 +420,13 @@ list_window_find(struct list_window *lw,
 		 bool wrap,
 		 bool bell_on_wrap)
 {
-	bool h;
 	unsigned i = lw->selected + 1;
-	const char *label;
 
 	assert(str != NULL);
 
 	do {
 		while (i < lw->length) {
-			label = callback(i, &h, NULL, callback_data);
+			const char *label = callback(i, callback_data);
 			assert(label != NULL);
 
 			if (match_line(label, str)) {
@@ -507,9 +458,7 @@ list_window_rfind(struct list_window *lw,
 		  bool wrap,
 		  bool bell_on_wrap)
 {
-	bool h;
 	int i = lw->selected - 1;
-	const char *label;
 
 	assert(str != NULL);
 
@@ -518,7 +467,7 @@ list_window_rfind(struct list_window *lw,
 
 	do {
 		while (i >= 0) {
-			label = callback(i, &h, NULL, callback_data);
+			const char *label = callback(i, callback_data);
 			assert(label != NULL);
 
 			if (match_line(label, str)) {
@@ -540,48 +489,53 @@ list_window_rfind(struct list_window *lw,
 	return false;
 }
 
-static bool
-jump_match(const char *haystack, const char *needle)
-{
 #ifdef NCMPC_MINI
-	bool jump_prefix_only = true;
-#else
-	bool jump_prefix_only = options.jump_prefix_only;
-#endif
+bool
+list_window_jump(struct list_window *lw,
+		 list_window_callback_fn_t callback,
+		 void *callback_data,
+		 const char *str)
+{
+	assert(str != NULL);
 
-	assert(haystack != NULL);
-	assert(needle != NULL);
+	for (unsigned i = 0; i < lw->length; i++) {
+		const char *label = callback(i, callback_data);
+		assert(label != NULL);
 
-	return jump_prefix_only
-		? g_ascii_strncasecmp(haystack, needle, strlen(needle)) == 0
-		: match_line(haystack, needle);
+		if (g_ascii_strncasecmp(label, str, strlen(str)) == 0) {
+			list_window_move_cursor(lw, i);
+			return true;
+		}
+	}
+	return false;
 }
-
+#else
 bool
 list_window_jump(struct list_window *lw,
 		 list_window_callback_fn_t callback,
 		 void *callback_data,
 		 const char *str)
 {
-	bool h;
-	const char *label;
-
 	assert(str != NULL);
 
-	for (unsigned i = 0; i < lw->length; ++i) {
-		label = callback(i, &h, NULL, callback_data);
-		assert(label != NULL);
+	GRegex *regex = compile_regex(str, options.jump_prefix_only);
+	if (regex == NULL)
+		return false;
 
-		if (label[0] == '[')
-			label++;
+	for (unsigned i = 0; i < lw->length; i++) {
+		const char *label = callback(i, callback_data);
+		assert(label != NULL);
 
-		if (jump_match(label, str)) {
+		if (match_regex(regex, label)) {
+			g_regex_unref(regex);
 			list_window_move_cursor(lw, i);
 			return true;
 		}
 	}
+	g_regex_unref(regex);
 	return false;
 }
+#endif
 
 /* perform basic list window commands (movement) */
 bool
@@ -675,7 +629,7 @@ list_window_scroll_cmd(struct list_window *lw, command_t cmd)
 		break;
 
 	case CMD_LIST_NEXT_PAGE:
-		lw->start += lw->rows - 1;
+		lw->start += lw->rows;
 		if (lw->start + lw->rows > lw->length) {
 			if (lw->length > lw->rows)
 				lw->start = lw->length - lw->rows;