commit 30f8fd5e95741399cdda93c414d5e67ef8aeb263
from: Stefan Sperling <stsp@stsp.name>
date: Tue Jun 04 19:25:23 2019 UTC

tog: fix off-by-one which caused line-wrapping errors

commit - 46b6ee7302a81a739a797e90a1d908be2b5e265d
commit + 30f8fd5e95741399cdda93c414d5e67ef8aeb263
blob - 9ff2c0fd82164f3e8c24814db6fb434f73902be5
blob + ebecb0fd724d04cbc1678a188044e11ecebe44ce
--- tog/tog.c
+++ tog/tog.c
@@ -2083,7 +2083,7 @@ draw_file(struct tog_view *view, FILE *f, int *first_d
 		waddwstr(view->window, wline);
 		if (view_needs_focus_indication(view))
 			wstandend(view->window);
-		if (width < view->ncols)
+		if (width < view->ncols - 1)
 			waddch(view->window, '\n');
 
 		if (max_lines <= 1)
@@ -2109,7 +2109,7 @@ draw_file(struct tog_view *view, FILE *f, int *first_d
 			return err;
 		}
 		waddwstr(view->window, wline);
-		if (width < view->ncols)
+		if (width < view->ncols - 1)
 			waddch(view->window, '\n');
 		if (++nprinted == 1)
 			*first_displayed_line = nlines;
@@ -2692,7 +2692,7 @@ draw_blame(struct tog_view *view, struct got_object_id
 		wstandend(view->window);
 	free(wline);
 	wline = NULL;
-	if (width < view->ncols)
+	if (width < view->ncols - 1)
 		waddch(view->window, '\n');
 
 	if (asprintf(&line, "[%d/%d] %s%s",
@@ -2710,7 +2710,7 @@ draw_blame(struct tog_view *view, struct got_object_id
 	waddwstr(view->window, wline);
 	free(wline);
 	wline = NULL;
-	if (width < view->ncols)
+	if (width < view->ncols - 1)
 		waddch(view->window, '\n');
 
 	*eof = 0;
@@ -3436,7 +3436,7 @@ draw_tree_entries(struct tog_view *view,
 		wstandend(view->window);
 	free(wline);
 	wline = NULL;
-	if (width < view->ncols)
+	if (width < view->ncols - 1)
 		waddch(view->window, '\n');
 	if (--limit <= 0)
 		return NULL;
@@ -3446,7 +3446,7 @@ draw_tree_entries(struct tog_view *view,
 	waddwstr(view->window, wline);
 	free(wline);
 	wline = NULL;
-	if (width < view->ncols)
+	if (width < view->ncols - 1)
 		waddch(view->window, '\n');
 	if (--limit <= 0)
 		return NULL;
@@ -3501,7 +3501,7 @@ draw_tree_entries(struct tog_view *view,
 			*selected_entry = te;
 		}
 		waddwstr(view->window, wline);
-		if (width < view->ncols)
+		if (width < view->ncols - 1)
 			waddch(view->window, '\n');
 		if (n == selected && view->focussed)
 			wstandend(view->window);