X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=92668921839101ff7a14893cbf1297e9dec4895c;hb=7df39f3fc71aa62e64664787902152b41617fe1c;hp=5d2d5413c6fcc0b220690ad2eeda5d8ccf4b8997;hpb=fef4614772c222fe5b095f89ddbcc7a5a34904ed;p=dwm.git diff --git a/dwm.c b/dwm.c index 5d2d541..9266892 100644 --- a/dwm.c +++ b/dwm.c @@ -128,8 +128,8 @@ typedef struct { } Rule; /* function declarations */ -static void adjustborder(Client *c, Bool issingle); static void applyrules(Client *c); +static Bool applysizehints(Client *c, int *x, int *y, 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,23 +246,13 @@ struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 /* function implementations */ void -adjustborder(Client *c, Bool issingle) { - XWindowChanges wc; - - wc.border_width = issingle ? 0 : borderpx; - if(c->bw != wc.border_width) { - c->bw = wc.border_width; - XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); - } -} - -void applyrules(Client *c) { unsigned int i; Rule *r; XClassHint ch = { 0 }; /* rule matching */ + c->isfloating = c->tags = 0; if(XGetClassHint(dpy, c->win, &ch)) { for(i = 0; i < LENGTH(rules); i++) { r = &rules[i]; @@ -270,7 +260,7 @@ applyrules(Client *c) { && (!r->class || (ch.res_class && strstr(ch.res_class, r->class))) && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) { c->isfloating = r->isfloating; - c->tags |= r->tags & TAGMASK ? r->tags & TAGMASK : tagset[seltags]; + c->tags |= r->tags; } } if(ch.res_class) @@ -278,8 +268,72 @@ applyrules(Client *c) { if(ch.res_name) XFree(ch.res_name); } - if(!c->tags) - c->tags = tagset[seltags]; + c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : tagset[seltags]; +} + +Bool +applysizehints(Client *c, int *x, int *y, int *w, int *h) { + Bool baseismin; + + /* set minimum possible */ + *w = MAX(1, *w); + *h = MAX(1, *h); + + if(*x > sx + sw) + *x = sw - WIDTH(c); + if(*y > sy + sh) + *y = sh - HEIGHT(c); + if(*x + *w + 2 * c->bw < sx) + *x = sx; + if(*y + *h + 2 * c->bw < sy) + *y = sy; + if(*h < bh) + *h = bh; + if(*w < bh) + *w = bh; + + if(resizehints || c->isfloating) { + /* see last two sentences in ICCCM 4.1.2.3 */ + baseismin = c->basew == c->minw && c->baseh == c->minh; + + 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); + } + return *x != c->x || *y != c->y || *w != c->w || *h != c->h; } void @@ -743,7 +797,10 @@ grabbuttons(Client *c, Bool focused) { for(i = 0; i < LENGTH(buttons); i++) if(buttons[i].click == ClkClientWin) for(j = 0; j < LENGTH(modifiers); j++) - XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); + XGrabButton(dpy, buttons[i].button, + buttons[i].mask | modifiers[j], + c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); } else XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); @@ -882,7 +939,8 @@ manage(Window w, XWindowAttributes *wa) { c->y = sy + sh - HEIGHT(c); c->x = MAX(c->x, sx); /* only fix client y-offset, if the client center might cover the bar */ - c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy); + c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) + && (c->x + (c->w / 2) < wx + ww)) ? bh : sy); c->bw = borderpx; } @@ -936,13 +994,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); - 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); } } @@ -963,8 +1018,6 @@ movemouse(const Arg *arg) { None, cursor[CurMove], CurrentTime) != GrabSuccess) return; XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui); - if(usegrab) - XGrabServer(dpy); do { XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev); switch (ev.type) { @@ -986,17 +1039,16 @@ movemouse(const Arg *arg) { ny = wy; else if(abs((wy + wh) - (ny + HEIGHT(c))) < snap) ny = wy + wh - HEIGHT(c); - if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap)) + if(!c->isfloating && lt[sellt]->arrange + && (abs(nx - c->x) > snap || abs(ny - c->y) > snap)) 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; } } while(ev.type != ButtonRelease); - if(usegrab) - XUngrabServer(dpy); XUngrabPointer(dpy, CurrentTime); } @@ -1012,7 +1064,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 */ @@ -1046,69 +1098,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); - } - if(w <= 0 || h <= 0) - return; - if(x > sx + sw) - x = sw - WIDTH(c); - if(y > sy + sh) - y = sh - HEIGHT(c); - if(x + w + 2 * c->bw < sx) - x = sx; - if(y + h + 2 * c->bw < sy) - y = sy; - if(h < bh) - h = bh; - if(w < bh) - w = bh; - if(c->x != x || c->y != y || c->w != w || c->h != h) { + if(applysizehints(c, &x, &y, &w, &h)) { c->x = wc.x = x; c->y = wc.y = y; c->w = wc.width = w; @@ -1137,8 +1130,6 @@ resizemouse(const Arg *arg) { None, cursor[CurResize], CurrentTime) != GrabSuccess) return; XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1); - if(usegrab) - XGrabServer(dpy); do { XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev); switch(ev.type) { @@ -1148,8 +1139,8 @@ resizemouse(const Arg *arg) { handler[ev.type](&ev); break; case MotionNotify: - nw = MAX(ev.xmotion.x - ocx - 2*c->bw + 1, 1); - nh = MAX(ev.xmotion.y - ocy - 2*c->bw + 1, 1); + nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1); + nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1); if(snap && nw >= wx && nw <= wx + ww && nh >= wy && nh <= wy + wh) { @@ -1158,13 +1149,11 @@ 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; } } while(ev.type != ButtonRelease); - if(usegrab) - XUngrabServer(dpy); XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1); XUngrabPointer(dpy, CurrentTime); while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); @@ -1305,7 +1294,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); @@ -1316,7 +1305,7 @@ setup(void) { blw = MAX(blw, w); } - wa.override_redirect = 1; + wa.override_redirect = True; wa.background_pixmap = ParentRelative; wa.event_mask = ButtonPressMask|ExposureMask; @@ -1346,10 +1335,9 @@ showhide(Client *c) { if(!c) return; if(ISVISIBLE(c)) { /* show clients top down */ - adjustborder(c, False); 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); } else { /* hide clients bottom up */ @@ -1410,8 +1398,7 @@ tile(void) { /* master */ c = nexttiled(clients); mw = mfact * ww; - adjustborder(c, n == 1); - 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; @@ -1425,9 +1412,8 @@ tile(void) { h = wh; for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) { - adjustborder(c, False); 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); } @@ -1447,7 +1433,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(); } @@ -1459,7 +1445,7 @@ toggletag(const Arg *arg) { return; mask = sel->tags ^ (arg->ui & TAGMASK); - if(sel && mask) { + if(mask) { sel->tags = mask; arrange(); } @@ -1559,7 +1545,8 @@ updatenumlockmask(void) { modmap = XGetModifierMapping(dpy); for(i = 0; i < 8; i++) for(j = 0; j < modmap->max_keypermod; j++) - if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock)) + if(modmap->modifiermap[i * modmap->max_keypermod + j] + == XKeysymToKeycode(dpy, XK_Num_Lock)) numlockmask = (1 << i); XFreeModifiermap(modmap); } @@ -1704,14 +1691,14 @@ zoom(const Arg *arg) { int main(int argc, char *argv[]) { if(argc == 2 && !strcmp("-v", argv[1])) - die("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n"); + die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n"); else if(argc != 1) 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();