summary refs log tree commit diff
path: root/group.c
diff options
context:
space:
mode:
authorokan <okan>2014-09-17 14:31:37 +0000
committerokan <okan>2014-09-17 14:31:37 +0000
commit74f4a1bad98bdb25212b32d15fa411d2ed16b6df (patch)
tree420b1d92baeb31357dfa062a904282bc439e7084 /group.c
parent4b6dc963983906e9a2866565da003840037dff23 (diff)
downloadcwm-74f4a1bad98bdb25212b32d15fa411d2ed16b6df.tar.gz
cwm-74f4a1bad98bdb25212b32d15fa411d2ed16b6df.tar.xz
cwm-74f4a1bad98bdb25212b32d15fa411d2ed16b6df.zip
Introduce a check to see if a group holds only 'sticky' clients and use
this check to decide if a group is virtually empty.  Rationale: if a
group contains *only* 'sticky' clients, it should be skipped while
cycling through groups.  Apply similar logic to the group menu.

Based on an idea from phessler@, who also tested another version.
Diffstat (limited to 'group.c')
-rw-r--r--group.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/group.c b/group.c
index bc8c300..8976f86 100644
--- a/group.c
+++ b/group.c
@@ -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);