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

Further simplify _NET_WM_DESKTOP handling using new group_assign().

Browse Source
This commit is contained in:
okan 2015-08-25 20:35:49 +00:00
parent 871ed39ccf
commit 6d53091429
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
group.c
View File

@ -331,20 +331,17 @@ group_restore(struct client_ctx *cc)
{ {
struct screen_ctx *sc = cc->sc; struct screen_ctx *sc = cc->sc;
struct group_ctx *gc; struct group_ctx *gc;
int num = -1; int num;
long *grpnum; long *grpnum;
if (xu_getprop(cc->win, ewmh[_NET_WM_DESKTOP], XA_CARDINAL, 1L, if (xu_getprop(cc->win, ewmh[_NET_WM_DESKTOP], XA_CARDINAL, 1L,
(unsigned char **)&grpnum) <= 0) (unsigned char **)&grpnum) <= 0)
return(0); return(0);
num = MIN(*grpnum, (CALMWM_NGROUPS - 1)); num = (*grpnum == -1) ? 0 : *grpnum;
num = MIN(num, (CALMWM_NGROUPS - 1));
XFree(grpnum); XFree(grpnum);
if (num == -1) {
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);