X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tag.c;h=015a06a4f047db019cec7a2a7c3444b99ca9d2fb;hb=e21d93b7bd5d34f31bc09a576b7d449df5b68c07;hp=0861128f594a7a08bd7ec4238d31893cab95e08b;hpb=dba23062bad40afb1a90f60b6897cf9e1ca5035b;p=dwm.git diff --git a/tag.c b/tag.c index 0861128..015a06a 100644 --- a/tag.c +++ b/tag.c @@ -2,71 +2,46 @@ * (C)opyright MMVI Anselm R. Garbe * See LICENSE file for license details. */ - -#include +#include "dwm.h" +#include #include +#include #include -#include +#include #include -#include "dwm.h" -static Rule rule[] = { - /* class instance tags dofloat */ - { "Firefox-bin", "Gecko", { [Twww] = "www" }, False }, -}; +typedef struct { + const char *clpattern; + const char *tpattern; + Bool isfloat; +} Rule; -void (*arrange)(Arg *) = dotile; +typedef struct { + regex_t *clregex; + regex_t *tregex; +} RReg; -Client * -getnext(Client *c) -{ - for(; c && !c->tags[tsel]; c = c->next); - return c; -} +/* static */ -void -settags(Client *c) -{ - XClassHint ch; - static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0; - unsigned int i, j; - Bool matched = False; +TAGS +RULES - if(!len) { - c->tags[tsel] = tags[tsel]; - return; - } +static RReg *rreg = NULL; +static unsigned int len = 0; - if(XGetClassHint(dpy, c->win, &ch)) { - if(ch.res_class && ch.res_name) { - for(i = 0; i < len; i++) - if(!strncmp(rule[i].class, ch.res_class, sizeof(rule[i].class)) - && !strncmp(rule[i].instance, ch.res_name, sizeof(rule[i].instance))) - { - for(j = 0; j < TLast; j++) - c->tags[j] = rule[i].tags[j]; - c->dofloat = rule[i].dofloat; - matched = True; - break; - } - } - if(ch.res_class) - XFree(ch.res_class); - if(ch.res_name) - XFree(ch.res_name); - } +void (*arrange)(Arg *) = DEFMODE; - if(!matched) - c->tags[tsel] = tags[tsel]; -} +/* extern */ void -view(Arg *arg) +appendtag(Arg *arg) { - tsel = arg->i; + if(!sel) + return; + + sel->tags[arg->i] = True; arrange(NULL); - drawall(); } void @@ -74,10 +49,11 @@ dofloat(Arg *arg) { Client *c; - arrange = dofloat; for(c = clients; c; c = c->next) { - if(c->tags[tsel]) - resize(c, True); + c->ismax = False; + if(c->tags[tsel]) { + resize(c, True, TopLeft); + } else ban(c); } @@ -86,6 +62,8 @@ dofloat(Arg *arg) higher(sel); focus(sel); } + else + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); } drawall(); } @@ -93,13 +71,12 @@ dofloat(Arg *arg) void dotile(Arg *arg) { - Client *c; 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->dofloat) + if(c->tags[tsel] && !c->isfloat) n++; if(n > 1) @@ -108,31 +85,38 @@ dotile(Arg *arg) h = sh - bh; for(i = 0, c = clients; c; c = c->next) { + c->ismax = False; if(c->tags[tsel]) { - if(c->dofloat) { + if(c->isfloat) { higher(c); - resize(c, True); + 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; + 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 { + 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; + c->h = h - 2; } - resize(c, False); + 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 @@ -143,29 +127,125 @@ dotile(Arg *arg) higher(sel); focus(sel); } + else + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); } drawall(); } +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 -appendtag(Arg *arg) +initrregs() { - if(!sel) - return; + unsigned int i; + regex_t *reg; - sel->tags[arg->i] = tags[arg->i]; - arrange(NULL); + if(rreg) + return; + 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, 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; + } + } } void replacetag(Arg *arg) { int i; + 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); } +void +settags(Client *c) +{ + char classinst[256]; + unsigned int i, j; + regmatch_t tmp; + Bool matched = False; + XClassHint ch; + + 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(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; + } + } + } + if(ch.res_class) + XFree(ch.res_class); + if(ch.res_name) + XFree(ch.res_name); + } + if(!matched) + c->tags[tsel] = True; +} + +void +togglemode(Arg *arg) +{ + arrange = arrange == dofloat ? dotile : dofloat; + arrange(NULL); +} + +void +view(Arg *arg) +{ + tsel = arg->i; + arrange(NULL); + drawall(); +} + +void +viewnext(Arg *arg) +{ + arg->i = (tsel < ntags-1) ? tsel+1 : 0; + view(arg); +} + +void +viewprev(Arg *arg) +{ + arg->i = (tsel > 0) ? tsel-1 : ntags-1; + view(arg); +}