diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2012-07-08 07:27:32 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2012-07-08 07:27:32 +0000 |
commit | 63f5c38023439e23365b18581eb32f530c66a2d9 (patch) | |
tree | c0edcb2175cac3a4718b51870b3d07b98770a3b4 | |
parent | 67b926cf3c77737e3b40c9d70c38314ac19ba105 (diff) |
Clear flags across all sessions, from Thomas Adam.
-rw-r--r-- | server-window.c | 11 | ||||
-rw-r--r-- | session.c | 8 | ||||
-rw-r--r-- | tmux.h | 1 | ||||
-rw-r--r-- | window.c | 28 |
4 files changed, 41 insertions, 7 deletions
diff --git a/server-window.c b/server-window.c index f382de99..c852acf1 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)) @@ -353,7 +353,7 @@ session_next(struct session *s, int alert) winlink_stack_remove(&s->lastw, wl); winlink_stack_push(&s->lastw, s->curw); s->curw = wl; - wl->flags &= ~WINLINK_ALERTFLAGS; + winlink_clear_flags(wl); return (0); } @@ -390,7 +390,7 @@ session_previous(struct session *s, int alert) winlink_stack_remove(&s->lastw, wl); winlink_stack_push(&s->lastw, s->curw); s->curw = wl; - wl->flags &= ~WINLINK_ALERTFLAGS; + winlink_clear_flags(wl); return (0); } @@ -408,7 +408,7 @@ session_select(struct session *s, int idx) winlink_stack_remove(&s->lastw, wl); winlink_stack_push(&s->lastw, s->curw); s->curw = wl; - wl->flags &= ~WINLINK_ALERTFLAGS; + winlink_clear_flags(wl); return (0); } @@ -427,7 +427,7 @@ session_last(struct session *s) winlink_stack_remove(&s->lastw, wl); winlink_stack_push(&s->lastw, s->curw); s->curw = wl; - wl->flags &= ~WINLINK_ALERTFLAGS; + winlink_clear_flags(wl); return (0); } @@ -2076,6 +2076,7 @@ struct window_pane *window_pane_find_down(struct window_pane *); struct window_pane *window_pane_find_left(struct window_pane *); struct window_pane *window_pane_find_right(struct window_pane *); void window_set_name(struct window *, const char *); +void winlink_clear_flags(struct winlink *); /* layout.c */ u_int layout_count_cells(struct layout_cell *); @@ -1164,3 +1164,31 @@ window_pane_find_right(struct window_pane *wp) } return (NULL); } + +/* Clear alert flags for a winlink */ +void +winlink_clear_flags(struct winlink *wl) +{ + struct winlink *wm; + struct session *s; + struct window *w; + u_int i; + + for (i = 0; i < ARRAY_LENGTH(&windows); i++) { + if ((w = ARRAY_ITEM(&windows, i)) == NULL) + continue; + + RB_FOREACH(s, sessions, &sessions) { + if ((wm = session_has(s, w)) == NULL) + continue; + + if (wm->window != wl->window) + continue; + if ((wm->flags & WINLINK_ALERTFLAGS) == 0) + continue; + + wm->flags &= ~WINLINK_ALERTFLAGS; + server_status_session(s); + } + } +} |