Commit 969c159c1ef1e3ac2df93c76782f75e5136215eb
2022-06-16T17:17:19
fix horizontal scrolling of unicode in tog diff view ok op@
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
diff --git a/tog/tog.c b/tog/tog.c
index ce1b254..34234f4 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -3237,8 +3237,6 @@ draw_file(struct tog_view *view, const char *header)
return got_ferror(s->f, GOT_ERR_IO);
}
- view->maxx = MAX(view->maxx, linelen);
-
tc = match_color(&s->colors, line);
if (tc)
wattr_on(view->window,
@@ -3251,22 +3249,38 @@ draw_file(struct tog_view *view, const char *header)
free(line);
return err;
}
+ view->maxx = MAX(view->maxx, width);
} else {
- err = format_line(&wline, &width, NULL, line, 0,
- view->x + view->ncols, 0, view->x ? 1 : 0);
+ int skip;
+
+ /* Set view->maxx based on full line length. */
+ err = format_line(&wline, &width, NULL, line,
+ 0, INT_MAX, 0, view->x ? 1 : 0);
if (err) {
free(line);
return err;
}
- if (view->x < width)
- waddwstr(view->window, wline + view->x);
+ view->maxx = MAX(view->maxx, width);
+
+ /*
+ * Get a new version of the line for display.
+ * This will be scrolled and/or trimmed in length.
+ */
+ free(wline);
+ err = format_line(&wline, &width, &skip, line,
+ view->x, view->ncols, 0, view->x ? 1 : 0);
+ if (err) {
+ free(line);
+ return err;
+ }
+ waddwstr(view->window, &wline[skip]);
free(wline);
wline = NULL;
}
if (tc)
wattr_off(view->window,
COLOR_PAIR(tc->colorpair), NULL);
- if (width - view->x <= view->ncols - 1)
+ if (width <= view->ncols - 1)
waddch(view->window, '\n');
nprinted++;
}