circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-18 02:18:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-02-08 16:01:17 +00:00
commit e09625e38b
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resize.c
View File

@ -84,8 +84,8 @@ recalculate_sizes(void)
if (s->sx == ssx && s->sy == ssy) if (s->sx == ssx && s->sy == ssy)
continue; continue;
log_debug("session size %u,%u (was %u,%u)", ssx, ssy, s->sx, log_debug("session $%u size %u,%u (was %u,%u)", s->id, ssx, ssy,
s->sy); s->sx, s->sy);
s->sx = ssx; s->sx = ssx;
s->sy = ssy; s->sy = ssy;
@ -130,8 +130,8 @@ recalculate_sizes(void)
if (w->sx == ssx && w->sy == ssy) if (w->sx == ssx && w->sy == ssy)
continue; continue;
log_debug("window size %u,%u (was %u,%u)", ssx, ssy, w->sx, log_debug("window @%u size %u,%u (was %u,%u)", w->id, ssx, ssy,
w->sy); w->sx, w->sy);
w->flags &= ~(WINDOW_FORCEWIDTH|WINDOW_FORCEHEIGHT); w->flags &= ~(WINDOW_FORCEWIDTH|WINDOW_FORCEHEIGHT);
w->flags |= forced; w->flags |= forced;

4
tty.c
View File

@ -142,6 +142,7 @@ tty_resize(struct tty *tty)
sx = 80; sx = 80;
sy = 24; sy = 24;
} }
log_debug("%s: %s now %ux%u", __func__, tty->path, sx, sy);
if (!tty_set_size(tty, sx, sy)) if (!tty_set_size(tty, sx, sy))
return (0); return (0);
@ -997,9 +998,6 @@ tty_cmd_linefeed(struct tty *tty, const struct tty_ctx *ctx)
if ((!tty_pane_full_width(tty, ctx) && !tty_use_margin(tty)) || if ((!tty_pane_full_width(tty, ctx) && !tty_use_margin(tty)) ||
tty_fake_bce(tty, wp, ctx->bg) || tty_fake_bce(tty, wp, ctx->bg) ||
!tty_term_has(tty->term, TTYC_CSR)) { !tty_term_has(tty->term, TTYC_CSR)) {
if (tty_large_region(tty, ctx))
wp->flags |= PANE_REDRAW;
else
tty_redraw_region(tty, ctx); tty_redraw_region(tty, ctx);
return; return;
} }