diff options
| author | Thomas Adam <thomas@xteddy.org> | 2018-07-04 13:02:25 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2018-07-04 13:02:25 +0100 |
| commit | 850c26dd46a0b6983e32112fc1e37b8aa5a5268b (patch) | |
| tree | ce9250e828bfc4ab96e3faae08ea9695006a5721 /tty.c | |
| parent | db07f338863eea6a8eda2b0efafb7e2b2500e14e (diff) | |
| parent | 2fae6a57618e1cef47b65e73504d7d5570ca6a8e (diff) | |
| download | rtmux-850c26dd46a0b6983e32112fc1e37b8aa5a5268b.tar.gz rtmux-850c26dd46a0b6983e32112fc1e37b8aa5a5268b.tar.bz2 rtmux-850c26dd46a0b6983e32112fc1e37b8aa5a5268b.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'tty.c')
| -rw-r--r-- | tty.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -913,6 +913,7 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp, int flags, cleared = 0; char buf[512]; size_t len, old_len; + u_int cellsize; flags = (tty->flags & TTY_NOCURSOR); tty->flags |= TTY_NOCURSOR; @@ -926,15 +927,17 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp, * there may be empty background cells after it (from BCE). */ sx = screen_size_x(s); - if (sx > gd->linedata[gd->hsize + py].cellsize) - sx = gd->linedata[gd->hsize + py].cellsize; + + cellsize = grid_get_line(gd, gd->hsize + py)->cellsize; + if (sx > cellsize) + sx = cellsize; if (sx > tty->sx) sx = tty->sx; ux = 0; if (wp == NULL || py == 0 || - (~gd->linedata[gd->hsize + py - 1].flags & GRID_LINE_WRAPPED) || + (~grid_get_line(gd, gd->hsize + py - 1)->flags & GRID_LINE_WRAPPED) || ox != 0 || tty->cx < tty->sx || screen_size_x(s) < tty->sx) { |