diff options
| author | okan <okan> | 2014-09-17 16:32:53 +0000 |
|---|---|---|
| committer | okan <okan> | 2014-09-17 16:32:53 +0000 |
| commit | 736d973f4668d0c2db37b54c3ecfd41aa6e5ca39 (patch) | |
| tree | e669779919a839debde49440d87504f2b8f16a67 | |
| parent | 7eef4eb63d7d2b2295091e6c1ccb68449e5a05e5 (diff) | |
| download | cwm-736d973f4668d0c2db37b54c3ecfd41aa6e5ca39.tar.gz cwm-736d973f4668d0c2db37b54c3ecfd41aa6e5ca39.tar.xz cwm-736d973f4668d0c2db37b54c3ecfd41aa6e5ca39.zip | |
Use a similarly named check as sticky for hidden check in a group.
| -rw-r--r-- | calmwm.h | 2 | ||||
| -rw-r--r-- | group.c | 14 | ||||
| -rw-r--r-- | mousefunc.c | 4 |
3 files changed, 8 insertions, 12 deletions
diff --git a/calmwm.h b/calmwm.h index 639e3ca..616839b 100644 --- a/calmwm.h +++ b/calmwm.h @@ -406,9 +406,9 @@ void client_wm_hints(struct client_ctx *); void group_alltoggle(struct screen_ctx *); void group_autogroup(struct client_ctx *); void group_cycle(struct screen_ctx *, int); -int group_hidden_state(struct group_ctx *); void group_hide(struct group_ctx *); void group_hidetoggle(struct screen_ctx *, int); +int group_holds_only_hidden(struct group_ctx *); int group_holds_only_sticky(struct group_ctx *); void group_init(struct screen_ctx *); void group_movetogroup(struct client_ctx *, int); diff --git a/group.c b/group.c index 8976f86..ce5a504 100644 --- a/group.c +++ b/group.c @@ -170,7 +170,7 @@ group_movetogroup(struct client_ctx *cc, int idx) if (cc->group == gc) return; - if (group_hidden_state(gc)) + if (group_holds_only_hidden(gc)) client_hide(cc); group_assign(gc, cc); } @@ -207,7 +207,6 @@ 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); @@ -215,11 +214,8 @@ group_holds_only_sticky(struct group_ctx *gc) return(1); } -/* - * If all clients in a group are hidden, then the group state is hidden. - */ int -group_hidden_state(struct group_ctx *gc) +group_holds_only_hidden(struct group_ctx *gc) { struct client_ctx *cc; int hidden = 0, same = 0; @@ -250,7 +246,7 @@ group_hidetoggle(struct screen_ctx *sc, int idx) break; } - if (group_hidden_state(gc)) + if (group_holds_only_hidden(gc)) group_show(gc); else { group_hide(gc); @@ -298,7 +294,7 @@ group_cycle(struct screen_ctx *sc, int flags) if (!group_holds_only_sticky(gc) && showgroup == NULL) showgroup = gc; - else if (!group_hidden_state(gc)) + else if (!group_holds_only_hidden(gc)) group_hide(gc); } @@ -307,7 +303,7 @@ group_cycle(struct screen_ctx *sc, int flags) group_hide(sc->group_active); - if (group_hidden_state(showgroup)) + if (group_holds_only_hidden(showgroup)) group_show(showgroup); else group_setactive(sc, showgroup->num); diff --git a/mousefunc.c b/mousefunc.c index 6b35029..8784039 100644 --- a/mousefunc.c +++ b/mousefunc.c @@ -191,7 +191,7 @@ mousefunc_menu_group(struct client_ctx *cc, union arg *arg) if (group_holds_only_sticky(gc)) continue; menuq_add(&menuq, gc, - group_hidden_state(gc) ? "%d: [%s]" : "%d: %s", + group_holds_only_hidden(gc) ? "%d: [%s]" : "%d: %s", gc->num, gc->name); } if (TAILQ_EMPTY(&menuq)) @@ -200,7 +200,7 @@ mousefunc_menu_group(struct client_ctx *cc, union arg *arg) if ((mi = menu_filter(sc, &menuq, NULL, NULL, 0, NULL, NULL)) != NULL) { gc = (struct group_ctx *)mi->ctx; - (group_hidden_state(gc)) ? + (group_holds_only_hidden(gc)) ? group_show(gc) : group_hide(gc); } |