mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

Allowing sending a valid 'nogroup' (0) group_ctx to group_assign()

Browse Source 
(since we init all groups), though assigning the client's group to NULL
for 'sticky'; use this simplification in a few places (others to
follow).
This commit is contained in:
okan 2015-08-25 19:49:19 +00:00
parent 96262a6b0c
commit cb60a4b917
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
group.c
View File

@ -48,6 +48,9 @@ group_assign(struct group_ctx *gc, struct client_ctx *cc)
if (cc->group != NULL) if (cc->group != NULL)
TAILQ_REMOVE(&cc->group->clientq, cc, group_entry); TAILQ_REMOVE(&cc->group->clientq, cc, group_entry);
if ((gc != NULL) && (gc->num == 0))
gc = NULL;
cc->group = gc; cc->group = gc;
if (cc->group != NULL) if (cc->group != NULL)
@ -129,6 +132,8 @@ group_init(struct screen_ctx *sc, int num)
gc->num = num; gc->num = num;
TAILQ_INIT(&gc->clientq); TAILQ_INIT(&gc->clientq);
fprintf(stderr, "%d: %s\n", gc->num, gc->name);
TAILQ_INSERT_TAIL(&sc->groupq, gc, entry); TAILQ_INSERT_TAIL(&sc->groupq, gc, entry);
if (num == 1) if (num == 1)
@ -338,7 +343,7 @@ group_restore(struct client_ctx *cc)
num = MIN(*grpnum, (CALMWM_NGROUPS - 1)); num = MIN(*grpnum, (CALMWM_NGROUPS - 1));
XFree(grpnum); XFree(grpnum);
if ((num == -1) || (num == 0)) { if (num == -1) {
group_assign(NULL, cc); group_assign(NULL, cc);
return(1); return(1);
} }
@ -373,10 +378,6 @@ group_autogroup(struct client_ctx *cc)
} }
} }
if (num == 0) {
group_assign(NULL, cc);
return(1);
}
TAILQ_FOREACH(gc, &sc->groupq, entry) { TAILQ_FOREACH(gc, &sc->groupq, entry) {
if (gc->num == num) { if (gc->num == num) {
group_assign(gc, cc); group_assign(gc, cc);