* 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
#include <errno.h>
#include <locale.h>
#include <stdarg.h>
+#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <sys/select.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <X11/cursorfont.h>
} 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);
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);
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 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);
/* 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;
&& (!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)
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();
Arg a = {.ui = ~0};
Layout foo = { "", NULL };
- close(STDIN_FILENO);
view(&a);
lt[sellt] = &foo;
while(stack)
}
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
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
}
if(c) {
+ if(c->isurgent)
+ clearurgent(c);
detachstack(c);
attachstack(c);
grabbuttons(c, True);
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
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:
void
quit(const Arg *arg) {
- readin = running = False;
+ running = False;
}
void
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) {
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 */
}
}
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,
/* 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);
}
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);
}
}
/* 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)
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)
if(mask) {
tagset[seltags] = mask;
- clearurgent();
arrange();
}
}
}
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);
}
seltags ^= 1; /* toggle sel tagset */
if(arg->ui & TAGMASK)
tagset[seltags] = arg->ui & TAGMASK;
- clearurgent();
arrange();
}
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");
Got questions, comments, patches, etc.? Contact Jason Woofenden