Commit 30f8fd5e95741399cdda93c414d5e67ef8aeb263
2019-06-04T21:25:23
tog: fix off-by-one which caused line-wrapping errors
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
diff --git a/tog/tog.c b/tog/tog.c
index 9ff2c0f..ebecb0f 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -2083,7 +2083,7 @@ draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
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_displayed_line,
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 *id, FILE *f,
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 *id, FILE *f,
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);