X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dwm.c;h=e50dfb80b6dd976ff28f13e8d0976525c4f1ab9f;hb=7bc272a4e4f463c673d12144b3a202db2345e7de;hp=01d40f1769b6841c990f8d5d1a17385cbd1bcd58;hpb=a3d8c05a95edbd4dad544c3373301551440c8092;p=dwm.git diff --git a/dwm.c b/dwm.c index 01d40f1..e50dfb8 100644 --- a/dwm.c +++ b/dwm.c @@ -67,10 +67,10 @@ struct Client { int x, y, w, h; int basew, baseh, incw, inch, maxw, maxh, minw, minh; int minax, maxax, minay, maxay; - int *tags; long flags; unsigned int border, oldborder; Bool isbanned, isfixed, isfloating, isurgent; + Bool *tags; Client *next; Client *prev; Client *snext; @@ -106,17 +106,12 @@ typedef struct { typedef struct { const char *prop; - const char *tags; + const char *tag; Bool isfloating; } Rule; -typedef struct { - regex_t *propregex; - regex_t *tagregex; -} Regs; - struct View { - int id; + unsigned int id; int x, y, w, h, wax, way, wah, waw; double mwfact; Layout *layout; @@ -132,20 +127,21 @@ void ban(Client *c); void buttonpress(XEvent *e); void checkotherwm(void); void cleanup(void); -void compileregs(void); void configure(Client *c); void configurenotify(XEvent *e); void configurerequest(XEvent *e); +Bool conflicts(Client *c, unsigned int tidx); void destroynotify(XEvent *e); void detach(Client *c); void detachstack(Client *c); void drawbar(View *v); -void drawsquare(View *v, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]); -void drawtext(View *v, const char *text, unsigned long col[ColLast], Bool invert); +void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]); +void drawtext(const char *text, unsigned long col[ColLast], Bool invert); void *emallocz(unsigned int size); void enternotify(XEvent *e); void eprint(const char *errstr, ...); void expose(XEvent *e); +unsigned int firstag(View *v); void floating(View *v); /* default floating layout */ void focus(Client *c); void focusin(XEvent *e); @@ -153,13 +149,13 @@ void focusnext(const char *arg); void focusprev(const char *arg); Client *getclient(Window w); unsigned long getcolor(const char *colstr); -View *getviewbar(Window barwin); View *getview(Client *c); +View *getviewbar(Window barwin); long getstate(Window w); Bool gettextprop(Window w, Atom atom, char *text, unsigned int size); void grabbuttons(Client *c, Bool focused); void grabkeys(void); -unsigned int idxoftag(const char *tag); +unsigned int idxoftag(const char *t); void initfont(const char *fontstr); Bool isoccupied(unsigned int t); Bool isprotodel(Client *c); @@ -210,12 +206,9 @@ void zoom(const char *arg); void selectview(const char *arg); /* variables */ -char stext[256]; +char stext[256], buf[256]; int nviews = 1; -View *selview; int screen; -int *seltags; -int *prevtags; int (*xerrorxlib)(Display *, XErrorEvent *); unsigned int bh, bpos; unsigned int blw = 0; @@ -235,58 +228,61 @@ void (*handler[LASTEvent]) (XEvent *) = { [UnmapNotify] = unmapnotify }; Atom wmatom[WMLast], netatom[NetLast]; -Bool isxinerama = False; Bool domwfact = True; Bool dozoom = True; Bool otherwm, readin; Bool running = True; +Bool *prevtags; +Bool *seltags; Client *clients = NULL; Client *sel = NULL; Client *stack = NULL; Cursor cursor[CurLast]; Display *dpy; DC dc = {0}; -Regs *regs = NULL; View *views; +View *selview; Window root; /* configuration, allows nested code to access above variables */ #include "config.h" +#define TAGSZ (LENGTH(tags) * sizeof(Bool)) /* function implementations */ + void applyrules(Client *c) { - static char buf[512]; - unsigned int i, j; - regmatch_t tmp; - Bool matched_tag = False; + unsigned int i, idx; + Bool matched = False; + Rule *r; XClassHint ch = { 0 }; /* rule matching */ XGetClassHint(dpy, c->win, &ch); - snprintf(buf, sizeof buf, "%s:%s:%s", - ch.res_class ? ch.res_class : "", - ch.res_name ? ch.res_name : "", c->name); - for(i = 0; i < LENGTH(rules); i++) - if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) { - c->isfloating = rules[i].isfloating; - for(j = 0; regs[i].tagregex && j < LENGTH(tags); j++) { - if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) { - matched_tag = True; - c->tags[j] = selview->id; - } + for(i = 0; i < LENGTH(rules); i++) { + r = &rules[i]; + if(strstr(c->name, r->prop) + || (ch.res_class && strstr(ch.res_class, r->prop)) + || (ch.res_name && strstr(ch.res_name, r->prop))) + { + c->isfloating = r->isfloating; + if(r->tag && !conflicts(c, (idx = idxoftag(r->tag)))) { + c->tags[idx] = True; + matched = True; } } + } if(ch.res_class) XFree(ch.res_class); if(ch.res_name) XFree(ch.res_name); - if(!matched_tag) - memcpy(c->tags, seltags, sizeof initags); + if(!matched) { + for(i = 0; i < LENGTH(tags); i++) + if(seltags[i] && vtags[i] == selview->id) + c->tags[i] = True; + } } - - void arrange(void) { unsigned int i; @@ -333,11 +329,11 @@ buttonpress(XEvent *e) { Client *c; XButtonPressedEvent *ev = &e->xbutton; - View *v = selview; - - if(ev->window == v->barwin) { + if(ev->window == selview->barwin) { x = 0; for(i = 0; i < LENGTH(tags); i++) { + if(&views[vtags[i]] != selview) + continue; x += textw(tags[i]); if(ev->x < x) { if(ev->button == Button1) { @@ -367,7 +363,7 @@ buttonpress(XEvent *e) { movemouse(c); } else if(ev->button == Button2) { - if((floating != v->layout->arrange) && c->isfloating) + if((floating != getview(c)->layout->arrange) && c->isfloating) togglefloating(NULL); else zoom(NULL); @@ -420,32 +416,6 @@ cleanup(void) { XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); } -void -compileregs(void) { - unsigned int i; - regex_t *reg; - - if(regs) - return; - regs = emallocz(LENGTH(rules) * sizeof(Regs)); - for(i = 0; i < LENGTH(rules); i++) { - if(rules[i].prop) { - reg = emallocz(sizeof(regex_t)); - if(regcomp(reg, rules[i].prop, REG_EXTENDED)) - free(reg); - else - regs[i].propregex = reg; - } - if(rules[i].tags) { - reg = emallocz(sizeof(regex_t)); - if(regcomp(reg, rules[i].tags, REG_EXTENDED)) - free(reg); - else - regs[i].tagregex = reg; - } - } -} - void configure(Client *c) { XConfigureEvent ce; @@ -476,7 +446,7 @@ configurenotify(XEvent *e) { XFreePixmap(dpy, dc.drawable); dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen)); XResizeWindow(dpy, v->barwin, v->w, bh); - updatebarpos(v); + updatebarpos(selview); arrange(); } } @@ -526,6 +496,16 @@ configurerequest(XEvent *e) { XSync(dpy, False); } +Bool +conflicts(Client *c, unsigned int tidx) { + unsigned int i; + + for(i = 0; i < LENGTH(tags); i++) + if(c->tags[i] && vtags[i] != vtags[tidx]) + return True; /* conflict */ + return False; +} + void destroynotify(XEvent *e) { Client *c; @@ -560,21 +540,23 @@ drawbar(View *v) { Client *c; dc.x = 0; - for(c = stack; c && !isvisible(c); c = c->snext); + for(c = stack; c && (!isvisible(c) || getview(c) != v); c = c->snext); for(i = 0; i < LENGTH(tags); i++) { + if(&views[vtags[i]] != v) + continue; dc.w = textw(tags[i]); if(seltags[i]) { - drawtext(v, tags[i], dc.sel, isurgent(i)); - drawsquare(v, c && c->tags[i], isoccupied(i), isurgent(i), dc.sel); + drawtext(tags[i], dc.sel, isurgent(i)); + drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel); } else { - drawtext(v, tags[i], dc.norm, isurgent(i)); - drawsquare(v, c && c->tags[i], isoccupied(i), isurgent(i), dc.norm); + drawtext(tags[i], dc.norm, isurgent(i)); + drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm); } dc.x += dc.w; } dc.w = blw; - drawtext(v, v->layout->symbol, dc.norm, False); + drawtext(v->layout->symbol, dc.norm, False); x = dc.x + dc.w; if(v == selview) { dc.w = textw(stext); @@ -583,25 +565,25 @@ drawbar(View *v) { dc.x = x; dc.w = v->w - x; } - drawtext(v, stext, dc.norm, False); + drawtext(stext, dc.norm, False); } else dc.x = v->w; if((dc.w = dc.x - x) > bh) { dc.x = x; if(c) { - drawtext(v, c->name, dc.sel, False); - drawsquare(v, False, c->isfloating, False, dc.sel); + drawtext(c->name, dc.sel, False); + drawsquare(False, c->isfloating, False, dc.sel); } else - drawtext(v, NULL, dc.norm, False); + drawtext(NULL, dc.norm, False); } XCopyArea(dpy, dc.drawable, v->barwin, dc.gc, 0, 0, v->w, bh, 0, 0); XSync(dpy, False); } void -drawsquare(View *v, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) { +drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) { int x; XGCValues gcv; XRectangle r = { dc.x, dc.y, dc.w, dc.h }; @@ -622,9 +604,8 @@ drawsquare(View *v, Bool filled, Bool empty, Bool invert, unsigned long col[ColL } void -drawtext(View *v, const char *text, unsigned long col[ColLast], Bool invert) { +drawtext(const char *text, unsigned long col[ColLast], Bool invert) { int x, y, w, h; - static char buf[256]; unsigned int len, olen; XRectangle r = { dc.x, dc.y, dc.w, dc.h }; @@ -675,10 +656,8 @@ enternotify(XEvent *e) { Client *c; XCrossingEvent *ev = &e->xcrossing; - if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) { - if(!isxinerama || ev->window != root) - return; - } + if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root) + return; if((c = getclient(ev->window))) focus(c); else @@ -700,10 +679,20 @@ expose(XEvent *e) { View *v; XExposeEvent *ev = &e->xexpose; - if(ev->count == 0 && (v = getviewbar(ev->window))) + if(ev->count == 0 && ((v = getviewbar(ev->window)))) drawbar(v); } +unsigned int +firstag(View *v) { + unsigned int i; + + for(i = 0; i < LENGTH(tags); i++) + if(vtags[i] == v->id) + return i; + return 0; /* safe fallback */ +} + void floating(View *v) { /* default floating layout */ Client *c; @@ -719,12 +708,11 @@ focus(Client *c) { View *v = selview; if(c) selview = getview(c); - else - selview = viewat(); if(selview != v) drawbar(v); if(!c || (c && !isvisible(c))) - for(c = stack; c && !isvisible(c); c = c->snext); + /* TODO: isvisible might take getview(c) as constraint? */ + for(c = stack; c && (!isvisible(c) || getview(c) != selview); c = c->snext); if(sel && sel != c) { grabbuttons(sel, False); XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]); @@ -804,23 +792,23 @@ getcolor(const char *colstr) { } View * -getviewbar(Window barwin) { +getview(Client *c) { unsigned int i; - for(i = 0; i < nviews; i++) - if(views[i].barwin == barwin) - return &views[i]; + for(i = 0; i < LENGTH(tags); i++) + if(c->tags[i]) + return &views[vtags[i]]; return NULL; } View * -getview(Client *c) { +getviewbar(Window barwin) { unsigned int i; - for(i = 0; i < LENGTH(tags); i++) - if(c->tags[i]) - return &views[c->tags[i] - 1]; - return &views[0]; /* fallback */ + for(i = 0; i < nviews; i++) + if(views[i].barwin == barwin) + return &views[i]; + return NULL; } long @@ -934,11 +922,11 @@ grabkeys(void) { } unsigned int -idxoftag(const char *tag) { +idxoftag(const char *t) { unsigned int i; - for(i = 0; (i < LENGTH(tags)) && (tags[i] != tag); i++); - return (i < LENGTH(tags)) ? i : 0; + for(i = 0; (i < LENGTH(tags)) && (tags[i] != t); i++); + return (i < LENGTH(tags)) ? i : firstag(selview); } void @@ -1073,7 +1061,7 @@ manage(Window w, XWindowAttributes *wa) { XWindowChanges wc; c = emallocz(sizeof(Client)); - c->tags = emallocz(sizeof initags); + c->tags = emallocz(TAGSZ); c->win = w; applyrules(c); @@ -1113,7 +1101,7 @@ manage(Window w, XWindowAttributes *wa) { if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success)) for(t = clients; t && t->win != trans; t = t->next); if(t) - memcpy(c->tags, t->tags, sizeof initags); + memcpy(c->tags, t->tags, TAGSZ); if(!c->isfloating) c->isfloating = (rettrans == Success) || c->isfixed; attach(c); @@ -1147,22 +1135,6 @@ maprequest(XEvent *e) { manage(ev->window, &wa); } -View * -viewat() { - int i, x, y; - Window win; - unsigned int mask; - - XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask); - for(i = 0; i < nviews; i++) { - if((x >= views[i].x && x < views[i].x + views[i].w) - && (y >= views[i].y && y < views[i].y + views[i].h)) { - return &views[i]; - } - } - return NULL; -} - void movemouse(Client *c) { int x1, y1, ocx, ocy, di, nx, ny; @@ -1407,7 +1379,7 @@ restack(View *v) { void run(void) { char *p; - char buf[sizeof stext]; + char sbuf[sizeof stext]; fd_set rd; int r, xfd; unsigned int len, offset; @@ -1419,7 +1391,7 @@ run(void) { readin = True; offset = 0; len = sizeof stext - 1; - buf[len] = stext[len] = '\0'; /* 0-terminator is never touched */ + sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */ while(running) { FD_ZERO(&rd); if(readin) @@ -1431,7 +1403,7 @@ run(void) { eprint("select failed\n"); } if(FD_ISSET(STDIN_FILENO, &rd)) { - switch((r = read(STDIN_FILENO, buf + offset, len - offset))) { + switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) { case -1: strncpy(stext, strerror(errno), len); readin = False; @@ -1441,15 +1413,15 @@ run(void) { readin = False; break; default: - for(p = buf + offset; r > 0; p++, r--, offset++) + for(p = sbuf + offset; r > 0; p++, r--, offset++) if(*p == '\n' || *p == '\0') { *p = '\0'; - strncpy(stext, buf, len); - p += r - 1; /* p is buf + offset + r - 1 */ + strncpy(stext, sbuf, len); + p += r - 1; /* p is sbuf + offset + r - 1 */ for(r = 0; *(p - r) && *(p - r) != '\n'; r++); offset = r; if(r) - memmove(buf, p - r + 1, r); + memmove(sbuf, p - r + 1, r); break; } break; @@ -1520,13 +1492,12 @@ setlayout(const char *arg) { if(sel) arrange(); else - drawbar(v); + drawbar(selview); } void setmwfact(const char *arg) { double delta; - View *v = selview; if(!domwfact) @@ -1549,7 +1520,7 @@ setmwfact(const char *arg) { void setup(void) { - unsigned int i; + unsigned int i, j; View *v; XSetWindowAttributes wa; XineramaScreenInfo *info = NULL; @@ -1567,13 +1538,13 @@ setup(void) { cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing); cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur); - if((isxinerama = XineramaIsActive(dpy))) + if(XineramaIsActive(dpy)) info = XineramaQueryScreens(dpy, &nviews); + #if defined(AIM_XINERAMA) -isxinerama = True; nviews = 2; /* aim Xinerama */ #endif - selview = views = emallocz(nviews * sizeof(View)); + views = emallocz(nviews * sizeof(View)); screen = DefaultScreen(dpy); root = RootWindow(dpy, screen); @@ -1599,17 +1570,24 @@ nviews = 2; /* aim Xinerama */ blw = i; } - seltags = emallocz(sizeof initags); - prevtags = emallocz(sizeof initags); - memcpy(seltags, initags, sizeof initags); - memcpy(prevtags, initags, sizeof initags); + seltags = emallocz(TAGSZ); + prevtags = emallocz(TAGSZ); + + /* check, if vtags need assistance, because there is only 1 view */ + if(nviews == 1) + for(i = 0; i < LENGTH(tags); i++) + vtags[i] = 0; for(i = 0; i < nviews; i++) { /* init geometry */ v = &views[i]; - v->id = i + 1; + v->id = i; + + /* select first tag of view */ + j = firstag(v); + seltags[j] = prevtags[j] = True; - if(nviews != 1 && isxinerama) { + if(info) { #if defined(AIM_XINERAMA) v->w = DisplayWidth(dpy, screen) / 2; @@ -1664,13 +1642,10 @@ v->h = DisplayHeight(dpy, screen); if(info) XFree(info); + selview = viewat(); + /* grab keys */ grabkeys(); - - /* init tags */ - compileregs(); - - selview = &views[0]; } void @@ -1704,8 +1679,10 @@ tag(const char *arg) { if(!sel) return; for(i = 0; i < LENGTH(tags); i++) - sel->tags[i] = (NULL == arg) ? selview->id : 0; - sel->tags[idxoftag(arg)] = selview->id; + sel->tags[i] = (NULL == arg) && (vtags[i] == getview(sel)->id); + i = idxoftag(arg); + if(!conflicts(sel, i)) + sel->tags[idxoftag(arg)] = True; arrange(); } @@ -1745,8 +1722,6 @@ tile(View *v) { for(i = 0, c = mc = nexttiled(clients, v); c; c = nexttiled(c->next, v)) { if(i == 0) { /* master */ - nx = v->wax; - ny = v->way; nw = mw - 2 * c->border; nh = v->wah - 2 * c->border; } @@ -1761,7 +1736,6 @@ tile(View *v) { else nh = th - 2 * c->border; } - fprintf(stderr, "tile %d %d %d %d\n", nx, ny, nw, nh); resize(c, nx, ny, nw, nh, RESIZEHINTS); if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw))) /* client doesn't accept size constraints */ @@ -1799,10 +1773,12 @@ toggletag(const char *arg) { if(!sel) return; i = idxoftag(arg); + if(conflicts(sel, i)) + return; sel->tags[i] = !sel->tags[i]; for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++); if(j == LENGTH(tags)) - sel->tags[i] = selview->id; /* at least one tag must be enabled */ + sel->tags[i] = True; /* at least one tag must be enabled */ arrange(); } @@ -1814,7 +1790,7 @@ toggleview(const char *arg) { seltags[i] = !seltags[i]; for(j = 0; j < LENGTH(tags) && !seltags[j]; j++); if(j == LENGTH(tags)) - seltags[i] = selview->id; /* at least one tag must be viewed */ + seltags[i] = True; /* at least one tag must be viewed */ arrange(); } @@ -1952,6 +1928,64 @@ updatewmhints(Client *c) { } } +void +view(const char *arg) { + unsigned int i, j; + Bool tmp[LENGTH(tags)]; + + memcpy(tmp, seltags, TAGSZ); + if(arg == NULL) { + for(i = 0; i < LENGTH(tags); i++) + tmp[i] = (vtags[i] == selview->id); + } + else { + i = idxoftag(arg); + for(j = 0; j < LENGTH(tags); j++) + if(selview->id == vtags[i]) { + /* view tag of selview */ + if(selview->id == vtags[j]) + tmp[j] = False; + } + else { + /* only touch the view the focus should go */ + if(vtags[j] == vtags[i]) + tmp[j] = False; + } + selview = &views[vtags[i]]; + tmp[i] = True; + } + if(memcmp(seltags, tmp, TAGSZ) != 0) { + memcpy(prevtags, seltags, TAGSZ); + memcpy(seltags, tmp, TAGSZ); + arrange(); + } +} + +View * +viewat() { + int i, x, y; + Window win; + unsigned int mask; + + XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask); + for(i = 0; i < nviews; i++) { + if((x >= views[i].x && x < views[i].x + views[i].w) + && (y >= views[i].y && y < views[i].y + views[i].h)) + return &views[i]; + } + return NULL; +} + +void +viewprevtag(const char *arg) { + static Bool tmp[LENGTH(tags)]; + + memcpy(tmp, seltags, TAGSZ); + memcpy(seltags, prevtags, TAGSZ); + memcpy(prevtags, tmp, TAGSZ); + arrange(); +} + /* There's no way to check accesses to destroyed windows, thus those cases are * ignored (especially on UnmapNotify's). Other types of errors call Xlibs * default error handler, which may call exit. */ @@ -1984,31 +2018,6 @@ xerrorstart(Display *dpy, XErrorEvent *ee) { return -1; } -void -view(const char *arg) { - unsigned int i; - int tmp[LENGTH(tags)]; - - for(i = 0; i < LENGTH(tags); i++) - tmp[i] = (NULL == arg) ? selview->id : 0; - tmp[idxoftag(arg)] = selview->id; - if(memcmp(seltags, tmp, sizeof initags) != 0) { - memcpy(prevtags, seltags, sizeof initags); - memcpy(seltags, tmp, sizeof initags); - arrange(); - } -} - -void -viewprevtag(const char *arg) { - static Bool tmp[LENGTH(tags)]; - - memcpy(tmp, seltags, sizeof initags); - memcpy(seltags, prevtags, sizeof initags); - memcpy(prevtags, tmp, sizeof initags); - arrange(); -} - void zoom(const char *arg) { Client *c = sel; @@ -2024,21 +2033,6 @@ zoom(const char *arg) { arrange(); } -void -selectview(const char *arg) { - int i; - View *v; - - if(!arg) - return; - if(arg) - i = atoi(arg); - v = &views[i % nviews]; - XWarpPointer(dpy, None, root, 0, 0, 0, 0, v->wax+v->waw/2, v->way+v->wah/2); - focus(NULL); -} - - int main(int argc, char *argv[]) { if(argc == 2 && !strcmp("-v", argv[1]))