diff options
| -rw-r--r-- | calmwm.h | 6 | ||||
| -rw-r--r-- | client.c | 16 | ||||
| -rw-r--r-- | group.c | 79 |
3 files changed, 62 insertions, 39 deletions
@@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: calmwm.h,v 1.302 2015/08/24 15:42:57 okan Exp $ + * $OpenBSD: calmwm.h,v 1.303 2015/08/25 18:29:10 okan Exp $ */ #ifndef _CALMWM_H_ @@ -426,7 +426,8 @@ void client_warp(struct client_ctx *); void client_wm_hints(struct client_ctx *); void group_alltoggle(struct screen_ctx *); -void group_autogroup(struct client_ctx *); +void group_assign(struct group_ctx *, struct client_ctx *); +int group_autogroup(struct client_ctx *); void group_cycle(struct screen_ctx *, int); void group_hide(struct group_ctx *); void group_hidetoggle(struct screen_ctx *, int); @@ -435,6 +436,7 @@ int group_holds_only_sticky(struct group_ctx *); void group_init(struct screen_ctx *, int); void group_movetogroup(struct client_ctx *, int); void group_only(struct screen_ctx *, int); +int group_restore(struct client_ctx *); void group_show(struct group_ctx *); void group_toggle_membership_enter(struct client_ctx *); void group_toggle_membership_leave(struct client_ctx *); @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: client.c,v 1.205 2015/08/24 15:42:57 okan Exp $ + * $OpenBSD: client.c,v 1.206 2015/08/25 18:29:10 okan Exp $ */ #include <sys/types.h> @@ -120,9 +120,17 @@ client_init(Window win, struct screen_ctx *sc) else client_unhide(cc); - if (mapped) - group_autogroup(cc); - + if (mapped) { + if (group_restore(cc)) + goto out; + if (group_autogroup(cc)) + goto out; + if (Conf.flags & CONF_STICKY_GROUPS) + group_assign(sc->group_active, cc); + else + group_assign(NULL, cc); + } +out: XSync(X_Dpy, False); XUngrabServer(X_Dpy); @@ -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.114 2015/08/23 17:31:20 okan Exp $ + * $OpenBSD: group.c,v 1.115 2015/08/25 18:29:10 okan Exp $ */ #include <sys/types.h> @@ -34,7 +34,6 @@ static struct group_ctx *group_next(struct group_ctx *); static struct group_ctx *group_prev(struct group_ctx *); -static void group_assign(struct group_ctx *, struct client_ctx *); static void group_restack(struct group_ctx *); static void group_setactive(struct group_ctx *); @@ -43,7 +42,7 @@ const char *num_to_name[] = { "seven", "eight", "nine" }; -static void +void group_assign(struct group_ctx *gc, struct client_ctx *cc) { if (cc->group != NULL) @@ -324,51 +323,65 @@ group_alltoggle(struct screen_ctx *sc) sc->hideall = !sc->hideall; } -void -group_autogroup(struct client_ctx *cc) +int +group_restore(struct client_ctx *cc) { struct screen_ctx *sc = cc->sc; - struct autogroupwin *aw; struct group_ctx *gc; - int num = -2, both_match = 0; + int num = -1; long *grpnum; - if (cc->ch.res_class == NULL || cc->ch.res_name == NULL) - return; + if (xu_getprop(cc->win, ewmh[_NET_WM_DESKTOP], XA_CARDINAL, 1L, + (unsigned char **)&grpnum) <= 0) + return(0); - if (xu_getprop(cc->win, ewmh[_NET_WM_DESKTOP], - XA_CARDINAL, 1, (unsigned char **)&grpnum) > 0) { - num = *grpnum; - if (num > CALMWM_NGROUPS || num < -1) - num = CALMWM_NGROUPS - 1; - XFree(grpnum); - } else { - TAILQ_FOREACH(aw, &Conf.autogroupq, entry) { - if (strcmp(aw->class, cc->ch.res_class) == 0) { - if ((aw->name != NULL) && - (strcmp(aw->name, cc->ch.res_name) == 0)) { - num = aw->num; - both_match = 1; - } else if (aw->name == NULL && !both_match) - num = aw->num; - } - } - } + num = MIN(*grpnum, (CALMWM_NGROUPS - 1)); + XFree(grpnum); if ((num == -1) || (num == 0)) { group_assign(NULL, cc); - return; + return(1); } - TAILQ_FOREACH(gc, &sc->groupq, entry) { if (gc->num == num) { group_assign(gc, cc); - return; + return(1); } } + return(0); +} - if (Conf.flags & CONF_STICKY_GROUPS) - group_assign(sc->group_active, cc); - else +int +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; + + if (cc->ch.res_class == NULL || cc->ch.res_name == NULL) + return(0); + + TAILQ_FOREACH(aw, &Conf.autogroupq, entry) { + if (strcmp(aw->class, cc->ch.res_class) == 0) { + if ((aw->name != NULL) && + (strcmp(aw->name, cc->ch.res_name) == 0)) { + num = aw->num; + both_match = 1; + } else if (aw->name == NULL && !both_match) + num = aw->num; + } + } + + if (num == 0) { group_assign(NULL, cc); + return(1); + } + TAILQ_FOREACH(gc, &sc->groupq, entry) { + if (gc->num == num) { + group_assign(gc, cc); + return(1); + } + } + return(0); } |