X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Flist_window.c;h=d44fd29329b427965abedef04a113f3445187015;hb=572f9c39c5e0947a95d126f7feedcf2d7d770503;hp=88f0a690c739f74316872331cb536785f568cda2;hpb=104b126c69b89cc4b7caf301fbdbd0b1c9a21bda;p=ncmpc.git

diff --git a/src/list_window.c b/src/list_window.c
index 88f0a69..d44fd29 100644
--- a/src/list_window.c
+++ b/src/list_window.c
@@ -1,30 +1,34 @@
-/* 
- * $Id$
- *
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
- *
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2010 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
+
+ * 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"
 #include "options.h"
-#include "support.h"
+#include "charset.h"
+#include "match.h"
 #include "command.h"
 #include "colors.h"
+#include "paint.h"
+#include "screen_message.h"
+#include "i18n.h"
 
+#include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -36,318 +40,650 @@ list_window_init(WINDOW *w, unsigned width, unsigned height)
 {
 	struct list_window *lw;
 
-	lw = g_malloc0(sizeof(list_window_t));
+	lw = g_malloc0(sizeof(*lw));
 	lw->w = w;
 	lw->cols = width;
 	lw->rows = height;
-	lw->clear = 1;
+	lw->range_selection = false;
 	return lw;
 }
 
-struct list_window *
+void
 list_window_free(struct list_window *lw)
 {
-	if (lw) {
-		memset(lw, 0, sizeof(list_window_t));
-		g_free(lw);
-	}
+	assert(lw != NULL);
 
-	return NULL;
+	g_free(lw);
 }
 
 void
 list_window_reset(struct list_window *lw)
 {
 	lw->selected = 0;
-	lw->xoffset = 0;
+	lw->range_selection = false;
+	lw->range_base = 0;
 	lw->start = 0;
-	lw->clear = 1;
+}
+
+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)
+{
+	lw->selected = list_window_validate_index(lw, lw->selected);
+
+	if(lw->range_selection)
+		lw->range_base =
+			list_window_validate_index(lw, lw->range_base);
+}
+
+/**
+ * Scroll after the cursor was moved, the list was changed or the
+ * window was resized.
+ */
+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;
+}
+
+void
+list_window_resize(struct list_window *lw, unsigned width, unsigned height)
+{
+	lw->cols = width;
+	lw->rows = height;
+
+	list_window_check_origin(lw);
 }
 
 void
