diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2012-07-11 17:06:11 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2012-07-11 17:06:11 +0000 |
| commit | 38530de62258baf12a89f508025f2dc38ce8b5f5 (patch) | |
| tree | a0f3e9011a62083c6f4076be57c17eb3b5ca4bc7 /server-window.c | |
| parent | f040bc249f87c3f1f78ed18e80d2384573f56142 (diff) | |
| download | rtmux-38530de62258baf12a89f508025f2dc38ce8b5f5.tar.gz rtmux-38530de62258baf12a89f508025f2dc38ce8b5f5.tar.bz2 rtmux-38530de62258baf12a89f508025f2dc38ce8b5f5.zip | |
Sync OpenBSD patchset 1144:
Clear flags across all sessions, from Thomas Adam.
Diffstat (limited to 'server-window.c')
| -rw-r--r-- | server-window.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/server-window.c b/server-window.c index b48c8a24..380719b3 100644 --- a/server-window.c +++ b/server-window.c @@ -56,9 +56,6 @@ server_window_loop(void) server_status_session(s); TAILQ_FOREACH(wp, &w->panes, entry) server_window_check_content(s, wl, wp); - - if (!(s->flags & SESSION_UNATTACHED)) - w->flags &= ~(WINDOW_BELL|WINDOW_ACTIVITY); } } } @@ -78,6 +75,8 @@ server_window_check_bell(struct session *s, struct winlink *wl) wl->flags |= WINLINK_BELL; if (s->flags & SESSION_UNATTACHED) return (1); + if (s->curw->window == wl->window) + w->flags &= ~WINDOW_BELL; visual = options_get_number(&s->options, "visual-bell"); action = options_get_number(&s->options, "bell-action"); @@ -108,6 +107,9 @@ server_window_check_activity(struct session *s, struct winlink *wl) struct window *w = wl->window; u_int i; + if (s->curw->window == wl->window) + w->flags &= ~WINDOW_ACTIVITY; + if (!(w->flags & WINDOW_ACTIVITY) || wl->flags & WINLINK_ACTIVITY) return (0); if (s->curw == wl && !(s->flags & SESSION_UNATTACHED)) @@ -196,6 +198,9 @@ server_window_check_content( char *found, *ptr; /* Activity flag must be set for new content. */ + if (s->curw->window == w) + w->flags &= ~WINDOW_ACTIVITY; + if (!(w->flags & WINDOW_ACTIVITY) || wl->flags & WINLINK_CONTENT) return (0); if (s->curw == wl && !(s->flags & SESSION_UNATTACHED)) |