X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=92668921839101ff7a14893cbf1297e9dec4895c;hb=7df39f3fc71aa62e64664787902152b41617fe1c;hp=0866c06754a4abd7fafae096f69a2c3ee71634c5;hpb=1c80c05587e0f9fc23fb774aa2ef3b297fc8f6d8;p=dwm.git diff --git a/dwm.c b/dwm.c index 0866c06..9266892 100644 --- a/dwm.c +++ b/dwm.c @@ -129,6 +129,7 @@ typedef struct { /* function declarations */ 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); @@ -169,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); @@ -178,7 +179,7 @@ static void setclientstate(Client *c, long state); static void setlayout(const Arg *arg); static void setmfact(const Arg *arg); static void setup(void); -static void showhide(Client *c, unsigned int ntiled); +static void showhide(Client *c); static void sigchld(int signal); static void spawn(const Arg *arg); static void tag(const Arg *arg); @@ -251,6 +252,7 @@ applyrules(Client *c) { 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]; @@ -258,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) @@ -266,17 +268,77 @@ 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 arrange(void) { - unsigned int nt; - Client *c; - - for(nt = 0, c = nexttiled(clients); c; c = nexttiled(c->next), nt++); - showhide(stack, nt); + showhide(stack); focus(NULL); if(lt[sellt]->arrange) lt[sellt]->arrange(); @@ -735,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); @@ -874,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; } @@ -931,7 +997,7 @@ monocle(void) { Client *c; for(c = nexttiled(clients); c; c = nexttiled(c->next)) { - 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); } } @@ -952,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) { @@ -975,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); } @@ -1035,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; @@ -1126,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) { @@ -1147,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)); @@ -1294,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); @@ -1331,17 +1331,17 @@ setup(void) { } void -showhide(Client *c, unsigned int ntiled) { +showhide(Client *c) { if(!c) return; if(ISVISIBLE(c)) { /* show clients top down */ 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); - showhide(c->snext, ntiled); + resize(c, c->x, c->y, c->w, c->h); + showhide(c->snext); } else { /* hide clients bottom up */ - showhide(c->snext, ntiled); + showhide(c->snext); XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); } } @@ -1398,7 +1398,7 @@ tile(void) { /* master */ c = nexttiled(clients); mw = mfact * ww; - 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; @@ -1413,7 +1413,7 @@ tile(void) { for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) { 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); } @@ -1433,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(); } @@ -1545,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); } @@ -1697,7 +1698,7 @@ main(int argc, char *argv[]) { if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) fputs("warning: no locale support\n", stderr); - if(!(dpy = XOpenDisplay(0))) + if(!(dpy = XOpenDisplay(NULL))) die("dwm: cannot open display\n"); checkotherwm();