From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 23 Sep 2009 13:22:23 +0000 (+0200)
Subject: use full textbox width when reflowing
X-Git-Tag: r0-52-11~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b16ddee71da5014643c5335ae92d4726421e735e;p=thirdparty%2Fnewt.git

use full textbox width when reflowing
---

diff --git a/textbox.c b/textbox.c
index ec75446..f6f89d9 100644
--- a/textbox.c
+++ b/textbox.c
@@ -174,7 +174,7 @@ static void doReflow(const char * text, char ** resultPtr, int width,
     mbstate_t ps;
 
     if (resultPtr) {
-	/* XXX I think this will work */
+	/* use width - 1 for double width characters that won't fit at end of line */
 	result = malloc(strlen(text) + (strlen(text) / (width - 1)) + 2);
 	*result = '\0';
     }
@@ -189,7 +189,7 @@ static void doReflow(const char * text, char ** resultPtr, int width,
 	    int len;
 		
 	    len = wstrlen(text, end - text);
-	    if (len < width) {
+	    if (len <= width) {
 		if (result) {
 		    strncat(result, text, end - text);
 		    strcat(result, "\n");
@@ -206,11 +206,11 @@ static void doReflow(const char * text, char ** resultPtr, int width,
 		if (*text) text++;
 	    } else {
 		const char *spcptr = NULL;
-	        int spc =0,w2, x;
+	        int spc = 0, w2 = 0, x, w;
 
 	        chptr = text;
-		w2 = 0;
-		for (i = 0; i < width - 1;) {
+		i = 0;
+		while (1) {
 			if ((x=mbrtowc(&tmp,chptr,end-chptr,&ps))<=0)
 				break;
 		        if (spc && !iswspace(tmp))
@@ -220,10 +220,13 @@ static void doReflow(const char * text, char ** resultPtr, int width,
 				spcptr = chptr;
 				w2 = i;
 			}
+			w = wcwidth(tmp);
+			if (w < 0)
+				w = 0;
+			if (i && w + i > width)
+				break;
 			chptr += x;
-			x = wcwidth(tmp);
-			if (x>0)
-			    i+=x;
+			i += w;
 		}
 		howbad += width - w2 + 1;
 #ifdef DEBUG_WRAP