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

Sync OpenBSD patchset 724:

Browse Source 
Having a list of winlinks->alerts for each session is stupid, just store
the alert flags directly in the winlink itself.
This commit is contained in:
Tiago Cunha
2010-06-22 23:26:18 +00:00
parent 6c76724201
commit 47b335dee7
8 changed files with 86 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server-fn.c
View File

@@ -1,4 +1,4 @@
/* $Id: server-fn.c,v 1.105 2010-04-18 15:10:55 tcunha Exp $ */
/* $Id: server-fn.c,v 1.106 2010-06-22 23:26:18 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -184,7 +184,7 @@ server_status_window(struct window *w)
for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
s = ARRAY_ITEM(&sessions, i);
if (s != NULL && session_has(s, w))
if (s != NULL && session_has(s, w) != NULL)
server_status_session(s);
}
}
@@ -249,7 +249,7 @@ server_kill_window(struct window *w)
for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
s = ARRAY_ITEM(&sessions, i);
if (s == NULL || !session_has(s, w))
if (s == NULL || session_has(s, w) == NULL)
continue;
while ((wl = winlink_find_by_window(&s->windows, w)) != NULL) {
if (session_detach(s, wl)) {
@@ -286,7 +286,7 @@ server_link_window(struct session *src, struct winlink *srcwl,
* Can't use session_detach as it will destroy session
* if this makes it empty.
*/
session_alert_cancel(dst, dstwl);
dstwl->flags &= ~WINLINK_ALERTFLAGS;
winlink_stack_remove(&dst->lastw, dstwl);
winlink_remove(&dst->windows, dstwl);