diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-11-28 12:18:41 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-11-28 12:18:41 +0000 |
| commit | 5f5f029e3b3a782dc616778739b2801b00b17c0e (patch) | |
| tree | fad35dccc37c54e45d0ecc497d3b915dd7b835aa /server-client.c | |
| parent | c13838436e6883d191374f1628e675bfbb8c8aeb (diff) | |
| parent | fa409194d3dfe0095bf6572a253772f2825f5dec (diff) | |
| download | rtmux-5f5f029e3b3a782dc616778739b2801b00b17c0e.tar.gz rtmux-5f5f029e3b3a782dc616778739b2801b00b17c0e.tar.bz2 rtmux-5f5f029e3b3a782dc616778739b2801b00b17c0e.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/server-client.c b/server-client.c index cedd00a1..d8907f2a 100644 --- a/server-client.c +++ b/server-client.c @@ -541,7 +541,8 @@ have_event: where = STATUS_RIGHT; break; case STYLE_RANGE_WINDOW: - wl = winlink_find_by_index(&s->windows, sr->argument); + wl = winlink_find_by_index(&s->windows, + sr->argument); if (wl == NULL) return (KEYC_UNKNOWN); m->w = wl->window->id; @@ -1319,7 +1320,6 @@ static int server_client_resize_force(struct window_pane *wp) { struct timeval tv = { .tv_usec = 100000 }; - struct winsize ws; /* * If we are resizing to the same size as when we entered the loop @@ -1349,6 +1349,7 @@ server_client_resize_force(struct window_pane *wp) #endif fatal("ioctl failed"); log_debug("%s: %%%u forcing resize", __func__, wp->id); + window_pane_send_resize(wp, -1); evtimer_add(&wp->resize_timer, &tv); wp->flags |= PANE_RESIZEFORCE; @@ -1376,6 +1377,7 @@ server_client_resize_pane(struct window_pane *wp) #endif fatal("ioctl failed"); log_debug("%s: %%%u resize to %u,%u", __func__, wp->id, wp->sx, wp->sy); + window_pane_send_resize(wp, 0); wp->flags &= ~PANE_RESIZE; |