X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=613b6f15eb01bf1f34c88b5e44b5d3d6d7c107cf;hb=f0d1d5206f926f58b259af3294a4eebf53a9e7bd;hp=ff71194ba3a896ee487cf979855e8b18dcb6d4f5;hpb=fbce733532f90c0f6af23c0216fe47b3d40fb5c3;p=dwm.git diff --git a/dwm.c b/dwm.c index ff71194..613b6f1 100644 --- a/dwm.c +++ b/dwm.c @@ -6,12 +6,9 @@ * events about window (dis-)appearance. Only one X connection at a time is * allowed to select for this event mask. * - * Calls to fetch an X event from the event queue are blocking. Due reading - * status text from standard input, a select()-driven main loop has been - * implemented which selects for reads on the X connection and STDIN_FILENO to - * handle all data smoothly. The event handlers of dwm are organized in an - * array which is accessed whenever a new event has been fetched. This allows - * event dispatching in O(1) time. + * The event handlers of dwm are organized in an array which is accessed + * whenever a new event has been fetched. This allows event dispatching + * in O(1) time. * * Each child of the root window is called a client, except windows which have * set the override_redirect flag. Clients are organized in a global @@ -26,11 +23,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include @@ -181,7 +178,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); @@ -196,6 +194,7 @@ static void updatebar(void); static void updategeom(void); static void updatenumlockmask(void); static void updatesizehints(Client *c); +static void updatestatus(void); static void updatetitle(Client *c); static void updatewmhints(Client *c); static void view(const Arg *arg); @@ -259,7 +258,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) @@ -273,7 +272,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(); @@ -344,7 +347,6 @@ cleanup(void) { Arg a = {.ui = ~0}; Layout foo = { "", NULL }; - close(STDIN_FILENO); view(&a); lt[sellt] = &foo; while(stack) @@ -928,8 +930,9 @@ void monocle(void) { Client *c; - for(c = nexttiled(clients); c; c = nexttiled(c->next)) + for(c = nexttiled(clients); c; c = nexttiled(c->next)) { resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints); + } } void @@ -998,9 +1001,11 @@ propertynotify(XEvent *e) { Window trans; XPropertyEvent *ev = &e->xproperty; - if(ev->state == PropertyDelete) + if((ev->window == root) && (ev->atom == XA_WM_NAME)) + updatestatus(); + else if(ev->state == PropertyDelete) return; /* ignore */ - if((c = getclient(ev->window))) { + else if((c = getclient(ev->window))) { switch (ev->atom) { default: break; case XA_WM_TRANSIENT_FOR: @@ -1026,7 +1031,7 @@ propertynotify(XEvent *e) { void quit(const Arg *arg) { - readin = running = False; + running = False; } void @@ -1132,8 +1137,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) { @@ -1180,60 +1185,13 @@ restack(void) { void run(void) { - char *p; - char sbuf[sizeof stext]; - fd_set rd; - int r, xfd; - unsigned int len, offset; XEvent ev; - /* main event loop, also reads status text from stdin */ + /* main event loop */ XSync(dpy, False); - xfd = ConnectionNumber(dpy); - offset = 0; - len = sizeof stext - 1; - sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */ - while(running) { - FD_ZERO(&rd); - if(readin) - FD_SET(STDIN_FILENO, &rd); - FD_SET(xfd, &rd); - if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) { - if(errno == EINTR) - continue; - die("select failed\n"); - } - if(FD_ISSET(STDIN_FILENO, &rd)) { - switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) { - case -1: - strncpy(stext, strerror(errno), len); - readin = False; - break; - case 0: - strncpy(stext, "EOF", 4); - readin = False; - break; - default: - for(p = sbuf + offset; r > 0; p++, r--, offset++) - if(*p == '\n' || *p == '\0') { - *p = '\0'; - strncpy(stext, sbuf, len); - p += r - 1; /* p is sbuf + offset + r - 1 */ - for(r = 0; *(p - r) && *(p - r) != '\n'; r++); - offset = r; - if(r) - memmove(sbuf, p - r + 1, r); - break; - } - break; - } - drawbar(); - } - while(XPending(dpy)) { - XNextEvent(dpy, &ev); - if(handler[ev.type]) - (handler[ev.type])(&ev); /* call handler */ - } + while(running && !XNextEvent(dpy, &ev)) { + if(handler[ev.type]) + (handler[ev.type])(&ev); /* call handler */ } } @@ -1336,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); @@ -1347,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; @@ -1356,8 +1314,7 @@ setup(void) { CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); XDefineCursor(dpy, barwin, cursor[CurNormal]); XMapRaised(dpy, barwin); - strcpy(stext, "dwm-"VERSION); - drawbar(); + updatestatus(); /* EWMH support per view */ XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32, @@ -1365,7 +1322,8 @@ setup(void) { /* select for events */ wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask - |EnterWindowMask|LeaveWindowMask|StructureNotifyMask; + |EnterWindowMask|LeaveWindowMask|StructureNotifyMask + |PropertyChangeMask; XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa); XSelectInput(dpy, root, wa.event_mask); @@ -1373,37 +1331,39 @@ setup(void) { } void -showhide(Client *c) { +showhide(Client *c, unsigned int ntiled) { 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); + 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 @@ -1485,7 +1445,7 @@ toggletag(const Arg *arg) { return; mask = sel->tags ^ (arg->ui & TAGMASK); - if(sel && mask) { + if(mask) { sel->tags = mask; arrange(); } @@ -1647,11 +1607,18 @@ updatetitle(Client *c) { } void +updatestatus() { + if(!gettextprop(root, XA_WM_NAME, stext, sizeof(stext))) + strcpy(stext, "dwm-"VERSION); + drawbar(); +} + +void updatewmhints(Client *c) { XWMHints *wmh; if((wmh = XGetWMHints(dpy, c->win))) { - if(ISVISIBLE(c) && wmh->flags & XUrgencyHint) { + if(c == sel && wmh->flags & XUrgencyHint) { wmh->flags &= ~XUrgencyHint; XSetWMHints(dpy, c->win, wmh); } @@ -1723,14 +1690,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();