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 2019-03-04 12:01:28 +00:00
commit 9ebd630675
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resize.c
View File

@ -188,7 +188,7 @@ recalculate_sizes(void)
type = options_get_number(w->options, "window-size"); type = options_get_number(w->options, "window-size");
if (type == WINDOW_SIZE_MANUAL) if (type == WINDOW_SIZE_MANUAL)
continue; continue;
current = !options_get_number(w->options, "aggressive-resize"); current = options_get_number(w->options, "aggressive-resize");
changed = 1; changed = 1;
if (type == WINDOW_SIZE_LARGEST) { if (type == WINDOW_SIZE_LARGEST) {

3
tty.c
View File

@ -807,6 +807,9 @@ tty_update_client_offset(struct client *c)
{ {
u_int ox, oy, sx, sy; u_int ox, oy, sx, sy;
if (~c->flags & CLIENT_TERMINAL)
return;
c->tty.oflag = tty_window_offset1(&c->tty, &ox, &oy, &sx, &sy); c->tty.oflag = tty_window_offset1(&c->tty, &ox, &oy, &sx, &sy);
if (ox == c->tty.oox && if (ox == c->tty.oox &&
oy == c->tty.ooy && oy == c->tty.ooy &&