diff options
| -rw-r--r-- | group.c | 9 | ||||
| -rw-r--r-- | search.c | 11 |
2 files changed, 7 insertions, 13 deletions
diff --git a/group.c b/group.c index d88484b..1c2fd03 100644 --- a/group.c +++ b/group.c @@ -179,19 +179,19 @@ group_init(struct screen_ctx *sc) } void -group_make_autogroup(struct conf *conf, char *class, int no) +group_make_autogroup(struct conf *conf, char *val, int no) { struct autogroupwin *aw; char *p; aw = xcalloc(1, sizeof(*aw)); - if ((p = strchr(class, ',')) == NULL) { + if ((p = strchr(val, ',')) == NULL) { aw->name = NULL; - aw->class = xstrdup(class); + aw->class = xstrdup(val); } else { *(p++) = '\0'; - aw->name = xstrdup(class); + aw->name = xstrdup(val); aw->class = xstrdup(p); } aw->num = no; @@ -426,6 +426,7 @@ group_autogroup(struct client_ctx *cc) if (cc->app_class == NULL || cc->app_name == NULL) return; + if (xu_getprop(cc->win, _NET_WM_DESKTOP, XA_CARDINAL, 1, (unsigned char **)&grpno) > 0) { if (*grpno == 0xffffffff) diff --git a/search.c b/search.c index 4383f5d..8cd6523 100644 --- a/search.c +++ b/search.c @@ -78,11 +78,7 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search) } } - /* - * See if there is a match on the window class - * name. - */ - + /* Then if there is a match on the window class name. */ if (tier < 0 && strsubmatch(search, cc->app_class, 0)) { cc->matchname = cc->app_class; tier = 3; @@ -99,9 +95,7 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search) if (cc == client_current() && tier < ntiers - 1) tier++; - /* - * Clients that are hidden get ranked one up. - */ + /* Clients that are hidden get ranked one up. */ if (cc->flags & CLIENT_HIDDEN && tier > 0) tier--; @@ -114,7 +108,6 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search) * Always make your current tierp the newly inserted * entry. */ - for (t = tier; t >= 0 && ((before = tierp[t]) == NULL); t--) ; |