X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tag.c;h=cdb0f5242e5438ae29a6d1fa24e2ffe723a68274;hb=b43989207a949cbc17182b451aa527afe542c98f;hp=90223717a5d19e7c7a0384c707e0e49c9fa42f89;hpb=666b4563a0064dd7aa27159813124837d306f81c;p=dwm.git diff --git a/tag.c b/tag.c index 9022371..cdb0f52 100644 --- a/tag.c +++ b/tag.c @@ -5,68 +5,66 @@ #include "dwm.h" #include #include +#include #include #include #include -/* static */ typedef struct { - const char *pattern; - Bool tags[TLast]; + const char *clpattern; + const char *tpattern; Bool isfloat; } Rule; +typedef struct { + regex_t *clregex; + regex_t *tregex; +} RReg; + +/* static */ + TAGS RULES +static RReg *rreg = NULL; +static unsigned int len = 0; + void (*arrange)(Arg *) = DEFMODE; /* extern */ void -appendtag(Arg *arg) -{ - if(!sel) - return; - - sel->tags[arg->i] = True; - arrange(NULL); -} - -void dofloat(Arg *arg) { Client *c; 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))) { - higher(sel); - focus(sel); - } - else - XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); - } - drawall(); + if(!sel || !isvisible(sel)) + sel = getnext(clients); + if(sel) + focus(sel); + else + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); + restack(); } void dotile(Arg *arg) { - int n, i, w, h; + int h, i, n, w; Client *c; 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) @@ -76,9 +74,8 @@ 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); continue; } @@ -98,7 +95,10 @@ dotile(Arg *arg) c->x = sx + mw; c->y = sy + (i - 1) * h + bh; c->w = w - 2; - c->h = h - 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; @@ -112,51 +112,126 @@ dotile(Arg *arg) else ban(c); } - if(!sel || (sel && !sel->tags[tsel])) { - if((sel = getnext(clients))) { - higher(sel); - focus(sel); - } - else - XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); - } - drawall(); + if(!sel || !isvisible(sel)) + sel = getnext(clients); + if(sel) + focus(sel); + else + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); + restack(); } Client * getnext(Client *c) { - for(; c && !c->tags[tsel]; c = c->next); + for(; c && !isvisible(c); c = c->next); return c; } Client * getprev(Client *c) { - for(; c && !c->tags[tsel]; c = c->prev); + for(; c && !isvisible(c); c = c->prev); return c; } void -replacetag(Arg *arg) +initrregs() { - int i; + unsigned int i; + regex_t *reg; - if(!sel) + if(rreg) return; + len = sizeof(rule) / sizeof(rule[0]); + rreg = emallocz(len * sizeof(RReg)); - for(i = 0; i < TLast; i++) - sel->tags[i] = False; - appendtag(arg); + 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; + } + } +} + +Bool +isvisible(Client *c) +{ + unsigned int i; + + for(i = 0; i < ntags; i++) + if(c->tags[i] && seltag[i]) + return True; + return False; +} + +void +restack() +{ + static unsigned int nwins = 0; + static Window *wins = NULL; + unsigned int f, fi, m, mi, n; + Client *c; + XEvent ev; + + for(f = 0, m = 0, c = clients; c; c = c->next) + if(isvisible(c)) { + if(c->isfloat || arrange == dofloat) + f++; + else + m++; + } + if(!(n = 2 * (f + m))) { + drawstatus(); + return; + } + if(nwins < n) { + nwins = n; + wins = erealloc(wins, nwins * sizeof(Window)); + } + + fi = 0; + mi = 2 * f; + if(sel->isfloat || arrange == dofloat) { + wins[fi++] = sel->title; + wins[fi++] = sel->win; + } + else { + wins[mi++] = sel->title; + wins[mi++] = sel->win; + } + for(c = clients; c; c = c->next) + if(isvisible(c) && c != sel) { + if(c->isfloat || arrange == dofloat) { + wins[fi++] = c->title; + wins[fi++] = c->win; + } + else { + wins[mi++] = c->title; + wins[mi++] = c->win; + } + } + XRestackWindows(dpy, wins, n); + drawall(); + XSync(dpy, False); + while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); } void settags(Client *c) { char classinst[256]; - static unsigned int len = sizeof(rule) / sizeof(rule[0]); unsigned int i, j; - regex_t regex; regmatch_t tmp; Bool matched = False; XClassHint ch; @@ -165,52 +240,89 @@ settags(Client *c) 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((c->tags[j] = rule[i].tags[j])) - matched = True; + 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] = True; + for(i = 0; i < ntags; i++) + c->tags[i] = seltag[i]; +} + +void +tag(Arg *arg) +{ + unsigned int i; + + if(!sel) + return; + + for(i = 0; i < ntags; i++) + sel->tags[i] = False; + sel->tags[arg->i] = True; + settitle(sel); + if(!isvisible(sel)) + arrange(NULL); } void togglemode(Arg *arg) { arrange = arrange == dofloat ? dotile : dofloat; - arrange(NULL); + if(sel) + arrange(NULL); + else + drawstatus(); } void -view(Arg *arg) +toggletag(Arg *arg) { - tsel = arg->i; - arrange(NULL); - drawall(); + 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; + settitle(sel); + if(!isvisible(sel)) + arrange(NULL); } + void -viewnext(Arg *arg) +toggleview(Arg *arg) { - arg->i = (tsel < TLast-1) ? tsel+1 : 0; - view(arg); + unsigned int i; + + seltag[arg->i] = !seltag[arg->i]; + for(i = 0; i < ntags && !seltag[i]; i++); + if(i == ntags) + seltag[arg->i] = True; /* cannot toggle last view */ + arrange(NULL); } void -viewprev(Arg *arg) +view(Arg *arg) { - arg->i = (tsel > 0) ? tsel-1 : TLast-1; - view(arg); + unsigned int i; + + for(i = 0; i < ntags; i++) + seltag[i] = False; + seltag[arg->i] = True; + arrange(NULL); }