diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2014-02-14 12:44:46 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2014-02-14 12:44:46 +0000 |
| commit | 9dfe0ba754e90206286939aaeb3e394e9d34e2dc (patch) | |
| tree | fb94b14dccd23b90c2c33e1a10e644743509065b /usr.bin/tmux | |
| parent | b816b766a7d4d976344812315862bd0ab62c1f1d (diff) | |
Do not need to call winlink_find_by_window, from Filip Moc.
Diffstat (limited to 'usr.bin/tmux')
| -rw-r--r-- | usr.bin/tmux/server-window.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/usr.bin/tmux/server-window.c b/usr.bin/tmux/server-window.c index d7278987c9f..96b58d07203 100644 --- a/usr.bin/tmux/server-window.c +++ b/usr.bin/tmux/server-window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-window.c,v 1.28 2013/03/21 18:47:01 nicm Exp $ */ +/* $OpenBSD: server-window.c,v 1.29 2014/02/14 12:44:45 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -76,7 +76,7 @@ server_window_check_bell(struct session *s, struct winlink *wl) wl->flags |= WINLINK_BELL; if (s->flags & SESSION_UNATTACHED) return (0); - if (s->curw->window == wl->window) + if (s->curw->window == w) w->flags &= ~WINDOW_BELL; visual = options_get_number(&s->options, "visual-bell"); @@ -93,10 +93,8 @@ server_window_check_bell(struct session *s, struct winlink *wl) } if (c->session->curw->window == w) status_message_set(c, "Bell in current window"); - else if (action == BELL_ANY) { - status_message_set(c, "Bell in window %u", - winlink_find_by_window(&s->windows, w)->idx); - } + else if (action == BELL_ANY) + status_message_set(c, "Bell in window %u", wl->idx); } return (1); @@ -110,7 +108,7 @@ server_window_check_activity(struct session *s, struct winlink *wl) struct window *w = wl->window; u_int i; - if (s->curw->window == wl->window) + if (s->curw->window == w) w->flags &= ~WINDOW_ACTIVITY; if (!(w->flags & WINDOW_ACTIVITY) || wl->flags & WINLINK_ACTIVITY) @@ -130,8 +128,7 @@ server_window_check_activity(struct session *s, struct winlink *wl) c = ARRAY_ITEM(&clients, i); if (c == NULL || c->session != s) continue; - status_message_set(c, "Activity in window %u", - winlink_find_by_window(&s->windows, w)->idx); + status_message_set(c, "Activity in window %u", wl->idx); } } @@ -182,8 +179,7 @@ server_window_check_silence(struct session *s, struct winlink *wl) c = ARRAY_ITEM(&clients, i); if (c == NULL || c->session != s) continue; - status_message_set(c, "Silence in window %u", - winlink_find_by_window(&s->windows, w)->idx); + status_message_set(c, "Silence in window %u", wl->idx); } } @@ -225,8 +221,7 @@ server_window_check_content( c = ARRAY_ITEM(&clients, i); if (c == NULL || c->session != s) continue; - status_message_set(c, "Content in window %u", - winlink_find_by_window(&s->windows, w)->idx); + status_message_set(c, "Content in window %u", wl->idx); } } |