X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tag.c;h=015a06a4f047db019cec7a2a7c3444b99ca9d2fb;hb=e21d93b7bd5d34f31bc09a576b7d449df5b68c07;hp=1bfedb226e3b7b7886d828b7ad9d64a690de6b89;hpb=c53980cddcee8afd13ea793134ed3ddf5dbef0e3;p=dwm.git diff --git a/tag.c b/tag.c index 1bfedb2..015a06a 100644 --- a/tag.c +++ b/tag.c @@ -3,28 +3,36 @@ * See LICENSE file for license details. */ #include "dwm.h" - +#include +#include +#include #include +#include #include + +typedef struct { + const char *clpattern; + const char *tpattern; + Bool isfloat; +} Rule; + +typedef struct { + regex_t *clregex; + regex_t *tregex; +} RReg; + /* static */ -/* CUSTOMIZE */ -static Rule rule[] = { - /* class instance tags isfloat */ - { "Firefox-bin", "firefox-bin", { [Twww] = "www" }, False }, -}; +TAGS +RULES -/* extern */ +static RReg *rreg = NULL; +static unsigned int len = 0; + +void (*arrange)(Arg *) = DEFMODE; -/* CUSTOMIZE */ -char *tags[TLast] = { - [Tscratch] = "scratch", - [Tdev] = "dev", - [Twww] = "www", - [Twork] = "work", -}; -void (*arrange)(Arg *) = dotile; +/* extern */ void appendtag(Arg *arg) @@ -32,7 +40,7 @@ appendtag(Arg *arg) if(!sel) return; - sel->tags[arg->i] = tags[arg->i]; + sel->tags[arg->i] = True; arrange(NULL); } @@ -41,9 +49,8 @@ dofloat(Arg *arg) { Client *c; - arrange = dofloat; for(c = clients; c; c = c->next) { - setgeom(c); + c->ismax = False; if(c->tags[tsel]) { resize(c, True, TopLeft); } @@ -51,10 +58,12 @@ dofloat(Arg *arg) ban(c); } if(sel && !sel->tags[tsel]) { - if((sel = getnext(clients, tsel))) { + if((sel = getnext(clients))) { higher(sel); focus(sel); } + else + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); } drawall(); } @@ -62,11 +71,10 @@ 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->isfloat) n++; @@ -77,7 +85,7 @@ dotile(Arg *arg) h = sh - bh; for(i = 0, c = clients; c; c = c->next) { - setgeom(c); + c->ismax = False; if(c->tags[tsel]) { if(c->isfloat) { higher(c); @@ -85,22 +93,28 @@ dotile(Arg *arg) 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->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->border; - *c->h = sh - 2 * c->border - bh; + 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 { - *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->h = sh - 2 - bh; } resize(c, False, TopLeft); i++; @@ -109,86 +123,109 @@ dotile(Arg *arg) ban(c); } if(!sel || (sel && !sel->tags[tsel])) { - if((sel = getnext(clients, tsel))) { + 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 && !c->tags[tsel]; c = c->next); return c; } -void -heretag(Arg *arg) +Client * +getprev(Client *c) { - int i; - Client *c; + for(; c && !c->tags[tsel]; c = c->prev); + return c; +} - if(arg->i == tsel) - return; +void +initrregs() +{ + unsigned int i; + regex_t *reg; - if(!(c = getnext(clients, arg->i))) + if(rreg) return; - - for(i = 0; i < TLast; i++) - c->tags[i] = NULL; - c->tags[tsel] = tags[tsel]; - pop(c); - focus(c); + 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) { - XClassHint ch; - static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0; + char classinst[256]; unsigned int i, j; + regmatch_t tmp; Bool matched = False; - - if(!len) { - c->tags[tsel] = tags[tsel]; - return; - } + XClassHint ch; 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->isfloat = rule[i].isfloat; - matched = True; - break; + 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] = tags[tsel]; + c->tags[tsel] = True; +} + +void +togglemode(Arg *arg) +{ + arrange = arrange == dofloat ? dotile : dofloat; + arrange(NULL); } void @@ -198,3 +235,17 @@ view(Arg *arg) 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); +}