# HG changeset patch # User Anselm R. Garbe # Date 1157527277 -7200 # Node ID a230e4432bb7fb5e2f94064db8c2ccd8b0ec4367 # Parent 1e8aba00964ee71dc1b144c48783b61ab59dd5d7 moved transient_for tag inheritance to settags diff -r 1e8aba00964e -r a230e4432bb7 client.c --- a/client.c Wed Sep 06 09:13:31 2006 +0200 +++ b/client.c Wed Sep 06 09:21:17 2006 +0200 @@ -199,7 +199,7 @@ manage(Window w, XWindowAttributes *wa) { unsigned int i; - Client *c, *tc; + Client *c; Window trans; XSetWindowAttributes twa; @@ -238,11 +238,7 @@ CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa); grabbuttons(c, False); - if((tc = getclient(trans))) /* inherit tags */ - for(i = 0; i < ntags; i++) - c->tags[i] = tc->tags[i]; - else - settags(c); + settags(c, getclient(trans)); if(!c->isfloat) c->isfloat = trans || (c->maxw && c->minw && diff -r 1e8aba00964e -r a230e4432bb7 dwm.h --- a/dwm.h Wed Sep 06 09:13:31 2006 +0200 +++ b/dwm.h Wed Sep 06 09:21:17 2006 +0200 @@ -115,7 +115,7 @@ extern void initrregs(); extern Client *getnext(Client *c); extern Client *getprev(Client *c); -extern void settags(Client *c); +extern void settags(Client *c, Client *trans); extern void tag(Arg *arg); extern void toggletag(Arg *arg); diff -r 1e8aba00964e -r a230e4432bb7 tag.c --- a/tag.c Wed Sep 06 09:13:31 2006 +0200 +++ b/tag.c Wed Sep 06 09:21:17 2006 +0200 @@ -76,15 +76,19 @@ } void -settags(Client *c) +settags(Client *c, Client *trans) { char prop[512]; unsigned int i, j; regmatch_t tmp; - Bool matched = False; + Bool matched = trans != NULL; XClassHint ch; - if(XGetClassHint(dpy, c->win, &ch)) { + if(matched) { + for(i = 0; i < ntags; i++) + c->tags[i] = trans->tags[i]; + } + else if(XGetClassHint(dpy, c->win, &ch)) { snprintf(prop, sizeof(prop), "%s:%s:%s", ch.res_class ? ch.res_class : "", ch.res_name ? ch.res_name : "", c->name);