circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-04 06:56:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2016-10-19 12:01:11 +01:00
parent 4c6eb6cc2f 99c262b7d0
commit 28a31201d3
6 changed files with 179 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server-client.c
View File

@ -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;