X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=3f896dcbf0d0a2be030bb44eeab2b632f683ffa9;hb=e237b2a76fb3dac1f43b91e5c7b6adb9ef04c9ed;hp=2985ceabc4fd600514b2b0b2741fca532371a665;hpb=c9170189bf0d0234f8d97fd7b717f859b7242674;p=dwm.git diff --git a/dwm.c b/dwm.c index 2985cea..3f896dc 100644 --- a/dwm.c +++ b/dwm.c @@ -1,6 +1,3 @@ -/** - * - allow for vstack - */ /* See LICENSE file for copyright and license details. * * dynamic window manager is designed like any other X client as well. It is @@ -36,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -100,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; @@ -120,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); @@ -164,14 +163,18 @@ 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); void tag(const char *arg); unsigned int textnw(const char *text, unsigned int len); unsigned int textw(const char *text); -void tile(void); -unsigned int tilemaster(void); +void tileh(void); +void tilehstack(unsigned int n); +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); void toggletag(const char *arg); @@ -179,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); @@ -193,7 +197,7 @@ void zoom(const char *arg); char stext[256], buf[256]; int screen, sx, sy, sw, sh; int (*xerrorxlib)(Display *, XErrorEvent *); -unsigned int bh, blw = 0; +int bx, by, bw, bh, blw, mx, my, mw, mh, mox, moy, mow, moh, tx, ty, tw, th, wx, wy, ww, wh; unsigned int numlockmask = 0; void (*handler[LASTEvent]) (XEvent *) = { [ButtonPress] = buttonpress, @@ -241,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) { @@ -406,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(); } } @@ -459,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; @@ -510,10 +520,10 @@ drawbar(void) { drawtext(lt->symbol, dc.norm, False); x = dc.x + dc.w; dc.w = textw(stext); - dc.x = BW - dc.w; + dc.x = bw - dc.w; if(dc.x < x) { dc.x = x; - dc.w = BW - x; + dc.w = bw - x; } drawtext(stext, dc.norm, False); if((dc.w = dc.x - x) > bh) { @@ -525,7 +535,7 @@ drawbar(void) { else drawtext(NULL, dc.norm, False); } - XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, BW, bh, 0, 0); + XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); XSync(dpy, False); } @@ -983,14 +993,14 @@ manage(Window w, XWindowAttributes *wa) { c->border = wa->border_width; } else { - if(c->x + c->w + 2 * c->border > WX + WW) - c->x = WX + WW - c->w - 2 * c->border; - if(c->y + c->h + 2 * c->border > WY + WH) - c->y = WY + WH - c->h - 2 * c->border; - if(c->x < WX) - c->x = WX; - if(c->y < WY) - c->y = WY; + if(c->x + c->w + 2 * c->border > wx + ww) + c->x = wx + ww - c->w - 2 * c->border; + if(c->y + c->h + 2 * c->border > wy + wh) + c->y = wy + wh - c->h - 2 * c->border; + if(c->x < wx) + c->x = wx; + if(c->y < wy) + c->y = wy; c->border = BORDERPX; } @@ -1042,12 +1052,12 @@ maprequest(XEvent *e) { } void -monocle(void) { +monocle(void) { Client *c; for(c = clients; c; c = c->next) if(isvisible(c)) - resize(c, MOX, MOY, MOW, MOH, RESIZEHINTS); + resize(c, mox, moy, mow, moh, RESIZEHINTS); } void @@ -1078,14 +1088,14 @@ movemouse(Client *c) { XSync(dpy, False); nx = ocx + (ev.xmotion.x - x1); ny = ocy + (ev.xmotion.y - y1); - if(abs(WX - nx) < SNAP) - nx = WX; - else if(abs((WX + WW) - (nx + c->w + 2 * c->border)) < SNAP) - nx = WX + WW - c->w - 2 * c->border; - if(abs(WY - ny) < SNAP) - ny = WY; - else if(abs((WY + WH) - (ny + c->h + 2 * c->border)) < SNAP) - ny = WY + WH - c->h - 2 * c->border; + if(abs(wx - nx) < SNAP) + nx = wx; + else if(abs((wx + ww) - (nx + c->w + 2 * c->border)) < SNAP) + nx = wx + ww - c->w - 2 * c->border; + if(abs(wy - ny) < SNAP) + ny = wy; + else if(abs((wy + wh) - (ny + c->h + 2 * c->border)) < SNAP) + ny = wy + wh - c->h - 2 * c->border; if(!c->isfloating && !lt->isfloating && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP)) togglefloating(NULL); if((lt->isfloating) || c->isfloating) @@ -1381,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; @@ -1412,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); @@ -1438,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); @@ -1464,7 +1514,7 @@ setup(void) { wa.background_pixmap = ParentRelative; wa.event_mask = ButtonPressMask|ExposureMask; - barwin = XCreateWindow(dpy, root, BX, BY, BW, bh, 0, DefaultDepth(dpy, screen), + barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); XDefineCursor(dpy, barwin, cursor[CurNormal]); @@ -1540,58 +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); +tileh(void) { + 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(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 +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; + 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; - } -} + h = th; -void -tile(void) { - tilevstack(tilemaster()); + 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 @@ -1671,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;