-list_window_check_selected(struct list_window *lw, unsigned length)
+list_window_set_length(struct list_window *lw, unsigned length)
 {
-	if (lw->start + lw->rows > length) {
-		if (length > lw->rows)
-			lw->start = length - lw->rows;
+	if (length == lw->length)
+		return;
+
+	lw->length = length;
+
+	list_window_check_selected(lw);
+	list_window_check_origin(lw);
+}
+
+void
+list_window_center(struct list_window *lw, unsigned n)
+{
+	if (n > lw->rows / 2)
+		lw->start = n - lw->rows / 2;
+	else
+		lw->start = 0;
+
+	if (lw->start + lw->rows > lw->length) {
+		if (lw->rows < lw->length)
+			lw->start = lw->length - lw->rows;
 		else
 			lw->start = 0;
 	}
+}
 
-	if (lw->selected < lw->start)
-		lw->selected = lw->start;
+void
+list_window_set_cursor(struct list_window *lw, unsigned i)
+{
+	lw->range_selection = false;
+	lw->selected = i;
 
-	if (length > 0 && lw->selected >= length)
-		lw->selected = length - 1;
+	list_window_check_selected(lw);
+	list_window_check_origin(lw);
 }
 
 void
-list_window_set_selected(struct list_window *lw, unsigned n)
+list_window_move_cursor(struct list_window *lw, unsigned n)
 {
 	lw->selected = n;
+
+	list_window_check_selected(lw);
+	list_window_check_origin(lw);
 }
 
 void
-list_window_next(struct list_window *lw, unsigned length)
+list_window_fetch_cursor(struct list_window *lw)
 {
-	if (lw->selected + 1 < length)
-		lw->selected++;
-	else if (options.list_wrap)
-		lw->selected = 0;
+	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_previous(struct list_window *lw, unsigned length)
+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 {
+			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;
+	}
+}
+
+static void
+list_window_next(struct list_window *lw)
+{
+	if (lw->selected + 1 < lw->length)
+		list_window_move_cursor(lw, lw->selected + 1);
+	else if (options.list_wrap)
+		list_window_move_cursor(lw, 0);
+}
+
+static void
+list_window_previous(struct list_window *lw)
 {
 	if (lw->selected > 0)
-		lw->selected--;
+		list_window_move_cursor(lw, lw->selected - 1);
 	else if (options.list_wrap)
-		lw->selected = length - 1;
+		list_window_move_cursor(lw, lw->length - 1);
 }
 
-void
+static void
+list_window_top(struct list_window *lw)
+{
+	if (lw->start == 0)
+		list_window_move_cursor(lw, lw->start);
+	else
+		if ((unsigned) options.scroll_offset * 2 >= lw->rows)
+			list_window_move_cursor(lw, lw->start + lw->rows / 2);
+		else
+			list_window_move_cursor(lw, lw->start + options.scroll_offset);
+}
+
+static void
+list_window_middle(struct list_window *lw)
+{
+	if (lw->length >= lw->rows)
+		list_window_move_cursor(lw, lw->start + lw->rows / 2);
+	else
+		list_window_move_cursor(lw, lw->length / 2);
+}
+
+static void
+list_window_bottom(struct list_window *lw)
+{
+	if (lw->length >= lw->rows)
+		if ((unsigned) options.scroll_offset * 2 >= lw->rows)
+			list_window_move_cursor(lw, lw->start + lw->rows / 2);
+		else
+			if (lw->start + lw->rows == lw->length)
+				list_window_move_cursor(lw, lw->length - 1);
+			else
+				list_window_move_cursor(lw, lw->start + lw->rows - 1 - options.scroll_offset);
+	else
+		list_window_move_cursor(lw, lw->length - 1);
+}
+
+static void
 list_window_first(struct list_window *lw)
 {
-	lw->xoffset = 0;
-	lw->selected = 0;
+	list_window_move_cursor(lw, 0);
 }
 
-void
-list_window_last(struct list_window *lw, unsigned length)
+static void
+list_window_last(struct list_window *lw)
 {
-	lw->xoffset = 0;
-	if (length > 0)
-		lw->selected = length - 1;
+	if (lw->length > 0)
+		list_window_move_cursor(lw, lw->length - 1);
 	else
-		lw->selected = 0;
+		list_window_move_cursor(lw, 0);
 }
 
-void
-list_window_next_page(struct list_window *lw, unsigned length)
+static void
+list_window_next_page(struct list_window *lw)
 {
 	if (lw->rows < 2)
 		return;
-	if (lw->selected + lw->rows < length)
-		lw->selected += lw->rows - 1;
+	if (lw->selected + lw->rows < lw->length)
+		list_window_move_cursor(lw, lw->selected + lw->rows - 1);
 	else
-		return list_window_last(lw, length);
+		list_window_last(lw);
 }
 
-void
+static void
 list_window_previous_page(struct list_window *lw)
 {
 	if (lw->rows < 2)
 		return;
 	if (lw->selected > lw->rows - 1)
-		lw->selected -= lw->rows - 1;
+		list_window_move_cursor(lw, lw->selected - lw->rows + 1);
 	else
 		list_window_first(lw);
 }
 
+static void
+list_window_scroll_up(struct list_window *lw, unsigned n)
+{
+	if (lw->start > 0) {
+		if (n > lw->start)
+			lw->start = 0;
+		else
+			lw->start -= n;
+
+		list_window_fetch_cursor(lw);
+	}
+}
+
+static void
+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)
+			lw->start = lw->length - lw->rows;
+		else
+			lw->start += n;
+
+		list_window_fetch_cursor(lw);
+	}
+}
+
+static void
+list_window_paint_row(WINDOW *w, unsigned width, bool selected,
+		      const char *text)
+{
+	row_paint_text(w, width, COLOR_LIST,
+		       selected, text);
+}
 
 void
