diff options
Diffstat (limited to '')
| -rw-r--r-- | group.c | 25 |
1 files changed, 12 insertions, 13 deletions
@@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: group.c,v 1.92 2014/08/20 15:15:29 okan Exp $ + * $OpenBSD: group.c,v 1.93 2014/08/22 19:04:00 okan Exp $ */ #include <sys/param.h> @@ -48,17 +48,14 @@ const char *num_to_name[] = { static void group_assign(struct group_ctx *gc, struct client_ctx *cc) { - if (gc == NULL) - gc = TAILQ_FIRST(&cc->sc->groupq); - if (cc->group == gc) - return; - if (cc->group != NULL) TAILQ_REMOVE(&cc->group->clients, cc, group_entry); - TAILQ_INSERT_TAIL(&gc->clients, cc, group_entry); cc->group = gc; + if (cc->group != NULL) + TAILQ_INSERT_TAIL(&gc->clients, cc, group_entry); + xu_ewmh_net_wm_desktop(cc); } @@ -354,7 +351,7 @@ group_autogroup(struct client_ctx *cc) struct screen_ctx *sc = cc->sc; struct autogroupwin *aw; struct group_ctx *gc; - int num = -1, both_match = 0; + int num = -2, both_match = 0; long *grpnum; if (cc->ch.res_class == NULL || cc->ch.res_name == NULL) @@ -362,12 +359,9 @@ group_autogroup(struct client_ctx *cc) if (xu_getprop(cc->win, ewmh[_NET_WM_DESKTOP], XA_CARDINAL, 1, (unsigned char **)&grpnum) > 0) { - if (*grpnum == -1) - num = 0; - else if (*grpnum > CALMWM_NGROUPS || *grpnum < 0) + num = *grpnum; + if (num > CALMWM_NGROUPS || num < -1) num = CALMWM_NGROUPS - 1; - else - num = *grpnum; XFree(grpnum); } else { TAILQ_FOREACH(aw, &Conf.autogroupq, entry) { @@ -382,6 +376,11 @@ group_autogroup(struct client_ctx *cc) } } + if ((num == -1) || (num == 0)) { + group_assign(NULL, cc); + return; + } + TAILQ_FOREACH(gc, &sc->groupq, entry) { if (gc->num == num) { group_assign(gc, cc); |