X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=f83e800a7d86d8e2f7a6ef0332ba1e35a1676636;hb=aa2395b6a81475b44dd74618fb7f0b40305e10bb;hp=f51d801d8394b30498be2bcc8047a984c691133f;hpb=d7b074fcce4877ed404f6a92671689fcdee9133b;p=dwm.git diff --git a/dwm.c b/dwm.c index f51d801..f83e800 100644 --- a/dwm.c +++ b/dwm.c @@ -46,6 +46,14 @@ #define LENGTH(x) (sizeof x / sizeof x[0]) #define MAXTAGLEN 16 #define MOUSEMASK (BUTTONMASK|PointerMotionMask) +#define DEFGEOM(GEONAME,BX,BY,BW,WX,WY,WW,WH,MX,MY,MW,MH,TX,TY,TW,TH,MOX,MOY,MOW,MOH) \ +void GEONAME(void) { \ + bx = (BX); by = (BY); bw = (BW); \ + wx = (WX); wy = (WY); ww = (WW); wh = (WH); \ + mx = (MX); my = (MY); mw = (MW); mh = (MH); \ + tx = (TX); ty = (TY); tw = (TW); th = (TH); \ + mox = (MOX); moy = (MOY); mow = (MOW); moh = (MOH); \ +} /* enums */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ @@ -86,6 +94,11 @@ typedef struct { } DC; /* draw context */ typedef struct { + const char *symbol; + void (*apply)(void); +} Geom; + +typedef struct { unsigned long mod; KeySym keysym; void (*func)(const char *arg); @@ -96,10 +109,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 +131,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 +176,7 @@ void restack(void); void run(void); void scan(void); void setclientstate(Client *c, long state); +void setgeom(const char *arg); void setlayout(const char *arg); void setup(void); void spawn(const char *arg); @@ -168,7 +185,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 +195,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); @@ -191,7 +210,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, @@ -218,6 +237,7 @@ Client *stack = NULL; Cursor cursor[CurLast]; Display *dpy; DC dc = {0}; +Geom *geom = NULL; Layout *lt = NULL; Window root, barwin; @@ -239,9 +259,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) { @@ -403,14 +423,8 @@ void 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); - arrange(); - } + if(ev->window == root && (ev->width != sw || ev->height != sh)) + setgeom(NULL); } void @@ -457,6 +471,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; @@ -508,10 +531,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) { @@ -523,7 +546,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); } @@ -981,14 +1004,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; } @@ -1040,12 +1063,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 @@ -1076,14 +1099,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) @@ -1379,6 +1402,21 @@ setclientstate(Client *c, long state) { } void +setgeom(const char *arg) { + unsigned int i; + + for(i = 0; arg && i < LENGTH(geoms); i++) + if(!strcmp(geoms[i].symbol, arg)) + break; + if(i == LENGTH(geoms)) + return; + geom = &geoms[i]; + geom->apply(); + updatebarpos(); + arrange(); +} + +void setlayout(const char *arg) { static Layout *revert = 0; unsigned int i; @@ -1410,10 +1448,16 @@ setup(void) { /* init screen */ screen = DefaultScreen(dpy); root = RootWindow(dpy, screen); + initfont(FONT); + + /* apply default geometry */ sx = 0; sy = 0; sw = DisplayWidth(dpy, screen); sh = DisplayHeight(dpy, screen); + bh = dc.font.height + 2; + geom = &geoms[0]; + geom->apply(); /* init atoms */ wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False); @@ -1436,7 +1480,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); @@ -1462,7 +1506,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]); @@ -1538,89 +1582,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; + x = tx; + w = tw / n; if(w < bh) - w = TW; + 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; + y = ty; + h = th / n; if(h < bh) - h = TH; + 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 @@ -1700,6 +1731,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;