X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=ef723ccbe1ba48e8bf9b4bc16c2413c8b91414b5;hp=dc63a0b75c32e369a2542579894393fde808b134;hb=1a26389e2bb90150786b20f7706091e3b5620b59;hpb=0b5dcf229f64a23438e6ef5929d78b7f9bd48355 diff --git a/dwm.c b/dwm.c index dc63a0b..ef723cc 100644 --- a/dwm.c +++ b/dwm.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -127,6 +128,7 @@ typedef struct { } Rule; /* function declarations */ +static void adjustborder(Client *c, unsigned int bw); static void applyrules(Client *c); static void arrange(void); static void attach(Client *c); @@ -177,7 +179,8 @@ 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); +static void showhide(Client *c, unsigned int ntiled); +static void sigchld(int signal); static void spawn(const Arg *arg); static void tag(const Arg *arg); static int textnw(const char *text, unsigned int len); @@ -243,6 +246,16 @@ 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; @@ -256,7 +269,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; + c->tags |= r->tags & TAGMASK ? r->tags & TAGMASK : tagset[seltags]; } } if(ch.res_class) @@ -270,7 +283,11 @@ applyrules(Client *c) { void arrange(void) { - showhide(stack); + unsigned int nt; + Client *c; + + for(nt = 0, c = nexttiled(clients); c; c = nexttiled(c->next), nt++); + showhide(stack, nt); focus(NULL); if(lt[sellt]->arrange) lt[sellt]->arrange(); @@ -341,7 +358,6 @@ cleanup(void) { Arg a = {.ui = ~0}; Layout foo = { "", NULL }; - close(STDIN_FILENO); view(&a); lt[sellt] = &foo; while(stack) @@ -923,10 +939,14 @@ maprequest(XEvent *e) { void monocle(void) { + unsigned int n; Client *c; - for(c = nexttiled(clients); c; c = nexttiled(c->next)) + 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); + } } void @@ -995,7 +1015,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 */ @@ -1131,8 +1151,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) { @@ -1325,37 +1345,41 @@ setup(void) { } void -showhide(Client *c) { +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); - showhide(c->snext); + showhide(c->snext, ntiled); } else { /* hide clients bottom up */ - showhide(c->snext); + showhide(c->snext, ntiled); XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); } } + +void +sigchld(int signal) { + while(0 < waitpid(-1, NULL, WNOHANG)); +} + void spawn(const Arg *arg) { - /* The double-fork construct avoids zombie processes and keeps the code - * clean from stupid signal handlers. */ + signal(SIGCHLD, sigchld); if(fork() == 0) { - if(fork() == 0) { - if(dpy) - close(ConnectionNumber(dpy)); - setsid(); - execvp(((char **)arg->v)[0], (char **)arg->v); - fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]); - perror(" failed"); - } + if(dpy) + close(ConnectionNumber(dpy)); + setsid(); + execvp(((char **)arg->v)[0], (char **)arg->v); + fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]); + perror(" failed"); exit(0); } - wait(0); } void @@ -1390,6 +1414,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); if(--n == 0) @@ -1404,6 +1429,7 @@ 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); if(h != wh) @@ -1437,7 +1463,7 @@ toggletag(const Arg *arg) { return; mask = sel->tags ^ (arg->ui & TAGMASK); - if(sel && mask) { + if(mask) { sel->tags = mask; arrange(); } @@ -1682,7 +1708,7 @@ 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");