aboutsummaryrefslogtreecommitdiffstats
path: root/group.c
diff options
context:
space:
mode:
Diffstat (limited to 'group.c')
-rw-r--r--group.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/group.c b/group.c
index ee86b52..0d09da7 100644
--- a/group.c
+++ b/group.c
@@ -16,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: group.c,v 1.102 2014/09/08 21:15:14 okan Exp $
+ * $OpenBSD: group.c,v 1.103 2014/09/17 14:31:37 okan Exp $
*/
#include <sys/param.h>
@@ -202,6 +202,19 @@ group_sticky_toggle_exit(struct client_ctx *cc)
client_draw_border(cc);
}
+int
+group_holds_only_sticky(struct group_ctx *gc)
+{
+ struct client_ctx *cc;
+
+ /* Check if all clients in the group are 'sticky'. */
+ TAILQ_FOREACH(cc, &gc->clientq, group_entry) {
+ if (!(cc->flags & CLIENT_STICKY))
+ return(0);
+ }
+ return(1);
+}
+
/*
* If all clients in a group are hidden, then the group state is hidden.
*/
@@ -283,7 +296,7 @@ group_cycle(struct screen_ctx *sc, int flags)
if (gc == sc->group_active)
break;
- if (!TAILQ_EMPTY(&gc->clientq) && showgroup == NULL)
+ if (!group_holds_only_sticky(gc) && showgroup == NULL)
showgroup = gc;
else if (!group_hidden_state(gc))
group_hide(gc);