diff options
| author | okan <okan> | 2015-08-25 20:35:49 +0000 |
|---|---|---|
| committer | okan <okan> | 2015-08-25 20:35:49 +0000 |
| commit | 6d53091429e074e0d5bd504a9001016106d2d1ac (patch) | |
| tree | d5a1af574f88ad11e8dd3337dbda37b5be751f76 /group.c | |
| parent | 871ed39ccf6b6ab7385c87f849a7c9bcff130792 (diff) | |
| download | cwm-6d53091429e074e0d5bd504a9001016106d2d1ac.tar.gz cwm-6d53091429e074e0d5bd504a9001016106d2d1ac.tar.xz cwm-6d53091429e074e0d5bd504a9001016106d2d1ac.zip | |
Further simplify _NET_WM_DESKTOP handling using new group_assign().
Diffstat (limited to 'group.c')
| -rw-r--r-- | group.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/group.c b/group.c index 0857437..5482d70 100644 --- a/group.c +++ b/group.c @@ -331,20 +331,17 @@ group_restore(struct client_ctx *cc) { struct screen_ctx *sc = cc->sc; struct group_ctx *gc; - int num = -1; + int num; long *grpnum; if (xu_getprop(cc->win, ewmh[_NET_WM_DESKTOP], XA_CARDINAL, 1L, (unsigned char **)&grpnum) <= 0) return(0); - num = MIN(*grpnum, (CALMWM_NGROUPS - 1)); + num = (*grpnum == -1) ? 0 : *grpnum; + num = MIN(num, (CALMWM_NGROUPS - 1)); XFree(grpnum); - if (num == -1) { - group_assign(NULL, cc); - return(1); - } TAILQ_FOREACH(gc, &sc->groupq, entry) { if (gc->num == num) { group_assign(gc, cc); |