Add a dedicated function to convert a line into a string and use it to simplify the search window function.

1 files changed, 17 insertions, 38 deletions

diff --git a/window.c b/window.c
index c1bab68b..568c1342 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.3 2009/06/23 20:17:30 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.4 2009/06/24 22:04:18 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -604,42 +604,21 @@ window_pane_mouse(
 char *
 window_pane_search(struct window_pane *wp, const char *searchstr)
 {
-	const struct grid_cell	*gc;
-	const struct grid_utf8	*gu;
-	char			*buf, *s;
-	size_t	 		 off;
-	u_int	 		 i, j, k;
-
-	buf = xmalloc(1);
-
-	for (j = 0; j < screen_size_y(&wp->base); j++) {
-		off = 0;
-		for (i = 0; i < screen_size_x(&wp->base); i++) {
-			gc = grid_view_peek_cell(wp->base.grid, i, j);
-			if (gc->flags & GRID_FLAG_UTF8) {
-				gu = grid_view_peek_utf8(wp->base.grid, i, j);
-				buf = xrealloc(buf, 1, off + 8);
-				for (k = 0; k < UTF8_SIZE; k++) {
-					if (gu->data[k] == 0xff)
-						break;
-					buf[off++] = gu->data[k];
-				}
-			} else {
-				buf = xrealloc(buf, 1, off + 1);
-				buf[off++] = gc->data;
-			}
-		}
-		while (off > 0 && buf[off - 1] == ' ')
-			off--;
-		buf[off] = '\0';
-
-		if ((s = strstr(buf, searchstr)) != NULL) {
-			s = section_string(buf, off, s - buf, 40);
-			xfree(buf);
-			return (s);
-		}
+	struct screen	*s = &wp->base;
+	char		*line, *ptr;
+	u_int	 	 i;
+
+	ptr = NULL;
+	for (i = 0; i < screen_size_y(s); i++) {
+		line = grid_view_string_cells(s->grid, 0, i, screen_size_x(s));
+		log_debug("XXX %s", line);
+		if ((ptr = strstr(line, searchstr)) != NULL)
+			break;		
+		xfree(line);
 	}
-
-	xfree(buf);
-	return (NULL);
+	if (ptr != NULL) {
+		ptr = section_string(line, strlen(ptr), ptr - line, 40);
+		xfree(line);
+	}
+	return (ptr);
 }