X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=3f896dcbf0d0a2be030bb44eeab2b632f683ffa9;hb=e237b2a76fb3dac1f43b91e5c7b6adb9ef04c9ed;hp=f1d59f955d5a62f4d9fe0bd0e9400f3046a48a25;hpb=d05d09b205e1f1b045cf8da7f0b83a2bee100be6;p=dwm.git diff --git a/dwm.c b/dwm.c index f1d59f9..3f896dc 100644 --- a/dwm.c +++ b/dwm.c @@ -96,10 +96,12 @@ typedef struct { const char *symbol; void (*arrange)(void); Bool isfloating; -} Layout; +} Layout; typedef struct { - const char *prop; + const char *class; + const char *instance; + const char *title; const char *tag; Bool isfloating; } Rule; @@ -116,6 +118,7 @@ void cleanup(void); void configure(Client *c); void configurenotify(XEvent *e); void configurerequest(XEvent *e); +unsigned int counttiled(void); void destroynotify(XEvent *e); void detach(Client *c); void detachstack(Client *c); @@ -160,6 +163,7 @@ void restack(void); void run(void); void scan(void); void setclientstate(Client *c, long state); +void setdefgeoms(void); void setlayout(const char *arg); void setup(void); void spawn(const char *arg); @@ -168,7 +172,8 @@ unsigned int textnw(const char *text, unsigned int len); unsigned int textw(const char *text); void tileh(void); void tilehstack(unsigned int n); -unsigned int tilemaster(void); +Client *tilemaster(unsigned int n); +void tileresize(Client *c, int x, int y, int w, int h); void tilev(void); void tilevstack(unsigned int n); void togglefloating(const char *arg); @@ -177,6 +182,7 @@ void toggleview(const char *arg); void unban(Client *c); void unmanage(Client *c); void unmapnotify(XEvent *e); +void updatebarpos(void); void updatesizehints(Client *c); void updatetitle(Client *c); void updatewmhints(Client *c); @@ -239,9 +245,9 @@ applyrules(Client *c) { XGetClassHint(dpy, c->win, &ch); 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))) + if(strstr(c->name, r->title) + || (ch.res_class && r->class && strstr(ch.res_class, r->class)) + || (ch.res_name && r->instance && strstr(ch.res_name, r->instance))) { c->isfloating = r->isfloating; if(r->tag) { @@ -404,11 +410,8 @@ configurenotify(XEvent *e) { XConfigureEvent *ev = &e->xconfigure; if(ev->window == root && (ev->width != sw || ev->height != sh)) { - sw = ev->width; - sh = ev->height; - XFreePixmap(dpy, dc.drawable); - dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen)); - XMoveResizeWindow(dpy, barwin, bx, by, bw, bh); + setgeoms(); + updatebarpos(); arrange(); } } @@ -457,6 +460,15 @@ configurerequest(XEvent *e) { XSync(dpy, False); } +unsigned int +counttiled(void) { + unsigned int n; + Client *c; + + for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++); + return n; +} + void destroynotify(XEvent *e) { Client *c; @@ -1040,7 +1052,7 @@ maprequest(XEvent *e) { } void -monocle(void) { +monocle(void) { Client *c; for(c = clients; c; c = c->next) @@ -1379,6 +1391,46 @@ setclientstate(Client *c, long state) { } void +setdefgeoms(void) { + + /* screen dimensions */ + sx = 0; + sy = 0; + sw = DisplayWidth(dpy, screen); + sh = DisplayHeight(dpy, screen); + + /* bar position */ + bx = sx; + by = sy; + bw = sw; + bh = dc.font.height + 2; + + /* window area */ + wx = sx; + wy = sy + bh; + ww = sw; + wh = sh - bh; + + /* master area */ + mx = wx; + my = wy; + mw = ((float)sw) * 0.55; + mh = wh; + + /* tile area */ + tx = mx + mw; + ty = wy; + tw = ww - mw; + th = wh; + + /* monocle area */ + mox = wx; + moy = wy; + mow = ww; + moh = wh; +} + +void setlayout(const char *arg) { static Layout *revert = 0; unsigned int i; @@ -1410,10 +1462,10 @@ setup(void) { /* init screen */ screen = DefaultScreen(dpy); root = RootWindow(dpy, screen); - sx = 0; - sy = 0; - sw = DisplayWidth(dpy, screen); - sh = DisplayHeight(dpy, screen); + initfont(FONT); + + /* apply default geometries */ + setgeoms(); /* init atoms */ wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False); @@ -1436,7 +1488,7 @@ setup(void) { dc.sel[ColBG] = getcolor(SELBGCOLOR); dc.sel[ColFG] = getcolor(SELFGCOLOR); initfont(FONT); - dc.h = bh = dc.font.height + 2; + dc.h = bh; dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen)); dc.gc = XCreateGC(dpy, root, 0, 0); XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); @@ -1451,35 +1503,6 @@ setup(void) { /* init layouts */ lt = &layouts[0]; - /* bar position */ - bx = BX; - by = BY; - bw = BW; - - /* window area */ - wx = WX; - wy = WY; - ww = WW; - wh = WH; - - /* master area */ - mx = MX; - my = MY; - mw = MW; - mh = MH; - - /* tile area */ - tx = TX; - ty = TY; - tw = TW; - th = TH; - - /* monocle area */ - mox = MOX; - moy = MOY; - mow = MOW; - moh = MOH; - /* init bar */ for(blw = i = 0; i < LENGTH(layouts); i++) { i = textw(layouts[i].symbol); @@ -1567,89 +1590,76 @@ textw(const char *text) { } void -tileresize(Client *c, int x, int y, int w, int h) { - resize(c, x, y, w, h, RESIZEHINTS); - if((RESIZEHINTS) && ((c->h < bh) || (c->h > h) || (c->w < bh) || (c->w > w))) - /* client doesn't accept size constraints */ - resize(c, x, y, w, h, False); -} - -void tileh(void) { - tilehstack(tilemaster()); -} - -void -tilehstack(unsigned int n) { - int i, x, w; + int x, w; + unsigned int i, n = counttiled(); Client *c; if(n == 0) return; + c = tilemaster(n); + if(--n == 0) + return; x = tx; w = tw / n; if(w < bh) w = tw; - for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++) - if(i > 0) { - if(i > 1 && i == n) /* remainder */ - tileresize(c, x, ty, (tx + tw) - x - 2 * c->border, - th - 2 * c->border); - else - tileresize(c, x, ty, w - 2 * c->border, - th - 2 * c->border); - if(w != tw) - x = c->x + c->w + 2 * c->border; - } + for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) { + if(i + 1 == n) /* remainder */ + tileresize(c, x, ty, (tx + tw) - x - 2 * c->border, th - 2 * c->border); + else + tileresize(c, x, ty, w - 2 * c->border, th - 2 * c->border); + if(w != tw) + x = c->x + c->w + 2 * c->border; + } } -unsigned int -tilemaster(void) { - unsigned int n; - Client *c, *mc; +Client * +tilemaster(unsigned int n) { + Client *c = nexttiled(clients); - for(n = 0, mc = c = nexttiled(clients); c; c = nexttiled(c->next)) - n++; - if(n == 0) - return 0; if(n == 1) - tileresize(mc, mox, moy, mow - 2 * mc->border, moh - 2 * mc->border); + tileresize(c, mox, moy, mow - 2 * c->border, moh - 2 * c->border); else - tileresize(mc, mx, my, mw - 2 * mc->border, mh - 2 * mc->border); - return n - 1; + tileresize(c, mx, my, mw - 2 * c->border, mh - 2 * c->border); + return c; } void -tilev(void) { - tilevstack(tilemaster()); +tileresize(Client *c, int x, int y, int w, int h) { + resize(c, x, y, w, h, RESIZEHINTS); + if((RESIZEHINTS) && ((c->h < bh) || (c->h > h) || (c->w < bh) || (c->w > w))) + /* client doesn't accept size constraints */ + resize(c, x, y, w, h, False); } void -tilevstack(unsigned int n) { - int i, y, h; +tilev(void) { + int y, h; + unsigned int i, n = counttiled(); Client *c; if(n == 0) return; + c = tilemaster(n); + if(--n == 0) + return; y = ty; h = th / n; if(h < bh) h = th; - for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++) - if(i > 0) { - if(i > 1 && i == n) /* remainder */ - tileresize(c, tx, y, tw - 2 * c->border, - (ty + th) - y - 2 * c->border); - else - tileresize(c, tx, y, tw - 2 * c->border, - h - 2 * c->border); - if(h != th) - y = c->y + c->h + 2 * c->border; - } + for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) { + if(i + 1 == n) /* remainder */ + tileresize(c, tx, y, tw - 2 * c->border, (ty + th) - y - 2 * c->border); + else + tileresize(c, tx, y, tw - 2 * c->border, h - 2 * c->border); + if(h != th) + y = c->y + c->h + 2 * c->border; + } } void @@ -1729,6 +1739,15 @@ unmapnotify(XEvent *e) { } void +updatebarpos(void) { + + if(dc.drawable != 0) + XFreePixmap(dpy, dc.drawable); + dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen)); + XMoveResizeWindow(dpy, barwin, bx, by, bw, bh); +} + +void updatesizehints(Client *c) { long msize; XSizeHints size;