X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=489ba80a9f82074399060c2df262bf8a608342da;hp=bded0c5def4e8650b3f99468db1bdc726a391c44;hb=be39dddcc5bad25e0e1430228e196c3837f1c3e7;hpb=ea8a4ca46a9577997e0a3f30e211c644477c6a00 diff --git a/dwm.c b/dwm.c index bded0c5..489ba80 100644 --- a/dwm.c +++ b/dwm.c @@ -6,16 +6,13 @@ * 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 - * doubly-linked client list, the focus history is remembered through a global + * linked client list, the focus history is remembered through a global * stack list. Each client contains a bit array to indicate the tags of a * client. * @@ -26,11 +23,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include @@ -131,6 +128,7 @@ typedef struct { } Rule; /* function declarations */ +static void adjustborder(Client *c, Bool issingle); static void applyrules(Client *c); static void arrange(void); static void attach(Client *c); @@ -138,7 +136,7 @@ static void attachstack(Client *c); static void buttonpress(XEvent *e); static void checkotherwm(void); static void cleanup(void); -static void clearurgent(void); +static void clearurgent(Client *c); static void configure(Client *c); static void configurenotify(XEvent *e); static void configurerequest(XEvent *e); @@ -182,6 +180,7 @@ static void setlayout(const Arg *arg); static void setmfact(const Arg *arg); static void setup(void); static void showhide(Client *c); +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 +195,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); @@ -246,6 +246,17 @@ 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; @@ -344,7 +355,6 @@ cleanup(void) { Arg a = {.ui = ~0}; Layout foo = { "", NULL }; - close(STDIN_FILENO); view(&a); lt[sellt] = &foo; while(stack) @@ -365,20 +375,15 @@ cleanup(void) { } void -clearurgent(void) { +clearurgent(Client *c) { XWMHints *wmh; - Client *c; - - for(c = clients; c; c = c->next) - if(ISVISIBLE(c) && c->isurgent) { - c->isurgent = False; - if (!(wmh = XGetWMHints(dpy, c->win))) - continue; - wmh->flags &= ~XUrgencyHint; - XSetWMHints(dpy, c->win, wmh); - XFree(wmh); - } + c->isurgent = False; + if(!(wmh = XGetWMHints(dpy, c->win))) + return; + wmh->flags &= ~XUrgencyHint; + XSetWMHints(dpy, c->win, wmh); + XFree(wmh); } void @@ -617,6 +622,8 @@ focus(Client *c) { XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]); } if(c) { + if(c->isurgent) + clearurgent(c); detachstack(c); attachstack(c); grabbuttons(c, True); @@ -929,10 +936,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); resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints); + } } void @@ -1001,9 +1012,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: @@ -1029,7 +1042,7 @@ propertynotify(XEvent *e) { void quit(const Arg *arg) { - readin = running = False; + running = False; } void @@ -1183,60 +1196,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 */ } } @@ -1359,8 +1325,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, @@ -1368,7 +1333,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); @@ -1380,6 +1346,7 @@ 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); @@ -1391,22 +1358,24 @@ showhide(Client *c) { } } + +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 @@ -1441,6 +1410,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); if(--n == 0) @@ -1455,14 +1425,9 @@ tile(void) { h = wh; for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) { - if(i + 1 == n) { /* remainder */ - if(wy + wh - y < bh) - resize(c, x, y, w - 2 * c->bw, wy + wh - y - 2 * c->bw, False); - else - resize(c, x, y, w - 2 * c->bw, wy + wh - y - 2 * c->bw, resizehints); - } - else - resize(c, x, y, w - 2 * c->bw, h - 2 * c->bw, resizehints); + 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); if(h != wh) y = c->y + HEIGHT(c); } @@ -1506,7 +1471,6 @@ toggleview(const Arg *arg) { if(mask) { tagset[seltags] = mask; - clearurgent(); arrange(); } } @@ -1657,11 +1621,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); } @@ -1679,7 +1650,6 @@ view(const Arg *arg) { seltags ^= 1; /* toggle sel tagset */ if(arg->ui & TAGMASK) tagset[seltags] = arg->ui & TAGMASK; - clearurgent(); arrange(); }