X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=tag.c;h=ef9cb0889300657441809adf32b17c5ae08ef917;hp=186a5aef007572c4445bedc28d15b16170c78671;hb=cb4aa5bc35cf16a06bb2b4e880648e390fa2cc55;hpb=dc5d967ee61046f899b3b49daeb9268c8161844a diff --git a/tag.c b/tag.c index 186a5ae..ef9cb08 100644 --- a/tag.c +++ b/tag.c @@ -1,221 +1,133 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVII Anselm R. Garbe * See LICENSE file for license details. */ #include "dwm.h" - #include #include +#include #include #include #include -/* static */ typedef struct { - const char *pattern; - char *tags[TLast]; + const char *clpattern; + const char *tpattern; Bool isfloat; } Rule; -/* CUSTOMIZE */ -static Rule rule[] = { - /* class:instance tags isfloat */ - { "Firefox.*", { [Twww] = "www" }, False }, - { "Gimp.*", { 0 }, True}, -}; - -/* extern */ +typedef struct { + regex_t *clregex; + regex_t *tregex; +} RReg; -/* CUSTOMIZE */ -char *tags[TLast] = { - [Tscratch] = "scratch", - [Tdev] = "dev", - [Twww] = "www", - [Twork] = "work", -}; -void (*arrange)(Arg *) = dotile; +/* static */ -void -appendtag(Arg *arg) -{ - if(!sel) - return; +TAGS +RULES - sel->tags[arg->i] = tags[arg->i]; - arrange(NULL); -} +static RReg *rreg = NULL; +static unsigned int len = 0; -void -dofloat(Arg *arg) -{ - Client *c; - - arrange = dofloat; - for(c = clients; c; c = c->next) { - if(c->tags[tsel]) { - resize(c, True, TopLeft); - } - else - ban(c); - } - if(sel && !sel->tags[tsel]) { - if((sel = getnext(clients, tsel))) { - higher(sel); - focus(sel); - } - } - drawall(); -} - -void -dotile(Arg *arg) -{ - int n, i, w, h; - Client *c; - - w = sw - mw; - arrange = dotile; - for(n = 0, c = clients; c; c = c->next) - if(c->tags[tsel] && !c->isfloat) - n++; - - if(n > 1) - h = (sh - bh) / (n - 1); - else - h = sh - bh; - - for(i = 0, c = clients; c; c = c->next) { - if(c->tags[tsel]) { - if(c->isfloat) { - higher(c); - resize(c, True, TopLeft); - continue; - } - if(n == 1) { - c->x = sx; - c->y = sy + bh; - c->w = sw - 2 * c->border; - c->h = sh - 2 * c->border - bh; - } - else if(i == 0) { - c->x = sx; - c->y = sy + bh; - c->w = mw - 2 * c->border; - c->h = sh - 2 * c->border - bh; - } - else if(h > bh) { - c->x = sx + mw; - c->y = sy + (i - 1) * h + bh; - c->w = w - 2 * c->border; - c->h = h - 2 * c->border; - } - else { /* fallback if h < bh */ - c->x = sx + mw; - c->y = sy + bh; - c->w = w - 2 * c->border; - c->h = sh - 2 * c->border - bh; - } - resize(c, False, TopLeft); - i++; - } - else - ban(c); - } - if(!sel || (sel && !sel->tags[tsel])) { - if((sel = getnext(clients, tsel))) { - higher(sel); - focus(sel); - } - } - drawall(); -} +/* extern */ Client * -getnext(Client *c, unsigned int t) -{ - for(; c && !c->tags[t]; c = c->next); +getnext(Client *c) { + for(; c && !isvisible(c); c = c->next); return c; } -void -heretag(Arg *arg) -{ - int i; - Client *c; - - if(arg->i == tsel) - return; - - if(!(c = getnext(clients, arg->i))) - return; - - for(i = 0; i < TLast; i++) - c->tags[i] = NULL; - c->tags[tsel] = tags[tsel]; - pop(c); - focus(c); +Client * +getprev(Client *c) { + for(; c && !isvisible(c); c = c->prev); + return c; } void -replacetag(Arg *arg) -{ - int i; +initrregs(void) { + unsigned int i; + regex_t *reg; - if(!sel) + if(rreg) return; - - for(i = 0; i < TLast; i++) - sel->tags[i] = NULL; - appendtag(arg); + len = sizeof rule / sizeof rule[0]; + rreg = emallocz(len * sizeof(RReg)); + for(i = 0; i < len; i++) { + if(rule[i].clpattern) { + reg = emallocz(sizeof(regex_t)); + if(regcomp(reg, rule[i].clpattern, REG_EXTENDED)) + free(reg); + else + rreg[i].clregex = reg; + } + if(rule[i].tpattern) { + reg = emallocz(sizeof(regex_t)); + if(regcomp(reg, rule[i].tpattern, REG_EXTENDED)) + free(reg); + else + rreg[i].tregex = reg; + } + } } void -settags(Client *c) -{ - char classinst[256]; - static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0; +settags(Client *c, Client *trans) { + char prop[512]; unsigned int i, j; - regex_t regex; regmatch_t tmp; - Bool matched = False; + Bool matched = trans != NULL; XClassHint ch; - if(!len) { - c->tags[tsel] = tags[tsel]; - return; + if(matched) { + for(i = 0; i < ntags; i++) + c->tags[i] = trans->tags[i]; } - - if(XGetClassHint(dpy, c->win, &ch)) { - snprintf(classinst, sizeof(classinst), "%s:%s", + 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 : ""); - for(i = 0; !matched && i < len; i++) { - if(!regcomp(®ex, rule[i].pattern, 0)) { - if(!regexec(®ex, classinst, 1, &tmp, 0)) { - for(j = 0; j < TLast; j++) { - if(rule[i].tags[j]) - matched = True; - c->tags[j] = rule[i].tags[j]; + ch.res_name ? ch.res_name : "", c->name); + for(i = 0; i < len; i++) + if(rreg[i].clregex && !regexec(rreg[i].clregex, prop, 1, &tmp, 0)) { + c->isfloat = rule[i].isfloat; + for(j = 0; rreg[i].tregex && j < ntags; j++) { + if(!regexec(rreg[i].tregex, tags[j], 1, &tmp, 0)) { + matched = True; + c->tags[j] = True; } - c->isfloat = rule[i].isfloat; } - regfree(®ex); } - } if(ch.res_class) XFree(ch.res_class); if(ch.res_name) XFree(ch.res_name); } if(!matched) - c->tags[tsel] = tags[tsel]; + for(i = 0; i < ntags; i++) + c->tags[i] = seltag[i]; } void -view(Arg *arg) -{ - tsel = arg->i; - arrange(NULL); - drawall(); +tag(Arg *arg) { + unsigned int i; + + if(!sel) + return; + for(i = 0; i < ntags; i++) + sel->tags[i] = (arg->i == -1) ? True : False; + if(arg->i >= 0 && arg->i < ntags) + sel->tags[arg->i] = True; + arrange(); +} + +void +toggletag(Arg *arg) { + unsigned int i; + + if(!sel) + return; + sel->tags[arg->i] = !sel->tags[arg->i]; + for(i = 0; i < ntags && !sel->tags[i]; i++); + if(i == ntags) + sel->tags[arg->i] = True; + arrange(); }