X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=tag.c;h=aecf048760a116dc5ae0b06dcfc9ab653d2337ad;hp=90223717a5d19e7c7a0384c707e0e49c9fa42f89;hb=d934296476be7345842fec1a2630d1752c704078;hpb=666b4563a0064dd7aa27159813124837d306f81c diff --git a/tag.c b/tag.c index 9022371..aecf048 100644 --- a/tag.c +++ b/tag.c @@ -1,216 +1,157 @@ -/* - * (C)opyright MMVI Anselm R. Garbe - * See LICENSE file for license details. - */ +/* © 2006-2007 Anselm R. Garbe + * © 2006-2007 Sander van Dijk + * © 2006-2007 Jukka Salmi + * © 2007 Premysl Hruby + * © 2007 Szabolcs Nagy + * See LICENSE file for license details. */ #include "dwm.h" #include #include -#include -#include +#include #include /* static */ typedef struct { - const char *pattern; - Bool tags[TLast]; - Bool isfloat; + const char *prop; + const char *tags; + Bool isfloating; } Rule; +typedef struct { + regex_t *propregex; + regex_t *tagregex; +} Regs; + TAGS RULES -void (*arrange)(Arg *) = DEFMODE; +static Regs *regs = NULL; +static unsigned int nrules = 0; /* extern */ void -appendtag(Arg *arg) -{ - if(!sel) - return; - - sel->tags[arg->i] = True; - arrange(NULL); -} +compileregs(void) { + unsigned int i; + regex_t *reg; -void -dofloat(Arg *arg) -{ - Client *c; - - for(c = clients; c; c = c->next) { - c->ismax = False; - if(c->tags[tsel]) { - resize(c, True, TopLeft); + if(regs) + return; + nrules = sizeof rule / sizeof rule[0]; + regs = emallocz(nrules * sizeof(Regs)); + for(i = 0; i < nrules; i++) { + if(rule[i].prop) { + reg = emallocz(sizeof(regex_t)); + if(regcomp(reg, rule[i].prop, REG_EXTENDED)) + free(reg); + else + regs[i].propregex = reg; } - else - ban(c); - } - if(sel && !sel->tags[tsel]) { - if((sel = getnext(clients))) { - higher(sel); - focus(sel); + if(rule[i].tags) { + reg = emallocz(sizeof(regex_t)); + if(regcomp(reg, rule[i].tags, REG_EXTENDED)) + free(reg); + else + regs[i].tagregex = reg; } - else - XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); } - drawall(); } -void -dotile(Arg *arg) -{ - int n, i, w, h; - Client *c; - - w = sw - mw; - 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) { - c->ismax = False; - 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->h = sh - 2 - bh; - } - else if(i == 0) { - c->x = sx; - c->y = sy + bh; - c->w = mw - 2; - c->h = sh - 2 - bh; - } - else if(h > bh) { - c->x = sx + mw; - c->y = sy + (i - 1) * h + bh; - c->w = w - 2; - c->h = h - 2; - } - else { /* fallback if h < bh */ - c->x = sx + mw; - c->y = sy + bh; - c->w = w - 2; - c->h = sh - 2 - bh; - } - resize(c, False, TopLeft); - i++; - } - else - ban(c); - } - if(!sel || (sel && !sel->tags[tsel])) { - if((sel = getnext(clients))) { - higher(sel); - focus(sel); - } - else - XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); - } - drawall(); -} +Bool +isvisible(Client *c) { + unsigned int i; -Client * -getnext(Client *c) -{ - for(; c && !c->tags[tsel]; c = c->next); - return c; -} - -Client * -getprev(Client *c) -{ - for(; c && !c->tags[tsel]; c = c->prev); - return c; -} - -void -replacetag(Arg *arg) -{ - int i; - - if(!sel) - return; - - for(i = 0; i < TLast; i++) - sel->tags[i] = False; - appendtag(arg); + for(i = 0; i < ntags; i++) + if(c->tags[i] && seltag[i]) + return True; + return False; } void -settags(Client *c) -{ - char classinst[256]; - static unsigned int len = sizeof(rule) / sizeof(rule[0]); +settags(Client *c, Client *trans) { + char prop[512]; unsigned int i, j; - regex_t regex; regmatch_t tmp; - Bool matched = False; - XClassHint ch; - - if(XGetClassHint(dpy, c->win, &ch)) { - snprintf(classinst, sizeof(classinst), "%s:%s", + Bool matched = trans != NULL; + XClassHint ch = { 0 }; + + if(matched) + for(i = 0; i < ntags; i++) + c->tags[i] = trans->tags[i]; + else { + 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((c->tags[j] = rule[i].tags[j])) - matched = True; + ch.res_name ? ch.res_name : "", c->name); + for(i = 0; i < nrules; i++) + if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) { + c->isfloating = rule[i].isfloating; + for(j = 0; regs[i].tagregex && j < ntags; j++) { + if(!regexec(regs[i].tagregex, 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] = True; + for(i = 0; i < ntags; i++) + c->tags[i] = seltag[i]; } void -togglemode(Arg *arg) -{ - arrange = arrange == dofloat ? dotile : dofloat; - arrange(NULL); +tag(const char *arg) { + int i; + + if(!sel) + return; + for(i = 0; i < ntags; i++) + sel->tags[i] = arg == NULL; + i = arg ? atoi(arg) : 0; + if(i >= 0 && i < ntags) + sel->tags[i] = True; + lt->arrange(); } void -view(Arg *arg) -{ - tsel = arg->i; - arrange(NULL); - drawall(); +toggletag(const char *arg) { + int i, j; + + if(!sel) + return; + i = arg ? atoi(arg) : 0; + sel->tags[i] = !sel->tags[i]; + for(j = 0; j < ntags && !sel->tags[j]; j++); + if(j == ntags) + sel->tags[i] = True; + lt->arrange(); } void -viewnext(Arg *arg) -{ - arg->i = (tsel < TLast-1) ? tsel+1 : 0; - view(arg); +toggleview(const char *arg) { + int i, j; + + i = arg ? atoi(arg) : 0; + seltag[i] = !seltag[i]; + for(j = 0; j < ntags && !seltag[j]; j++); + if(j == ntags) + seltag[i] = True; /* cannot toggle last view */ + lt->arrange(); } void -viewprev(Arg *arg) -{ - arg->i = (tsel > 0) ? tsel-1 : TLast-1; - view(arg); +view(const char *arg) { + int i; + + for(i = 0; i < ntags; i++) + seltag[i] = arg == NULL; + i = arg ? atoi(arg) : 0; + if(i >= 0 && i < ntags) + seltag[i] = True; + lt->arrange(); }