Commit Diff

Commit:
8d208d3487a42414bcbbd542d3caca89e442fb33
From:
Omar Polo <op@omarpolo.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
simplify scroll_wline (now span_wline) and format_line generalize scroll_wline to start at a specified offset so that we can reuse it to simplify format_line. While here, simplify scroll_wline (now called span_wline) too. ok and improvements by stsp@
Actions:
Patch | Tree
commit - 1065461da75da76e9e55d79a8b1c74b7d1f75e00
commit + 8d208d3487a42414bcbbd542d3caca89e442fb33
blob - db49500a25ff2007eb34f2ecd219ecc9277a6927
blob + cc1da9ade2720147f1f3088d366efaa7c236844c
--- tog/tog.c
+++ tog/tog.c
@@ -1270,51 +1270,40 @@ expand_tab(char **ptr, const char *src)
 	return NULL;
 }
 
-/* 
- * Skip leading nscroll columns of a wide character string.
- * Returns the index to the first character of the scrolled string.
+/*
+ * Advance at most n columns from wline starting at offset off.
+ * Return the index to the first character after the span operation.
+ * Return the combined column width of all spanned wide character in
+ * *rcol.
  */
-static const struct got_error *
-scroll_wline(int *scrollx , wchar_t *wline, int nscroll,
-    int col_tab_align)
-{
-	int cols = 0;
-	size_t wlen = wcslen(wline);
-	int i = 0;
+static int
+span_wline(int *rcol, int off, wchar_t *wline, int n, int col_tab_align)
+{
+	int width, i, cols = 0;
 
-	*scrollx = 0;
+	if (n == 0) {
+		*rcol = cols;
+		return off;
+	}
 
-	while (i < wlen && cols < nscroll) {
-		int width = wcwidth(wline[i]);
+	for (i = off; wline[i] != L'\0'; ++i) {
+		if (wline[i] == L'\t')
+			width = TABSIZE - ((cols + col_tab_align) % TABSIZE);
+		else
+			width = wcwidth(wline[i]);
 
-		if (width == 0) {
-			i++;
-			continue;
+		if (width == -1) {
+			width = 1;
+			wline[i] = L'.';
 		}
 
-		if (width == 1 || width == 2) {
-			if (cols + width > nscroll)
-				break;
-			cols += width;
-			i++;
-		} else if (width == -1) {
-			if (wline[i] == L'\t') {
-				width = TABSIZE -
-				    ((cols + col_tab_align) % TABSIZE);
-			} else {
-				width = 1;
-				wline[i] = L'.';
-			}
-			if (cols + width > nscroll)
-				break;
-			cols += width;
-			i++;
-		} else
-			return got_error_from_errno("wcwidth");
+		if (cols + width > n)
+			break;
+		cols += width;
 	}
 
-	*scrollx = i;
-	return NULL;
+	*rcol = cols;
+	return i;
 }
 
 /*
@@ -1327,11 +1316,11 @@ format_line(wchar_t **wlinep, int *widthp, int *scroll
     const char *line, int nscroll, int wlimit, int col_tab_align, int expand)
 {
 	const struct got_error *err = NULL;
-	int cols = 0;
+	int cols;
 	wchar_t *wline = NULL;
 	char *exstr = NULL;
 	size_t wlen;
-	int i, scrollx = 0;
+	int i, scrollx;
 
 	*wlinep = NULL;
 	*widthp = 0;
@@ -1347,9 +1336,7 @@ format_line(wchar_t **wlinep, int *widthp, int *scroll
 	if (err)
 		return err;
 
-	err = scroll_wline(&scrollx, wline, nscroll, col_tab_align);
-	if (err)
-		goto done;
+	scrollx = span_wline(&cols, 0, wline, nscroll, col_tab_align);
 
 	if (wlen > 0 && wline[wlen - 1] == L'\n') {
 		wline[wlen - 1] = L'\0';
@@ -1360,43 +1347,13 @@ format_line(wchar_t **wlinep, int *widthp, int *scroll
 		wlen--;
 	}
 
-	i = scrollx;
-	while (i < wlen) {
-		int width = wcwidth(wline[i]);
-
-		if (width == 0) {
-			i++;
-			continue;
-		}
+	i = span_wline(&cols, scrollx, wline, wlimit, col_tab_align);
+	wline[i] = L'\0';
 
-		if (width == 1 || width == 2) {
-			if (cols + width > wlimit)
-				break;
-			cols += width;
-			i++;
-		} else if (width == -1) {
-			if (wline[i] == L'\t') {
-				width = TABSIZE -
-				    ((cols + col_tab_align) % TABSIZE);
-			} else {
-				width = 1;
-				wline[i] = L'.';
-			}
-			if (cols + width > wlimit)
-				break;
-			cols += width;
-			i++;
-		} else {
-			err = got_error_from_errno("wcwidth");
-			goto done;
-		}
-	}
-	wline[i] = L'\0';
 	if (widthp)
 		*widthp = cols;
 	if (scrollxp)
 		*scrollxp = scrollx;
-done:
 	if (err)
 		free(wline);
 	else