diff options
| -rw-r--r-- | usr.bin/tmux/server-client.c | 27 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 5 | ||||
| -rw-r--r-- | usr.bin/tmux/window.c | 6 |
3 files changed, 32 insertions, 6 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index e3208958f79..94914eaf5da 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.234 2017/05/29 20:41:29 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.235 2017/05/31 10:15:51 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -1050,14 +1050,36 @@ server_client_resize_event(__unused int fd, __unused short events, void *data) if (!(wp->flags & PANE_RESIZE)) return; + /* + * If we are resizing to the same size as when we entered the loop + * (that is, to the same size the application currently thinks it is), + * tmux may have gone through several resizes internally and thrown + * away parts of the screen. So we need the application to actually + * redraw even though its final size has not changed. + */ + if (wp->sx == wp->osx && + wp->sy == wp->osy && + wp->sx > 1 && + wp->sy > 1) { + memset(&ws, 0, sizeof ws); + ws.ws_col = wp->sx - 1; + ws.ws_row = wp->sy - 1; + if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1) + fatal("ioctl failed"); + log_debug("%s: %%%u forcing resize", __func__, wp->id); + } + memset(&ws, 0, sizeof ws); ws.ws_col = wp->sx; ws.ws_row = wp->sy; - if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1) fatal("ioctl failed"); + log_debug("%s: %%%u resize to %u,%u", __func__, wp->id, wp->sx, wp->sy); wp->flags &= ~PANE_RESIZE; + + wp->osx = wp->sx; + wp->osy = wp->sy; } /* Check if pane should be resized. */ @@ -1068,6 +1090,7 @@ server_client_check_resize(struct window_pane *wp) if (!(wp->flags & PANE_RESIZE)) return; + log_debug("%s: %%%u resize to %u,%u", __func__, wp->id, wp->sx, wp->sy); if (!event_initialized(&wp->resize_timer)) evtimer_set(&wp->resize_timer, server_client_resize_event, wp); diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index eca50eb4b48..c9bba5b6b09 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.776 2017/05/31 08:43:44 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.777 2017/05/31 10:15:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -745,6 +745,9 @@ struct window_pane { u_int sx; u_int sy; + u_int osx; + u_int osy; + u_int xoff; u_int yoff; diff --git a/usr.bin/tmux/window.c b/usr.bin/tmux/window.c index 49c8f265e96..66b11660288 100644 --- a/usr.bin/tmux/window.c +++ b/usr.bin/tmux/window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window.c,v 1.196 2017/05/30 21:44:59 nicm Exp $ */ +/* $OpenBSD: window.c,v 1.197 2017/05/31 10:15:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -800,8 +800,8 @@ window_pane_create(struct window *w, u_int sx, u_int sy, u_int hlimit) wp->xoff = 0; wp->yoff = 0; - wp->sx = sx; - wp->sy = sy; + wp->sx = wp->osx = sx; + wp->sy = wp->osx = sy; wp->pipe_fd = -1; wp->pipe_off = 0; |