X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=3ae709b827cdac655ee2b39c46c7ca59afd4b038;hp=db9e9c0c0056a35329db8f32a0933bc0bcc78e3d;hb=ea0008cba24b57f7955541568c8c527c06329ccd;hpb=90687482ad880358fce3f023633ebe68f5e96cdb diff --git a/dwm.c b/dwm.c index db9e9c0..3ae709b 100644 --- a/dwm.c +++ b/dwm.c @@ -128,8 +128,8 @@ typedef struct { } Rule; /* function declarations */ -static void adjustborder(Client *c, unsigned int bw); static void applyrules(Client *c); +static void applysizehints(Client *c, int *w, int *h); static void arrange(void); static void attach(Client *c); static void attachstack(Client *c); @@ -170,7 +170,7 @@ static void movemouse(const Arg *arg); static Client *nexttiled(Client *c); static void propertynotify(XEvent *e); static void quit(const Arg *arg); -static void resize(Client *c, int x, int y, int w, int h, Bool sizehints); +static void resize(Client *c, int x, int y, int w, int h); static void resizemouse(const Arg *arg); static void restack(void); static void run(void); @@ -246,16 +246,6 @@ struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 /* function implementations */ void -adjustborder(Client *c, unsigned int bw) { - XWindowChanges wc; - - if(c->bw != bw) { - c->bw = wc.border_width = bw; - XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); - } -} - -void applyrules(Client *c) { unsigned int i; Rule *r; @@ -282,6 +272,58 @@ applyrules(Client *c) { } void +applysizehints(Client *c, int *w, int *h) { + Bool baseismin; + + if(!resizehints && !c->isfloating) + return; + + /* see last two sentences in ICCCM 4.1.2.3 */ + baseismin = c->basew == c->minw && c->baseh == c->minh; + + /* set minimum possible */ + *w = MAX(1, *w); + *h = MAX(1, *h); + + if(!baseismin) { /* temporarily remove base dimensions */ + *w -= c->basew; + *h -= c->baseh; + } + + /* adjust for aspect limits */ + if(c->mina > 0 && c->maxa > 0) { + if(c->maxa < (float)*w / *h) + *w = *h * c->maxa; + else if(c->mina < (float)*h / *w) + *h = *w * c->mina; + } + + if(baseismin) { /* increment calculation requires this */ + *w -= c->basew; + *h -= c->baseh; + } + + /* adjust for increment value */ + if(c->incw) + *w -= *w % c->incw; + if(c->inch) + *h -= *h % c->inch; + + /* restore base dimensions */ + *w += c->basew; + *h += c->baseh; + + *w = MAX(*w, c->minw); + *h = MAX(*h, c->minh); + + if(c->maxw) + *w = MIN(*w, c->maxw); + + if(c->maxh) + *h = MIN(*h, c->maxh); +} + +void arrange(void) { unsigned int nt; Client *c; @@ -939,13 +981,10 @@ maprequest(XEvent *e) { void monocle(void) { - unsigned int n; Client *c; - for(n = 0, c = nexttiled(clients); c && n < 2; c = nexttiled(c->next), n++); for(c = nexttiled(clients); c; c = nexttiled(c->next)) { - adjustborder(c, n == 1 ? 0 : borderpx); - resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints); + resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw); } } @@ -993,7 +1032,7 @@ movemouse(const Arg *arg) { togglefloating(NULL); } if(!lt[sellt]->arrange || c->isfloating) - resize(c, nx, ny, c->w, c->h, False); + resize(c, nx, ny, c->w, c->h); break; } } @@ -1015,7 +1054,7 @@ propertynotify(XEvent *e) { Window trans; XPropertyEvent *ev = &e->xproperty; - if((ev->window == root) && (ev->atom = XA_WM_NAME)) + if((ev->window == root) && (ev->atom == XA_WM_NAME)) updatestatus(); else if(ev->state == PropertyDelete) return; /* ignore */ @@ -1049,54 +1088,10 @@ quit(const Arg *arg) { } void -resize(Client *c, int x, int y, int w, int h, Bool sizehints) { +resize(Client *c, int x, int y, int w, int h) { XWindowChanges wc; - if(sizehints) { - /* see last two sentences in ICCCM 4.1.2.3 */ - Bool baseismin = c->basew == c->minw && c->baseh == c->minh; - - /* set minimum possible */ - w = MAX(1, w); - h = MAX(1, h); - - if(!baseismin) { /* temporarily remove base dimensions */ - w -= c->basew; - h -= c->baseh; - } - - /* adjust for aspect limits */ - if(c->mina > 0 && c->maxa > 0) { - if(c->maxa < (float)w / h) - w = h * c->maxa; - else if(c->mina < (float)h / w) - h = w * c->mina; - } - - if(baseismin) { /* increment calculation requires this */ - w -= c->basew; - h -= c->baseh; - } - - /* adjust for increment value */ - if(c->incw) - w -= w % c->incw; - if(c->inch) - h -= h % c->inch; - - /* restore base dimensions */ - w += c->basew; - h += c->baseh; - - w = MAX(w, c->minw); - h = MAX(h, c->minh); - - if(c->maxw) - w = MIN(w, c->maxw); - - if(c->maxh) - h = MIN(h, c->maxh); - } + applysizehints(c, &w, &h); if(w <= 0 || h <= 0) return; if(x > sx + sw) @@ -1161,7 +1156,7 @@ resizemouse(const Arg *arg) { togglefloating(NULL); } if(!lt[sellt]->arrange || c->isfloating) - resize(c, c->x, c->y, nw, nh, True); + resize(c, c->x, c->y, nw, nh); break; } } @@ -1308,7 +1303,7 @@ setup(void) { dc.sel[ColBG] = getcolor(selbgcolor); dc.sel[ColFG] = getcolor(selfgcolor); dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen)); - dc.gc = XCreateGC(dpy, root, 0, 0); + dc.gc = XCreateGC(dpy, root, 0, NULL); XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); if(!dc.font.set) XSetFont(dpy, dc.gc, dc.font.xfont->fid); @@ -1319,7 +1314,7 @@ setup(void) { blw = MAX(blw, w); } - wa.override_redirect = 1; + wa.override_redirect = True; wa.background_pixmap = ParentRelative; wa.event_mask = ButtonPressMask|ExposureMask; @@ -1349,11 +1344,9 @@ showhide(Client *c, unsigned int ntiled) { if(!c) return; if(ISVISIBLE(c)) { /* show clients top down */ - if(c->isfloating || ntiled > 1) /* avoid unnecessary border reverts */ - adjustborder(c, borderpx); XMoveWindow(dpy, c->win, c->x, c->y); if(!lt[sellt]->arrange || c->isfloating) - resize(c, c->x, c->y, c->w, c->h, True); + resize(c, c->x, c->y, c->w, c->h); showhide(c->snext, ntiled); } else { /* hide clients bottom up */ @@ -1414,8 +1407,7 @@ tile(void) { /* master */ c = nexttiled(clients); mw = mfact * ww; - adjustborder(c, n == 1 ? 0 : borderpx); - resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints); + resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw); if(--n == 0) return; @@ -1429,9 +1421,8 @@ tile(void) { h = wh; for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) { - adjustborder(c, borderpx); resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n) - ? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints); + ? wy + wh - y - 2 * c->bw : h - 2 * c->bw)); if(h != wh) y = c->y + HEIGHT(c); } @@ -1451,7 +1442,7 @@ togglefloating(const Arg *arg) { return; sel->isfloating = !sel->isfloating || sel->isfixed; if(sel->isfloating) - resize(sel, sel->x, sel->y, sel->w, sel->h, True); + resize(sel, sel->x, sel->y, sel->w, sel->h); arrange(); } @@ -1463,7 +1454,7 @@ toggletag(const Arg *arg) { return; mask = sel->tags ^ (arg->ui & TAGMASK); - if(sel && mask) { + if(mask) { sel->tags = mask; arrange(); } @@ -1713,9 +1704,9 @@ main(int argc, char *argv[]) { die("usage: dwm [-v]\n"); if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fprintf(stderr, "warning: no locale support\n"); + fputs("warning: no locale support\n", stderr); - if(!(dpy = XOpenDisplay(0))) + if(!(dpy = XOpenDisplay(NULL))) die("dwm: cannot open display\n"); checkotherwm();