From c6a3446398648fc2cc3682c351b57b9bfe5bc5f0 Mon Sep 17 00:00:00 2001 From: nicm Date: Thu, 9 Feb 2017 15:04:53 +0000 Subject: Instead of numbering session groups, give them a name which may be given to -t instead of a target session. Also allow them to contain only one session. --- server-fn.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'server-fn.c') diff --git a/server-fn.c b/server-fn.c index d43461f3..c14b4cab 100644 --- a/server-fn.c +++ b/server-fn.c @@ -78,7 +78,7 @@ server_redraw_session_group(struct session *s) { struct session_group *sg; - if ((sg = session_group_find(s)) == NULL) + if ((sg = session_group_contains(s)) == NULL) server_redraw_session(s); else { TAILQ_FOREACH(s, &sg->sessions, gentry) @@ -102,7 +102,7 @@ server_status_session_group(struct session *s) { struct session_group *sg; - if ((sg = session_group_find(s)) == NULL) + if ((sg = session_group_contains(s)) == NULL) server_status_session(s); else { TAILQ_FOREACH(s, &sg->sessions, gentry) @@ -220,7 +220,7 @@ server_kill_window(struct window *w) } if (options_get_number(s->options, "renumber-windows")) { - if ((sg = session_group_find(s)) != NULL) { + if ((sg = session_group_contains(s)) != NULL) { TAILQ_FOREACH(target_s, &sg->sessions, gentry) session_renumber_windows(target_s); } else @@ -238,8 +238,8 @@ server_link_window(struct session *src, struct winlink *srcwl, struct winlink *dstwl; struct session_group *srcsg, *dstsg; - srcsg = session_group_find(src); - dstsg = session_group_find(dst); + srcsg = session_group_contains(src); + dstsg = session_group_contains(dst); if (src != dst && srcsg != NULL && dstsg != NULL && srcsg == dstsg) { xasprintf(cause, "sessions are grouped"); return (-1); @@ -348,7 +348,7 @@ server_destroy_session_group(struct session *s) struct session_group *sg; struct session *s1; - if ((sg = session_group_find(s)) == NULL) + if ((sg = session_group_contains(s)) == NULL) server_destroy_session(s); else { TAILQ_FOREACH_SAFE(s, &sg->sessions, gentry, s1) { -- cgit