-list_window_paint(struct list_window *lw,
+list_window_paint(const struct list_window *lw,
 		  list_window_callback_fn_t callback,
 		  void *callback_data)
 {
-	unsigned i;
-	int fill = options.wide_cursor;
-	int show_cursor = !(lw->flags & LW_HIDE_CURSOR);
+	bool show_cursor = !lw->hide_cursor &&
+		(!options.hardware_cursor || lw->range_selection);
+	struct list_window_range range;
 
-	if (show_cursor) {
-		if (lw->selected < lw->start) {
-			lw->start = lw->selected;
-			lw->clear=1;
-		}
+	if (show_cursor)
+		list_window_get_range(lw, &range);
+
+	for (unsigned i = 0; i < lw->rows; i++) {
+		const char *label;
 
-		if (lw->selected >= lw->start + lw->rows) {
-			lw->start = lw->selected - lw->rows + 1;
-			lw->clear=1;
+		wmove(lw->w, i, 0);
+
+		if (lw->start + i >= lw->length) {
+			wclrtobot(lw->w);
+			break;
 		}
+
+		label = callback(lw->start + i, callback_data);
+		assert(label != NULL);
+
+		list_window_paint_row(lw->w, lw->cols,
+				      show_cursor &&
+				      lw->start + i >= range.start &&
+				      lw->start + i < range.end,
+				      label);
 	}
 
-	for (i = 0; i < lw->rows; i++) {
-		int highlight = 0;
-		const char *label;
+	row_color_end(lw->w);
 
-		label = callback(lw->start + i, &highlight, callback_data);
-		wmove(lw->w, i, 0);
-		if( lw->clear && (!fill || !label) )
-			wclrtoeol(lw->w);
+	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);
+	}
+}
 
-		if (label) {
-			int selected = lw->start + i == lw->selected;
-			size_t len = my_strlen(label);
+void
+list_window_paint2(const struct list_window *lw,
+		   list_window_paint_callback_t paint_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(lw->w, COLOR_LIST_BOLD);
-			else
-				colors_use(lw->w, COLOR_LIST);
+	if (show_cursor)
+		list_window_get_range(lw, &range);
 
-			if( show_cursor && selected )
-				wattron(lw->w, A_REVERSE);
+	for (unsigned i = 0; i < lw->rows; i++) {
+		bool selected;
 
-			//waddnstr(lw->w, label, lw->cols);
-			waddstr(lw->w, label);
-			if( fill && len<lw->cols )
-				whline(lw->w,  ' ', lw->cols-len);
+		wmove(lw->w, i, 0);
 
-			if( selected )
-				wattroff(lw->w, A_REVERSE);
+		if (lw->start + i >= lw->length) {
+			wclrtobot(lw->w);
+			break;
 		}
+
+		selected = show_cursor &&
+			lw->start + i >= range.start &&
+			lw->start + i < range.end;
+
+		paint_callback(lw->w, lw->start + i, i, lw->cols,
+			       selected, callback_data);
 	}
 
-	lw->clear=0;
+	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);
+	}
 }
 
-int
+bool
 list_window_find(struct list_window *lw,
 		 list_window_callback_fn_t callback,
 		 void *callback_data,
 		 const char *str,
-		 int wrap)
+		 bool wrap,
+		 bool bell_on_wrap)
 {
-	int h;
 	unsigned i = lw->selected + 1;
 	const char *label;
 
-	while (wrap || i == lw->selected + 1) {
-		while ((label = callback(i,&h,callback_data))) {
-			if (str && label && strcasestr(label, str)) {
-				lw->selected = i;
-				return 0;
+	assert(str != NULL);
+
+	do {
+		while (i < lw->length) {
+			label = callback(i, callback_data);
+			assert(label != NULL);
+
+			if (match_line(label, str)) {
+				list_window_move_cursor(lw, i);
+				return true;
 			}
 			if (wrap && i == lw->selected)
-				return 1;
+				return false;
 			i++;
 		}
 		if (wrap) {
 			if (i == 0) /* empty list */
 				return 1;
 			i=0; /* first item */
-			screen_bell();
+			if (bell_on_wrap) {
+				screen_bell();
+			}
 		}
-	}
+	} while (wrap);
 
-	return 1;
+	return false;
 }
 
-int
+bool
 list_window_rfind(struct list_window *lw,
 		  list_window_callback_fn_t callback,
 		  void *callback_data,
 		  const char *str,
-		  int wrap,
-		  unsigned rows)
+		  bool wrap,
+		  bool bell_on_wrap)
 {
-	int h;
 	int i = lw->selected - 1;
 	const char *label;
 
-	if (rows == 0)
-		return 1;
+	assert(str != NULL);
+
+	if (lw->length == 0)
+		return false;
+
+	do {
+		while (i >= 0) {
+			label = callback(i, callback_data);
+			assert(label != NULL);
 
-	while (wrap || i == (int)lw->selected - 1) {
-		while (i >= 0 && (label = callback(i,&h,callback_data))) {
-			if( str && label && strcasestr(label, str) ) {
-				lw->selected = i;
-				return 0;
+			if (match_line(label, str)) {
+				list_window_move_cursor(lw, i);
+				return true;
 			}
 			if (wrap && i == (int)lw->selected)
-				return 1;
+				return false;
 			i--;
 		}
 		if (wrap) {
-			i = rows - 1; /* last item */
-			screen_bell();
+			i = lw->length - 1; /* last item */
+			if (bell_on_wrap) {
+				screen_bell();
+			}
+		}
+	} while (wrap);
+
+	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
+
+	assert(haystack != NULL);
+	assert(needle != NULL);
+
+	return jump_prefix_only
+		? g_ascii_strncasecmp(haystack, needle, strlen(needle)) == 0
+		: match_line(haystack, needle);
+}
+
+bool
+list_window_jump(struct list_window *lw,
+		 list_window_callback_fn_t callback,
+		 void *callback_data,
+		 const char *str)
+{
+	const char *label;
+
+	assert(str != NULL);
+
+	for (unsigned i = 0; i < lw->length; ++i) {
+		label = callback(i, callback_data);
+		assert(label != NULL);
+
+		if (jump_match(label, str)) {
+			list_window_move_cursor(lw, i);
+			return true;
 		}
 	}
-	return 1;
+	return false;
 }
 
 /* perform basic list window commands (movement) */
-int
-list_window_cmd(struct list_window *lw, unsigned rows, command_t cmd)
+bool
+list_window_cmd(struct list_window *lw, command_t cmd)
 {
 	switch (cmd) {
 	case CMD_LIST_PREVIOUS:
-		list_window_previous(lw, rows);
+		list_window_previous(lw);
 		break;
 	case CMD_LIST_NEXT:
-		list_window_next(lw, rows);
+		list_window_next(lw);
+		break;
+	case CMD_LIST_TOP:
+		list_window_top(lw);
+		break;
+	case CMD_LIST_MIDDLE:
+		list_window_middle(lw);
+		break;
+	case CMD_LIST_BOTTOM:
+		list_window_bottom(lw);
 		break;
 	case CMD_LIST_FIRST:
 		list_window_first(lw);
 		break;
 	case CMD_LIST_LAST:
-		list_window_last(lw, rows);
+		list_window_last(lw);
 		break;
 	case CMD_LIST_NEXT_PAGE:
-		list_window_next_page(lw, rows);
+		list_window_next_page(lw);
 		break;
 	case CMD_LIST_PREVIOUS_PAGE:
 		list_window_previous_page(lw);
 		break;
+	case CMD_LIST_RANGE_SELECT:
+		if(lw->range_selection)
+		{
+			screen_status_printf(_("Range selection disabled"));
+			list_window_set_cursor(lw, lw->selected);
+		}
+		else
+		{
+			screen_status_printf(_("Range selection enabled"));
+			lw->range_base = lw->selected;
+			lw->range_selection = true;
+		}
+		break;
+	case CMD_LIST_SCROLL_UP_LINE:
+		list_window_scroll_up(lw, 1);
+		break;
+	case CMD_LIST_SCROLL_DOWN_LINE:
+		list_window_scroll_down(lw, 1);
+		break;
+	case CMD_LIST_SCROLL_UP_HALF:
+		list_window_scroll_up(lw, (lw->rows - 1) / 2);
+		break;
+	case CMD_LIST_SCROLL_DOWN_HALF:
+		list_window_scroll_down(lw, (lw->rows - 1) / 2);
+		break;
 	default:
-		return 0;
+		return false;
 	}
 
-	lw->repaint  = 1;
-	return 1;
+	return true;
 }
 
-list_window_state_t *
-list_window_init_state(void)
+bool
+list_window_scroll_cmd(struct list_window *lw, command_t cmd)
 {
-	return g_malloc0(sizeof(list_window_state_t));
-}
+	switch (cmd) {
+	case CMD_LIST_SCROLL_UP_LINE:
+	case CMD_LIST_PREVIOUS:
+		if (lw->start > 0)
+			lw->start--;
+		break;
 
-list_window_state_t *
-list_window_free_state(list_window_state_t *state)
-{
-	if (state) {
-		if (state->list) {
-			GList *list = state->list;
+	case CMD_LIST_SCROLL_DOWN_LINE:
+	case CMD_LIST_NEXT:
+		if (lw->start + lw->rows < lw->length)
+			lw->start++;
+		break;
 
-			while (list) {
-				g_free(list->data);
-				list->data = NULL;
-				list = list->next;
-			}
+	case CMD_LIST_FIRST:
+		lw->start = 0;
+		break;
 
-			g_list_free(state->list);
-			state->list = NULL;
+	case CMD_LIST_LAST:
+		if (lw->length > lw->rows)
+			lw->start = lw->length - lw->rows;
+		else
+			lw->start = 0;
+		break;
+
+	case CMD_LIST_NEXT_PAGE:
+		lw->start += lw->rows - 1;
+		if (lw->start + lw->rows > lw->length) {
+			if (lw->length > lw->rows)
+				lw->start = lw->length - lw->rows;
+			else
+				lw->start = 0;
 		}
+		break;
 
-		g_free(state);
-	}
+	case CMD_LIST_PREVIOUS_PAGE:
+		if (lw->start > lw->rows)
+			lw->start -= lw->rows;
+		else
+			lw->start = 0;
+		break;
 
-	return NULL;
-}
+	case CMD_LIST_SCROLL_UP_HALF:
+		if (lw->start > (lw->rows - 1) / 2)
+			lw->start -= (lw->rows - 1) / 2;
+		else
+			lw->start = 0;
+		break;
 
-void
-list_window_push_state(list_window_state_t *state, struct list_window *lw)
-{
-	if (state) {
-		struct list_window *tmp = g_malloc(sizeof(list_window_t));
-		memcpy(tmp, lw, sizeof(list_window_t));
-		state->list = g_list_prepend(state->list, (gpointer) tmp);
-		list_window_reset(lw);
+	case CMD_LIST_SCROLL_DOWN_HALF:
+		lw->start += (lw->rows - 1) / 2;
+		if (lw->start + lw->rows > lw->length) {
+			if (lw->length > lw->rows)
+				lw->start = lw->length - lw->rows;
+			else
+				lw->start = 0;
+		}
+		break;
+
+	default:
+		return false;
 	}
+
+	return true;
 }
 
+#ifdef HAVE_GETMOUSE
 bool
-list_window_pop_state(list_window_state_t *state, struct list_window *lw)
+list_window_mouse(struct list_window *lw, unsigned long bstate, int y)
 {
-	if (state && state->list) {
-		struct list_window *tmp = state->list->data;
+	assert(lw != NULL);
 
-		memcpy(lw, tmp, sizeof(list_window_t));
-		g_free(tmp);
-		state->list->data = NULL;
-		state->list = g_list_delete_link(state->list, state->list);
+	/* if the even occurred above the list window move up */
+	if (y < 0) {
+		if (bstate & BUTTON3_CLICKED)
+			list_window_first(lw);
+		else
+			list_window_previous_page(lw);
+		return true;
+	}
+
+	/* if the even occurred below the list window move down */
+	if ((unsigned)y >= lw->length) {
+		if (bstate & BUTTON3_CLICKED)
+			list_window_last(lw);
+		else
+			list_window_next_page(lw);
+		return true;
 	}
 
-	// return TRUE if there are still states in the list
-	return (state && state->list) ? TRUE : FALSE;
+	return false;
 }
+#endif