X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tag.c;h=51dda03ab0e29e314c460e7a9208413f12704d39;hb=292ccc4c43d9529cb6db0973fcab6e24c73607a5;hp=d6c349b808e2a53134162e8a01bb3b062e2f819f;hpb=4688ad181da14be36e034918580ec0ce5968ffdb;p=dwm.git diff --git a/tag.c b/tag.c index d6c349b..51dda03 100644 --- a/tag.c +++ b/tag.c @@ -3,38 +3,36 @@ * 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}, -}; +typedef struct { + regex_t *clregex; + regex_t *tregex; +} RReg; -/* extern */ +/* static */ + +TAGS +RULES + +static RReg *rreg = NULL; +static unsigned int len = 0; -/* CUSTOMIZE */ -char *tags[TLast] = { - [Tscratch] = "scratch", - [Tdev] = "dev", - [Twww] = "www", - [Twork] = "work", -}; -void (*arrange)(Arg *) = dotile; +void (*arrange)(Arg *) = DEFMODE; + +/* extern */ void appendtag(Arg *arg) @@ -42,7 +40,7 @@ appendtag(Arg *arg) if(!sel) return; - sel->tags[arg->i] = tags[arg->i]; + sel->tags[arg->i] = True; arrange(NULL); } @@ -53,18 +51,18 @@ dofloat(Arg *arg) for(c = clients; c; c = c->next) { c->ismax = False; - if(c->tags[tsel]) { + if(isvisible(c)) { resize(c, True, TopLeft); } else ban(c); } - if(sel && !sel->tags[tsel]) { - if((sel = getnext(clients, tsel))) { - higher(sel); - focus(sel); - } + if((sel = getnext(clients))) { + higher(sel); + focus(sel); } + else + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); drawall(); } @@ -76,7 +74,7 @@ dotile(Arg *arg) w = sw - mw; for(n = 0, c = clients; c; c = c->next) - if(c->tags[tsel] && !c->isfloat) + if(isvisible(c) && !c->isfloat) n++; if(n > 1) @@ -86,7 +84,7 @@ dotile(Arg *arg) for(i = 0, c = clients; c; c = c->next) { c->ismax = False; - if(c->tags[tsel]) { + if(isvisible(c)) { if(c->isfloat) { higher(c); resize(c, True, TopLeft); @@ -95,26 +93,29 @@ dotile(Arg *arg) if(n == 1) { c->x = sx; c->y = sy + bh; - c->w = sw - 2 * c->border; - c->h = sh - 2 * c->border - 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->border; - c->h = sh - 2 * c->border - 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->border; - c->h = h - 2 * c->border; + c->w = w - 2; + if(i + 1 == n) + c->h = sh - c->y - 2; + else + c->h = h - 2; } 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; + c->w = w - 2; + c->h = sh - 2 - bh; } resize(c, False, TopLeft); i++; @@ -122,39 +123,67 @@ dotile(Arg *arg) else ban(c); } - if(!sel || (sel && !sel->tags[tsel])) { - if((sel = getnext(clients, tsel))) { - higher(sel); - focus(sel); - } + if((sel = getnext(clients))) { + higher(sel); + focus(sel); } + else + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); drawall(); } Client * -getnext(Client *c, unsigned int t) +getnext(Client *c) { - for(; c && !c->tags[t]; c = c->next); + for(; c && !isvisible(c); c = c->next); + return c; +} + +Client * +getprev(Client *c) +{ + for(; c && !isvisible(c); c = c->prev); return c; } void -heretag(Arg *arg) +initrregs() { - int i; - Client *c; + unsigned int i; + regex_t *reg; - if(arg->i == tsel) + if(rreg) return; + len = sizeof(rule) / sizeof(rule[0]); + rreg = emallocz(len * sizeof(RReg)); - if(!(c = getnext(clients, arg->i))) - return; + for(i = 0; i < len; i++) { + if(rule[i].clpattern) { + reg = emallocz(sizeof(regex_t)); + if(regcomp(reg, rule[i].clpattern, 0)) + free(reg); + else + rreg[i].clregex = reg; + } + if(rule[i].tpattern) { + reg = emallocz(sizeof(regex_t)); + if(regcomp(reg, rule[i].tpattern, 0)) + free(reg); + else + rreg[i].tregex = reg; + } + } +} - for(i = 0; i < TLast; i++) - c->tags[i] = NULL; - c->tags[tsel] = tags[tsel]; - pop(c); - focus(c); +Bool +isvisible(Client *c) +{ + unsigned int i; + + for(i = 0; i < ntags; i++) + if(c->tags[i] && seltag[i]) + return True; + return False; } void @@ -165,8 +194,8 @@ replacetag(Arg *arg) if(!sel) return; - for(i = 0; i < TLast; i++) - sel->tags[i] = NULL; + for(i = 0; i < ntags; i++) + sel->tags[i] = False; appendtag(arg); } @@ -174,42 +203,33 @@ void settags(Client *c) { char classinst[256]; - static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0; unsigned int i, j; - regex_t regex; regmatch_t tmp; Bool matched = False; XClassHint ch; - if(!len) { - c->tags[tsel] = tags[tsel]; - return; - } - if(XGetClassHint(dpy, c->win, &ch)) { snprintf(classinst, sizeof(classinst), "%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]; + for(i = 0; !matched && i < len; i++) + if(rreg[i].clregex && !regexec(rreg[i].clregex, classinst, 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 @@ -222,7 +242,44 @@ togglemode(Arg *arg) void view(Arg *arg) { - tsel = arg->i; + unsigned int i; + + for(i = 0; i < ntags; i++) + seltag[i] = False; + seltag[arg->i] = True; + arrange(NULL); + drawall(); +} + +void +viewextend(Arg *arg) +{ + unsigned int i; + + seltag[arg->i] = !seltag[arg->i]; + for(i = 0; !seltag[i] && i < ntags; i++); + if(i == ntags) + seltag[arg->i] = True; /* cannot toggle last view */ arrange(NULL); drawall(); } + +void +viewnext(Arg *arg) +{ + unsigned int i; + + for(i = 0; !seltag[i]; i++); + arg->i = (i < ntags-1) ? i+1 : 0; + view(arg); +} + +void +viewprev(Arg *arg) +{ + unsigned int i; + + for(i = 0; !seltag[i]; i++); + arg->i = (i > 0) ? i-1 : ntags-1; + view(arg); +}