diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-10-19 12:01:11 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-10-19 12:01:11 +0100 |
| commit | 28a31201d3d75502e70ff97d03e129a92c3f82ae (patch) | |
| tree | b772df443166456fcd81269b65dc7a63366bca4d /server-client.c | |
| parent | 4c6eb6cc2f415544d81608109058690d88bd9db7 (diff) | |
| parent | 99c262b7d0a2f41497327e8f5caefde802178346 (diff) | |
| download | rtmux-28a31201d3d75502e70ff97d03e129a92c3f82ae.tar.gz rtmux-28a31201d3d75502e70ff97d03e129a92c3f82ae.tar.bz2 rtmux-28a31201d3d75502e70ff97d03e129a92c3f82ae.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/server-client.c b/server-client.c index 846ff4df..2a3af8d5 100644 --- a/server-client.c +++ b/server-client.c @@ -851,6 +851,7 @@ server_client_loop(void) struct client *c; struct window *w; struct window_pane *wp; + int focus; TAILQ_FOREACH(c, &clients, entry) { server_client_check_exit(c); @@ -864,11 +865,13 @@ server_client_loop(void) * Any windows will have been redrawn as part of clients, so clear * their flags now. Also check pane focus and resize. */ + focus = options_get_number(global_options, "focus-events"); RB_FOREACH(w, windows, &windows) { w->flags &= ~WINDOW_REDRAW; TAILQ_FOREACH(wp, &w->panes, entry) { if (wp->fd != -1) { - server_client_check_focus(wp); + if (focus) + server_client_check_focus(wp); server_client_check_resize(wp); } wp->flags &= ~PANE_REDRAW; @@ -945,10 +948,6 @@ server_client_check_focus(struct window_pane *wp) struct client *c; int push; - /* Are focus events off? */ - if (!options_get_number(global_options, "focus-events")) - return; - /* Do we need to push the focus state? */ push = wp->flags & PANE_FOCUSPUSH; wp->flags &= ~PANE_FOCUSPUSH; |