aboutsummaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
Diffstat (limited to 'session.c')
-rw-r--r--session.c127
1 files changed, 23 insertions, 104 deletions
diff --git a/session.c b/session.c
index fccbd3e3..272f112c 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $Id: session.c,v 1.75 2010-06-22 23:22:31 tcunha Exp $ */
+/* $Id: session.c,v 1.76 2010-06-22 23:26:18 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,71 +31,8 @@ struct sessions sessions;
struct sessions dead_sessions;
struct session_groups session_groups;
-struct winlink *session_next_alert(struct session *, struct winlink *);
-struct winlink *session_previous_alert(struct session *, struct winlink *);
-
-void
-session_alert_cancel(struct session *s, struct winlink *wl)
-{
- struct session_alert *sa, *sb;
-
- sa = SLIST_FIRST(&s->alerts);
- while (sa != NULL) {
- sb = sa;
- sa = SLIST_NEXT(sa, entry);
-
- if (wl == NULL || sb->wl == wl) {
- SLIST_REMOVE(&s->alerts, sb, session_alert, entry);
- xfree(sb);
- }
- }
-}
-
-void
-session_alert_add(struct session *s, struct window *w, int type)
-{
- struct session_alert *sa;
- struct winlink *wl;
-
- RB_FOREACH(wl, winlinks, &s->windows) {
- if (wl == s->curw)
- continue;
-
- if (wl->window == w &&
- !session_alert_has(s, wl, type)) {
- sa = xmalloc(sizeof *sa);
- sa->wl = wl;
- sa->type = type;
- SLIST_INSERT_HEAD(&s->alerts, sa, entry);
- }
- }
-}
-
-int
-session_alert_has(struct session *s, struct winlink *wl, int type)
-{
- struct session_alert *sa;
-
- SLIST_FOREACH(sa, &s->alerts, entry) {
- if (sa->wl == wl && sa->type == type)
- return (1);
- }
-
- return (0);
-}
-
-int
-session_alert_has_window(struct session *s, struct window *w, int type)
-{
- struct session_alert *sa;
-
- SLIST_FOREACH(sa, &s->alerts, entry) {
- if (sa->wl->window == w && sa->type == type)
- return (1);
- }
-
- return (0);
-}
+struct winlink *session_next_alert(struct winlink *);
+struct winlink *session_previous_alert(struct winlink *);
/* Find session by name. */
struct session *
@@ -133,7 +70,6 @@ session_create(const char *name, const char *cmd, const char *cwd,
s->curw = NULL;
TAILQ_INIT(&s->lastw);
RB_INIT(&s->windows);
- SLIST_INIT(&s->alerts);
paste_init_stack(&s->buffers);
@@ -196,7 +132,6 @@ session_destroy(struct session *s)
xfree(s->tio);
session_group_remove(s);
- session_alert_cancel(s, NULL);
environ_free(&s->environ);
options_free(&s->options);
paste_free_stack(&s->buffers);
@@ -284,7 +219,7 @@ session_detach(struct session *s, struct winlink *wl)
session_last(s) != 0 && session_previous(s, 0) != 0)
session_next(s, 0);
- session_alert_cancel(s, wl);
+ wl->flags &= ~WINLINK_ALERTFLAGS;
winlink_stack_remove(&s->lastw, wl);
winlink_remove(&s->windows, wl);
session_group_synchronize_from(s);
@@ -296,27 +231,23 @@ session_detach(struct session *s, struct winlink *wl)
}
/* Return if session has window. */
-int
+struct winlink *
session_has(struct session *s, struct window *w)
{
struct winlink *wl;
RB_FOREACH(wl, winlinks, &s->windows) {
if (wl->window == w)
- return (1);
+ return (wl);
}
- return (0);
+ return (NULL);
}
struct winlink *
-session_next_alert(struct session *s, struct winlink *wl)
+session_next_alert(struct winlink *wl)
{
while (wl != NULL) {
- if (session_alert_has(s, wl, WINDOW_BELL))
- break;
- if (session_alert_has(s, wl, WINDOW_ACTIVITY))
- break;
- if (session_alert_has(s, wl, WINDOW_CONTENT))
+ if (wl->flags & WINLINK_ALERTFLAGS)
break;
wl = winlink_next(wl);
}
@@ -334,10 +265,10 @@ session_next(struct session *s, int alert)
wl = winlink_next(s->curw);
if (alert)
- wl = session_next_alert(s, wl);
+ wl = session_next_alert(wl);
if (wl == NULL) {
wl = RB_MIN(winlinks, &s->windows);
- if (alert && ((wl = session_next_alert(s, wl)) == NULL))
+ if (alert && ((wl = session_next_alert(wl)) == NULL))
return (-1);
}
if (wl == s->curw)
@@ -345,19 +276,15 @@ session_next(struct session *s, int alert)
winlink_stack_remove(&s->lastw, wl);
winlink_stack_push(&s->lastw, s->curw);
s->curw = wl;
- session_alert_cancel(s, wl);
+ wl->flags &= ~WINLINK_ALERTFLAGS;
return (0);
}
struct winlink *
-session_previous_alert(struct session *s, struct winlink *wl)
+session_previous_alert(struct winlink *wl)
{
while (wl != NULL) {
- if (session_alert_has(s, wl, WINDOW_BELL))
- break;
- if (session_alert_has(s, wl, WINDOW_ACTIVITY))
- break;
- if (session_alert_has(s, wl, WINDOW_CONTENT))
+ if (wl->flags & WINLINK_ALERTFLAGS)
break;
wl = winlink_previous(wl);
}
@@ -375,10 +302,10 @@ session_previous(struct session *s, int alert)
wl = winlink_previous(s->curw);
if (alert)
- wl = session_previous_alert(s, wl);
+ wl = session_previous_alert(wl);
if (wl == NULL) {
wl = RB_MAX(winlinks, &s->windows);
- if (alert && (wl = session_previous_alert(s, wl)) == NULL)
+ if (alert && (wl = session_previous_alert(wl)) == NULL)
return (-1);
}
if (wl == s->curw)
@@ -386,7 +313,7 @@ session_previous(struct session *s, int alert)
winlink_stack_remove(&s->lastw, wl);
winlink_stack_push(&s->lastw, s->curw);
s->curw = wl;
- session_alert_cancel(s, wl);
+ wl->flags &= ~WINLINK_ALERTFLAGS;
return (0);
}
@@ -404,7 +331,7 @@ session_select(struct session *s, int idx)
winlink_stack_remove(&s->lastw, wl);
winlink_stack_push(&s->lastw, s->curw);
s->curw = wl;
- session_alert_cancel(s, wl);
+ wl->flags &= ~WINLINK_ALERTFLAGS;
return (0);
}
@@ -423,7 +350,7 @@ session_last(struct session *s)
winlink_stack_remove(&s->lastw, wl);
winlink_stack_push(&s->lastw, s->curw);
s->curw = wl;
- session_alert_cancel(s, wl);
+ wl->flags &= ~WINLINK_ALERTFLAGS;
return (0);
}
@@ -540,7 +467,6 @@ session_group_synchronize1(struct session *target, struct session *s)
struct winlinks old_windows, *ww;
struct winlink_stack old_lastw;
struct winlink *wl, *wl2;
- struct session_alert *sa;
/* Don't do anything if the session is empty (it'll be destroyed). */
ww = &target->windows;
@@ -558,8 +484,10 @@ session_group_synchronize1(struct session *target, struct session *s)
RB_INIT(&s->windows);
/* Link all the windows from the target. */
- RB_FOREACH(wl, winlinks, ww)
- winlink_add(&s->windows, wl->window, wl->idx);
+ RB_FOREACH(wl, winlinks, ww) {
+ wl2 = winlink_add(&s->windows, wl->window, wl->idx);
+ wl2->flags |= wl->flags & WINLINK_ALERTFLAGS;
+ }
/* Fix up the current window. */
if (s->curw != NULL)
@@ -576,15 +504,6 @@ session_group_synchronize1(struct session *target, struct session *s)
TAILQ_INSERT_TAIL(&s->lastw, wl2, sentry);
}
- /* And update the alerts list. */
- SLIST_FOREACH(sa, &s->alerts, entry) {
- wl = winlink_find_by_index(&s->windows, sa->wl->idx);
- if (wl == NULL)
- session_alert_cancel(s, sa->wl);
- else
- sa->wl = wl;
- }
-
/* Then free the old winlinks list. */
while (!RB_EMPTY(&old_windows)) {
wl = RB_ROOT(&old_windows);
generated by cgit (git 2.34.1) at 2025-05-03 10:59:00 +0000