circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2017-04-16 22:01:19 +01:00
parent 9583878a7b d566c780e5
commit d912687be7
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tmux.c
View File

@@ -139,6 +139,8 @@ make_label(const char *label)
if (realpath(base, resolved) == NULL) if (realpath(base, resolved) == NULL)
strlcpy(resolved, base, sizeof resolved); strlcpy(resolved, base, sizeof resolved);
xasprintf(&path, "%s/%s", resolved, label); xasprintf(&path, "%s/%s", resolved, label);
free(base);
return (path); return (path);
fail: fail:

15
tty.c
View File

@@ -693,10 +693,11 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp,
{ {
struct grid_cell gc, last; struct grid_cell gc, last;
u_int i, j, sx, width; u_int i, j, sx, width;
int flags = (tty->flags & TTY_NOCURSOR); int flags, cleared = 0;
char buf[512]; char buf[512];
size_t len; size_t len;
flags = (tty->flags & TTY_NOCURSOR);
tty->flags |= TTY_NOCURSOR; tty->flags |= TTY_NOCURSOR;
tty_update_mode(tty, tty->mode, s); tty_update_mode(tty, tty->mode, s);
@@ -709,6 +710,16 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp,
if (sx > tty->sx) if (sx > tty->sx)
sx = tty->sx; sx = tty->sx;
if (screen_size_x(s) < tty->sx &&
ox == 0 &&
sx != screen_size_x(s) &&
tty_term_has(tty->term, TTYC_EL1) &&
!tty_fake_bce(tty, wp, 8)) {
tty_default_attributes(tty, wp, 8);
tty_cursor(tty, screen_size_x(s) - 1, oy + py);
tty_putcode(tty, TTYC_EL1);
cleared = 1;
}
tty_cursor(tty, ox, oy + py); tty_cursor(tty, ox, oy + py);
memcpy(&last, &grid_default_cell, sizeof last); memcpy(&last, &grid_default_cell, sizeof last);
@@ -763,7 +774,7 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp,
tty_putn(tty, buf, len, width); tty_putn(tty, buf, len, width);
} }
if (sx < tty->sx) { if (!cleared && sx < tty->sx) {
tty_default_attributes(tty, wp, 8); tty_default_attributes(tty, wp, 8);
tty_cursor(tty, ox + sx, oy + py); tty_cursor(tty, ox + sx, oy + py);